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

[Felix Yan]

Date: Monday, January 25, 2016 @ 04:46:59
  Author: fyan
Revision: 158801

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-cdparanoia/repos/multilib-x86_64/
  lib32-cdparanoia/repos/multilib-x86_64/PKGBUILD
(from rev 158800, lib32-cdparanoia/trunk/PKGBUILD)
  lib32-cdparanoia/repos/multilib-x86_64/gcc.patch
(from rev 158800, lib32-cdparanoia/trunk/gcc.patch)

---+
 PKGBUILD  |   45 
 gcc.patch |  582 
 2 files changed, 627 insertions(+)

Copied: lib32-cdparanoia/repos/multilib-x86_64/PKGBUILD (from rev 158800, 
lib32-cdparanoia/trunk/PKGBUILD)
===
--- multilib-x86_64/PKGBUILD(rev 0)
+++ multilib-x86_64/PKGBUILD2016-01-25 03:46:59 UTC (rev 158801)
@@ -0,0 +1,45 @@
+# Maintainer: Maxime Gauduin 
+
+pkgname=lib32-cdparanoia
+pkgver=10.2
+pkgrel=2
+pkgdesc='Compact Disc Digital Audio extraction tool'
+arch=('x86_64')
+url='http://www.xiph.org/paranoia/'
+license=('GPL')
+depends=('cdparanoia' 'lib32-glibc')
+makedepends=('gcc-multilib')
+options=('!makeflags')
+source=("http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-${pkgver}.src.tgz;
+'gcc.patch')
+sha256sums=('005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df'
+'9a3f3802856e96080fb30562a10899ef3378723e85f289fa29619b21d6051575')
+
+prepare() {
+  cd cdparanoia-III-${pkgver}
+
+  patch -Np0 -i ../gcc.patch
+}
+
+build() {
+  cd cdparanoia-III-${pkgver}
+
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+  autoreconf
+  ./configure \
+--prefix="${pkgdir}/usr" \
+--libdir="${pkgdir}/usr/lib32"
+  make
+}
+
+package() {
+  cd cdparanoia-III-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+  rm -rf "${pkgdir}"/usr/{bin,include,share}
+}
+
+# vim: ts=2 sw=2 et:

Copied: lib32-cdparanoia/repos/multilib-x86_64/gcc.patch (from rev 158800, 
lib32-cdparanoia/trunk/gcc.patch)
===
--- multilib-x86_64/gcc.patch   (rev 0)
+++ multilib-x86_64/gcc.patch   2016-01-25 03:46:59 UTC (rev 158801)
@@ -0,0 +1,582 @@
+Index: interface/test_interface.c
+===
+--- interface/test_interface.c (Revision 15337)
 interface/test_interface.c (Revision 15340)
+@@ -66,9 +66,9 @@
+   if(!fd)fd=fdopen(d->cdda_fd,"r");
+ 
+   if(beginprivate->last_milliseconds=20;
++d->private_data->last_milliseconds=20;
+   else
+-d->private->last_milliseconds=sectors;
++d->private_data->last_milliseconds=sectors;
+ 
+ #ifdef CDDA_TEST_UNDERRUN
+   sectors-=1;
+Index: interface/cdda_interface.h
+===
+--- interface/cdda_interface.h (Revision 15337)
 interface/cdda_interface.h (Revision 15340)
+@@ -84,7 +84,7 @@
+   int is_atapi;
+   int is_mmc;
+ 
+-  cdda_private_data_t *private;
++  cdda_private_data_t *private_data;
+   void *reserved;
+   unsigned char inqbytes[4];
+ 
+Index: interface/interface.c
+===
+--- interface/interface.c  (Revision 15337)
 interface/interface.c  (Revision 15340)
+@@ -39,9 +39,9 @@
+ if(d->drive_model)free(d->drive_model);
+ if(d->cdda_fd!=-1)close(d->cdda_fd);
+ if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd);
+-if(d->private){
+-  if(d->private->sg_hd)free(d->private->sg_hd);
+-  free(d->private);
++if(d->private_data){
++  if(d->private_data->sg_hd)free(d->private_data->sg_hd);
++  free(d->private_data);
+ }
+ 
+ free(d);
+@@ -127,7 +127,7 @@
+   }
+   }   
+ }
+-if(ms)*ms=d->private->last_milliseconds;
++if(ms)*ms=d->private_data->last_milliseconds;
+ return(sectors);
+   }
+   
+Index: interface/scsi_interface.c
+===
+--- interface/scsi_interface.c (Revision 15337)
 interface/scsi_interface.c (Revision 15340)
+@@ -15,13 +15,13 @@
+ static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
+   struct timespec tv1;
+   struct timespec tv2;
+-  int ret1=clock_gettime(d->private->clock,);
++  int ret1=clock_gettime(d->private_data->clock,);
+   int ret2=ioctl(fd, command,arg);
+-  int ret3=clock_gettime(d->private->clock,);
++  int ret3=clock_gettime(d->private_data->clock,);
+   if(ret1<0 || ret3<0){
+-d->private->last_milliseconds=-1;
++d->private_data->last_milliseconds=-1;
+   }else{
+-d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + 
(tv2.tv_nsec-tv1.tv_nsec)/100.;
++d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + 
(tv2.tv_nsec-tv1.tv_nsec)/100.;
+   }
+   return ret2;
+ }
+@@ -96,7 +96,7 @@
+ static void 

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

[Maxime Gauduin]

Date: Tuesday, March 26, 2013 @ 18:33:07
  Author: alucryd
