Upstream patch to make avidemux compile with the latest version of x264. Bug #356373. Thanks to all these people who provided solutions on the bug

Package-Manager: portage-2.1.9.41/cvs/Linux x86_64

4 files changed, 271 insertions, 3 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index 2e27a42a080e..b0db0ce07a61 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/avidemux
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.178 2010/11/02 13:39:21 scarabeus Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.179 2011/03/12 11:26:12 hwoarang Exp $
+
+*avidemux-2.5.4-r2 (12 Mar 2011)
+
+  12 Mar 2011; Markos Chandras <hwoarang@gentoo.org> +avidemux-2.5.4-r2.ebuild,
+  +files/avidemux-2.5.4-x264-version-fix.patch:
+  Upstream patch to make avidemux compile with the latest version of x264. Bug
+  #356373. Thanks to all these people who provided solutions on the bug
 
   02 Nov 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   avidemux-2.5.4-r1.ebuild:
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 081fabc7825c..66466f8502a6 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX 2.5.3_field_asm_fix.diff 4377 RMD160 d7f90a7086ac1a1112681832eb9af9d6d0ea73dd SHA1 bfd66b5a5cc98f2f1eedf2f3a9b67a11cdb973df SHA256 6f8093983b0bd53ef50e2f7aa22beb85147c2a4566c0faa9416fb90f282aa6b5
 AUX avidemux-2.4-cmake264.patch 820 RMD160 e02c32891a257dd6e14e2b6aa464232cea222429 SHA1 387804ad24a816a24a036b57692cee9ff13e728f SHA256 693958df6c16d467e3c4a0b9dc56861c2c1bf8eed051de5cd7422b274d5d68af
 AUX avidemux-2.4-i18n.patch 1676 RMD160 5cc06702f8a4d96a12630d4f543035baa5ccac0f SHA1 32557519caeed3b236f48b40d5ee8953b2d03197 SHA256 ab978ed96a2689af2e01ad8b9a08ed9bd4b2f8e4c6721d9598964f1fd8a5e6d2
@@ -9,6 +12,7 @@ AUX avidemux-2.5.3-build-plugins-fix.patch 469 RMD160 9788ca88e4016b90e7e4fd2a17
 AUX avidemux-2.5.3-fix-fgets-fortify.patch 1313 RMD160 8f0d81b331ad6f28f3e989f11a07a7d9b3fae4d7 SHA1 c41b1116970660a051c87c7e536ad36e1ca5a3e6 SHA256 f75bf00058715479d4e1d531e81aefc6db8375de509b3001bdba0332a6bb09fd
 AUX avidemux-2.5.4-build-plugins-fix.patch 497 RMD160 5099949dfb00bfcda59cfc00d9bd25c0ecd60807 SHA1 df33b52bedcce4db40b4f85f2238e2dfd3e973a6 SHA256 a470bfa50d86082f4e9ad31c5be630efe9a237f8dd504058278968770635ecef
 AUX avidemux-2.5.4-dummy-sound-fix.patch 476 RMD160 6c784197aa444a1722f0b540d1da02bd4b5d7aa3 SHA1 1ac354248a653d42f87820a1911a4f35888ec7ca SHA256 652c5403b93fa2b4f400d2790dbe75c36b8f98ce1a7d4d0647307e67888683d3
+AUX avidemux-2.5.4-x264-version-fix.patch 4001 RMD160 9644a443bf6b9ab31c02ff628525504291bd7f03 SHA1 a75529d04ea9fb1ebf21d9c9d19c332389bda3a7 SHA256 cce9317b111ff08bd47aee52bf417abeadac90f8bd8076461ed5abcbc20ce213
 AUX avidemux-pulseaudiosimple.patch 840 RMD160 7ac4ec7030524c94400cefc3eaf7b9cc55b65958 SHA1 4cff8353b11008c7da880357ef32c4c59fdcbe50 SHA256 1fa35c31f95e7276e816c47ba46977e4ad102ccf70652f95196df1bf9a1587b1
 AUX lavcodec-mpegvideo_mmx-asm-fix.patch 2443 RMD160 3b1b315ef1e5083f95807ce5419196c832a66aad SHA1 0bd5ca05d373f7fd63cafb03d5514cfc86d8504c SHA256 c6cfcf06da8a254e542077a7ac728be220d41fc0ad3c4b7001ac63de5f36bc6c
 DIST avidemux-2.5-r5428.tar.bz2 11433656 RMD160 ae72e5d03f2c12b1a9e64ed9cd57a00c84eac841 SHA1 d29d7a2d1054108bc20b4371be9c5ab29816a2e6 SHA256 42e3d596d8ac106120f88a77442a5a916fd34c64b09940f70d3156221cd7e50c
