Support newer libcdio-paranoia

(Portage version: 2.2.0_alpha154/cvs/Linux x86_64, signed Manifest commit with key 1191738E)

3 files changed, 52 insertions, 3 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 870b865041c3..1b28070b8096 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.133 2013/01/17 10:38:23 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.134 2013/01/17 10:55:55 lu_zero Exp $
+
+  17 Jan 2013; Luca Barbato <lu_zero@gentoo.org> libav-0.8.5.ebuild,
+  +files/libav-0.8.5-support-libcdio-paranoia.patch:
+  Support newer libcdio-paranoia
 
   17 Jan 2013; Luca Barbato <lu_zero@gentoo.org>
   +files/0001-libcdio-support-recent-cdio-paranoia.patch, libav-9.1.ebuild:
diff --git a/media-video/libav/files/libav-0.8.5-support-libcdio-paranoia.patch b/media-video/libav/files/libav-0.8.5-support-libcdio-paranoia.patch
new file mode 100644
index 000000000000..a2930a11e75a
--- /dev/null
+++ b/media-video/libav/files/libav-0.8.5-support-libcdio-paranoia.patch
@@ -0,0 +1,43 @@
+diff -urN libav-0.8.5.orig//configure libav-0.8.5/configure
+--- libav-0.8.5.orig//configure	2013-01-12 18:00:42.000000000 +0100
++++ libav-0.8.5/configure	2013-01-17 11:43:39.798920861 +0100
+@@ -1062,6 +1062,8 @@
+     asm_mod_y
+     attribute_may_alias
+     attribute_packed
++    cdio_paranoia_h
++    cdio_paranoia_paranoia_h
+     closesocket
+     cmov
+     dcbzl
+@@ -3020,8 +3022,9 @@
+ 
+ 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"
++if enabled libcdio; then
++    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
++fi
+ 
+ enabled x11grab                         &&
+ check_header X11/Xlib.h                 &&
+diff -urN libav-0.8.5.orig//libavdevice/libcdio.c libav-0.8.5/libavdevice/libcdio.c
+--- libav-0.8.5.orig//libavdevice/libcdio.c	2013-01-12 18:00:42.000000000 +0100
++++ libav-0.8.5/libavdevice/libcdio.c	2013-01-17 11:44:28.314919094 +0100
+@@ -23,8 +23,15 @@
+  * libcdio CD grabbing
+  */
+ 
++#include "config.h"
++
++#if HAVE_CDIO_PARANOIA_H
+ #include <cdio/cdda.h>
+ #include <cdio/paranoia.h>
++#elif HAVE_CDIO_PARANOIA_PARANOIA_H
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
++#endif
+ 
+ #include "libavutil/log.h"
+ #include "libavutil/mem.h"
diff --git a/media-video/libav/libav-0.8.5.ebuild b/media-video/libav/libav-0.8.5.ebuild
index 5d1a3fc1750a..c810bda20024 100644
--- a/media-video/libav/libav-0.8.5.ebuild
+++ b/media-video/libav/libav-0.8.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.5.ebuild,v 1.6 2013/01/16 20:05:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.5.ebuild,v 1.7 2013/01/17 10:55:55 lu_zero Exp $
 
 EAPI=5
 
@@ -47,7 +47,8 @@ RDEPEND="
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
 	bzip2? ( app-arch/bzip2 )
-	cdio? ( dev-libs/libcdio )
+	cdio? ( || ( dev-libs/libcdio-paranoia
+				<dev-libs/libcdio-0.90[-minimal] ) )
 	dirac? ( media-video/dirac )
 	encode? (
 		aac? ( media-libs/vo-aacenc )
@@ -106,6 +107,7 @@ src_prepare() {
 	if [[ ${PV%_p*} != ${PV} ]]; then
 		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
 	fi
+	epatch "${FILESDIR}"/$P-support-libcdio-paranoia.patch
 }
 
 src_configure() {