* Update version of libcdio. 0.78.2 is now the req. version

  Patch by Patrick McLean <chutzpah at gentoo d0t org>

  contrib update by me

diff --git a/THANKS b/THANKS
index 2dfbbb769db1b659829a340cc4a23c32ba433d21..ae555a93c71015efcb7029c51c9d6bdcfba643ba 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -129,6 +129,7 @@ Olivier Pomel <pomel at via.ecp.fr> - original VLC code
 Ondrej Kuda aka Albert <kuda at natur dot cuni dot cz> - HTTP interface tips and fixes
 Øyvind Kolbu <oyvindk at world-online.no> - FreeBSD patches
 Patrick Horn <patrickd0thorn at mindspring d0t com> - DirectShow patch
+Patrick McLean <chutzpah at gentoo d0t org> - Libcdio update patch
 Paul Mackerras <paulus at linuxcare.com.au> - AltiVec IDCT and motion
 Pavlov Konstantin “thresh” - several Linux build system fixes
 Petr Vacek - FTP cleartext authentication

diff --git a/configure.ac b/configure.ac
index 16c54c54dd9a551bf644c47d62a1edb68b0046ef..edc4d49e431dfeabc9433fb68414e89bc85eecbd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2102,16 +2102,16 @@ have_libcdio=no
 have_libvcdinfo=no
 if test "${enable_libcdio}" != "no"
 then
-  PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.72,
+  PKG_CHECK_MODULES(LIBCDIO, libcdio >= 0.78.2,
      have_libcdio=yes
      AC_DEFINE(HAVE_LIBCDIO, [], 
-     [Define if you have libcdio 0.72 or greater installed]),
+     [Define if you have libcdio 0.78.2 or greater installed]),
      [AC_MSG_WARN(CD Reading and information library not found)])
 
-  PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.21,
+  PKG_CHECK_MODULES(VCDINFO, libvcdinfo >= 0.7.22,
      [have_libvcdinfo=yes
      AC_DEFINE(HAVE_VCDINFO, [], 
-     [Define if you have libvcdinfo 0.7.21 or greater installed])],
+     [Define if you have libvcdinfo 0.7.22 or greater installed])],
      [AC_MSG_WARN(VCD information library not found)])
 fi
 

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index f7a8a1fc96a500a1b1cfb23e9c27e90ce9ea8a7b..a410c8a72fa72c4887f92a9559fa2248de659747 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -110,7 +110,7 @@ CDDB_VERSION=1.2.1
 CDDB_URL=$(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.bz2
 VCDIMAGER_VERSION=0.7.23
 VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
-CDIO_VERSION=0.77
+CDIO_VERSION=0.78.2
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
 PNG_VERSION=1.2.12
 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2