[arch-commits] Commit in libcdio/repos (8 files)

Jan Steffens heftig at archlinux.org
Wed Dec 21 23:35:01 UTC 2016


    Date: Wednesday, December 21, 2016 @ 23:35:00
  Author: heftig
Revision: 284404

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libcdio/repos/extra-i686/PKGBUILD
    (from rev 284403, libcdio/trunk/PKGBUILD)
  libcdio/repos/extra-i686/libcdio-0.83-linking.patch
    (from rev 284403, libcdio/trunk/libcdio-0.83-linking.patch)
  libcdio/repos/extra-x86_64/PKGBUILD
    (from rev 284403, libcdio/trunk/PKGBUILD)
  libcdio/repos/extra-x86_64/libcdio-0.83-linking.patch
    (from rev 284403, libcdio/trunk/libcdio-0.83-linking.patch)
Deleted:
  libcdio/repos/extra-i686/PKGBUILD
  libcdio/repos/extra-i686/libcdio-0.83-linking.patch
  libcdio/repos/extra-x86_64/PKGBUILD
  libcdio/repos/extra-x86_64/libcdio-0.83-linking.patch

-----------------------------------------+
 /PKGBUILD                               |   88 ++++++++++++++++++++++++++++++
 /libcdio-0.83-linking.patch             |   44 +++++++++++++++
 extra-i686/PKGBUILD                     |   38 ------------
 extra-i686/libcdio-0.83-linking.patch   |   22 -------
 extra-x86_64/PKGBUILD                   |   38 ------------
 extra-x86_64/libcdio-0.83-linking.patch |   22 -------
 6 files changed, 132 insertions(+), 120 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-12-21 23:34:37 UTC (rev 284403)
+++ extra-i686/PKGBUILD	2016-12-21 23:35:00 UTC (rev 284404)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=libcdio
-pkgver=0.94
-pkgrel=1
-pkgdesc="GNU Compact Disc Input and Control Library"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="https://www.gnu.org/software/libcdio/"
-depends=('libcddb' 'ncurses' 'gcc-libs')
-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 ${pkgname}-${pkgver}
-  patch -Np1 -i ../libcdio-0.83-linking.patch
-}
-
-build() {
-  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
-}
-
-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
-}

Copied: libcdio/repos/extra-i686/PKGBUILD (from rev 284403, libcdio/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-12-21 23:35:00 UTC (rev 284404)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer:
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=libcdio
+pkgver=0.94
+pkgrel=2
+pkgdesc="GNU Compact Disc Input and Control Library"
+arch=('i686' 'x86_64')
+license=('GPL3')
+url="https://www.gnu.org/software/libcdio/"
+depends=('libcddb' 'ncurses' 'gcc-libs')
+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 ${pkgname}-${pkgver}
+  patch -Np1 -i ../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() {
+  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
+}
+
+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
+}

Deleted: extra-i686/libcdio-0.83-linking.patch
===================================================================
--- extra-i686/libcdio-0.83-linking.patch	2016-12-21 23:34:37 UTC (rev 284403)
+++ extra-i686/libcdio-0.83-linking.patch	2016-12-21 23:35:00 UTC (rev 284404)
@@ -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: libcdio/repos/extra-i686/libcdio-0.83-linking.patch (from rev 284403, libcdio/trunk/libcdio-0.83-linking.patch)
===================================================================
--- extra-i686/libcdio-0.83-linking.patch	                        (rev 0)
+++ extra-i686/libcdio-0.83-linking.patch	2016-12-21 23:35:00 UTC (rev 284404)
@@ -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/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-12-21 23:34:37 UTC (rev 284403)
+++ extra-x86_64/PKGBUILD	2016-12-21 23:35:00 UTC (rev 284404)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=libcdio
-pkgver=0.94
-pkgrel=1
-pkgdesc="GNU Compact Disc Input and Control Library"
-arch=('i686' 'x86_64')
-license=('GPL3')
-url="https://www.gnu.org/software/libcdio/"
-depends=('libcddb' 'ncurses' 'gcc-libs')
-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 ${pkgname}-${pkgver}
-  patch -Np1 -i ../libcdio-0.83-linking.patch
-}
-
-build() {
-  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
-}
-
-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
-}

Copied: libcdio/repos/extra-x86_64/PKGBUILD (from rev 284403, libcdio/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-12-21 23:35:00 UTC (rev 284404)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer:
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=libcdio
+pkgver=0.94
+pkgrel=2
+pkgdesc="GNU Compact Disc Input and Control Library"
+arch=('i686' 'x86_64')
+license=('GPL3')
+url="https://www.gnu.org/software/libcdio/"
+depends=('libcddb' 'ncurses' 'gcc-libs')
+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 ${pkgname}-${pkgver}
+  patch -Np1 -i ../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() {
+  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
+}
+
+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
+}

Deleted: extra-x86_64/libcdio-0.83-linking.patch
===================================================================
--- extra-x86_64/libcdio-0.83-linking.patch	2016-12-21 23:34:37 UTC (rev 284403)
+++ extra-x86_64/libcdio-0.83-linking.patch	2016-12-21 23:35:00 UTC (rev 284404)
@@ -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: libcdio/repos/extra-x86_64/libcdio-0.83-linking.patch (from rev 284403, libcdio/trunk/libcdio-0.83-linking.patch)
===================================================================
--- extra-x86_64/libcdio-0.83-linking.patch	                        (rev 0)
+++ extra-x86_64/libcdio-0.83-linking.patch	2016-12-21 23:35:00 UTC (rev 284404)
@@ -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