slomo gst-plugins-base: gst-plugins-base/

CVS Root:       /cvs/gstreamer
Module:         gst-plugins-base
Changes by:     slomo
Date:           Mon Dec 08 2008  18:12:32 UTC

Log message:
* configure.ac:
First check for "theoraenc theoradec" and if that failed check
for "theora >= 1.0alpha5". The former appeared in 1.0beta3 and
deprecate the latter. Also linking on Windows fails with just "theora"
and the version check would fail for the release candidates.
Fixes bug #563718.

Modified files:
    .               : ChangeLog configure.ac

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.4233&r2=1.4234
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/configure.ac.diff?r1=1.754&r2=1.755

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v
retrieving revision 1.4233
retrieving revision 1.4234
diff -u -d -r1.4233 -r1.4234
--- ChangeLog	8 Dec 2008 15:25:11 -0000	1.4233
+++ ChangeLog	8 Dec 2008 18:12:17 -0000	1.4234
@@ -1,10 +1,18 @@
+2008-12-08  Sebastian Dröge  <[email protected]>
+
+	* configure.ac:
+	First check for "theoraenc theoradec" and if that failed check
+	for "theora >= 1.0alpha5". The former appeared in 1.0beta3 and
+	deprecate the latter. Also linking on Windows fails with just "theora"
+	and the version check would fail for the release candidates.
+	Fixes bug #563718.
 2008-12-08  Stefan Kost  <[email protected]>
 
 	* gst/playback/gstdecodebin.c:
 	* gst/playback/gstdecodebin2.c:
 	  Add basic docs to decodebin and link to decodebin from decodebin2.
 	  
-
 2008-12-08  Wim Taymans  <[email protected]>
 	Patch by: Olivier Crete  <tester at tester ca>
Index: configure.ac
RCS file: /cvs/gstreamer/gst-plugins-base/configure.ac,v
retrieving revision 1.754
retrieving revision 1.755
diff -u -d -r1.754 -r1.755
--- configure.ac	4 Dec 2008 20:09:19 -0000	1.754
+++ configure.ac	8 Dec 2008 18:12:18 -0000	1.755
@@ -507,9 +507,14 @@
 dnl *** theora ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_THEORA, true)
 AG_GST_CHECK_FEATURE(THEORA, [Xiph Theora video codec], theora, [
-  dnl this check will work as long as theora uses 1.0.x or similar for the
-  dnl first post-alpha release and not just 1.0
-  AG_GST_PKG_CHECK_MODULES(THEORA, theora >= 1.0alpha5)
+  dnl theora uses pkg-config version incorrectly, for pkg-config:
+  dnl 1.0 < 1.0RCX < 1.0alphaX < 1.0betaX < 1.0.0
+  dnl theoraenc and theoradec appeared in 1.0beta3
+  AG_GST_PKG_CHECK_MODULES(THEORA, theoradec theoraenc)
+  if test x$HAVE_THEORA = xno; then
+    AG_GST_PKG_CHECK_MODULES(THEORA, theora >= 1.0alpha5)
+  fi
 ])
 dnl *** vorbis ***

------------------------------------------------------------------------------
SF.Net email is Sponsored by MIX09, March 18-20, 2009 in Las Vegas, Nevada.
The future of the web can't happen without you.  Join us at MIX09 to help
pave the way to the Next Web now. Learn more and register at
http://ad.doubleclick.net/clk;208669438;13503038;i?http://2009.visitmix.com/

_______________________________________________
gstreamer-cvs-verbose mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gstreamer-cvs-verbose