diff options
| -rw-r--r-- | abs/extra/libcdio/PKGBUILD | 45 | ||||
| -rw-r--r-- | abs/extra/libcdio/libcdio-0.83-linking.patch | 22 | ||||
| -rw-r--r-- | abs/extra/libcdio/libcdio.install | 13 |
3 files changed, 24 insertions, 56 deletions
diff --git a/abs/extra/libcdio/PKGBUILD b/abs/extra/libcdio/PKGBUILD index c20a675..3bfed9a 100644 --- a/abs/extra/libcdio/PKGBUILD +++ b/abs/extra/libcdio/PKGBUILD @@ -1,38 +1,41 @@ # $Id$ -# Maintainer: +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: damir <damir@archlinux.org> pkgname=libcdio -pkgver=0.93 -pkgrel=3 +pkgver=2.0.0 +pkgrel=1 pkgdesc="GNU Compact Disc Input and Control Library" -arch=('i686' 'x86_64') -license=('GPL3') -url="http://www.gnu.org/software/libcdio/" -depends=('libcddb' 'ncurses' 'gcc-libs') -install=libcdio.install -source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig} - libcdio-0.83-linking.patch) -md5sums=('d154476feaac5a7b5f180e83eaf3d689' - 'SKIP' - '5a7f50209c03d5919d5b932f07871af7') +url="https://www.gnu.org/software/libcdio/" +arch=(x86_64) +license=(GPL3) +depends=(libcddb ncurses gcc-libs) +source=(https://ftp.gnu.org/gnu/libcdio/$pkgname-$pkgver.tar.bz2{,.sig}) +sha256sums=('cd0da052a0e149e2526c41c5ac37b4865deb5c1cffe6faed18850154dbbd284b' + 'SKIP') validpgpkeys=('DAA63BC2582034A02B923D521A8DE5008275EC21') # R. Bernstein prepare() { - cd ${pkgname}-${pkgver} - patch -Np1 -i ../libcdio-0.83-linking.patch + cd $pkgname-$pkgver + autoreconf -fi } build() { - cd ${pkgname}-${pkgver} + cd $pkgname-$pkgver ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs --disable-static + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } +check() { + cd $pkgname-$pkgver + make -C test check +} + package() { - cd ${pkgname}-${pkgver} - make -j1 DESTDIR="${pkgdir}" install - - sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \ - $pkgdir/usr/include/cdio/cdio_config.h + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + + sed -e "/define CDIO_LIBCDIO_SOURCE_PATH/s|.*|/* #undef CDIO_LIBCDIO_SOURCE_PATH */|" \ + -i "$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 deleted file mode 100644 index 84a0746..0000000 --- a/abs/extra/libcdio/libcdio-0.83-linking.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 deleted file mode 100644 index 33a4e1a..0000000 --- a/abs/extra/libcdio/libcdio.install +++ /dev/null @@ -1,13 +0,0 @@ -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 -} |