@@ -20,5 +24,23 @@ EBUILD avidemux-2.5.1_p5428.ebuild 4857 RMD160 4fd54ea871c0d7538dc912cfa41df99de
 EBUILD avidemux-2.5.2.ebuild 5052 RMD160 ca2ca7915983430614dbcca64945491a8f7eac07 SHA1 3218e147678317326c8fa88657a175f800d22d79 SHA256 97e2f83b5cbdaf3f41551814193ebe4f1e99c4dd03d174428a00bacb1a1449f5
 EBUILD avidemux-2.5.3-r3.ebuild 5165 RMD160 99a00e99f0f186bb0c18728ba66d83467daaf680 SHA1 cf6f88c8454ff8b5142ad26465fa12e0c8a66486 SHA256 80e79c241eb193d6b9761dbdd157bc0005e4641884407d36eedb6f08eea91723
 EBUILD avidemux-2.5.4-r1.ebuild 4345 RMD160 8f9763976c8106dcdf7a0e3055f48f273cad1c8a SHA1 ba7a6a86c60508979254c4f809c97c5ceb941843 SHA256 d2e91c4a3760027e3110d544358943f146f3774bffcf2f4cca116f62414f7a2d
-MISC ChangeLog 32333 RMD160 a771bd9fa7b333e62f5483efbafc3a293fa38dc1 SHA1 1490dc87175876fecb07888c70f60c9cebc13c28 SHA256 9b6f152e6539cf2955f7aa22a85df579cb088ca9d8168f1aa81379c432e37c79
+EBUILD avidemux-2.5.4-r2.ebuild 4400 RMD160 f47f297a85e20966f80889e12544891f786dead1 SHA1 8f5cea42a98ace5a40cf8fd1d683c6562f2dd34b SHA256 891e93370397f6f0aa1a4c7ab89f6d6d3383d538ef235da88ead66a278478013
+MISC ChangeLog 32646 RMD160 20f9974ab77dc585bfae6deb4d09e99aab20da6d SHA1 984c370cac42ca63566c333d7ddbff3c4a0cbf2e SHA256 54174d2253997dc170ea0c831955d1b888d01e55e16d7a891ab4d0e5b7a46c29
 MISC metadata.xml 485 RMD160 95a87d5c668b8ebcf81bda32aa17066dd4c8482e SHA1 0b52f00590772f6caa104e4a8ac830ddf230e95c SHA256 07609a99bbf9772db5da33f0a6fe4fd72f1e6d60ccd96961ee9032bcd331b5c6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNe1gYAAoJEPqDWhW0r/LCExcP/1MSgD13XSWPHbNAfoPcW5vA
+gWg9xdKrPGIwe0dwvvoIs6tOav1xcMdaS2ef5RaHJka2Wg+tX3L2/uJnZxQe4FG5
+/sxPVPMD/boUeZwELD/QmN94uQLfjm9Q5fXzOAPmNyJT9eLCGrKiWyBlUBEosEmO
+XesoureJmBiCiTVWN2utPHah2gdB/4ZhXQwyIMfIO2CXWsBwJSE1O9uuVtLI2lIg
+14MoLSt6qHfIcaQZEl6up9Z9U9T8v6FrlvwzvV7uxdiZ18NIWfWmaIPob5S1CIj1
+0V/1nLmXGJe9A9qePLu9VSWtNvkfNxIal1Tyk5AmtE3OBbyFOMNDMsM7bQaWd9ih
+T4CSNu8DhQztxdXazYjxdkVCxhH8CqnpY7piVM+XJj5DcDAdVSmJuPpGVID1Ju5+
+y0NXjNrkiD3Ph3sg5Nvcy+1Zt9cDoyInXdnTTtlsjXbthHSYQgY5Bf8p7MJIasM5
+6PLMMJ7T537SX00PwDoLCeO0fItMcH1XuSmGvAvrjCoCssbUCq+H/1t2D7yvslo9
+D5HngQX/vKjmhnWxCv05JBjR+4pFfr+Q0hd4fHu90IFam/AYKjkLTJgl0dWXmpx0
+Ig2/xFEhShfDwnO/KwPPUGSTcb6/GSKPBUJ8agUfPcr9GJySKn3UltvwHYNav+d7
+UFH5mJj4Vi5dkWbRV55e
+=uqDp
+-----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.5.4-r2.ebuild b/media-video/avidemux/avidemux-2.5.4-r2.ebuild
new file mode 100644
index 000000000000..925fe58d198f
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.5.4-r2.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.4-r2.ebuild,v 1.1 2011/03/12 11:26:12 hwoarang Exp $
+
+EAPI="2"
+
+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 ~ppc ~x86"
+IUSE="+aac +aften +alsa amr +dts esd 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 )
+	esd? ( media-sound/esound )
+	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-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}/${P}-build-plugins-fix.patch"
+	#bug 342909
+	"${FILESDIR}/${P}-dummy-sound-fix.patch"
+	#bug 356373
+	"${FILESDIR}/${P}-x264-version-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
+}
+
+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)
+		$(cmake-utils_use esd)
+		$(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" || die "building plugins failed"
+}
+
+src_install() {
+	# install the application
+	cmake-utils_src_install
+	# install plugins
+	emake -C "${CMAKE_BUILD_DIR}/plugins" DESTDIR="${D}" install \
+		|| die "installing plugins failed"
+
+	dodoc AUTHORS || die "dodoc failed"
+	newicon ${PN}_icon.png ${PN}.png || die "installing icon failed"
+
+	if use qt4; then
+		sed -i "s/\(${PN}2_\)gtk/\1qt4/" ${PN}2.desktop || die "sed failed"
+		domenu ${PN}2.desktop || die "installing desktop file failed"
+	fi
+
+	if use gtk; then
+		domenu ${PN}2-gtk.desktop || die "installing desktop file failed"
+	fi
+}
diff --git a/media-video/avidemux/files/avidemux-2.5.4-x264-version-fix.patch b/media-video/avidemux/files/avidemux-2.5.4-x264-version-fix.patch
new file mode 100644
index 000000000000..c0825afdb596
--- /dev/null
+++ b/media-video/avidemux/files/avidemux-2.5.4-x264-version-fix.patch
@@ -0,0 +1,81 @@
+diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2011-03-12 12:04:53.100131791 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2011-03-12 12:02:58.063666919 +0200
+@@ -94,6 +94,13 @@
+ 	connect(ui.dct8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(dct8x8CheckBox_toggled(bool)));

