configure.ac: First check for "theoraenc theoradec" and if that failed check for "theora >= 1.0alpha5". The former ap...

Original commit message from CVS:
* 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.
This commit is contained in:
Sebastian Dröge 2008-12-08 18:12:18 +00:00
parent 16e2bccc61
commit 9912a2270a
2 changed files with 17 additions and 4 deletions

View file

@ -1,10 +1,18 @@
2008-12-08 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* 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 <ensonic@users.sf.net> 2008-12-08 Stefan Kost <ensonic@users.sf.net>
* gst/playback/gstdecodebin.c: * gst/playback/gstdecodebin.c:
* gst/playback/gstdecodebin2.c: * gst/playback/gstdecodebin2.c:
Add basic docs to decodebin and link to decodebin from decodebin2. Add basic docs to decodebin and link to decodebin from decodebin2.
2008-12-08 Wim Taymans <wim.taymans@collabora.co.uk> 2008-12-08 Wim Taymans <wim.taymans@collabora.co.uk>
Patch by: Olivier Crete <tester at tester ca> Patch by: Olivier Crete <tester at tester ca>

View file

@ -507,9 +507,14 @@ AG_GST_CHECK_FEATURE(PANGO, [Pango font rendering], pango, [
dnl *** theora *** dnl *** theora ***
translit(dnm, m, l) AM_CONDITIONAL(USE_THEORA, true) translit(dnm, m, l) AM_CONDITIONAL(USE_THEORA, true)
AG_GST_CHECK_FEATURE(THEORA, [Xiph Theora video codec], theora, [ 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 theora uses pkg-config version incorrectly, for pkg-config:
dnl first post-alpha release and not just 1.0 dnl 1.0 < 1.0RCX < 1.0alphaX < 1.0betaX < 1.0.0
AG_GST_PKG_CHECK_MODULES(THEORA, theora >= 1.0alpha5) 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 *** dnl *** vorbis ***