Revision bump. Fix up dependencies that are enabled by default as well as those that are disabled by default; they were not automagic as checks were present, I just did not notice them. This was incorrect due to wrongly checking the dependencies in my early developer days, as well as adding the cmake arguments in a sub phase of the configure phase instead of for the whole configure phase; I need to make sure I check USE="-*" and USE="*" in the future and look closer at cmake files to avoid this. Fixes bug #476602, reported by Nikoli.

Package-Manager: portage-2.1.12.13/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

5 files changed, 188 insertions, 10 deletions

diff --git a/media-libs/avidemux-plugins/ChangeLog b/media-libs/avidemux-plugins/ChangeLog
index fe60c9f091f9..6d05a2306a4a 100644
--- a/media-libs/avidemux-plugins/ChangeLog
+++ b/media-libs/avidemux-plugins/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-libs/avidemux-plugins
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/ChangeLog,v 1.7 2013/07/07 13:08:34 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/ChangeLog,v 1.8 2013/07/12 18:53:50 tomwij Exp $
+
+*avidemux-plugins-2.6.4-r1 (12 Jul 2013)
+
+  12 Jul 2013; Tom Wijsman <TomWij@gentoo.org>
+  +avidemux-plugins-2.6.4-r1.ebuild,
+  +files/avidemux-plugins-2.6.4-optional-pulse.patch, metadata.xml:
+  Revision bump. Fix up dependencies that are enabled by default as well as
+  those that are disabled by default; they were not automagic as checks were
+  present, I just did not notice them. This was incorrect due to wrongly
+  checking the dependencies in my early developer days, as well as adding the
+  cmake arguments in a sub phase of the configure phase instead of for the whole
+  configure phase; I need to make sure I check USE="-*" and USE="*" in the
+  future and look closer at cmake files to avoid this. Fixes bug #476602,
+  reported by Nikoli.
 
   07 Jul 2013; Tom Wijsman <TomWij@gentoo.org> avidemux-plugins-2.6.2-r2.ebuild,
   avidemux-plugins-2.6.3.ebuild, avidemux-plugins-2.6.4.ebuild:
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index 1d9ced4c88f6..056f3cbe109e 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,22 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX avidemux-plugins-2.6.4-optional-pulse.patch 787 SHA256 c95b6e56c51aa41894aa963c8568289968d07b8d685a3d7ed0d5ed74ade9a453 SHA512 783963cfb21e0e6510b80a56ffd2eb93dd94c79ab9f81ec91d82753734c7fc545c14d61f19abcc6ee935b05791182e83b5ad2db84d5286d220f7bfa013413dd6 WHIRLPOOL 0f91cd59f61d9695d1fedcb3efb6cd69520ecedc982cb2b74167c452db36174c8b24290191f35cd319caa5e2b4a360252ad1b11ec794266a572e6eafd9d72501
 DIST avidemux_2.6.2.tar.gz 17009420 SHA256 67c5676692152094033fbab490fbea24af27d8744496578d1c77957ab103fdb6 SHA512 1ba6f1c751732eec9fdceb2b0728122005ceab4c74ac09d213ebeff4c2af2a0b6ce8737d88e7c43970d1b9ca80cb36ad925efc9e4a487c4f463f1435aee328b3 WHIRLPOOL 0c95e87293251fffb773c8a1996ac015ba0d6f9d36d4f5ae01313c0532d2cf020a3ba0704d0f607347bbf0444e10857d7508fcbd968d62e889d7b62b36b85df7
 DIST avidemux_2.6.3.tar.gz 17025710 SHA256 78972b46c6ef1eb52fc012cafdeb2b6275913b968a49053016fb91ef0e9e5137 SHA512 a51e3cd95695a8500f1355c7a76b8313ae3fe68855b8eb9351038c00cd3d05bbf3ada3b75bf9d817fcddf1786a55c1c09cdbc4fe774974c5e4484c12ccd0a8fc WHIRLPOOL 899c5135e92cd3a830c84b1701ac6bfaf73d7417fa869ab26dd16b3754e5b71c5e667b30d747c5f19b902e1a8d53679447e86f9c6403f32a31554e551929e2bf
 DIST avidemux_2.6.4.tar.gz 17109929 SHA256 2937c6c09248445942ac7e71b100ff8f7e272c4ad9c38e7d8c519ce4a11cec44 SHA512 1b80f65ac5a1da844b521a82bab8976d01c81923460004dc76ed0f6994f95da0ad9a836c90ffa1595ad060f0d6f27ce30add0204ca9d5295084a62e79dd484c9 WHIRLPOOL a1cbfcfeafa163ed24881edb085126a69eca3e0e8eaee50091ceadb993105a0cb43068b7725fa54871bc04b20ca5b51650ac536688b1d1f8d5b0a2d7356459ef
 EBUILD avidemux-plugins-2.6.2-r2.ebuild 2819 SHA256 b8c9abaa39d61935b1d160d727faea686336f8733cb24e37be38b0705f06acaf SHA512 6d93ac535f168d241a9fa86627b154d828ea836ab057578edf3d434934106108aad1246ea1676236b2647241ddcb7878771f8b48718a84524b9dcda525cf1647 WHIRLPOOL 0f7af0fac61957dda46bdb61d04f8a727f8fa6bc8a5032b417a8ccf97202db0df75fe0b5c32fc35ae0a3928e610fe6c3c094a479b441737ce7ebed5237d2001f
 EBUILD avidemux-plugins-2.6.3.ebuild 3634 SHA256 e17913ab59b4c8140152826803a2c8f56a8b7421da0dedadd6edc26c96e02631 SHA512 00c841f1a37264ea9b128aa3fa8c58242cafe8d3f7856a70a940ed07d030ba6361d1b107a73bac5290d3ae39e04cd736afecd669d98906c85b1fbbaaa306c89d WHIRLPOOL 128d382992298f16c88fdcbef2c9960387f330d5356e6ceefda6e44b16d836489a31955e20001c4843edd71979164bb7e36ec82ef4aeac32e2ad579bd62e5470
