libcdio: 0.83 -> 0.92

4 files changed, 48 insertions, 28 deletions

diff --git a/libcdio/.footprint b/libcdio/.footprint
index bfccebfa0..b102aad69 100644
--- a/libcdio/.footprint
+++ b/libcdio/.footprint
@@ -2,7 +2,6 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/cd-drive
 -rwxr-xr-x	root/root	usr/bin/cd-info
--rwxr-xr-x	root/root	usr/bin/cd-paranoia
 -rwxr-xr-x	root/root	usr/bin/cd-read
 -rwxr-xr-x	root/root	usr/bin/cdda-player
 -rwxr-xr-x	root/root	usr/bin/iso-info
@@ -25,10 +24,8 @@ drwxr-xr-x	root/root	usr/include/cdio/
 -rw-r--r--	root/root	usr/include/cdio/bytesex.h
 -rw-r--r--	root/root	usr/include/cdio/bytesex_asm.h
 -rw-r--r--	root/root	usr/include/cdio/cd_types.h
--rw-r--r--	root/root	usr/include/cdio/cdda.h
 -rw-r--r--	root/root	usr/include/cdio/cdio.h
 -rw-r--r--	root/root	usr/include/cdio/cdio_config.h
--rw-r--r--	root/root	usr/include/cdio/cdio_unconfig.h
 -rw-r--r--	root/root	usr/include/cdio/cdtext.h
 -rw-r--r--	root/root	usr/include/cdio/device.h
 -rw-r--r--	root/root	usr/include/cdio/disc.h
@@ -42,7 +39,6 @@ drwxr-xr-x	root/root	usr/include/cdio/
 -rw-r--r--	root/root	usr/include/cdio/mmc_hl_cmds.h
 -rw-r--r--	root/root	usr/include/cdio/mmc_ll_cmds.h
 -rw-r--r--	root/root	usr/include/cdio/mmc_util.h
--rw-r--r--	root/root	usr/include/cdio/paranoia.h
 -rw-r--r--	root/root	usr/include/cdio/posix.h
 -rw-r--r--	root/root	usr/include/cdio/read.h
 -rw-r--r--	root/root	usr/include/cdio/rock.h
@@ -57,30 +53,27 @@ drwxr-xr-x	root/root	usr/include/cdio/
 -rw-r--r--	root/root	usr/include/cdio/version.h
 -rw-r--r--	root/root	usr/include/cdio/xa.h
 drwxr-xr-x	root/root	usr/lib/
+-rw-r--r--	root/root	usr/lib/libcdio++.a
 -rwxr-xr-x	root/root	usr/lib/libcdio++.la
 lrwxrwxrwx	root/root	usr/lib/libcdio++.so -> libcdio++.so.0.0.2
 lrwxrwxrwx	root/root	usr/lib/libcdio++.so.0 -> libcdio++.so.0.0.2
 -rwxr-xr-x	root/root	usr/lib/libcdio++.so.0.0.2
+-rw-r--r--	root/root	usr/lib/libcdio.a
 -rwxr-xr-x	root/root	usr/lib/libcdio.la
-lrwxrwxrwx	root/root	usr/lib/libcdio.so -> libcdio.so.13.0.0
-lrwxrwxrwx	root/root	usr/lib/libcdio.so.13 -> libcdio.so.13.0.0
--rwxr-xr-x	root/root	usr/lib/libcdio.so.13.0.0
--rwxr-xr-x	root/root	usr/lib/libcdio_cdda.la
-lrwxrwxrwx	root/root	usr/lib/libcdio_cdda.so -> libcdio_cdda.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libcdio_cdda.so.1 -> libcdio_cdda.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libcdio_cdda.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libcdio_paranoia.la
-lrwxrwxrwx	root/root	usr/lib/libcdio_paranoia.so -> libcdio_paranoia.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libcdio_paranoia.so.1 -> libcdio_paranoia.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libcdio_paranoia.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libcdio.so -> libcdio.so.15.0.0
+lrwxrwxrwx	root/root	usr/lib/libcdio.so.15 -> libcdio.so.15.0.0
+-rwxr-xr-x	root/root	usr/lib/libcdio.so.15.0.0
+-rw-r--r--	root/root	usr/lib/libiso9660++.a
 -rwxr-xr-x	root/root	usr/lib/libiso9660++.la
 lrwxrwxrwx	root/root	usr/lib/libiso9660++.so -> libiso9660++.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libiso9660++.so.0 -> libiso9660++.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libiso9660++.so.0.0.0
+-rw-r--r--	root/root	usr/lib/libiso9660.a
 -rwxr-xr-x	root/root	usr/lib/libiso9660.la
