rpms/cdrkit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert to cdda-paranoia, libcdio has now incompatible GPLv3+ license.

Browse Source 
Revert "ported from cdda-paranoia to libcdio-paranoia, modified paranoia-cdda.patch"

This reverts commit 763f5bd6c2.

Conflicts:
	cdrkit.spec
This commit is contained in:
Frantisek Kluknavsky 2014-11-07 13:02:13 +01:00
parent b72deb9a39
commit a4cafe97ff
3 changed files with 15 additions and 2871 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cdrkit-1.1.11-paranoiacdda.patch
View File

@ -25,10 +25,10 @@ diff -up cdrkit-1.1.11/icedax/CMakeLists.txt.paranoiacdda cdrkit-1.1.11/icedax/C
ENDIF(HAVE_LIBOSSAUDIO) ENDIF(HAVE_LIBOSSAUDIO)
-LIST(APPEND EXTRA_LIBS paranoia) -LIST(APPEND EXTRA_LIBS paranoia)
+CHECK_INCLUDE_FILES(cdio/cdda.h HAVE_CDDA_INTERFACE_H) +CHECK_INCLUDE_FILES(cdda/cdda_interface.h HAVE_CDDA_INTERFACE_H)
+CHECK_LIBRARY_EXISTS (cdio_paranoia cdio_paranoia_init "" HAVE_LIBPARANOIA) +CHECK_LIBRARY_EXISTS (cdda_paranoia paranoia_init "" HAVE_LIBPARANOIA)
+IF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA) +IF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
+ LIST(APPEND EXTRA_LIBS cdio_paranoia cdio_cdda) + LIST(APPEND EXTRA_LIBS cdda_paranoia cdda_interface)
+ELSE(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA) +ELSE(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
+ MESSAGE(FATAL_ERROR "You need cdparanoia library installed") + MESSAGE(FATAL_ERROR "You need cdparanoia library installed")
+ENDIF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA) +ENDIF(HAVE_CDDA_INTERFACE_H AND HAVE_LIBPARANOIA)
@ -51,8 +51,8 @@ diff -up cdrkit-1.1.11/icedax/global.h.paranoiacdda cdrkit-1.1.11/icedax/global.
#endif #endif
#ifdef USE_PARANOIA #ifdef USE_PARANOIA
-#include "cdda_paranoia.h" -#include "cdda_paranoia.h"
+#include <cdio/cdda.h> +#include <cdda/cdda_interface.h>
+#include <cdio/paranoia.h> +#include <cdda/cdda_paranoia.h>
#endif #endif
typedef struct index_list typedef struct index_list
@ -79,8 +79,8 @@ diff -up cdrkit-1.1.11/icedax/icedax.c.paranoiacdda cdrkit-1.1.11/icedax/icedax.
#include "mp3.h" /* mp3 file handling */ #include "mp3.h" /* mp3 file handling */
#endif #endif
+#ifdef USE_PARANOIA +#ifdef USE_PARANOIA
+#include <cdio/cdda.h> +#include <cdda/cdda_interface.h>
+#include <cdio/paranoia.h> +#include <cdda/cdda_paranoia.h>
+#endif +#endif
#include "interface.h" /* low level cdrom interfacing */ #include "interface.h" /* low level cdrom interfacing */
#include "icedax.h" #include "icedax.h"
@ -118,7 +118,7 @@ diff -up cdrkit-1.1.11/icedax/icedax.c.paranoiacdda cdrkit-1.1.11/icedax/icedax.
#endif #endif
#if defined USE_PARANOIA #if defined USE_PARANOIA
- fputs( ", libparanoia", stderr ); - fputs( ", libparanoia", stderr );
+ fputs( ", libcdio_paranoia", stderr ); + fputs( ", libcdda_paranoia", stderr );
#endif #endif
fputs( " support\n", stderr ); fputs( " support\n", stderr );
} }

2857
cdrkit-1.1.11-paranoiacdio.patch
View File

File diff suppressed because it is too large Load Diff

13
cdrkit.spec
View File

@ -1,7 +1,7 @@
Summary: A collection of CD/DVD utilities Summary: A collection of CD/DVD utilities
Name: cdrkit Name: cdrkit
Version: 1.1.11 Version: 1.1.11
Release: 25%{?dist} Release: 26%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/System Group: Applications/System
URL: http://cdrkit.org/ URL: http://cdrkit.org/
@ -23,7 +23,6 @@ Patch14: cdrkit-1.1.11-paranoiacdda.patch
Patch15: cdrkit-1.1.11-utf8.patch Patch15: cdrkit-1.1.11-utf8.patch
Patch16: cdrkit-1.1.11-cmakewarn.patch Patch16: cdrkit-1.1.11-cmakewarn.patch
Patch17: cdrkit-1.1.11-memset.patch Patch17: cdrkit-1.1.11-memset.patch
Patch18: cdrkit-1.1.11-paranoiacdio.patch
Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch
BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
@ -86,8 +85,8 @@ Requires: libusal = %{version}-%{release}
Requires(preun): %{_sbindir}/alternatives chkconfig coreutils Requires(preun): %{_sbindir}/alternatives chkconfig coreutils
Requires(post): %{_sbindir}/alternatives chkconfig coreutils Requires(post): %{_sbindir}/alternatives chkconfig coreutils
Requires: vorbis-tools Requires: vorbis-tools
Requires: cdparanoia libcdio-paranoia Requires: cdparanoia
BuildRequires: cdparanoia-devel libcdio-paranoia-devel BuildRequires: cdparanoia-devel
%description -n icedax %description -n icedax
Icedax is a sampling utility for CD-ROM drives that are capable of Icedax is a sampling utility for CD-ROM drives that are capable of
@ -134,7 +133,6 @@ SCSI devices.
%patch15 -p1 %patch15 -p1
%patch16 -p1 -b .cmakewarn %patch16 -p1 -b .cmakewarn
%patch17 -p1 -b .edcspeed %patch17 -p1 -b .edcspeed
%patch18 -p1 -b .paranoiacdio
%patch19 -p1 -b .elfheader %patch19 -p1 -b .elfheader
# we do not want bundled paranoia library # we do not want bundled paranoia library
@ -300,6 +298,9 @@ fi
%{_includedir}/usal %{_includedir}/usal
%changelog %changelog
* Fri Nov 07 2014 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.1.11-26
- reverted back to cdda-paranoia, cdio has now incompatible GPLv3+ license
* Wed Nov 05 2014 Dan Horák <dan[at]danny.cz> - 1.1.11-25 * Wed Nov 05 2014 Dan Horák <dan[at]danny.cz> - 1.1.11-25
- fix build on ppc* (#1144072) - fix build on ppc* (#1144072)
@ -409,7 +410,7 @@ fi
* Fri Jul 10 2009 Adam Jackson <ajax@redhat.com> 1.1.9-7 * Fri Jul 10 2009 Adam Jackson <ajax@redhat.com> 1.1.9-7
- Move dirsplit to a subpackage to isolate the perl dependency. - Move dirsplit to a subpackage to isolate the perl dependency.
* Mon Jun 15 2009 Roman Rakus <rrakus@redhat.com> - 1.1.9-6 * Tue Jun 15 2009 Roman Rakus <rrakus@redhat.com> - 1.1.9-6
- rename functions as they conflict with glibc - rename functions as they conflict with glibc
- Don't push cdda2mp3 because we don't have any mp3 coder - Don't push cdda2mp3 because we don't have any mp3 coder
Resolves: #505918 Resolves: #505918