+EBUILD avidemux-plugins-2.6.4-r1.ebuild 4120 SHA256 083058508669fd6d7b4b9f66eaad669dada52df0b2a83cd290e1c4082278d385 SHA512 22b4be0e8b7496a1fd47c3e8ce04ea2e2115576222da322fc7d958844e27e1d89ed820e104520cc1d48cd84db3d4b23fa61461d9f37f07b4cab55ee2c5b7258f WHIRLPOOL 90bfcf3e844977d1738d4531c9694648fe650b6f47a1d868a42f5a2beb0b28a39f0224ff1908f5d7fe373a786ace8baf3788c1ca9fdf231a591d3cdb43181006
 EBUILD avidemux-plugins-2.6.4.ebuild 3634 SHA256 1e4d21304f8290116f57d4255ad9ca48517561d34880cc8fb4ef9277d33677af SHA512 4ca0796ebe87e72d00fece8f3933d12a73708cd26aba648f3244a9f49736213b54090679e3f12e994ee95cf52223bef721ed492b2931a3e4c13f6c58c37ff6ea WHIRLPOOL 03d11ee54a8dbdce4f0c9cb7e24e7225656faba76aefaceb70a5c432ecab43637ebaf48aa6678bcd1c3ed397014773da5bb674cbda06e0d7aa52d3421471c2d3
