fix build break caused by upgrading xorg-server

Change-Id: I5bec945e23cb6935ad35ca3a2a2dfd14cb311821

diff --git a/configure.ac b/configure.ac
index 513586d..0cfec00 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,10 +37,7 @@ XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
 XORG_DRIVER_CHECK_EXT(XV, videoproto)
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(PROTO, [xproto fontsproto])
-PKG_CHECK_MODULES(XORG, xorg-server >= 1.15.0,
-                  [AC_DEFINE(LATEST_XORG, [1], ["temp define for backward compatibility with old xorg-server"])],
-                  [PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.0)])
+PKG_CHECK_MODULES(XORG, [xorg-server xproto fontsproto])
 
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
@@ -56,8 +53,8 @@ if test x"$udev" = xyes; then
        AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection])
 fi
 
-EXYNOS_CFLAGS="$EXYNOS_CFLAGS $PROTO_CFLAGS $XDBG_CFLAGS"
-EXYNOS_LIBS="$EXYNOS_LIBS $PROTO_CFLAGS $XDBG_LIBS"
+EXYNOS_CFLAGS="$EXYNOS_CFLAGS $XDBG_CFLAGS"
+EXYNOS_LIBS="$EXYNOS_LIBS $XDBG_LIBS"
 
 EXYNOS_CFLAGS="$EXYNOS_CFLAGS $DRM_CFLAGS $LIBTBM_CFLAGS "
 EXYNOS_LIBS="$EXYNOS_LIBS $DRM_LIBS $LIBTBM_LIBS "

diff --git a/src/crtcconfig/sec_crtc.c b/src/crtcconfig/sec_crtc.c
index 39d5610..de6a6e0 100644 (file)
--- a/src/crtcconfig/sec_crtc.c
+++ b/src/crtcconfig/sec_crtc.c
@@ -1419,22 +1419,14 @@ SECCrtcHideCursor (xf86CrtcPtr pCrtc)
     _cursorHide (pCrtc);
 }
 
-#ifdef LATEST_XORG
-static Bool
-#else
 static void
-#endif
 SECCrtcLoadCursorArgb(xf86CrtcPtr pCrtc, CARD32 *image)
 {
     SECCrtcPrivPtr pCrtcPriv = pCrtc->driver_private;
 
     if (pCrtcPriv == NULL || image == NULL)
     {
-#ifdef LATEST_XORG
-        return FALSE;
-#else
        return;
-#endif
     }
     XDBG_TRACE (MCRS, "[%p] image(%p) \n", pCrtc, image);
 
@@ -1446,12 +1438,7 @@ SECCrtcLoadCursorArgb(xf86CrtcPtr pCrtc, CARD32 *image)
                                      , NULL
                                      , 0);
 
-#ifdef LATEST_XORG
-    XDBG_RETURN_VAL_IF_FAIL (pCrtcPriv->backup_image != NULL, FALSE);
-#else
     XDBG_RETURN_IF_FAIL (pCrtcPriv->backup_image != NULL);
-#endif
-
 
     memcpy (pixman_image_get_data(pCrtcPriv->backup_image), image, SEC_CURSOR_W * SEC_CURSOR_H * 4);
 
@@ -1462,9 +1449,6 @@ SECCrtcLoadCursorArgb(xf86CrtcPtr pCrtc, CARD32 *image)
     }
 
     pCrtcPriv->need_cursor_update = TRUE;
-#ifdef LATEST_XORG
-    return TRUE;
-#endif
 }