-lrwxrwxrwx	root/root	usr/lib/libiso9660.so -> libiso9660.so.8.0.0
-lrwxrwxrwx	root/root	usr/lib/libiso9660.so.8 -> libiso9660.so.8.0.0
--rwxr-xr-x	root/root	usr/lib/libiso9660.so.8.0.0
+lrwxrwxrwx	root/root	usr/lib/libiso9660.so -> libiso9660.so.9.0.0
+lrwxrwxrwx	root/root	usr/lib/libiso9660.so.9 -> libiso9660.so.9.0.0
+-rwxr-xr-x	root/root	usr/lib/libiso9660.so.9.0.0
+-rw-r--r--	root/root	usr/lib/libudf.a
 -rwxr-xr-x	root/root	usr/lib/libudf.la
 lrwxrwxrwx	root/root	usr/lib/libudf.so -> libudf.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libudf.so.0 -> libudf.so.0.0.0
@@ -88,8 +81,6 @@ lrwxrwxrwx	root/root	usr/lib/libudf.so.0 -> libudf.so.0.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libcdio++.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libcdio.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/libcdio_cdda.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/libcdio_paranoia.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libiso9660++.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libiso9660.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libudf.pc
@@ -97,7 +88,7 @@ drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/cd-drive.1.gz
 -rw-r--r--	root/root	usr/man/man1/cd-info.1.gz
--rw-r--r--	root/root	usr/man/man1/cd-paranoia.1.gz
 -rw-r--r--	root/root	usr/man/man1/cd-read.1.gz
 -rw-r--r--	root/root	usr/man/man1/iso-info.1.gz
 -rw-r--r--	root/root	usr/man/man1/iso-read.1.gz
+drwxr-xr-x	root/root	usr/share/
diff --git a/libcdio/.md5sum b/libcdio/.md5sum
index dbaaabb34..90a762787 100644
--- a/libcdio/.md5sum
+++ b/libcdio/.md5sum
@@ -1 +1,2 @@
-b9e0f1bccb142e697cd834fe56b6e6fb  libcdio-0.83.tar.gz
+5a7f50209c03d5919d5b932f07871af7  libcdio-0.83-linking.patch
+86f3f2869c1d34e4c6e52db77992b918  libcdio-0.92.tar.gz
diff --git a/libcdio/Pkgfile b/libcdio/Pkgfile
index 68a5abef2..9afd199fa 100644
--- a/libcdio/Pkgfile
+++ b/libcdio/Pkgfile
@@ -2,24 +2,30 @@
 # URL: http://www.gnu.org/software/libcdio/
 # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
 # Packager: Tim Biermann, tim_biermann at web dot de
-# Depends on: cdparanoia
+# Depends on: libcddb ncurses
 
 name=libcdio
-version=0.83
+version=0.92
 release=1
-source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
+source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz
+	libcdio-0.83-linking.patch)
 
 build() {
 	cd $name-$version
 
+	patch -p 1 -i $SRC/libcdio-0.83-linking.patch
+
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/man \
-		--disable-static
+		--disable-vcd-info \
+		--enable-cpp-progs
 
 	make
 	make DESTDIR=$PKG install
 
-	rm -rf $PKG/usr/share
-	rm -r $PKG/usr/man/jp
+	sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
+		$PKG/usr/include/cdio/cdio_config.h
+
+	rm -r $PKG/usr/share/info
 }
diff --git a/libcdio/libcdio-0.83-linking.patch b/libcdio/libcdio-0.83-linking.patch
new file mode 100644
index 000000000..84a0746b5
--- /dev/null
+++ b/libcdio/libcdio-0.83-linking.patch
@@ -0,0 +1,22 @@
+diff -Naur libcdio-0.83-orig/example/C++/OO/Makefile.in libcdio-0.83/example/C++/OO/Makefile.in
+--- libcdio-0.83-orig/example/C++/OO/Makefile.in	2011-10-27 18:02:31.000000000 +1000
++++ libcdio-0.83/example/C++/OO/Makefile.in	2012-02-18 11:10:07.369277231 +1000
+@@ -315,15 +315,15 @@
+ 
+ isofile2_SOURCES = isofile2.cpp
+ isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
++	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+ 
+ isolist_SOURCES = isolist.cpp
+ isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
++	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+ 
+ iso4_SOURCES = iso4.cpp
+ iso4_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
+-	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
++	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
+ 
+ mmc1_SOURCES = mmc1.cpp
+ mmc1_DEPENDENCIES = $(LIBCDIO_DEPS)