diff options
author | frealgagu | 2018-03-12 10:28:24 -0500 |
---|---|---|
committer | frealgagu | 2018-03-12 10:28:24 -0500 |
commit | 7f9d46a99aeb9e7ecd547301dbc57c8ab9b75d72 (patch) | |
tree | 0d8a9d783f6cfafb0ab2436528b1dffcb772a692 | |
parent | 5574401508783c57a1d881b447d2c658ac2b4891 (diff) | |
download | aur-7f9d46a99aeb9e7ecd547301dbc57c8ab9b75d72.tar.gz |
Upgrading to version 2.0.0
-rw-r--r-- | PKGBUILD | 40 | ||||
-rw-r--r-- | libcdio-0.83-linking.patch | 22 | ||||
-rw-r--r-- | libcdio.install | 13 |
3 files changed, 24 insertions, 51 deletions
@@ -1,5 +1,5 @@ -# $Id: PKGBUILD 298837 2018-02-26 21:27:42Z eschwartz $ -# Maintainer: schuay <jakob.gruber@gmail.com> +# Maintainer: Fredy GarcĂa <frealgagu at gmail dot com> +# Contributor: schuay <jakob.gruber@gmail.com> # Contributor: GordonGR <ntheo1979@gmail.com> # Contributor: Kazuo Teramoto <kaz.rag at gmail dot com> # Contributor: damir <damir@archlinux.org> @@ -7,7 +7,7 @@ pkgname=lib32-libcdio _pkgname=libcdio pkgver=2.0.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Compact Disc Input and Control Library (32-bit)" arch=('x86_64') license=('GPL3') @@ -15,7 +15,7 @@ url="https://www.gnu.org/software/libcdio/" depends=('lib32-gcc-libs' "libcdio") source=(https://ftp.gnu.org/gnu/libcdio/${_pkgname}-${pkgver}.tar.gz{,.sig}) sha256sums=('1b481b5da009bea31db875805665974e2fc568e2b2afa516f4036733657cf958' - 'SKIP') + '1ca33fe6e86266f7829f0d4cdef36e0268144484c86090d6608fa53da782e8ac') validpgpkeys=('DAA63BC2582034A02B923D521A8DE5008275EC21') # R. Bernstein prepare() { @@ -24,21 +24,29 @@ prepare() { } build() { - export CC="gcc -m32" - export CXX="g++ -m32" - export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" - cd ${_pkgname}-${pkgver} - ./configure --prefix=/usr --disable-vcd-info --enable-cpp-progs \ - --libdir=/usr/lib32 --without-cd-drive --without-cd-info \ - --without-cdda-player --without-cd-read --without-iso-info \ - --without-iso-read --disable-cddb - make + cd ${_pkgname}-${pkgver} + ./configure \ + --prefix=/usr \ + --disable-vcd-info \ + --enable-cpp-progs \ + --libdir=/usr/lib32 \ + --without-cd-drive \ + --without-cd-info \ + --without-cdda-player \ + --without-cd-read \ + --without-iso-info \ + --without-iso-read \ + --disable-cddb + make } package() { - cd ${_pkgname}-${pkgver} - make -j1 DESTDIR="${pkgdir}" install + cd ${_pkgname}-${pkgver} + make -j1 DESTDIR="${pkgdir}" install - rm -rf ${pkgdir}/usr/bin ${pkgdir}/usr/include ${pkgdir}/usr/share + rm -rf ${pkgdir}/usr/bin ${pkgdir}/usr/include ${pkgdir}/usr/share } diff --git a/libcdio-0.83-linking.patch b/libcdio-0.83-linking.patch deleted file mode 100644 index 84a0746b5202..000000000000 --- a/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/libcdio.install b/libcdio.install deleted file mode 100644 index 33a4e1ace1fc..000000000000 --- a/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 -} |