-MISC ChangeLog 1847 SHA256 e7a45ac7e26331f871e35d858043e0c9278ea77e907bfba89ac659a9c3fae704 SHA512 daa1ddcba39776200a5e9e357d8cd1e075a6f3eba786a68a0bbe8c56784c983137ee3a775ef55194ffc3bb027d47e3d99ad9a922bb43bc828aefaa5342cc10a4 WHIRLPOOL 741b08fcc7e6171fe16abe4d901384721a53aa5f36ab2c31af0f8ac32ec16210ccfab62fdc919487a867ce8545acd25cc5b2f763451db3e500198b30ab4b1d88
-MISC metadata.xml 1007 SHA256 1a4c911a631fca3bcc61f79eec9ea93c8a66390bfeca32ae4f06ab1f7707bf4a SHA512 1ebcd623ab08176143226f9544005953e2a7a08ca457f378bd083f0eaeef2d2f64f6c5e2d321ba4f67e34720804e03136d6749a2254ab2b92b2145604637adbd WHIRLPOOL 7da1e5d6ab98313b0dd79ec3f9a1e7c7699fbaecbbe8c4a938fcba8b3805337ed5605b71a586794f5b6bc231a0e6be3c182cc40216db2eeaf9c0f87e80e1f991
+MISC ChangeLog 2598 SHA256 7550a392250840bf269685eb02b9f5bdc010ffaded1a11e3cb1a581ca52a06c0 SHA512 5c53758e65126d95faf838443c532f6f44163d1b2838207e2ba0a5fd7e87540af5d294c38d7c1114aa1d2a08478ed927b64b452ed8800223bab1962f69556f83 WHIRLPOOL d64b7f71e4e86cea5389a32b7f5334fab297b1aba0a360ad6d1c2406e62b5ffaa93f27633fde524e790157000b5bdcec074b4ff9369894f0ad45307f33a5cbb4
+MISC metadata.xml 1102 SHA256 59cb0db3f9cf5d6738ffdab76c56d587fe1aa4695b371c19784b7e6b067efe1e SHA512 ecbe5c59191bfb0dad30b0904100144b3224bfa0041d1fecc9f53ade4f94a3d9145b1667d01278a09f15127043e76c82c3a426c506b7e428cf156eae4130a9db WHIRLPOOL 1118520528d4712b626da02667e66fcf3a29c994b129391e984fad24529f15825a519faafa0df1bd66d4fabd5270e971e229026ba83e94f60bf649aa6c107be1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR2WeZAAoJEJWyH81tNOV9ENgH/0I/Fat7XVJtRsHltSBDlI/3
-BRdiLkNSzylUqVSBG8FHTyrCW+qBISQrfqkSGuh8UyhXmpimP5ZOuwDDrI9ZSWgk
-tMDnssc3+ZOUTeGWW/+fHOHxQPIJtS2MREc4JtBgA7siaiwvSUPLejt4DAh+NYa1
-BYnC/tzZlaug+yOC8Ra/3ARe3E46AnCbvMPV2ElrtXiLwffKYGTOnIIwWxV68iQG
-Kk1I7UdsWhysyT0gVzqawQne0dzq2xwaE7T61/uy8RREkqusp7G9TfEgfTqSkuZM
-2G33sQ8Z8atvH4Dqv3wSrOBSCHvdQFGqN8CYbvY4KvH+IXBsTwbvfnDp9IvBNBM=
-=H1WN
+iQEcBAEBCAAGBQJR4E/8AAoJEJWyH81tNOV9DFIH/jEfvxR9V8Zl4v23RehP5xTx
+XGd7L0KIISCwPy2PVAWIY94g64aVv2d48jI3Q5atlY8zlHcCLXbmEw+Cr6lD/5Nf
+9RS+RJzd51pHmtJ2vHJ9cuW+Uk/6DzgQggK5tA+gvFhhhLqiPbHk6sOvry+on36W
+krq2uG7VdVyFTnAUH+4FE3i4UrbJ/phXAcRKy8J7OHL1b9EVSccEzCAZRTl8+nPa
+ayTeSWzCV9DuEuWa+Uh8u16l8idHogRAR8iGJGrHLReM+CGg9FIPeRR7TPLrNtki
+d+LHxLLK7sXS9yXFLgAv+sbYPL9FYd5ME7ZOcKlHxNLNVRwPsBSpHOL+5gzQq20=
+=Lv3V
 -----END PGP SIGNATURE-----
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild
new file mode 100644
index 000000000000..17db187e2c5f
--- /dev/null
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/avidemux-plugins/avidemux-plugins-2.6.4-r1.ebuild,v 1.1 2013/07/12 18:53:50 tomwij Exp $
+
+EAPI="5"
+
+PLOCALES="ca cs de el es fr it ja pt_BR ru sr sr@latin tr"
+inherit cmake-utils eutils flag-o-matic l10n toolchain-funcs
+
+SLOT="2.6"
+MY_PN="${PN/-plugins/}"
+MY_P="${MY_PN}_${PV}"
+
+DESCRIPTION="Plugins for avidemux; a video editor designed for simple cutting, filtering and encoding tasks."
+HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="mirror://sourceforge/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+# Multiple licenses because of all the bundled stuff.
+LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
+KEYWORDS="~amd64 ~x86"
+IUSE="aften a52 alsa amr debug dts faac faad fontconfig freetype2 fribidi jack lame libsamplerate mmx opengl oss pulseaudio qt4 vorbis truetype twolame xvid x264 vpx"
+
+DEPEND="
+	=media-video/avidemux-${PV}[opengl?,qt4?]
+	>=dev-lang/spidermonkey-1.5-r2
+	dev-libs/libxml2
+	media-libs/libpng
+	virtual/libiconv
+	aften? ( media-libs/aften )
+	alsa? ( >=media-libs/alsa-lib-1.0.3b-r2 )
+	amr? ( media-libs/opencore-amr )
+	dts? ( media-libs/libdca )
+	faac? ( media-libs/faac )
+	faad? ( media-libs/faad2 )
+	fontconfig? ( media-libs/fontconfig )
+	freetype2? ( media-libs/freetype:2 )
+	fribidi? ( dev-libs/fribidi )
+	jack? (
+		media-sound/jack-audio-connection-kit
+		libsamplerate? ( media-libs/libsamplerate )
+	)
+	lame? ( media-sound/lame )
+	oss? ( virtual/os-headers )
+	pulseaudio? ( media-sound/pulseaudio )
+	truetype? ( >=media-libs/freetype-2.1.5 )
+	twolame? ( media-sound/twolame )
+	x264? ( media-libs/x264:= )
+	xvid? ( media-libs/xvid )
+	vorbis? ( media-libs/libvorbis )
+	vpx? ( media-libs/libvpx )
+"
+RDEPEND="$DEPEND"
+
+S="${WORKDIR}/${MY_P}"
+
+PROCESSES="buildPluginsCommon:avidemux_plugins
+	buildPluginsCLI:avidemux_plugins"
+
+use qt4 && PROCESSES+=" buildPluginsQt4:avidemux_plugins"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-optional-pulse.patch
+}
+
+src_configure() {
+	local x mycmakeargs plugin_ui
+
+	mycmakeargs="
+		$(cmake-utils_use alsa ALSA)
+		$(cmake-utils_use aften AFTEN)
+		$(cmake-utils_use amr OPENCORE_AMRWB)
+		$(cmake-utils_use amr OPENCORE_AMRNB)
+		$(cmake-utils_use dts LIBDCA)
+		$(cmake-utils_use faad FAAC)
+		$(cmake-utils_use faad FAAD)
+		$(cmake-utils_use fontconfig FONTCONFIG)
+		$(cmake-utils_use freetype2 FREETYPE2)
+		$(cmake-utils_use jack JACK)
+		$(cmake-utils_use lame LAME)
+		$(cmake-utils_use oss OSS)
+		$(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE)
+		$(cmake-utils_use qt4 QT4)
+		$(cmake-utils_use truetype FREETYPE2)
+		$(cmake-utils_use twolame TWOLAME)
+		$(cmake-utils_use x264 X264)
+		$(cmake-utils_use xvid XVID)
+		$(cmake-utils_use xvid XVIDEO)
+		$(cmake-utils_use vorbis VORBIS)
+		$(cmake-utils_use vorbis LIBVORBIS)
+		$(cmake-utils_use vpx VPXDEC)
+	"
+
+	use debug && POSTFIX="_debug" && mycmakeargs+="-DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug"
+
+	for PROCESS in ${PROCESSES} ; do
+		SOURCE="${PROCESS%%:*}"
+		DEST="${PROCESS#*:}"
+
+		mkdir "${S}"/${SOURCE} || die "Can't create build folder."
+		cd "${S}"/${SOURCE} || die "Can't enter build folder."
+
+		if [[ "${SOURCE}" == "buildPluginsCommon" ]] ; then
+			plugin_ui="-DPLUGIN_UI=COMMON"
+		elif [[ "${SOURCE}" == "buildPluginsCLI" ]] ; then
+			plugin_ui="-DPLUGIN_UI=CLI"
+		elif [[ "${SOURCE}" == "buildPluginsQt4" ]] ; then
+			plugin_ui="-DPLUGIN_UI=QT4"
+		fi
+
+		cmake -DAVIDEMUX_SOURCE_DIR="${S}" \
+			-DCMAKE_INSTALL_PREFIX="/usr" \
+			${mycmakeargs} ${plugin_ui} -G "Unix Makefiles" ../"${DEST}${POSTFIX}/" || die "cmake failed."
+	done
+}
+
+src_compile() {
+	# Add lax vector typing for PowerPC.
+	if use ppc || use ppc64 ; then
+		append-cflags -flax-vector-conversions
+	fi
+
+	# See bug 432322.
+	use x86 && replace-flags -O0 -O1
+
+	for PROCESS in ${PROCESSES} ; do
+		SOURCE="${PROCESS%%:*}"
+
+		cd "${S}/${SOURCE}" || die "Can't enter build folder."
+		emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+	done
+}
+
+src_install() {
+	for PROCESS in ${PROCESSES} ; do
+		SOURCE="${PROCESS%%:*}"
+
+		cd "${S}/${SOURCE}" || die "Can't enter build folder."
+		emake DESTDIR="${ED}" install
+	done
+}
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch
new file mode 100644
index 000000000000..78650aaa7c02
--- /dev/null
+++ b/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch
@@ -0,0 +1,21 @@
+--- a/cmake/admCheckAudioDeviceLibs.cmake


