[arch-commits] Commit in lib32-libcdio/repos/multilib-x86_64 (4 files)
Laurent Carlier
lcarlier at archlinux.org
Tue Jul 4 09:06:39 UTC 2017
Date: Tuesday, July 4, 2017 @ 09:06:38
Author: lcarlier
Revision: 242289
archrelease: copy trunk to multilib-x86_64
Added:
lib32-libcdio/repos/multilib-x86_64/PKGBUILD
(from rev 242288, lib32-libcdio/trunk/PKGBUILD)
lib32-libcdio/repos/multilib-x86_64/libcdio-0.83-linking.patch
(from rev 242288, lib32-libcdio/trunk/libcdio-0.83-linking.patch)
Deleted:
lib32-libcdio/repos/multilib-x86_64/PKGBUILD
lib32-libcdio/repos/multilib-x86_64/libcdio-0.83-linking.patch
----------------------------+
PKGBUILD | 99 +++++++++++++++++++++++--------------------
libcdio-0.83-linking.patch | 44 +++++++++----------
2 files changed, 75 insertions(+), 68 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-07-04 09:06:24 UTC (rev 242288)
+++ PKGBUILD 2017-07-04 09:06:38 UTC (rev 242289)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: schuay <jakob.gruber at gmail.com>
-# Contributor: GordonGR <ntheo1979 at gmail.com>
-# Contributor: Kazuo Teramoto <kaz.rag at gmail dot com>
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=lib32-libcdio
-_pkgname=libcdio
-pkgver=0.93
-pkgrel=5
-pkgdesc="GNU Compact Disc Input and Control Library (32-bit)"
-arch=("x86_64")
-license=('GPL3')
-url="http://www.gnu.org/software/libcdio/"
-depends=('lib32-gcc-libs' "libcdio")
-options=('!libtool')
-source=("http://ftp.gnu.org/gnu/libcdio/${_pkgname}-${pkgver}.tar.gz"
- "libcdio-0.83-linking.patch")
-
-prepare() {
- cd "${srcdir}/${_pkgname}-${pkgver}"
- patch -Np1 -i $srcdir/libcdio-0.83-linking.patch
-}
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd "${srcdir}/${_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 "${srcdir}/${_pkgname}-${pkgver}"
- make -j1 DESTDIR="${pkgdir}" install
-
- rm -rf ${pkgdir}/usr/bin ${pkgdir}/usr/include ${pkgdir}/usr/share
-}
-
-md5sums=('d154476feaac5a7b5f180e83eaf3d689'
- '5a7f50209c03d5919d5b932f07871af7')
Copied: lib32-libcdio/repos/multilib-x86_64/PKGBUILD (from rev 242288, lib32-libcdio/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-07-04 09:06:38 UTC (rev 242289)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: schuay <jakob.gruber at gmail.com>
+# Contributor: GordonGR <ntheo1979 at gmail.com>
+# Contributor: Kazuo Teramoto <kaz.rag at gmail dot com>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=lib32-libcdio
+_pkgname=libcdio
+pkgver=0.94
+pkgrel=1
+pkgdesc="GNU Compact Disc Input and Control Library (32-bit)"
+arch=("x86_64")
+license=('GPL3')
+url="https://www.gnu.org/software/libcdio/"
+depends=('lib32-gcc-libs' "libcdio")
+options=('!libtool')
+source=(https://ftp.gnu.org/gnu/libcdio/${_pkgname}-${pkgver}.tar.gz{,.sig}
+ libcdio-0.83-linking.patch)
+sha256sums=('96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a'
+ 'SKIP'
+ 'd88186b2a11726fe5ef10853e0245996b55793552b14230d1f7ba5ee3c54f3ed')
+validpgpkeys=('DAA63BC2582034A02B923D521A8DE5008275EC21') # R. Bernstein
+
+prepare() {
+ cd "${srcdir}/${_pkgname}-${pkgver}"
+ patch -Np1 -i $srcdir/libcdio-0.83-linking.patch
+
+ # Unbreak symbol versioning
+ # https://savannah.gnu.org/bugs/?49907
+ sed -i '/AM_INIT_AUTOMAKE/s/subdir-objects//' configure.ac
+
+ autoreconf -fi
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ cd "${srcdir}/${_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 "${srcdir}/${_pkgname}-${pkgver}"
+ make -j1 DESTDIR="${pkgdir}" install
+
+ rm -rf ${pkgdir}/usr/bin ${pkgdir}/usr/include ${pkgdir}/usr/share
+}
Deleted: libcdio-0.83-linking.patch
===================================================================
--- libcdio-0.83-linking.patch 2017-07-04 09:06:24 UTC (rev 242288)
+++ libcdio-0.83-linking.patch 2017-07-04 09:06:38 UTC (rev 242289)
@@ -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)
Copied: lib32-libcdio/repos/multilib-x86_64/libcdio-0.83-linking.patch (from rev 242288, lib32-libcdio/trunk/libcdio-0.83-linking.patch)
===================================================================
--- libcdio-0.83-linking.patch (rev 0)
+++ libcdio-0.83-linking.patch 2017-07-04 09:06:38 UTC (rev 242289)
@@ -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)
More information about the arch-commits
mailing list