From 299e917c17619f800f0c21cf43209065b608223f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Fri, 24 Feb 2012 23:15:21 +0000
Subject: Fri Feb 24 23:15:21 UTC 2012

---
 extra/libcdio/PKGBUILD                   | 33 ++++++++++++++++++++------------
 extra/libcdio/libcdio-0.83-linking.patch | 22 +++++++++++++++++++++
 2 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 extra/libcdio/libcdio-0.83-linking.patch

(limited to 'extra/libcdio')

diff --git a/extra/libcdio/PKGBUILD b/extra/libcdio/PKGBUILD
index 4c309a65e..a532e0d77 100644
--- a/extra/libcdio/PKGBUILD
+++ b/extra/libcdio/PKGBUILD
@@ -1,25 +1,34 @@
-# $Id: PKGBUILD 59886 2009-11-29 15:21:53Z jgc $
-# 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")
+arch=('i686' 'x86_64')
 license=('GPL3')
 url="http://www.gnu.org/software/libcdio/"
-depends=('gcc-libs>=4.4.2' 'libcddb' 'ncurses')
+depends=('libcddb' 'ncurses')
 options=('!libtool')
 install=libcdio.install
-source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz)
-md5sums=('1c29b18e01ab2b966162bc727bf3c360')
+source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig}
+        libcdio-0.83-linking.patch)
+md5sums=('b9e0f1bccb142e697cd834fe56b6e6fb'
+         'a7864a4b572a1e2a28cc0a05aa4a67d3'
+         '5a7f50209c03d5919d5b932f07871af7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs || return 1
-  make || return 1
-  make -j1 DESTDIR="${pkgdir}" install || return 1
-  #install -m644 libcdio_paranoia.pc libcdio_cdda.pc \
-  #  "${pkgdir}/usr/lib/pkgconfig/" || return 1
+  patch -Np1 -i $srcdir/libcdio-0.83-linking.patch
+  ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs
+  make
+}
+
+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/extra/libcdio/libcdio-0.83-linking.patch b/extra/libcdio/libcdio-0.83-linking.patch
new file mode 100644
index 000000000..84a0746b5
--- /dev/null
+++ b/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)
-- 
cgit v1.2.3-54-g00ecf