[Spice-commits] 2 commits - common/pixman_utils.c m4/spice-deps.m4

[GitLab Mirror]

 common/pixman_utils.c |    6 ++----
 m4/spice-deps.m4      |    1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 9bf4c3228804ad1a7dc19afae4030649fbee30c1
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Fri Jul 6 17:28:23 2018 +0200

    build: Define GLIB_VERSION_MIN_REQUIRED/GLIB_VERSION_MAX_ALLOWED
    
    This is defined for the meson build, but not the autotools build. This
    commit makes them consistent.
    
    Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4
index 61290fe..1721d34 100644
--- a/m4/spice-deps.m4
+++ b/m4/spice-deps.m4
@@ -183,6 +183,7 @@ AC_DEFUN([SPICE_CHECK_PIXMAN], [
 #------------------
 AC_DEFUN([SPICE_CHECK_GLIB2], [
     PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.38 gio-2.0 >= 2.38 gthread-2.0 >= 2.38)
+    GLIB2_CFLAGS="$GLIB2_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_38"
 ])
 
 # SPICE_CHECK_GDK_PIXBUF
commit 204ff1ae2efddb5d7ac7b641fb8f5b2f43dc6ba7
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Fri Jul 6 17:27:23 2018 +0200

    pixman: Use g_error() rather than g_abort()
    
    g_abort() was only added in glib 2.50, which causes meson build failures
    since this defines GLIB_VERSION_MIN_REQUIRED/GLIB_VERSION_MAX_ALLOWED
    
    Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
    Acked-by: Jonathon Jongsma <jjongsma at redhat.com>

diff --git a/common/pixman_utils.c b/common/pixman_utils.c
index b7cf25c..c573574 100644
--- a/common/pixman_utils.c
+++ b/common/pixman_utils.c
@@ -935,8 +935,7 @@ pixman_format_code_t spice_surface_format_to_pixman(uint32_t surface_format)
     case SPICE_SURFACE_FMT_32_ARGB:
         return PIXMAN_a8r8g8b8;
     default:
-        printf("Unknown surface format %d\n", surface_format);
-        g_abort();
+        g_error("Unknown surface format %d\n", surface_format);
         break;
     }
         return (pixman_format_code_t)0; /* Not reached */
@@ -974,8 +973,7 @@ pixman_format_code_t spice_bitmap_format_to_pixman(int bitmap_format,
 
     case SPICE_BITMAP_FMT_INVALID:
     default:
-        printf("Unknown bitmap format %d\n", bitmap_format);
-        g_abort();
+        g_error("Unknown bitmap format %d\n", bitmap_format);
         return PIXMAN_a8r8g8b8;
     }
 }