[packages/ffmpeg] - added cdio-paranoia patch: adjust for separate libcdio-paranoia

[qboosh]

commit a09e741c0391106effb339a2ff2b2664d6f9dc06
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Dec 6 21:34:08 2012 +0100

    - added cdio-paranoia patch: adjust for separate libcdio-paranoia

 ffmpeg-cdio-paranoia.patch | 24 ++++++++++++++++++++++++
 ffmpeg.spec                |  6 ++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 64d6d21..4ceee0e 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -40,6 +40,7 @@ Source3:	ffserver.conf
 Patch0:		%{name}-gsm.patch
 Patch1:		%{name}-opencv24.patch
 Patch2:		%{name}-openjpeg.patch
+Patch3:		%{name}-cdio-paranoia.patch
 URL:		http://www.ffmpeg.org/
 %{?with_openal:BuildRequires:	OpenAL-devel}
 BuildRequires:	SDL-devel >= 1.2.1
@@ -64,7 +65,7 @@ BuildRequires:	libass-devel
 BuildRequires:	libavc1394-devel
 BuildRequires:	libbluray-devel
 %{?with_caca:BuildRequires:	libcaca-devel}
-BuildRequires:	libcdio-devel
+BuildRequires:	libcdio-paranoia-devel >= 0.90-2
 BuildRequires:	libdc1394-devel >= 2
 BuildRequires:	libgsm-devel
 BuildRequires:	libiec61883-devel
@@ -186,7 +187,7 @@ Requires:	lame-libs-devel >= 3.98.3
 Requires:	libass-devel
 Requires:	libavc1394-devel
 Requires:	libbluray-devel
-Requires:	libcdio-devel
+Requires:	libcdio-paranoia-devel >= 0.90-2
 Requires:	libdc1394-devel >= 2
 Requires:	libgsm-devel
 Requires:	libiec61883-devel
@@ -275,6 +276,7 @@ dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
+%patch3 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig
diff --git a/ffmpeg-cdio-paranoia.patch b/ffmpeg-cdio-paranoia.patch
new file mode 100644
index 0000000..48ecede
--- /dev/null
+++ b/ffmpeg-cdio-paranoia.patch
@@ -0,0 +1,24 @@
+--- ffmpeg-1.0.1/libavdevice/libcdio.c.orig	2012-12-03 22:17:35.000000000 +0100
++++ ffmpeg-1.0.1/libavdevice/libcdio.c	2012-12-06 19:03:32.695282861 +0100
+@@ -23,8 +23,8 @@
+  * libcdio CD grabbing
+  */
+ 
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ 
+ #include "libavutil/log.h"
+ #include "libavutil/mem.h"
+--- ffmpeg-1.0.1/configure.orig	2012-12-06 19:06:32.011945790 +0100
++++ ffmpeg-1.0.1/configure	2012-12-06 19:29:13.155250760 +0100
+@@ -3771,7 +3771,7 @@
+ enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
+ 
+ enabled libcdio &&
+-    check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open "-lcdio_paranoia -lcdio_cdda -lcdio"
++    check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open "-lcdio_paranoia -lcdio_cdda -lcdio"
+ 
+ enabled x11grab                                           &&
+ require X11 X11/Xlib.h XOpenDisplay -lX11                 &&
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/a09e741c0391106effb339a2ff2b2664d6f9dc06