experimental/SFEmp3c.spec: add LDFLAGS %{gnu_lib_path}, commit missing mp3c-01-cdio-define.diff, add patch mp3c-02-use-cd-paranoia-and-not-cdda2wav.diff
--- a/experimental/SFEmp3c.spec Sat Oct 01 20:12:44 2011 +0000
+++ b/experimental/SFEmp3c.spec Sat Oct 01 20:26:12 2011 +0000
@@ -14,6 +14,8 @@
URL: http://wspse.de/WSPse/Linux-MP3c.php3
Version: 0.31
Source: ftp://ftp.wspse.de/pub/linux/wspse/mp3c-%{version}.tar.bz2
+Patch1: mp3c-01-cdio-define.diff
+Patch2: mp3c-02-use-cd-paranoia-and-not-cdda2wav.diff
SUNW_BaseDir: %{_basedir}
@@ -26,22 +28,24 @@
BuildRequires: SUNWncurses-devel
Requires: SUNWncurses
-
+#BuildRequires: SFElame-devel
+Requires: SFElame
+#BuildRequires: SFElibcdio
+Requires: SFElibcdio
%prep
%setup -q -n mp3c-%version
+%patch1 -p1
+%patch2 -p1
%build
export CC=gcc
export CXX=g++
-#export CFLAGS="%optflags -I/usr/gnu/include/ncurses -DHAVE_LINUX_CDROM_H"
-#export CXXFLAGS="%cxx_optflags -I/usr/gnu/include/ncurses -DHAVE_LINUX_CDROM_H"
-
-export CFLAGS="%optflags -I/usr/include/ncurses -DHAVE_SYS_CDIO_H"
-export CXXFLAGS="%cxx_optflags -I/usr/include/ncurses -DHAVE_SYS_CDIO_H"
-export LDFLAGS="%_ldflags"
+export CFLAGS="%optflags -I/usr/include/ncurses "
+export CXXFLAGS="%cxx_optflags -I/usr/include/ncurses "
+export LDFLAGS="%_ldflags %{gnu_lib_path} -lsocket -lnsl"
@@ -62,15 +66,21 @@
%files
%defattr(-, root, bin)
-%doc README ChangeLog CREDITS COPYING INSTALL NEWS AUTHORS TODO ABOUT-NLS
+%doc README BATCH.README CDDB_HOWTO ChangeLog INSTALL NEWS AUTHORS BUGS COPYING FAQ OTHERS TODO ABOUT-NLS
%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/*
%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%dir %attr (-, root, other) %{_datadir}/doc
%dir %attr(0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/*
%{_mandir}/*/*
%changelog
+* Sat Oct 1 2011 - Thomas Wagner
+- fix permissions /usr/share/doc
+- LDFLAGS add %{gnu_lib_path} to have ncurses found
+- add Requires: SFElame, SFElibcdio (to get cd-paranoia)
* Mon Feb 23 2009 - Thomas Wagner
- Initial spec
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/mp3c-01-cdio-define.diff Sat Oct 01 20:26:12 2011 +0000
@@ -0,0 +1,155 @@
+diff -ur mp3c-0.31/src/iocd.c mp3c-0.31_compiled_hurra/src/iocd.c
+--- mp3c-0.31/src/iocd.c 2001-05-18 17:09:37.000000000 +0200
++++ mp3c-0.31_compiled_hurra/src/iocd.c 2011-06-03 14:27:52.186702852 +0200
+@@ -30,8 +30,9 @@
+ #include <stdio.h>
+ #include "mp3creat.h"
+
++#define HAVE_LINUX_CDROM_H
+ #ifdef HAVE_LINUX_CDROM_H
+-#include <linux/cdrom.h>
++#include <sys/cdio.h>
+ #endif
+ #ifdef HAVE_SYS_CDIO_H
+ #include <sys/cdio.h>
+@@ -118,11 +119,7 @@
+ {
+ int tmp;
+
+-#ifdef HAVE_LINUX_CDROM_H
+ tmp = ioctl_cdrom(CDROMEJECT);
+-#else
+- tmp = ioctl_cdrom(CDIOCEJECT);
+-#endif /* !HAVE_LINUX_CDROM_H */
+ if(tmp != 0) return 1;
+ return 0; /* Eject ok */
+ }
+@@ -132,11 +129,7 @@
+ {
+ int tmp;
+
+-#ifdef HAVE_LINUX_CDROM_H
+ tmp = ioctl_cdrom(CDROMCLOSETRAY);
+-#else
+- tmp = ioctl_cdrom(CDIOCCLOSE);
+-#endif /* !HAVE_LINUX_CDROM_H */
+ if(tmp != 0) return 1; /* closing the tray failed... */
+ return 0; /* Tray closed */
+ }
+@@ -159,11 +152,7 @@
+ closeing_needed = TRUE;
+ }
+
+-#ifdef HAVE_LINUX_CDROM_H
+ tmp = ioctl(cd_drv, CDROMREADTOCHDR, &tochdr); /* read header of toc */
+-#else
+- tmp = ioctl(cd_drv, CDIOREADTOCHEADER, &tochdr); /* read header of toc */
+-#endif /* !HAVE_LINUX_CDROM_H */
+ if(tmp != 0) {
+ if(closeing_needed) close_cdrom();
+ return -1;
+@@ -184,16 +173,10 @@
+ #endif /* !CDROM_LEADOUT */
+
+ tocentry.starting_track = CDROM_LEADOUT;
+- tocentry.address_format = CD_MSF_FORMAT;
++ tocentry.address_format = CDROM_LBA;
+ #endif /* !HAVE_LINUX_CDROM_H */
+
+-#ifdef HAVE_LINUX_CDROM_H
+ if(ioctl(cd_drv, CDROMREADTOCENTRY, &tocentry) != 0) {
+-#else
+- tocentry.data = &cddata;
+- tocentry.data_len = sizeof(cddata);
+- if(ioctl(cd_drv, CDIOREADTOCENTRYS, &tocentry) != 0) {
+-#endif /* !HAVE_LINUX_CDROM_H */
+ if(closeing_needed) close_cdrom();
+ return -1;
+ }
+@@ -209,17 +192,10 @@
+ #endif /* !HAVE_LINUX_CDROM_H */
+
+ for(i=track_last;i>=track_first;i--) {
+-#ifdef HAVE_LINUX_CDROM_H
+ tocentry.cdte_track = i;
+ tocentry.cdte_format = CDROM_MSF;
+
+ if(ioctl(cd_drv, CDROMREADTOCENTRY, &tocentry) != 0) {
+-#else
+- tocentry.starting_track = i;
+- tocentry.address_format = CD_MSF_FORMAT;
+-
+- if(ioctl(cd_drv, CDIOREADTOCENTRYS, &tocentry) == -1) {
+-#endif /* !HAVE_LINUX_CDROM_H */
+ if(closeing_needed) close_cdrom();
+ return -1;
+ }
+@@ -244,11 +220,8 @@
+ {
+ int tmp;
+
+-#ifdef HAVE_LINUX_CDROM_H
+- tmp = ioctl_cdrom(CDROMRESET);
+-#else
+- tmp = ioctl_cdrom(CDIOCRESET);
+-#endif /* !HAVE_LINUX_CDROM_H */
++ /* tmp = ioctl_cdrom(CDROMRESET);*/
++ tmp = 0;
+ return tmp;
+ }
+
+@@ -273,18 +246,10 @@
+ if(open_cdrom() < 0) {
+ return -1;
+ }
+-#ifdef HAVE_LINUX_CDROM_H
+ tmp = ioctl(cd_drv, CDROMPLAYTRKIND, &ti);
+-#else
+- tmp = ioctl(cd_drv, CDIOCPLAYTRACKS, &ti);
+-#endif /* !HAVE_LINUX_CDROM_H */
+ close_cdrom();
+ } else {
+-#ifdef HAVE_LINUX_CDROM_H
+ tmp = ioctl(cd_drv, CDROMPLAYTRKIND, &ti);
+-#else
+- tmp = ioctl(cd_drv, CDIOCPLAYTRACKS, &ti);
+-#endif /* !HAVE_LINUX_CDROM_H */
+ }
+ if(tmp != 0) return -1;
+ return 0;
+@@ -294,11 +259,7 @@
+ int stop_cd ()
+ {
+ int tmp;
+-#ifdef HAVE_LINUX_CDROM_H
+ tmp = ioctl_cdrom(CDROMSTOP);
+-#else
+- tmp = ioctl_cdrom(CDIOCSTOP);
+-#endif /* !HAVE_LINUX_CDROM_H */
+ if(tmp != 0) return -1;
+ return 0;
+ }
+@@ -308,11 +269,7 @@
+ {
+ int tmp;
+
+-#ifdef HAVE_LINUX_CDROM_H
+ tmp = ioctl_cdrom(CDROMPAUSE);
+-#else
+- tmp = ioctl_cdrom(CDIOCPAUSE);
+-#endif /* !HAVE_LINUX_CDROM_H */
+ if(tmp != 0) return -1;
+ return 0;
+ }
+@@ -322,11 +279,7 @@
+ {
+ int tmp;
+
+-#ifdef HAVE_LINUX_CDROM_H
+ tmp = ioctl_cdrom(CDROMRESUME);
+-#else
+- tmp = ioctl_cdrom(CDIOCRESUME);
+-#endif /* !HAVE_LINUX_CDROM_H */
+ if(tmp != 0) return -1;
+ return 0;
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/mp3c-02-use-cd-paranoia-and-not-cdda2wav.diff Sat Oct 01 20:26:12 2011 +0000
@@ -0,0 +1,13 @@
+--- mp3c-0.31/src/conf.c.orig 2006-03-08 13:13:46.000000000 +0100
++++ mp3c-0.31/src/conf.c 2011-06-03 17:18:15.156109462 +0200
+@@ -69,8 +69,8 @@
+ #define DEF_MP3_ENC_NF PRE2_ENC_NF
+ #define DEF_MP3_ENC_OF PRE2_ENC_OF
+ #endif
+-#define DEF_CD_RIP_NF "cdda2wav -H -D \"%1\" -t %2 -O wav -paranoia \"%3\""
+-#define DEF_CD_RIP_OF "cdda2wav -H -D \"%1\" -t %2 -O wav -paranoia -"
++#define DEF_CD_RIP_NF "cd-paranoia -d \"%1\" %2 \"%3\""
++#define DEF_CD_RIP_OF "cd-paranoia -p -d \"%1\" %2 -"
+ #define DEF_FRM_MULTI 214
+ #define DEF_M3U_PATTERN "%1-%3.m3u" /* pattern for m3u-playlist: %1 = artist,
+ %2 = songtitle, %3 = album */