Version bump (bug #373067).

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

3 files changed, 176 insertions, 16 deletions

diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog
index c6652b840f3a..96c918df5afb 100644
--- a/media-video/avidemux/ChangeLog
+++ b/media-video/avidemux/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/avidemux
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.185 2011/06/13 15:11:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.186 2011/08/24 02:44:23 radhermit Exp $
+
+*avidemux-2.5.5 (24 Aug 2011)
+
+  24 Aug 2011; Tim Harder <radhermit@gentoo.org> +avidemux-2.5.5.ebuild:
+  Version bump (bug #373067).
 
   13 Jun 2011; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Remove myself from metadata.xml
diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index cfab30380b2b..fa8df7d430a6 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -24,27 +24,23 @@ DIST avidemux-2.5.1-patches-1.tar.bz2 3700 RMD160 6150cef25c8411c76816f800bc1d68
 DIST avidemux_2.5.2.tar.gz 13593297 RMD160 133df6676d6ac608c31d130897b54a47c54c7055 SHA1 7fbec6f832b31b45a979184b8d1cf32c61a71e5f SHA256 685e37b936f646de6fe65973c95ca9708959e7b6e66d0f6b17a6cc988e2ef8aa
 DIST avidemux_2.5.3.tar.gz 14309500 RMD160 680963060cdb959d1791a4c0d481eed0e426214d SHA1 073e20007ba5097790cf84cf94b6002c54953395 SHA256 4bcebbb3543250053b784414bca1c22d1313107bf3909444d6026e470aecc2cf
 DIST avidemux_2.5.4.tar.gz 18154965 RMD160 e20454a558210d5f7ab1418ae4013b618d1001d9 SHA1 83d6f6d87442ce4fc4e4806735ec27ef5e90364c SHA256 355bd3d235f6b3d0af65cbed535f51a1a7213c8abf8794af8b8d2cf88c1d720d
+DIST avidemux_2.5.5.tar.gz 15738941 RMD160 0303642d97dcbc165f27273d451b92804227a5a5 SHA1 bb4271390f2fad4eaf212b620622a11c084f0dd9 SHA256 c5bf45298911e00b06cf48ae4a936525d28cc2dddd4f41ee22e689b023b4923a
 EBUILD avidemux-2.5.1_p5428.ebuild 4857 RMD160 4fd54ea871c0d7538dc912cfa41df99de09f5f93 SHA1 d0e2b7698da69c2dccb36dd4955e4f2ffe341185 SHA256 6015b26c03e792621e3ad3b517e3b10452b1fda0c4e691190db9beb0ef93da0f
 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 4354 RMD160 acaf65aacd80de3f8b1d6f7c32bc15058030c2a7 SHA1 a9b7ba0ff81fc126aad8e54c32a48563985a4608 SHA256 dd399bc2064d9e51e1f96e03de6fde8e2e02d3cbf897f5044c419383f9f03e4f
 EBUILD avidemux-2.5.4-r2.ebuild 4573 RMD160 476437402af4f5197d3e535de5423c58a181893e SHA1 f7e65945685fa3cd833f4db2d244ddeb57f6406a SHA256 d22be01176cf95574715a88437896d739416aa61ae14fcbd0687984d532a3a1b
-MISC ChangeLog 33683 RMD160 b18b264cc90be510b8432f2ef46bfa00d5350d9b SHA1 d916efd7d83fa0b9073f12ed89959079ff85dc6e SHA256 f88f931d485e9359325c9e911029dad3a4617771af8de2bebaacb44a8364a222
+EBUILD avidemux-2.5.5.ebuild 4261 RMD160 1bae29c6ef5e642a47c8be819fca336aff8aa5f1 SHA1 ee6df02ffb1e875099bd4a6db17ef6fb62a72bb0 SHA256 156e82f0309f1d9ef316204b60f64f1cde991df2f7e0f5f5000494cafbe522f1
+MISC ChangeLog 33819 RMD160 da9a2b4360a15db581e0099199cbeca3b765383b SHA1 fee13a69685c88ec5c5d1594f0b86724682e852d SHA256 30402931e6b8f9fc320879e4a629c40656f8cf61ca801301011498a5f2becece
 MISC metadata.xml 385 RMD160 c434ac5525d87786bfb7109a81bee4a5eb36f24a SHA1 473eae98f7fc44b8a373e15e18a86ea63c47d1bc SHA256 827ca0bd67c11039bbd1beb06b5219771b37e617319b83db46be716e40b6f7b7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN9ihlAAoJEPqDWhW0r/LCGVUP/3t7fmAw5+n1h52DHDL3kZnd
-2j581UfzzdfVKVTP2WuPnxw0JdGfxdH039dJkuQgxXddPz8Mh7DBzomjcVFOpjbW
-Od7musx8idAGwFj0M5YdOLXeVk9xH+sKsY7HCF8zQiQ8v1qe7fjTw4Iyc9P+XHWl
-ppA++9QWVBWr1HIoIW7VwlkVvf+MsOnRHWW57ezlHyUkzU/wOR0f3z0OJAlG46pw
-5bF44UwDjeX9kBNMrhGsMrVf+gDH4zUKwWWOGu0NFGlk3C5k/wlwCxCf6WCDupwt
-klsYjvK8OmYi102ExovzUKuGisKjKlEVEAqx7Jxz9D7TVo44IuaerVjd2JDvNmTi
-mB6N/qLm88CFfBIopkdKaZoBWNTwTabHGTzIIZ1vQnQ9SgUNoMIqmSsmmZsecNXS
-agJlsA1qbJS/yZ+VniMPMBxAhnxCq39VW/T/TVsgYN5v5Bt5Bp7ELl/kzFD2zs0c
-Z5+y7BWIce41NnDvORnu8oy9+aH+c+MRcRYbO8tsPdyuVn2cSIglmGzuxVNwxcl7
-swq9UEKMAbHM5mzYAAwJLQ9/14SpfdYYnjrs+2P4WAxluj02OUKLgDQCSuLkTVkT
-l5CJpjVbnqylmWWhyRM/l5cu9bPItaTflvSWZzF0okg7RYOZMidemtOsCPPbLkzY
-nqJ9deUjSpjPjx4AC+CX
-=XX/U
+iQEcBAEBCgAGBQJOVGWeAAoJEEqz6FtPBkyjObUH/3TWOymUXQ3E5T5wiQu9zf2K
+BO5AVjrd8MeS0BS/MLwejMdV1ir3NYYhYOf+Q5/um2tAd0uIR4Xpde5gGKcBBxiv
+O7FugDJuGn00I4kP/KYd2lUi6rPw4jNGOrK77953EcoaV2hgD36HJpeEp9yNki5u
+ghODtSzAq/N2JFUSo8i8WCJa1vIbbeV7rD1C07DTod5VlZ7ETd7sx3MF8ZBlHHvG
+Blkg15STfnI8PZSPqlfIPRZmIDqOBLHxV+fgpxug+NpGDsoRd9/ZmoxY58ZkZyo/
+bQzUih7kDQyOBskQXNWexvMm7ik4nBWZZDWWVOZpf7j7YaGCzPP66SJvOxrzxRQ=
+=YfFC
 -----END PGP SIGNATURE-----
diff --git a/media-video/avidemux/avidemux-2.5.5.ebuild b/media-video/avidemux/avidemux-2.5.5.ebuild
new file mode 100644
index 000000000000..26a0a30656d7
--- /dev/null
+++ b/media-video/avidemux/avidemux-2.5.5.ebuild
@@ -0,0 +1,159 @@
+# 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.5.ebuild,v 1.1 2011/08/24 02:44:23 radhermit 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 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-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)
+		$(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"
+}
+
+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
+}