+ 	connect(ui.p8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(p8x8CheckBox_toggled(bool)));

+ 

++#if X264_BUILD < 110

++	ui.weightedPPredictComboBox->clear();

++	ui.weightedPPredictComboBox->addItem(tr("Disabled"));

++	ui.weightedPPredictComboBox->addItem(tr("Blind Offset"));

++	ui.weightedPPredictComboBox->addItem(tr("Smart Analysis"));

++#endif

++

+ 	// Frame tab

+ 	connect(ui.loopFilterCheckBox, SIGNAL(toggled(bool)), this, SLOT(loopFilterCheckBox_toggled(bool)));

+ 

+diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui	2011-03-12 12:04:53.100131791 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui	2011-03-12 12:02:58.063666919 +0200
+@@ -1131,12 +1131,12 @@
+                 </item>
+                 <item>
+                  <property name="text">
+-                  <string>Blind Offset</string>
++                  <string>Weighted References</string>
+                  </property>
+                 </item>
+                 <item>
+                  <property name="text">
+-                  <string>Smart Analysis</string>
++                  <string>Weighted References + Duplicates</string>
+                  </property>
+                 </item>
+                </widget>
+diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-03-12 12:04:53.100131791 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp	2011-03-12 12:02:58.062666914 +0200
+@@ -1386,9 +1386,15 @@
+ 		case X264_WEIGHTP_NONE:

+ 			strcpy((char*)xmlBuffer, "none");

+ 			break;

++#if X264_BUILD < 110

+ 		case X264_WEIGHTP_BLIND:

+ 			strcpy((char*)xmlBuffer, "blind");

+ 			break;

++#else

++		case X264_WEIGHTP_SIMPLE:

++			strcpy((char*)xmlBuffer, "simple");

++			break;

++#endif

+ 		case X264_WEIGHTP_SMART:

+ 			strcpy((char*)xmlBuffer, "smart");

+ 			break;

+@@ -1895,8 +1901,13 @@
+ 			{

+ 				int weightedPredPFrames = X264_WEIGHTP_NONE;

+ 

++#if X264_BUILD < 110

+ 				if (strcmp(content, "blind") == 0)

+ 					weightedPredPFrames = X264_WEIGHTP_BLIND;

++#else

++				if (strcmp(content, "simple") == 0)

++					weightedPredPFrames = X264_WEIGHTP_SIMPLE;

++#endif

+ 				else if (strcmp(content, "smart") == 0)

+ 					weightedPredPFrames = X264_WEIGHTP_SMART;

+ 

+diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd	2011-03-12 12:04:53.100131791 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd	2011-03-12 12:02:58.062666914 +0200
+@@ -335,7 +335,9 @@
+                       <xs:simpleType>

+                         <xs:restriction base="xs:string">

+                           <xs:enumeration value="none"/>

++						  <!-- blind deprecated core 110 -->

+                           <xs:enumeration value="blind"/>

++						  <xs:enumeration value="simple"/>

+                           <xs:enumeration value="smart"/>

+                         </xs:restriction>

+                       </xs:simpleType>