diff options
| -rw-r--r-- | base/cdrdao/.footprint (renamed from extra/cdrdao/.footprint) | 3 | ||||
| -rw-r--r-- | base/cdrdao/.md5sum | 1 | ||||
| -rwxr-xr-x | base/cdrdao/Pkgfile (renamed from extra/cdrdao/Pkgfile) | 11 | ||||
| -rw-r--r-- | extra/cdrdao/.md5sum | 3 | ||||
| -rw-r--r-- | extra/cdrdao/cdrao-1.2.2-glibc.patch | 71 | ||||
| -rw-r--r-- | extra/cdrdao/gcc4.patch | 67 |
6 files changed, 7 insertions, 149 deletions
diff --git a/extra/cdrdao/.footprint b/base/cdrdao/.footprint index 7b4263a54..b4ff479c4 100644 --- a/extra/cdrdao/.footprint +++ b/base/cdrdao/.footprint @@ -4,7 +4,6 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/cue2toc -rwxr-xr-x root/root usr/bin/toc2cddb -rwxr-xr-x root/root usr/bin/toc2cue --rwxr-xr-x root/root usr/bin/toc2mp3 drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/cdrdao/ -rw-r--r-- root/root usr/share/cdrdao/drivers @@ -12,3 +11,5 @@ drwxr-xr-x root/root usr/share/man/ drwxr-xr-x root/root usr/share/man/man1/ -rw-r--r-- root/root usr/share/man/man1/cdrdao.1.gz -rw-r--r-- root/root usr/share/man/man1/cue2toc.1.gz +-rw-r--r-- root/root usr/share/man/man1/toc2cddb.1.gz +-rw-r--r-- root/root usr/share/man/man1/toc2cue.1.gz diff --git a/base/cdrdao/.md5sum b/base/cdrdao/.md5sum new file mode 100644 index 000000000..a84209052 --- /dev/null +++ b/base/cdrdao/.md5sum @@ -0,0 +1 @@ +8d15ba6280bb7ba2f4d6be31d28b3c0c cdrdao-1.2.3.tar.bz2 diff --git a/extra/cdrdao/Pkgfile b/base/cdrdao/Pkgfile index 973af9f57..371dfcf2b 100755 --- a/extra/cdrdao/Pkgfile +++ b/base/cdrdao/Pkgfile @@ -5,19 +5,16 @@ # Depends on: name=cdrdao -version=1.2.2 +version=1.2.3 release=1 -source=( http://downloads.sourceforge.net/$name/$name-$version.tar.bz2 \ - cdrao-1.2.2-glibc.patch gcc4.patch) - +source=( http://downloads.sourceforge.net/$name/$name-$version.tar.bz2) build() { cd $name-$version - patch -Np1 -i ../cdrao-1.2.2-glibc.patch - patch -Np1 -i ../gcc4.patch ./configure --prefix=/usr \ --mandir=/usr/share/man \ - --infodir=/usr/share/info + --infodir=/usr/share/info \ + --without-lame make make DESTDIR=$PKG install } diff --git a/extra/cdrdao/.md5sum b/extra/cdrdao/.md5sum deleted file mode 100644 index e052c98b2..000000000 --- a/extra/cdrdao/.md5sum +++ /dev/null @@ -1,3 +0,0 @@ -684dc1e24b14c7837a6c93498a1cd951 cdrao-1.2.2-glibc.patch -f0cbf36907406cb4f4c568f9e6669a34 cdrdao-1.2.2.tar.bz2 -a3026879702a38f904dbf0dd8a19fb26 gcc4.patch diff --git a/extra/cdrdao/cdrao-1.2.2-glibc.patch b/extra/cdrdao/cdrao-1.2.2-glibc.patch deleted file mode 100644 index 04809b317..000000000 --- a/extra/cdrdao/cdrao-1.2.2-glibc.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -puNr cdrdao-1.2.2.orig/scsilib/include/schily.h cdrdao-1.2.2/scsilib/include/schily.h ---- cdrdao-1.2.2.orig/scsilib/include/schily.h 2004-03-05 01:30:40.000000000 +0100 -+++ cdrdao-1.2.2/scsilib/include/schily.h 2009-03-11 21:55:15.000000000 +0100 -@@ -108,7 +108,7 @@ extern int fexecle __PR((const char *, F - /* 6th arg not const, fexecv forces av[ac] = NULL */ - extern int fexecv __PR((const char *, FILE *, FILE *, FILE *, int, - char **)); --extern int fexecve __PR((const char *, FILE *, FILE *, FILE *, -+extern int f_execve __PR((const char *, FILE *, FILE *, FILE *, - char * const *, char * const *)); - extern int fspawnv __PR((FILE *, FILE *, FILE *, int, char * const *)); - extern int fspawnl __PR((FILE *, FILE *, FILE *, -@@ -187,7 +187,7 @@ extern char *fillbytes __PR((void *, int - extern char *findbytes __PR((const void *, int, char)); - extern int findline __PR((const char *, char, const char *, - int, char **, int)); --extern int getline __PR((char *, int)); -+extern int get_line __PR((char *, int)); - extern int getstr __PR((char *, int)); - extern int breakline __PR((char *, char, char **, int)); - extern int getallargs __PR((int *, char * const**, const char *, ...)); -diff -puNr cdrdao-1.2.2.orig/scsilib/libscg/scsitransp.c cdrdao-1.2.2/scsilib/libscg/scsitransp.c ---- cdrdao-1.2.2.orig/scsilib/libscg/scsitransp.c 2004-06-17 22:20:27.000000000 +0200 -+++ cdrdao-1.2.2/scsilib/libscg/scsitransp.c 2009-03-11 21:54:24.000000000 +0100 -@@ -323,7 +323,7 @@ scg_yes(msg) - - js_printf("%s", msg); - flush(); -- if (getline(okbuf, sizeof (okbuf)) == EOF) -+ if (get_line(okbuf, sizeof (okbuf)) == EOF) - exit(EX_BAD); - if (streql(okbuf, "y") || streql(okbuf, "yes") || - streql(okbuf, "Y") || streql(okbuf, "YES")) -diff -puNr cdrdao-1.2.2.orig/scsilib/libschily/fexec.c cdrdao-1.2.2/scsilib/libschily/fexec.c ---- cdrdao-1.2.2.orig/scsilib/libschily/fexec.c 2004-06-06 13:50:24.000000000 +0200 -+++ cdrdao-1.2.2/scsilib/libschily/fexec.c 2009-03-11 21:55:06.000000000 +0100 -@@ -159,7 +159,7 @@ fexecle(name, in, out, err, va_alist) - } while (p != NULL); - va_end(args); - -- ret = fexecve(name, in, out, err, av, env); -+ ret = f_execve(name, in, out, err, av, env); - if (av != xav) - free(av); - return (ret); -@@ -173,11 +173,11 @@ fexecv(name, in, out, err, ac, av) - char *av[]; - { - av[ac] = NULL; /* force list to be null terminated */ -- return (fexecve(name, in, out, err, av, environ)); -+ return (f_execve(name, in, out, err, av, environ)); - } - - EXPORT int --fexecve(name, in, out, err, av, env) -+f_execve(name, in, out, err, av, env) - const char *name; - FILE *in, *out, *err; - char * const av[], * const env[]; -diff -puNr cdrdao-1.2.2.orig/scsilib/libschily/stdio/fgetline.c cdrdao-1.2.2/scsilib/libschily/stdio/fgetline.c ---- cdrdao-1.2.2.orig/scsilib/libschily/stdio/fgetline.c 2004-08-08 13:02:05.000000000 +0200 -+++ cdrdao-1.2.2/scsilib/libschily/stdio/fgetline.c 2009-03-11 21:54:04.000000000 +0100 -@@ -64,7 +64,7 @@ fgetline(f, buf, len) - } - - EXPORT int --getline(buf, len) -+get_line(buf, len) - char *buf; - int len; - { diff --git a/extra/cdrdao/gcc4.patch b/extra/cdrdao/gcc4.patch deleted file mode 100644 index f7d55d432..000000000 --- a/extra/cdrdao/gcc4.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatConverter.cc cdrdao-1.2.2/trackdb/FormatConverter.cc ---- cdrdao-1.2.2.orig/trackdb/FormatConverter.cc 2005-05-10 00:55:28.000000000 +0000 -+++ cdrdao-1.2.2/trackdb/FormatConverter.cc 2008-03-07 11:14:07.000000000 +0000 -@@ -22,6 +22,7 @@ - #include <ao/ao.h> - #endif - #include <fstream> -+#include <cstring> - - #include "config.h" - #include "util.h" -diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatOgg.cc cdrdao-1.2.2/trackdb/FormatOgg.cc ---- cdrdao-1.2.2.orig/trackdb/FormatOgg.cc 2005-04-22 02:01:46.000000000 +0000 -+++ cdrdao-1.2.2/trackdb/FormatOgg.cc 2008-03-07 11:14:07.000000000 +0000 -@@ -18,6 +18,7 @@ - */ - - #include <stdio.h> -+#include <cstring> - - #include "util.h" - #include "FormatOgg.h" -diff -Naurp cdrdao-1.2.2.orig/trackdb/FormatMp3.cc cdrdao-1.2.2/trackdb/FormatMp3.cc ---- cdrdao-1.2.2.orig/trackdb/FormatMp3.cc 2005-09-24 20:28:43.000000000 +0000 -+++ cdrdao-1.2.2/trackdb/FormatMp3.cc 2008-03-07 11.14.07.000000000 +0000 -@@ -25,6 +25,7 @@ - #include <stdlib.h> - #include <unistd.h> - #include <fcntl.h> -+#include <cstring> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/mman.h> -diff -Naurp cdrdao-1.2.2.orig/trackdb/TempFileManager.cc cdrdao-1.2.2/trackdb/TempFileManager.cc ---- cdrdao-1.2.2.orig/trackdb/TempFileManager.cc 2005-04-22 02:01:46.000000000 +0000 -+++ cdrdao-1.2.2/trackdb/TempFileManager.cc 2008-03-07 11:14:07.000000000 +0000 -@@ -24,6 +24,7 @@ - #include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> -+#include <cstring> - - #define DEFAULT_TEMP_PATH "/tmp/" - -diff -Naurp cdrdao-1.2.2.orig/xdao/AudioCDProject.cc cdrdao-1.2.2/xdao/AudioCDProject.cc ---- cdrdao-1.2.2.orig/xdao/AudioCDProject.cc 2006-09-18 10:42:26.000000000 +0000 -+++ cdrdao-1.2.2/xdao/AudioCDProject.cc 2008-03-07 11:15:26.000000000 +0000 -@@ -18,6 +18,7 @@ - */ - - #include <assert.h> -+#include <cstring> - #include <gtkmm.h> - #include <libgnome/gnome-i18n.h> - -diff -Naurp cdrdao-1.2.2.orig/xdao/TextEdit.cc cdrdao-1.2.2/xdao/TextEdit.cc ---- cdrdao-1.2.2.orig/xdao/TextEdit.cc 2004-02-12 01:13:32.000000000 +0000 -+++ cdrdao-1.2.2/xdao/TextEdit.cc 2008-03-07 11:14:07.000000000 +0000 -@@ -21,6 +21,7 @@ - - #include <stddef.h> - #include <ctype.h> -+#include <cstring> - - TextEdit::TextEdit(const char *sample) : Gtk::Entry() - { - |