++++ b/cmake/admCheckAudioDeviceLibs.cmake


+@@ -158,6 +158,8 @@


+ 


+ 	MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE")


+ 	MESSAGE(STATUS "*****************************")


++


++	IF (PULSEAUDIOSIMPLE)


+         IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES)


+         # in cache already


+          SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE)


+@@ -198,6 +200,9 @@


+         MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES)


+ 


+ 		APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}")


++	ELSE (PULSEAUDIOSIMPLE)


++		MESSAGE("${MSG_DISABLE_OPTION}")


++	ENDIF (PULSEAUDIOSIMPLE)


+ ELSE (UNIX AND NOT APPLE)


+ 	SET(PULSEAUDIOSIMPLE_CAPABLE FALSE)


+ ENDIF (UNIX AND NOT APPLE)


diff --git a/media-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml
index f726581edae9..9060db157e32 100644
--- a/media-libs/avidemux-plugins/metadata.xml
+++ b/media-libs/avidemux-plugins/metadata.xml
@@ -11,6 +11,7 @@
     <flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag>
     <flag name="faac">Enable free MPEG-4 audio codecs support via <pkg>media-libs/faac</pkg>.</flag>
     <flag name="faad">Enable AAC audio decoding library support via <pkg>media-libs/faad2</pkg>.</flag>
+    <flag name="freetype2">Enable FreeType2 support via <pkg>media-libs/freetype</pkg>.</flag>
     <flag name="fribidi">Enable unicode bidirectional algorithm support via <pkg>dev-libs/fribidi</pkg>.</flag>
     <flag name="twolame">Enable TwoLAME support via <pkg>media-sound/twolame</pkg>, an optimised MPEG Audio Layer 2 (MP2) encoder.</flag>
     <flag name="vpx">Enable WebM VP8 Codec SDK support via <pkg>media-libs/libvpx</pkg>.</flag>