Update of /cvsroot/xine/xine-lib
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22629
Modified Files:
AUTHORS ChangeLog configure.ac
Log Message:
Commit the XCB output plugins by Christoph Pfister after testing on Gentoo
packages for about ten days.
Index: AUTHORS
===================================================================
RCS file: /cvsroot/xine/xine-lib/AUTHORS,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -r1.230 -r1.231
--- AUTHORS 12 Aug 2006 23:57:29 -0000 1.230
+++ AUTHORS 15 Feb 2007 15:19:32 -0000 1.231
@@ -565,4 +565,7 @@
Chris Cannam <[EMAIL PROTECTED]>
JACK audio driver
+Christoph Pfister <[EMAIL PROTECTED]>
+ XCB output plugins
+
(let us know if we've forgotten anyone)
Index: ChangeLog
===================================================================
RCS file: /cvsroot/xine/xine-lib/ChangeLog,v
retrieving revision 1.718
retrieving revision 1.719
diff -u -r1.718 -r1.719
--- ChangeLog 3 Feb 2007 10:54:18 -0000 1.718
+++ ChangeLog 15 Feb 2007 15:19:32 -0000 1.719
@@ -1,6 +1,10 @@
xine-lib (1.1.5)
* Improved PulseAudio plugin, now only one connection per instance is opened
and the mainloop is threaded to reduce latency during playback.
+ * Added XCB-based output plugins (Xv and XShm), to use in software using
+ XCB to talk with the server rather than libX11 (like new Kaffeine).
+ The plugins are contributed by Christoph Pfister with the help of
+ Vincent Torri, Jamey Sharp and Christophe Thommeret.
xine-lib (1.1.4)
* Mark string-type configuration items according to whether they're plain
Index: configure.ac
===================================================================
RCS file: /cvsroot/xine/xine-lib/configure.ac,v
retrieving revision 1.459
retrieving revision 1.460
diff -u -r1.459 -r1.460
--- configure.ac 28 Jan 2007 23:48:29 -0000 1.459
+++ configure.ac 15 Feb 2007 15:19:33 -0000 1.460
@@ -894,6 +894,46 @@
dnl ---------------------------------------------
+dnl Check for xcb
+dnl ---------------------------------------------
+AC_ARG_WITH([xcb], AC_HELP_STRING([--without-xcb], [Doesn't build XCB video
out plugins]))
+
+if test "x$with_xcb" != "xno"; then
+ PKG_CHECK_MODULES([XCB], [xcb-shape >= 1.0], [have_xcb="yes"],
[have_xcb="no"])
+fi
+
+AC_SUBST(XCB_CFLAGS)
+AC_SUBST(XCB_LIBS)
+AM_CONDITIONAL(HAVE_XCB, test "x$have_xcb" = "xyes" )
+
+
+dnl ---------------------------------------------
+dnl Check for xcb-shm
+dnl ---------------------------------------------
+
+if test "x$have_xcb" = "xyes"; then
+ PKG_CHECK_MODULES([XCBSHM], [xcb-shm], [have_xcbshm="yes"],
[have_xcbshm="no"])
+fi
+
+AC_SUBST(XCBSHM_CFLAGS)
+AC_SUBST(XCBSHM_LIBS)
+AM_CONDITIONAL(HAVE_XCBSHM, test "x$have_xcbshm" = "xyes" )
+
+
+dnl ---------------------------------------------
+dnl Check for xcb-xv
+dnl ---------------------------------------------
+
+if test "x$have_xcb" = "xyes"; then
+ PKG_CHECK_MODULES([XCBXV], [xcb-xv], [have_xcbxv="yes"], [have_xcbxv="no"])
+fi
+
+AC_SUBST(XCBXV_CFLAGS)
+AC_SUBST(XCBXV_LIBS)
+AM_CONDITIONAL(HAVE_XCBXV, test "x$have_xcbxv" = "xyes" )
+
+
+dnl ---------------------------------------------
dnl Checks for Xinerama extension
dnl ---------------------------------------------
@@ -2959,6 +2999,16 @@
fi
fi
fi
+if test "x$have_xcb" = "xyes"; then
+ dnl xcb-shm
+ if test "x$have_xcbshm" = "xyes"; then
+ echo " - xcb-shm (X shared memory using XCB)"
+ fi
+ dnl xcb-xv
+ if test "x$have_xcbxv" = "xyes"; then
+ echo " - xcb-xv (XVideo using XCB)"
+ fi
+fi
if test "x$no_aalib" != "xyes"; then
echo " - aa (Ascii ART)"
fi
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
