Fix for building with media-video/ffmpeg-0.4.9_p20080326, wrt bug #231063.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25.8 i686)

9 files changed, 269 insertions, 13 deletions

diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog
index 5f550b31b4f4..1633c99bf360 100644
--- a/app-cdr/k3b/ChangeLog
+++ b/app-cdr/k3b/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/k3b
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.207 2008/06/13 22:17:16 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.208 2008/07/07 19:39:26 loki_val Exp $
+
+*k3b-1.0.5-r2 (07 Jul 2008)
+
+  07 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch, k3b-0.12.17.ebuild,
+  k3b-1.0.3.ebuild, k3b-1.0.4.ebuild, k3b-1.0.4-r1.ebuild, k3b-1.0.5.ebuild,
+  k3b-1.0.5-r1.ebuild, +k3b-1.0.5-r2.ebuild:
+  Fix for building with media-video/ffmpeg-0.4.9_p20080326, wrt bug #231063.
 
 *k3b-1.0.5-r1 (13 Jun 2008)
 
diff --git a/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch b/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch
new file mode 100644
index 000000000000..dc9bee0d0769
--- /dev/null
+++ b/app-cdr/k3b/files/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch
@@ -0,0 +1,100 @@
+diff -NrU5 k3b-1.0.5.orig/configure.in k3b-1.0.5/configure.in
+--- k3b-1.0.5.orig/configure.in	2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/configure.in	2008-07-07 20:39:13.000000000 +0200
+@@ -574,12 +574,12 @@
+ 	AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
+ 	AC_LANG_SAVE
+ 	AC_LANG_CPLUSPLUS
+ 	AC_COMPILE_IFELSE( 
+ 		extern "C" {
+-		#include <ffmpeg/avformat.h>
+-		#include <ffmpeg/avcodec.h>
++		#include <libavformat/avformat.h>
++		#include <libavcodec/avcodec.h>
+ 		}
+ 
+ 		int main() {
+ 		  AVFormatContext* fc = 0;
+ 		  AVPacket* p = 0;
+@@ -589,12 +589,12 @@
+ 	[ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
+ 	OLD_LIBS=$LIBS
+ 	LIBS="-lavformat -lavcodec $LIBS"
+ 	AC_LINK_IFELSE( 
+ 		extern "C" {
+-		#include <ffmpeg/avformat.h>
+-		#include <ffmpeg/avcodec.h>
++		#include <libavformat/avformat.h>
++		#include <libavcodec/avcodec.h>
+ 		}
+ 
+ 		int main() {
+ 		  AVFormatContext* fc = 0;
+ 		  AVPacket* p = 0;
+diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/configure.in.in k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/configure.in.in	2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/plugins/decoder/ffmpeg/configure.in.in	2008-07-07 20:43:02.000000000 +0200
+@@ -19,12 +19,12 @@
+ 	AC_MSG_CHECKING(for ffmpeg >= 0.4.9)
+ 	AC_LANG_SAVE
+ 	AC_LANG_CPLUSPLUS
+ 	AC_COMPILE_IFELSE( 
+ 		extern "C" {
+-		#include <ffmpeg/avformat.h>
+-		#include <ffmpeg/avcodec.h>
++		#include <libavformat/avformat.h>
++		#include <libavcodec/avcodec.h>
+ 		}
+ 
+ 		int main() {
+ 		  AVFormatContext* fc = 0;
+ 		  AVPacket* p = 0;
+@@ -34,12 +34,12 @@
+ 	[ffmpeg_compiles=yes], [ffmpeg_compiles=no] )
+ 	OLD_LIBS=$LIBS
+ 	LIBS="-lavformat -lavcodec $LIBS"
+ 	AC_LINK_IFELSE( 
+ 		extern "C" {
+-		#include <ffmpeg/avformat.h>
+-		#include <ffmpeg/avcodec.h>
++		#include <libavformat/avformat.h>
++		#include <libavcodec/avcodec.h>
+ 		}
+ 
+ 		int main() {
+ 		  AVFormatContext* fc = 0;
+ 		  AVPacket* p = 0;
+diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp	2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegdecoder.cpp	2008-07-07 20:45:07.000000000 +0200
+@@ -20,11 +20,11 @@
+ 
+ #include <kdebug.h>
+ #include <k3bpluginfactory.h>
+ 
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
++#include <libavcodec/avcodec.h>
+ }
+ 
+ #include <math.h>
+ 
+ 
+diff -NrU5 k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+--- k3b-1.0.5.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2008-07-07 20:36:06.000000000 +0200
++++ k3b-1.0.5/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp	2008-07-07 20:44:02.000000000 +0200
+@@ -16,12 +16,12 @@
+ #include <config.h>
+ 
+ #include "k3bffmpegwrapper.h"
+ 
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ }
+ 
+ #include <string.h>
+ 
+ #include <klocale.h>
diff --git a/app-cdr/k3b/k3b-0.12.17.ebuild b/app-cdr/k3b/k3b-0.12.17.ebuild
index c843a255ce0a..b3dc3abb6aeb 100644
--- a/app-cdr/k3b/k3b-0.12.17.ebuild
+++ b/app-cdr/k3b/k3b-0.12.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.17.ebuild,v 1.16 2008/06/15 12:04:15 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-0.12.17.ebuild,v 1.17 2008/07/07 19:39:26 loki_val Exp $
 
 inherit kde eutils
 
@@ -19,7 +19,7 @@ DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
 	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )
diff --git a/app-cdr/k3b/k3b-1.0.3.ebuild b/app-cdr/k3b/k3b-1.0.3.ebuild
index a23756de86e0..82ee3916bb5c 100644
--- a/app-cdr/k3b/k3b-1.0.3.ebuild
+++ b/app-cdr/k3b/k3b-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.3.ebuild,v 1.6 2008/06/15 12:04:15 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.3.ebuild,v 1.7 2008/07/07 19:39:26 loki_val Exp $
 
 inherit kde eutils
 
@@ -23,7 +23,7 @@ DEPEND="kde? ( || ( kde-base/kdesu kde-base/kdebase ) )
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
 	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )
diff --git a/app-cdr/k3b/k3b-1.0.4-r1.ebuild b/app-cdr/k3b/k3b-1.0.4-r1.ebuild
index 9cfae140728c..8a695038c7e4 100644
--- a/app-cdr/k3b/k3b-1.0.4-r1.ebuild
+++ b/app-cdr/k3b/k3b-1.0.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.4-r1.ebuild,v 1.1 2008/04/26 22:43:49 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.4-r1.ebuild,v 1.2 2008/07/07 19:39:26 loki_val Exp $
 
 inherit kde eutils
 
@@ -22,7 +22,7 @@ DEPEND="hal? ( dev-libs/dbus-qt3-old sys-apps/hal )
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
 	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )
diff --git a/app-cdr/k3b/k3b-1.0.4.ebuild b/app-cdr/k3b/k3b-1.0.4.ebuild
index 069ae8271672..7c46030d0e20 100644
--- a/app-cdr/k3b/k3b-1.0.4.ebuild
+++ b/app-cdr/k3b/k3b-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.4.ebuild,v 1.8 2008/01/05 19:56:48 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.4.ebuild,v 1.9 2008/07/07 19:39:26 loki_val Exp $
 
 inherit kde eutils
 
@@ -22,7 +22,7 @@ DEPEND="hal? ( dev-libs/dbus-qt3-old sys-apps/hal )
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
 	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )
diff --git a/app-cdr/k3b/k3b-1.0.5-r1.ebuild b/app-cdr/k3b/k3b-1.0.5-r1.ebuild
index 4870d38bd908..23c2ca8fccc5 100644
--- a/app-cdr/k3b/k3b-1.0.5-r1.ebuild
+++ b/app-cdr/k3b/k3b-1.0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5-r1.ebuild,v 1.1 2008/06/13 22:17:16 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5-r1.ebuild,v 1.2 2008/07/07 19:39:26 loki_val Exp $
 
 inherit kde eutils
 
@@ -22,7 +22,7 @@ DEPEND="hal? ( dev-libs/dbus-qt3-old sys-apps/hal )
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
 	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )
diff --git a/app-cdr/k3b/k3b-1.0.5-r2.ebuild b/app-cdr/k3b/k3b-1.0.5-r2.ebuild
new file mode 100644
index 000000000000..71ff37d5d408
--- /dev/null
+++ b/app-cdr/k3b/k3b-1.0.5-r2.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5-r2.ebuild,v 1.1 2008/07/07 19:39:26 loki_val Exp $
+
+inherit kde eutils
+
+MY_P=${P/_/}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="K3b, KDE CD Writing Software"
+HOMEPAGE="http://www.k3b.org/"
+SRC_URI="mirror://sourceforge/k3b/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="alsa css dvdr dvdread encode ffmpeg flac hal mp3 musepack musicbrainz
+	sndfile vcd vorbis emovix"
+
+DEPEND="hal? ( dev-libs/dbus-qt3-old sys-apps/hal )
+	media-libs/libsamplerate
+	media-libs/taglib
+	>=media-sound/cdparanoia-3.9.8
+	sndfile? ( media-libs/libsndfile )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+	flac? ( media-libs/flac )
+	mp3? ( media-libs/libmad )
+	musepack? ( media-libs/libmpcdec )
+	vorbis? ( media-libs/libvorbis )
+	musicbrainz? ( =media-libs/musicbrainz-2* )
+	encode? ( media-sound/lame )
+	alsa? ( media-libs/alsa-lib )
+	dvdread? ( media-libs/libdvdread )"
+
+RDEPEND="${DEPEND}
+	virtual/cdrtools
+	>=app-cdr/cdrdao-1.1.7-r3
+	media-sound/normalize
+	dvdr? ( >=app-cdr/dvd+rw-tools-7.0 )
+	css? ( media-libs/libdvdcss )
+	encode? ( media-sound/sox
+				media-video/transcode )
+	vcd? ( media-video/vcdimager )
+	emovix? ( media-video/emovix )"
+
+DEPEND="${DEPEND}
+	dev-util/pkgconfig"
+
+need-kde 3.5
+
+PATCHES=(	"${FILESDIR}/k3b-1.0.5-desktop-entry.diff"
+		"${FILESDIR}/k3b-1.0.5-ffmpeg-0.4.9_p20080326-API.patch"	)
+
+I18N="${PN}-i18n-${PV}"
+
+# Supported languages and translated documentation
+LANGS="af ar bg br bs ca cs cy da de el en_GB es et eu fa fi fr ga gl he hi hu is it ja ka lt mk ms nb nds nl nn pa pl pt pt_BR ru rw se sk sr sr@Latn sv ta tr uk uz zh_CN zh_TW"
+for X in ${LANGS}; do
+	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://sourceforge/k3b/${I18N}.tar.bz2 )"
+	IUSE="${IUSE} linguas_${X}"
+done
+
+pkg_setup() {
+	if use hal && has_version '<sys-apps/dbus-0.91' && ! built_with_use sys-apps/dbus qt3; then
+		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"hal\" USE flag enabled,"
+		eerror "but sys-apps/dbus is not built with Qt3 support."
+		die "Please, rebuild sys-apps/dbus with the \"qt3\" USE flag."
+	fi
+	if use encode && ! built_with_use media-video/transcode dvdread; then
+		eerror "You are trying to compile ${CATEGORY}/${PF} with the \"encode\""
+		eerror "USE flag enabled, however media-video/transcode was not built"
+		eerror "with libdvdread support. Also keep in mind that enabling"
+		eerror "the dvdread USE flag will cause k3b to use libdvdread as well."
+		die "Please, rebuild media-video/transcode with the \"dvdread\" USE flag."
+	fi
+
+	if use flac && ! built_with_use --missing true media-libs/flac cxx; then
+		eerror "To build ${PN} with flac support you need the C++ bindings for flac."
+		eerror "Please enable the cxx USE flag for media-libs/flac"
+		die "Missing FLAC C++ bindings."
+	fi
+
+	kde_pkg_setup
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		cd "${WORKDIR}/${I18N}"
+		for X in ${LANGS}; do
+			use linguas_${X} || rm -rf "${X}"
+		done
+		rm -f configure
+	fi
+	rm -f "${S}/configure"
+}
+
+src_compile() {
+	local myconf="--enable-libsuffix=		\
+			--with-external-libsamplerate	\
+			--without-resmgr				\
+			--without-cdrecord-suid-root	\
+			--without-k3bsetup				\
+			$(use_with hal)					\
+			$(use_with encode lame)			\
+			$(use_with ffmpeg)				\
+			$(use_with flac)				\
+			$(use_with vorbis oggvorbis)	\
+			$(use_with sndfile)				\
+			$(use_with mp3 libmad)			\
+			$(use_with musepack)			\
+			$(use_with musicbrainz)			\
+			$(use_with alsa)"
+
+	# Build process of K3b
+	kde_src_compile
+
+	# Build process of K3b-i18n
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		KDE_S="${WORKDIR}/${I18N}" \
+		kde_src_compile
+	fi
+}
+
+src_install() {
+	kde_src_install
+	dodoc FAQ KNOWNBUGS PERMISSIONS
+
+	if [ -d "${WORKDIR}/${I18N}" ]; then
+		KDE_S="${WORKDIR}/${I18N}" \
+		kde_src_install
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "We don't install k3bsetup anymore because Gentoo doesn't need it."
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	echo
+
+	local group=cdrom
+	use kernel_linux || group=operator
+	elog "Make sure you have proper read/write permissions on the cdrom device(s)."
+	elog "Usually, it is sufficient to be in the ${group} group."
+	echo
+}
diff --git a/app-cdr/k3b/k3b-1.0.5.ebuild b/app-cdr/k3b/k3b-1.0.5.ebuild
index 707c30d9cdf0..fd25aa606e6b 100644
--- a/app-cdr/k3b/k3b-1.0.5.ebuild
+++ b/app-cdr/k3b/k3b-1.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5.ebuild,v 1.1 2008/05/31 21:12:14 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-1.0.5.ebuild,v 1.2 2008/07/07 19:39:26 loki_val Exp $
 
 inherit kde eutils
 
@@ -22,7 +22,7 @@ DEPEND="hal? ( dev-libs/dbus-qt3-old sys-apps/hal )
 	media-libs/taglib
 	>=media-sound/cdparanoia-3.9.8
 	sndfile? ( media-libs/libsndfile )
-	ffmpeg? ( media-video/ffmpeg )
+	ffmpeg? ( <media-video/ffmpeg-0.4.9_p20080326 )
 	flac? ( media-libs/flac )
 	mp3? ( media-libs/libmad )
 	musepack? ( media-libs/libmpcdec )