Add upstream patch to fix undefined reference during linking, thanks to everyone in bug 403253. Remove old versions.

(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)

6 files changed, 35 insertions, 327 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index d41a8042aa48..8f8dd0f2250c 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.192 2012/03/19 22:18:08 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.193 2012/04/18 14:50:38 pesa Exp $
+
+  18 Apr 2012; Davide Pesavento <pesa@gentoo.org>
+  +files/avidemux-2.5.6-ffmpeg-symbol-visibility.patch, -avidemux-2.5.5.ebuild,
+  -avidemux-2.5.6.ebuild, avidemux-2.5.6-r1.ebuild, metadata.xml:
+  Add upstream patch to fix undefined reference during linking, thanks to
+  everyone in bug 403253. Remove old versions.
 
   19 Mar 2012; Davide Pesavento <pesa@gentoo.org> avidemux-2.5.6-r1.ebuild:
   Revert to bundled spidermonkey (bug #408813).
diff --git a/media-video/avidemux/avidemux-2.5.5.ebuild b/media-video/avidemux/avidemux-2.5.5.ebuild
deleted file mode 100644
index 62c3c38c35bb..000000000000
--- a/media-video/avidemux/avidemux-2.5.5.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.5.ebuild,v 1.2 2012/03/18 13:57:59 ssuominen Exp $
-
-EAPI="4"
-
-inherit cmake-utils flag-o-matic
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+aac +aften +alsa amr +dts jack libsamplerate +mp3 nls oss
-	pulseaudio +sdl +truetype +vorbis +x264 +xv +xvid gtk +qt4"
-
-RDEPEND="dev-libs/libxml2
-	aac? (
-		media-libs/faac
-		media-libs/faad2
-	)
-	aften? ( media-libs/aften[cxx] )
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	dts? ( media-libs/libdca )
-	mp3? ( media-sound/lame )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	truetype? (
-		media-libs/freetype:2
-		media-libs/fontconfig
-	)
-	vorbis? ( media-libs/libvorbis )
-	x264? ( media-libs/x264 )
-	xv? ( x11-libs/libXv )
-	xvid? ( media-libs/xvid )
-	gtk? ( x11-libs/gtk+:2 )
-	qt4? ( x11-libs/qt-gui:4 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-lang/yasm
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-BUILD_S=${WORKDIR}/${P}_build
-
-AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
-for L in ${AVIDEMUX_LANGS}; do
-	IUSE="${IUSE} linguas_${L}"
-done
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.4-build-plugins-fix.patch"
-	#bug 365153
-	"${FILESDIR}/${PN}-2.5.4-x264-build115.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	local po_files=
-	local qt_ts_files=
-	local avidemux_ts_files=
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} ${AVIDEMUX_LANGS}; then
-			if [[ -e ${S}/po/${lingua}.po ]]; then
-				po_files="${po_files} \${po_subdir}/${lingua}.po"
-			fi
-			if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
-				qt_ts_files="${qt_ts_files} \${ts_subdir}/qt_${lingua}.ts"
-			fi
-			if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
-				avidemux_ts_files="${avidemux_ts_files} \${ts_subdir}/${PN}_${lingua}.ts"
-			fi
-		fi
-	done
-
-	sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \
-		"${S}/cmake/Po.cmake" || die "sed failed"
-	sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \
-	    -e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
-		"${S}/cmake/Ts.cmake" || die "sed failed"
-	#fix exec command wrt bug #316599 and #291453
-	sed -i "/Exec/s:\[\$e\]::" ${PN}2-gtk.desktop || die
-
-	# Don't install Windows-related files
-	sed -i -e '/addons\/avsfilter/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	### Add lax vector typing for PowerPC
-	if use ppc || use ppc64; then
-		append-cflags "-flax-vector-conversions"
-	fi
-
-	mycmakeargs+="
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DAVIDEMUX_INSTALL_PREFIX='${BUILD_S}'
-		-DAVIDEMUX_CORECONFIG_DIR='${BUILD_S}/config'
-		$(cmake-utils_use gtk)
-		$(cmake-utils_use qt4)
-		$(cmake-utils_use nls GETTEXT)
-		$(cmake-utils_use sdl)
-		$(cmake-utils_use xv XVIDEO)
-		$(cmake-utils_use alsa)
-		-DUSE_ESD=OFF
-		$(cmake-utils_use jack)
-		$(cmake-utils_use oss)
-		$(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
-		$(cmake-utils_use aften)
-		$(cmake-utils_use mp3 LAME)
-		$(cmake-utils_use aac FAAC)
-		$(cmake-utils_use aac FAAD)
-		$(cmake-utils_use vorbis)
-		$(cmake-utils_use dts LIBDCA)
-		$(cmake-utils_use amr OPENCORE_AMRNB)
-		$(cmake-utils_use amr OPENCORE_AMRWB)
-		$(cmake-utils_use truetype FREETYPE2)
-		$(cmake-utils_use truetype FONTCONFIG)
-		$(cmake-utils_use xvid)
-		$(cmake-utils_use x264)
-	"
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	append-flags -D__STDC_FORMAT_MACROS
-	# first build the application
-	cmake-utils_src_compile
-	# and then go on with plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins"
-}
-
-src_install() {
-	# install the application
-	cmake-utils_src_install
-	# install plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins" DESTDIR="${D}" install
-
-	dodoc AUTHORS
-	newicon ${PN}_icon.png ${PN}.png
-
-	if use qt4; then
-		sed -i "s/\(${PN}2_\)gtk/\1qt4/" ${PN}2.desktop || die "sed failed"
-		domenu ${PN}2.desktop
-	fi
-
-	if use gtk; then
-		domenu ${PN}2-gtk.desktop
-	fi
-}
diff --git a/media-video/avidemux/avidemux-2.5.6-r1.ebuild b/media-video/avidemux/avidemux-2.5.6-r1.ebuild
index dd0ba2254775..a283010bd40e 100644
--- a/media-video/avidemux/avidemux-2.5.6-r1.ebuild
+++ b/media-video/avidemux/avidemux-2.5.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.6-r1.ebuild,v 1.2 2012/03/19 22:18:08 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.6-r1.ebuild,v 1.3 2012/04/18 14:50:38 pesa Exp $
 
 EAPI=4
 
@@ -63,17 +63,19 @@ DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 "
 
-S=${WORKDIR}/${MY_P}
-BUILD_S=${WORKDIR}/${P}_build
-
 AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
 for lang in ${AVIDEMUX_LANGS}; do
 	IUSE+=" linguas_${lang}"
 done
 unset lang
 
+S=${WORKDIR}/${MY_P}
+BUILD_S=${WORKDIR}/${P}_build
+
+DOCS=( AUTHORS )
 PATCHES=(
 	"${FILESDIR}/${PN}-2.5.4-build-plugins-fix.patch"
+	"${FILESDIR}/${P}-ffmpeg-symbol-visibility.patch"
 )
 
 src_prepare() {
@@ -162,9 +164,7 @@ src_install() {
 	# install plugins
 	emake -C "${CMAKE_BUILD_DIR}/plugins" DESTDIR="${D}" install
 
-	dodoc AUTHORS
 	newicon ${PN}_icon.png ${PN}.png
-
 	use gtk && domenu avidemux2-gtk.desktop
 	use qt4 && domenu avidemux2.desktop
 }
diff --git a/media-video/avidemux/avidemux-2.5.6.ebuild b/media-video/avidemux/avidemux-2.5.6.ebuild
deleted file mode 100644
index e1eccb34fe60..000000000000
--- a/media-video/avidemux/avidemux-2.5.6.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.6.ebuild,v 1.3 2012/03/18 13:57:59 ssuominen Exp $
-
-EAPI="4"
-
-inherit cmake-utils flag-o-matic
-
-MY_P=${PN}_${PV}
-
-DESCRIPTION="Video editor designed for simple cutting, filtering and encoding tasks"
-HOMEPAGE="http://fixounet.free.fr/avidemux"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="+aac +aften +alsa amr +dts jack libsamplerate +mp3 nls opengl
-	oss pulseaudio +sdl +truetype +vorbis +x264 +xv +xvid gtk +qt4"
-
-RDEPEND="dev-libs/libxml2
-	aac? (
-		media-libs/faac
-		media-libs/faad2
-	)
-	aften? ( media-libs/aften[cxx] )
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	dts? ( media-libs/libdca )
-	mp3? ( media-sound/lame )
-	jack? ( media-sound/jack-audio-connection-kit )
-	libsamplerate? ( media-libs/libsamplerate )
-	pulseaudio? ( media-sound/pulseaudio )
-	sdl? ( media-libs/libsdl )
-	truetype? (
-		media-libs/freetype:2
-		media-libs/fontconfig
-	)
-	vorbis? ( media-libs/libvorbis )
-	x264? ( media-libs/x264 )
-	xv? ( x11-libs/libXv )
-	xvid? ( media-libs/xvid )
-	gtk? ( x11-libs/gtk+:2 )
-	qt4? ( x11-libs/qt-gui:4
-		opengl? ( x11-libs/qt-opengl:4 )
-	)"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	dev-lang/yasm
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-BUILD_S=${WORKDIR}/${P}_build
-
-AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW"
-for L in ${AVIDEMUX_LANGS}; do
-	IUSE="${IUSE} linguas_${L}"
-done
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.5.4-build-plugins-fix.patch"
-)
-
-src_prepare() {
-	base_src_prepare
-
-	local po_files=
-	local qt_ts_files=
-	local avidemux_ts_files=
-	for lingua in ${LINGUAS}; do
-		if has ${lingua} ${AVIDEMUX_LANGS}; then
-			if [[ -e ${S}/po/${lingua}.po ]]; then
-				po_files="${po_files} \${po_subdir}/${lingua}.po"
-			fi
-			if [[ -e ${S}/po/qt_${lingua}.ts ]]; then
-				qt_ts_files="${qt_ts_files} \${ts_subdir}/qt_${lingua}.ts"
-			fi
-			if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then
-				avidemux_ts_files="${avidemux_ts_files} \${ts_subdir}/${PN}_${lingua}.ts"
-			fi
-		fi
-	done
-
-	sed -i -e "s!FILE(GLOB po_files .*)!SET(po_files ${po_files})!" \
-		"${S}/cmake/Po.cmake" || die "sed failed"
-	sed -i -e "s!FILE(GLOB.*qt.*)!SET(ts_files ${qt_ts_files})!" \
-	    -e "s!FILE(GLOB.*avidemux.*)!SET(ts_files ${avidemux_ts_files})!" \
-		"${S}/cmake/Ts.cmake" || die "sed failed"
-	#fix exec command wrt bug #316599 and #291453
-	sed -i "/Exec/s:\[\$e\]::" ${PN}2-gtk.desktop || die
-
-	# Don't install Windows-related files
-	sed -i -e '/addons\/avsfilter/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	### Add lax vector typing for PowerPC
-	if use ppc || use ppc64; then
-		append-cflags "-flax-vector-conversions"
-	fi
-
-	mycmakeargs+="
-		-DAVIDEMUX_SOURCE_DIR='${S}'
-		-DAVIDEMUX_INSTALL_PREFIX='${BUILD_S}'
-		-DAVIDEMUX_CORECONFIG_DIR='${BUILD_S}/config'
-		$(cmake-utils_use gtk)
-		$(cmake-utils_use qt4)
-		$(cmake-utils_use nls GETTEXT)
-		$(cmake-utils_use sdl)
-		$(cmake-utils_use xv XVIDEO)
-		$(cmake-utils_use alsa)
-		-DUSE_ESD=OFF
-		$(cmake-utils_use jack)
-		$(cmake-utils_use oss)
-		$(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
-		$(cmake-utils_use aften)
-		$(cmake-utils_use mp3 LAME)
-		$(cmake-utils_use aac FAAC)
-		$(cmake-utils_use aac FAAD)
-		$(cmake-utils_use vorbis)
-		$(cmake-utils_use dts LIBDCA)
-		$(cmake-utils_use amr OPENCORE_AMRNB)
-		$(cmake-utils_use amr OPENCORE_AMRWB)
-		$(cmake-utils_use truetype FREETYPE2)
-		$(cmake-utils_use truetype FONTCONFIG)
-		$(cmake-utils_use xvid)
-		$(cmake-utils_use x264)
-		$(cmake-utils_use_use opengl)
-	"
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	append-flags -D__STDC_FORMAT_MACROS
-	# first build the application
-	cmake-utils_src_compile -j1
-	# and then go on with plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins"
-}
-
-src_install() {
-	# install the application
-	cmake-utils_src_install
-	# install plugins
-	emake -C "${CMAKE_BUILD_DIR}/plugins" DESTDIR="${D}" install
-
-	dodoc AUTHORS
-	newicon ${PN}_icon.png ${PN}.png
-
-	if use qt4; then
-		sed -i "s/\(${PN}2_\)gtk/\1qt4/" ${PN}2.desktop || die "sed failed"
-		domenu ${PN}2.desktop
-	fi
-
-	if use gtk; then
-		domenu ${PN}2-gtk.desktop
-	fi
-}
diff --git a/media-video/avidemux/files/avidemux-2.5.6-ffmpeg-symbol-visibility.patch b/media-video/avidemux/files/avidemux-2.5.6-ffmpeg-symbol-visibility.patch
new file mode 100644
index 000000000000..3251209800a0
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.6-ffmpeg-symbol-visibility.patch
@@ -0,0 +1,20 @@
+--- branches/avidemux_2.5_branch_gruntster/cmake/patches/libavcodec_libavcodec.v.patch	2011/12/15 11:09:11	7699
++++ branches/avidemux_2.5_branch_gruntster/cmake/patches/libavcodec_libavcodec.v.patch	2012/03/15 07:19:34	7750
+@@ -1,11 +1,12 @@
+---- ../ffmpeg-0.9/libavcodec/libavcodec.v	2011-12-14 15:00:29 +0000
+-+++ libavcodec/libavcodec.v	2011-12-14 15:00:28 +0000
+-@@ -25,5 +25,8 @@
++--- libavcodec/libavcodec.v.old	2012-03-04 08:36:22.038330656 +0100
+++++ libavcodec/libavcodec.v	2012-03-04 08:36:44.128330633 +0100
++@@ -25,5 +25,9 @@
+                  ff_mmxext_idct;
+                  ff_idct_xvid*;
+                  ff_jpeg_fdct*;
+ +                ff_h264_info;
+-+				ff_golomb_vlc_len;
+-+				ff_ue_golomb_vlc_code;
+++                ff_golomb_vlc_len;
+++                ff_ue_golomb_vlc_code;
+++                ff_se_golomb_vlc_code;
+          local:  *;
+  };
diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 7f9ae3f7ed27..51c48baaab3f 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/metadata.xml
@@ -5,8 +5,7 @@
 <herd>video</herd>
 <use>
 	<flag name="aften">Enable A/52 (AC-3) audio encoder support</flag>
-	<flag name="amr">Enable Adaptive Multi-Rate format support through
-		<pkg>media-libs/opencore-amr</pkg></flag>
-	<flag name="vpx">Enable vp8 codec support using <pkg>media-libs/libvpx</pkg></flag>
+	<flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg></flag>
+	<flag name="vpx">Enable VP8 codec support via <pkg>media-libs/libvpx</pkg></flag>
 </use>
 </pkgmetadata>