cdparanoia: updated to 10.2

diff --git a/conf/checksums.ini b/conf/checksums.ini
index d8355ad..f98fa55 100644 (file)
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2934,6 +2934,10 @@ sha256=2dec31ba4a176c921a653c0949a53c2d3497e047737724350897fd2534db18fe
 md5=0ec2460a4484d5f5595d8faca61bc9c5
 sha256=e823bfcce52916727cb23d6d549a64347c45c364b3c628d6a352c407fce8f4b4
 
+[http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz]
+md5=b304bbe8ab63373924a744eac9ebc652
+sha256=005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df
+
 [http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-alpha9.8.src.tgz]
 md5=7218e778b5970a86c958e597f952f193
 sha256=1b79fae1aedc692f87d1344410f5c6b666961afccdc78bc5c4c257c450dfa008

diff --git a/packages/cdparanoia/cdparanoia_10.2.bb b/packages/cdparanoia/cdparanoia_10.2.bb
new file mode 100644 (file)
index 0000000..2a22033
--- /dev/null
+++ b/packages/cdparanoia/cdparanoia_10.2.bb
@@ -0,0 +1,33 @@
+# cdparanoia OE build file
+# Copyright (C) 2005, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+PR ="r0"
+LICENSE="GPL"
+
+SRC_URI="http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz \
+        file://fixes10.patch;patch=1 \
+        file://Makefile.in.patch;patch=1 \
+        file://interface_Makefile.in.patch;patch=1 \
+        file://paranoia_Makefile.in.patch;patch=1 "
+
+S="${WORKDIR}/cdparanoia-III-10.2"
+
+PARALLEL_MAKE = ""
+
+inherit autotools
+
+do_install() {
+       oe_runmake BINDIR="${D}/usr/bin" MANDIR="${D}/usr/share/man/" \
+                  INCLUDEDIR="${D}/usr/include/" LIBDIR="${D}/usr/lib" install
+}
+
+do_stage() {
+       install -d ${STAGING_INCDIR} ${STAGING_LIBDIR}
+
+       install -m 0644 paranoia/cdda_paranoia.h ${STAGING_INCDIR}
+       install -m 0644 interface/cdda_interface.h ${STAGING_INCDIR}
+
+       oe_libinstall -C interface libcdda_interface ${STAGING_LIBDIR}
+       oe_libinstall -C paranoia libcdda_paranoia ${STAGING_LIBDIR}
+}

diff --git a/packages/cdparanoia/files/Makefile.in.patch b/packages/cdparanoia/files/Makefile.in.patch
new file mode 100644 (file)
index 0000000..40cf4ad
--- /dev/null
+++ b/packages/cdparanoia/files/Makefile.in.patch
@@ -0,0 +1,13 @@
+--- cdparanoia-III-10.2/Makefile.in.orig       2009-01-27 23:32:15.000000000 +0100
++++ cdparanoia-III-10.2/Makefile.in    2009-01-27 23:32:53.000000000 +0100
+@@ -87,8 +87,9 @@
+               $(LIBDIR)/libcdda_paranoia.so
+ 
+ cdparanoia:   $(OFILES) $(LIBDEP)
+-              $(LD) $(CFLAGS) $(LDFLAGS) $(OFILES) \
++              $(LD) $(CFLAGS) \
+               -L$(PWD)/paranoia -L$(PWD)/interface \
++              $(LDFLAGS) $(OFILES) \
+               -o cdparanoia $(LIBS)
+ 
+ .c.o:

diff --git a/packages/cdparanoia/files/fixes10.patch b/packages/cdparanoia/files/fixes10.patch
new file mode 100644 (file)
index 0000000..414ff39
--- /dev/null
+++ b/packages/cdparanoia/files/fixes10.patch
@@ -0,0 +1,25 @@
+--- cdparanoia-III-alpha9.8/configure.in       2000-03-26 00:33:22.000000000 -0700
++++ cdparanoia-III-alpha9.8.new/configure.in   2004-12-23 16:34:04.072846728 -0700
+@@ -1,7 +1,7 @@
+ AC_INIT(interface/interface.c)
+ 
+-cp $srcdir/configure.guess $srcdir/config.guess
+-cp $srcdir/configure.sub $srcdir/config.sub
++#cp $srcdir/configure.guess $srcdir/config.guess
++#cp $srcdir/configure.sub $srcdir/config.sub
+ 
+ AC_CANONICAL_HOST
+ 
+--- cdparanoia-III-alpha9.8/interface/scan_devices.c   2001-03-25 22:44:01.000000000 -0700
++++ cdparanoia-III-alpha9.8.new/interface/scan_devices.c       2004-12-23 16:38:47.128815680 -0700
+@@ -19,6 +19,10 @@
+ #include "common_interface.h"
+ #include "utils.h"
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ #define MAX_DEV_LEN 20 /* Safe because strings only come from below */
+ /* must be absolute paths! */
+ static char *scsi_cdrom_prefixes[]={

diff --git a/packages/cdparanoia/files/interface_Makefile.in.patch b/packages/cdparanoia/files/interface_Makefile.in.patch
new file mode 100644 (file)
index 0000000..4dbd2bb
--- /dev/null
+++ b/packages/cdparanoia/files/interface_Makefile.in.patch
@@ -0,0 +1,11 @@
+--- cdparanoia-III-10.2/interface/Makefile.in.orig     2009-01-27 23:52:42.000000000 +0100
++++ cdparanoia-III-10.2/interface/Makefile.in  2009-01-27 23:53:27.000000000 +0100
+@@ -46,7 +46,7 @@
+       $(RANLIB) libcdda_interface.a
+ 
+ libcdda_interface.so:         $(OFILES)       
+-      $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
++      $(CC) -fpic -shared -o libcdda_interface.so.0.$(VERSION) $(LDFLAGS) -Wl,-soname -Wl,libcdda_interface.so.0 $(OFILES) $(LIBS)
+       [ -e libcdda_interface.so.0 ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so.0
+       [ -e libcdda_interface.so ] || ln -s libcdda_interface.so.0.$(VERSION) libcdda_interface.so
+ 

diff --git a/packages/cdparanoia/files/paranoia_Makefile.in.patch b/packages/cdparanoia/files/paranoia_Makefile.in.patch
new file mode 100644 (file)
index 0000000..962a43a
--- /dev/null
+++ b/packages/cdparanoia/files/paranoia_Makefile.in.patch
@@ -0,0 +1,11 @@
+--- cdparanoia-III-10.2/paranoia/Makefile.in.orig      2009-01-27 23:54:45.000000000 +0100
++++ cdparanoia-III-10.2/paranoia/Makefile.in   2009-01-27 23:55:05.000000000 +0100
+@@ -44,7 +44,7 @@
+       $(RANLIB) libcdda_paranoia.a
+ 
+ libcdda_paranoia.so:  $(OFILES)       
+-      $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
++      $(CC) -fpic -shared -o libcdda_paranoia.so.0.$(VERSION) $(LDFLAGS) -Wl,-soname -Wl,libcdda_paranoia.so.0 $(OFILES) -L ../interface -lcdda_interface
+       [ -e libcdda_paranoia.so.0 ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so.0
+       [ -e libcdda_paranoia.so ] || ln -s libcdda_paranoia.so.0.$(VERSION) libcdda_paranoia.so
+