summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZaheer Abbas Merali <zaheerabbas@merali.org>2005-07-14 18:57:03 +0000
committerZaheer Abbas Merali <zaheerabbas@merali.org>2005-07-14 18:57:03 +0000
commitb77ac4a6aeeb700ae8ac5950b1750fb422fb60b0 (patch)
tree72753e6da27eaa1c573e6813528ee6387a53d0e9
parente4257a11b6eba02a3746129404b1dec6ec5c70e7 (diff)
downloadgst-plugins-bad-b77ac4a6aeeb700ae8ac5950b1750fb422fb60b0.tar.gz
gst-plugins-bad-b77ac4a6aeeb700ae8ac5950b1750fb422fb60b0.tar.bz2
gst-plugins-bad-b77ac4a6aeeb700ae8ac5950b1750fb422fb60b0.zip
+ sys/ximage/ximageutil.h: + sys/ximage/ximageutil.c:
Original commit message from CVS: 2005-07-14 Zaheer Abbas Merali <zaheerabbas at merali dot org> * configure.ac: * sys/ximage/Makefile.am: * sys/ximage/ximagesink.c: (gst_ximagesink_ximage_new), (gst_ximagesink_ximage_destroy), (gst_ximagesink_xcontext_get), (gst_ximagesink_xcontext_clear), (gst_ximagesink_buffer_free): * sys/ximage/ximagesink.h: * 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): + sys/ximage/ximageutil.h: + sys/ximage/ximageutil.c: Add shm support (Luca Ognibene) (bug #306292) Add mouse pointer display support using XFixes extension New property for ximagesrc: show-pointer
-rw-r--r--ChangeLog20
-rw-r--r--configure.ac25
2 files changed, 44 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ae6b887e..c4932e5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2005-07-14 Zaheer Abbas Merali <zaheerabbas at merali dot org>
+
+ * configure.ac:
+ * sys/ximage/Makefile.am:
+ * sys/ximage/ximagesink.c: (gst_ximagesink_ximage_new),
+ (gst_ximagesink_ximage_destroy), (gst_ximagesink_xcontext_get),
+ (gst_ximagesink_xcontext_clear), (gst_ximagesink_buffer_free):
+ * sys/ximage/ximagesink.h:
+ * 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):
+ + sys/ximage/ximageutil.h:
+ + sys/ximage/ximageutil.c:
+ Add shm support (Luca Ognibene) (bug #306292)
+ Add mouse pointer display support using XFixes extension
+ New property for ximagesrc: show-pointer
+
2005-07-14 Luca Ognibene <luogni@tin.it>
* gst/tcp/gstmultifdsink.h (enum):
diff --git a/configure.ac b/configure.ac
index 80142c0f..f81f48b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -625,10 +625,22 @@ GST_CHECK_FEATURE(X, [X libraries and plugins],
X_LIBS="$X_LIBS -lX11"
AC_SUBST(X_CFLAGS)
AC_SUBST(X_LIBS)
+ dnl check for Xfixes
+ AC_CHECK_HEADERS(X11/extensions/Xfixes.h, HAVE_XFIXES="yes", HAVE_XFIXES="no", [#include <X11/Xlib.h>])
+ if test "x$HAVE_XFIXES" = "xno"
+ then
+ AC_MSG_NOTICE([cannot find XFixes development files])
+ else
+ XFIXES_LIBS="-lXfixes"
+ AC_SUBST(XFIXES_LIBS)
+ fi
+
+ AM_CONDITIONAL(HAVE_XFIXES, test "x$HAVE_XFIXES" = "xyes")
+
fi
AC_SUBST(HAVE_X)
])
-
+
dnl *** XVideo ***
dnl Look for the PIC library first, Debian requires it.
dnl Check debian-devel archives for gory details.
@@ -1331,6 +1343,16 @@ GST_CHECK_FEATURE(LIBMMS, [mms protocol library], libmms, [
])
AC_SUBST(LIBMMS_LIBS)
+dnl *** live.com ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_LIVECOM, true)
+GST_CHECK_FEATURE(LIVECOM, [live.com rtsp library], livecom, [
+ dnl fixme
+ LIVECOM_CFLAGS="-I/usr/lib/live/liveMedia/include -I/usr/lib/live/UsageEnvironment/include -I/usr/lib/live/BasicUsageEnvironment/include -I/usr/lib/live/groupsock/include"
+ LIVECOM_LIBS="-L/usr/lib/live -lgroupsock -lliveMedia -lUsageEnvironment -lBasicUsageEnvironment"
+])
+AC_SUBST(LIVECOM_CFLAGS)
+AC_SUBST(LIVECOM_LIBS)
+
dnl *** libmng ***
translit(dnm, m, l) AM_CONDITIONAL(USE_LIBMNG, true)
GST_CHECK_FEATURE(LIBMNG, [libmng library], mngdec, [
@@ -2121,6 +2143,7 @@ ext/libfame/Makefile
ext/libmng/Makefile
ext/libpng/Makefile
ext/libvisual/Makefile
+ext/livecom/Makefile
ext/mad/Makefile
dnl ext/mas/Makefile
ext/mikmod/Makefile