3 files changed, 58 insertions, 15 deletions
diff --git a/abs/extra/libcdio/PKGBUILD b/abs/extra/libcdio/PKGBUILD
index 1d4cacf..a532e0d 100644
--- a/abs/extra/libcdio/PKGBUILD
+++ b/abs/extra/libcdio/PKGBUILD
@@ -1,26 +1,34 @@
-# $Id: PKGBUILD 9268 2008-08-17 05:54:40Z allan $
-# Maintainer: damir <damir@archlinux.org>
+# $Id: PKGBUILD 150880 2012-02-23 13:48:06Z allan $
+# Maintainer:
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=libcdio
-pkgver=0.82
+pkgver=0.83
 pkgrel=1
 pkgdesc="GNU Compact Disc Input and Control Library"
-arch=("i686" "x86_64")
-license=('GPL')
+arch=('i686' 'x86_64')
+license=('GPL3')
 url="http://www.gnu.org/software/libcdio/"
-depends=('gcc-libs>=4.3.0' 'libcddb' 'ncurses')
+depends=('libcddb' 'ncurses')
 options=('!libtool')
-source=(http://ftp.gnu.org/gnu/libcdio/$pkgname-$pkgver.tar.gz)
+install=libcdio.install
+source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig}
+        libcdio-0.83-linking.patch)
+md5sums=('b9e0f1bccb142e697cd834fe56b6e6fb'
+         'a7864a4b572a1e2a28cc0a05aa4a67d3'
+         '5a7f50209c03d5919d5b932f07871af7')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --disable-vcd-info || return 1
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-  install -m644 libcdio_paranoia.pc libcdio_cdda.pc \
-    ${startdir}/pkg/usr/lib/pkgconfig/ || return 1
-  rm ${pkgdir}/usr/share/info/dir
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i $srcdir/libcdio-0.83-linking.patch
+  ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs
+  make
 }
 
-md5sums=('1c29b18e01ab2b966162bc727bf3c360')
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 DESTDIR="${pkgdir}" install
+  
+  sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
+    $pkgdir/usr/include/cdio/cdio_config.h
+}
diff --git a/abs/extra/libcdio/libcdio-0.83-linking.patch b/abs/extra/libcdio/libcdio-0.83-linking.patch
new file mode 100644
index 0000000..84a0746
--- /dev/null
+++ b/abs/extra/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)
diff --git a/abs/extra/libcdio/libcdio.install b/abs/extra/libcdio/libcdio.install
new file mode 100644
index 0000000..33a4e1a
--- /dev/null
+++ b/abs/extra/libcdio/libcdio.install
@@ -0,0 +1,13 @@
+info_dir=/usr/share/info
+
+post_install() {
+  install-info ${info_dir}/libcdio.info.gz ${info_dir}/dir 2> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  install-info --delete ${info_dir}/libcdio.info.gz ${info_dir}/dir 2> /dev/null
+}