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

Jan de Groot jgc at archlinux.org
Sun Nov 29 10:21:54 EST 2009


    Date: Sunday, November 29, 2009 @ 10:21:53
  Author: jgc
Revision: 59886

Merged revisions 59885 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/libcdio/trunk

........
  r59885 | jgc | 2009-11-29 16:21:37 +0100 (Sun, 29 Nov 2009) | 2 lines
  
  upgpkg: libcdio 0.82-1
      Update to 0.82, remove upstream applied patch
........

Modified:
  libcdio/repos/extra-x86_64/	(properties)
  libcdio/repos/extra-x86_64/PKGBUILD
Deleted:
  libcdio/repos/extra-x86_64/fix-loop.patch

----------------+
 PKGBUILD       |   15 +++++----------
 fix-loop.patch |   15 ---------------
 2 files changed, 5 insertions(+), 25 deletions(-)


Property changes on: libcdio/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /libcdio/trunk:1-35679
   + /libcdio/trunk:1-59885

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-11-29 15:21:37 UTC (rev 59885)
+++ extra-x86_64/PKGBUILD	2009-11-29 15:21:53 UTC (rev 59886)
@@ -3,28 +3,23 @@
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=libcdio
-pkgver=0.81
-pkgrel=2
+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.3.3' 'libcddb' 'ncurses')
+depends=('gcc-libs>=4.4.2' 'libcddb' 'ncurses')
 options=('!libtool')
 install=libcdio.install
-source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz
-	fix-loop.patch)
-md5sums=('2ad1622b672ccf53a3444a0c55724d38'
-	 '31cb8c3bf42761c467379c97798f0320')
+source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz)
+md5sums=('1c29b18e01ab2b966162bc727bf3c360')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-loop.patch" || return 1
   ./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
-  rm -f "${pkgdir}/usr/share/info/dir"
-  gzip ${pkgdir}/usr/share/info/*.info
 }

Deleted: extra-x86_64/fix-loop.patch
===================================================================
--- extra-x86_64/fix-loop.patch	2009-11-29 15:21:37 UTC (rev 59885)
+++ extra-x86_64/fix-loop.patch	2009-11-29 15:21:53 UTC (rev 59886)
@@ -1,15 +0,0 @@
-X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=libcdio.git;a=blobdiff_plain;f=lib%2Fdriver%2Fgnu_linux.c;h=092af0d661ecb2c3e9435f0847017e1ff36040ba;hp=7e2f3c449de78af0004dd07ef3b243333bc3a401;hb=7c497a2c735b695cdbedc3cfb80348bad847ba00;hpb=37f248aa4685cae0187f3e100623a94320944251
-
-diff --git a/lib/driver/gnu_linux.c b/lib/driver/gnu_linux.c
-index 7e2f3c4..092af0d 100644
---- a/lib/driver/gnu_linux.c
-+++ b/lib/driver/gnu_linux.c
-@@ -1448,7 +1448,7 @@ cdio_get_default_device_linux(void)
-   /* Scan the system for CD-ROM drives.
-      Not always 100% reliable, so use the USE_MNTENT code above first.
-   */
--  for ( i=0; checklist2[i].format; ++i ) {
-+  for ( i=0; i < checklist2_size; ++i ) {
-     unsigned int j;
-     for ( j=checklist2[i].num_min; j<=checklist2[i].num_max; ++j ) {
-       if (snprintf(drive, sizeof(drive), checklist2[i].format, j) < 0)



More information about the arch-commits mailing list