diff options
| author | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2005-07-21 13:56:45 +0000 |
|---|---|---|
| committer | Zaheer Abbas Merali <zaheerabbas@merali.org> | 2005-07-21 13:56:45 +0000 |
| commit | 59a14a7a1037425fa0f90f648e44f2add10d7f6b (patch) | |
| tree | caa79557298081e50b6ea432bb7c28c16304dc6a | |
| parent | 933712c25cc31cca24e45022520f5a38952a2138 (diff) | |
| download | gstreamer-plugins-bad-59a14a7a1037425fa0f90f648e44f2add10d7f6b.tar.gz | |
Fix xfixes cursor addition (thanks Luca for patch)
Original commit message from CVS:
2005-07-21 Zaheer Abbas Merali <zaheerabbas at merali dot org>
* configure.ac:
* sys/ximage/Makefile.am:
* sys/ximage/ximagesrc.c: (gst_ximagesrc_ximage_get),
(gst_ximagesrc_getcaps), (gst_ximagesrc_free_data_func),
(composite_pixel), (gst_ximagesrc_get), (ximagesrc_imagepool_free),
(gst_ximagesrc_change_state), (gst_ximagesrc_init),
(gst_ximagesrc_set_property), (gst_ximagesrc_get_property),
(gst_ximagesrc_finalize), (gst_ximagesrc_class_init):
Fix xfixes cursor addition (thanks Luca for patch)
Add xdamage support
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | configure.ac | 17 |
2 files changed, 29 insertions, 1 deletions
@@ -1,3 +1,16 @@ +2005-07-21 Zaheer Abbas Merali <zaheerabbas at merali dot org> + + * configure.ac: + * sys/ximage/Makefile.am: + * sys/ximage/ximagesrc.c: (gst_ximagesrc_ximage_get), + (gst_ximagesrc_getcaps), (gst_ximagesrc_free_data_func), + (composite_pixel), (gst_ximagesrc_get), (ximagesrc_imagepool_free), + (gst_ximagesrc_change_state), (gst_ximagesrc_init), + (gst_ximagesrc_set_property), (gst_ximagesrc_get_property), + (gst_ximagesrc_finalize), (gst_ximagesrc_class_init): + Fix xfixes cursor addition (thanks Luca for patch) + Add xdamage support + 2005-07-20 Michal Benes <michal.benes@xeris.cz> Reviewed by: Ronald S. Bultje <rbultje@ronald.bitfreak.net> diff --git a/configure.ac b/configure.ac index 788328112..0c15fb821 100644 --- a/configure.ac +++ b/configure.ac @@ -626,12 +626,27 @@ GST_CHECK_FEATURE(X, [X libraries and plugins], AC_SUBST(X_CFLAGS) AC_SUBST(X_LIBS) dnl check for Xfixes - PKG_CHECK_MODULES(XFIXES, xfixes, HAVE_XFIXES="yes", HAVE_XFIXES="no") + PKG_CHECK_MODULES(XFIXES, xfixes, HAVE_XFIXES="yes", HAVE_XFIXES="no") + if test "x$HAVE_XFIXES" = "xyes" + then + XFIXES_CFLAGS="-DHAVE_XFIXES $XFIXES_CFLAGS" + fi AC_SUBST(XFIXES_LIBS) AC_SUBST(XFIXES_CFLAGS) AM_CONDITIONAL(HAVE_XFIXES, test "x$HAVE_XFIXES" = "xyes") + dnl check for Xdamage + PKG_CHECK_MODULES(XDAMAGE, xdamage, HAVE_XDAMAGE="yes", HAVE_XDAMAGE="no") + if test "x$HAVE_XDAMAGE" = "xyes" + then + XDAMAGE_CFLAGS="-DHAVE_XDAMAGE $XDAMAGE_CFLAGS" + fi + AC_SUBST(XDAMAGE_LIBS) + AC_SUBST(XDAMAGE_CFLAGS) + + AM_CONDITIONAL(HAVE_XDAMAGE, test "x$HAVE_XDAMAGE" = "xyes") + fi AC_SUBST(HAVE_X) ]) |