Date: Thursday, February 23, 2012 @ 08:48:06 Author: allan Revision: 150880
db-move: moved libcdio from [staging] to [extra] (x86_64) Added: libcdio/repos/extra-x86_64/PKGBUILD (from rev 150872, libcdio/repos/staging-x86_64/PKGBUILD) libcdio/repos/extra-x86_64/libcdio-0.83-linking.patch (from rev 150872, libcdio/repos/staging-x86_64/libcdio-0.83-linking.patch) libcdio/repos/extra-x86_64/libcdio.install (from rev 150872, libcdio/repos/staging-x86_64/libcdio.install) Deleted: libcdio/repos/extra-x86_64/PKGBUILD libcdio/repos/extra-x86_64/libcdio.install libcdio/repos/staging-x86_64/ ----------------------------+ PKGBUILD | 59 ++++++++++++++++++++++++------------------- libcdio-0.83-linking.patch | 22 ++++++++++++++++ libcdio.install | 26 +++++++++--------- 3 files changed, 69 insertions(+), 38 deletions(-) Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-02-23 13:48:05 UTC (rev 150879) +++ extra-x86_64/PKGBUILD 2012-02-23 13:48:06 UTC (rev 150880) @@ -1,25 +0,0 @@ -# $Id$ -# Maintainer: damir <da...@archlinux.org> -# Contributor: damir <da...@archlinux.org> - -pkgname=libcdio -pkgver=0.82 -pkgrel=1 -pkgdesc="GNU Compact Disc Input and Control Library" -arch=("i686" "x86_64") -license=('GPL3') -url="http://www.gnu.org/software/libcdio/" -depends=('gcc-libs>=4.4.2' 'libcddb' 'ncurses') -options=('!libtool') -install=libcdio.install -source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz) -md5sums=('1c29b18e01ab2b966162bc727bf3c360') - -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 -} Copied: libcdio/repos/extra-x86_64/PKGBUILD (from rev 150872, libcdio/repos/staging-x86_64/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-02-23 13:48:06 UTC (rev 150880) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: +# Contributor: damir <da...@archlinux.org> + +pkgname=libcdio +pkgver=0.83 +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') +options=('!libtool') +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 "${srcdir}/${pkgname}-${pkgver}" + 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 +} Copied: libcdio/repos/extra-x86_64/libcdio-0.83-linking.patch (from rev 150872, libcdio/repos/staging-x86_64/libcdio-0.83-linking.patch) =================================================================== --- extra-x86_64/libcdio-0.83-linking.patch (rev 0) +++ extra-x86_64/libcdio-0.83-linking.patch 2012-02-23 13:48:06 UTC (rev 150880) @@ -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) Deleted: extra-x86_64/libcdio.install =================================================================== --- extra-x86_64/libcdio.install 2012-02-23 13:48:05 UTC (rev 150879) +++ extra-x86_64/libcdio.install 2012-02-23 13:48:06 UTC (rev 150880) @@ -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 -} Copied: libcdio/repos/extra-x86_64/libcdio.install (from rev 150872, libcdio/repos/staging-x86_64/libcdio.install) =================================================================== --- extra-x86_64/libcdio.install (rev 0) +++ extra-x86_64/libcdio.install 2012-02-23 13:48:06 UTC (rev 150880) @@ -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 +}