Revision: 87068

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-cdparanoia/repos/multilib-x86_64/
  lib32-cdparanoia/repos/multilib-x86_64/PKGBUILD
(from rev 87067, lib32-cdparanoia/trunk/PKGBUILD)
  lib32-cdparanoia/repos/multilib-x86_64/gcc.patch
(from rev 87067, lib32-cdparanoia/trunk/gcc.patch)

---+
 PKGBUILD  |   44 
 gcc.patch |  582 
 2 files changed, 626 insertions(+)

Copied: lib32-cdparanoia/repos/multilib-x86_64/PKGBUILD (from rev 87067, 
lib32-cdparanoia/trunk/PKGBUILD)
===
--- multilib-x86_64/PKGBUILD(rev 0)
+++ multilib-x86_64/PKGBUILD2013-03-26 17:33:07 UTC (rev 87068)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Maxime Gauduin aluc...@gmail.com
+
+pkgname=lib32-cdparanoia
+pkgver=10.2
+pkgrel=1
+pkgdesc=Compact Disc Digital Audio extraction tool
+arch=('x86_64')
+url=http://www.xiph.org/paranoia/;
+license=('GPL')
+depends=(${pkgname#*-} 'lib32-glibc')
+makedepends=('gcc-multilib')
+options=('!makeflags')
+source=(http://downloads.xiph.org/releases/${pkgname#*-}/${pkgname#*-}-III-${pkgver}.src.tgz;
+'gcc.patch')
+sha256sums=('005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df'
+'9a3f3802856e96080fb30562a10899ef3378723e85f289fa29619b21d6051575')
+
+build() {
+  cd ${srcdir}/${pkgname#*-}-III-${pkgver}
+
+# Patch
+  patch -p0 -i ${srcdir}/gcc.patch
+
+# Multilib
+  export CC=gcc -m32
+  export CXX=g++ -m32
+  export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+
+# Build
+  autoreconf
+  ./configure --prefix=${pkgdir}/usr --libdir='${prefix}/lib32'
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname#*-}-III-${pkgver}
+
+# Install
+  make DESTDIR=${pkgdir} install
+  rm -rf ${pkgdir}/usr/{bin,include,share}
+}
+
+# vim: ts=2 sw=2 et:

Copied: lib32-cdparanoia/repos/multilib-x86_64/gcc.patch (from rev 87067, 
lib32-cdparanoia/trunk/gcc.patch)
===
--- multilib-x86_64/gcc.patch   (rev 0)
+++ multilib-x86_64/gcc.patch   2013-03-26 17:33:07 UTC (rev 87068)
@@ -0,0 +1,582 @@
+Index: interface/test_interface.c
+===
+--- interface/test_interface.c (Revision 15337)
 interface/test_interface.c (Revision 15340)
+@@ -66,9 +66,9 @@
+   if(!fd)fd=fdopen(d-cdda_fd,r);
+ 
+   if(beginlastread)
+-d-private-last_milliseconds=20;
++d-private_data-last_milliseconds=20;
+   else
+-d-private-last_milliseconds=sectors;
++d-private_data-last_milliseconds=sectors;
+ 
+ #ifdef CDDA_TEST_UNDERRUN
+   sectors-=1;
+Index: interface/cdda_interface.h
+===
+--- interface/cdda_interface.h (Revision 15337)
 interface/cdda_interface.h (Revision 15340)
+@@ -84,7 +84,7 @@
+   int is_atapi;
+   int is_mmc;
+ 
+-  cdda_private_data_t *private;
++  cdda_private_data_t *private_data;
+   void *reserved;
+   unsigned char inqbytes[4];
+ 
+Index: interface/interface.c
+===
+--- interface/interface.c  (Revision 15337)
 interface/interface.c  (Revision 15340)
+@@ -39,9 +39,9 @@
+ if(d-drive_model)free(d-drive_model);
+ if(d-cdda_fd!=-1)close(d-cdda_fd);
+ if(d-ioctl_fd!=-1  d-ioctl_fd!=d-cdda_fd)close(d-ioctl_fd);
+-if(d-private){
+-  if(d-private-sg_hd)free(d-private-sg_hd);
+-  free(d-private);
++if(d-private_data){
++  if(d-private_data-sg_hd)free(d-private_data-sg_hd);
++  free(d-private_data);
+ }
+ 
+ free(d);
+@@ -127,7 +127,7 @@
+   }
+   }   
+ }
+-if(ms)*ms=d-private-last_milliseconds;
++if(ms)*ms=d-private_data-last_milliseconds;
+ return(sectors);
+   }
+   
+Index: interface/scsi_interface.c
+===
+--- interface/scsi_interface.c (Revision 15337)
 interface/scsi_interface.c (Revision 15340)
+@@ -15,13 +15,13 @@
+ static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){
+   struct timespec tv1;
+   struct timespec tv2;
+-  int ret1=clock_gettime(d-private-clock,tv1);
++  int ret1=clock_gettime(d-private_data-clock,tv1);
+   int ret2=ioctl(fd, command,arg);
+-  int ret3=clock_gettime(d-private-clock,tv2);
++  int ret3=clock_gettime(d-private_data-clock,tv2);
+   if(ret10 || ret30){
+-d-private-last_milliseconds=-1;
++d-private_data-last_milliseconds=-1;
+   }else{
+-d-private-last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + 
(tv2.tv_nsec-tv1.tv_nsec)/100.;
++d-private_data-last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + 
(tv2.tv_nsec-tv1.tv_nsec)/100.;
+   }
+   return ret2;
+ }
+@@ -96,7 +96,7 @@
+ static void clear_garbage(cdrom_drive *d){
+   fd_set fdset;