From 7612b67f83c241c0c7cce27dad00e267e76d6bd3 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Mon, 2 Jan 2012 14:56:21 +0000 Subject: [PATCH] version bump Package-Manager: portage-2.2.0_alpha82/cvs/Linux x86_64 --- media-video/avidemux/ChangeLog | 9 +- media-video/avidemux/Manifest | 24 ++-- media-video/avidemux/avidemux-2.5.6.ebuild | 157 +++++++++++++++++++++ 3 files changed, 180 insertions(+), 10 deletions(-) create mode 100644 media-video/avidemux/avidemux-2.5.6.ebuild diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog index 8edb604a4bdd..66c43e4e63fa 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.187 2011/11/12 08:10:33 radhermit Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.188 2012/01/02 14:56:21 hwoarang Exp $ + +*avidemux-2.5.6 (02 Jan 2012) + + 02 Jan 2012; Markos Chandras +avidemux-2.5.6.ebuild: + version bump 12 Nov 2011; Tim Harder -files/2.5.3_field_asm_fix.diff, -files/avidemux-2.4-cmake264.patch, diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest index c384f175dfa0..a888273ce2ed 100644 --- a/media-video/avidemux/Manifest +++ b/media-video/avidemux/Manifest @@ -10,18 +10,26 @@ AUX avidemux-2.5.4-x264.patch 1248 RMD160 9f797ef1e22931088c19ef336d26c64d003446 AUX avidemux-2.5.4-xvid.patch 1250 RMD160 8be1d4553a02a20a1ab14471adb46ebe4c5bf362 SHA1 0128d046cb78e52d6fab4e2c4098cb2db2434959 SHA256 679b6d9d2ac05fa74a29ff2fa74b3d9a425e841b39426c84a2203e308b66b85b 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 +DIST avidemux_2.5.6.tar.gz 14914123 RMD160 c09f1018ed4ded7f7a89ba0cc2a7a056314cc785 SHA1 47205c236bf6a4435b9d4dd944493c7b7e2752f5 SHA256 d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b EBUILD avidemux-2.5.4-r2.ebuild 4573 RMD160 476437402af4f5197d3e535de5423c58a181893e SHA1 f7e65945685fa3cd833f4db2d244ddeb57f6406a SHA256 d22be01176cf95574715a88437896d739416aa61ae14fcbd0687984d532a3a1b EBUILD avidemux-2.5.5.ebuild 4261 RMD160 1bae29c6ef5e642a47c8be819fca336aff8aa5f1 SHA1 ee6df02ffb1e875099bd4a6db17ef6fb62a72bb0 SHA256 156e82f0309f1d9ef316204b60f64f1cde991df2f7e0f5f5000494cafbe522f1 -MISC ChangeLog 34451 RMD160 a2fcc082bd82cdc07649f8112a74098a8fd669a4 SHA1 bca3b578f25fbc9d45f85de4f09da654d9213743 SHA256 7e7ec9e7d4648c14189d4f1658a650a68697d29a6c5b8fabe70834ac7c4abc1b +EBUILD avidemux-2.5.6.ebuild 4204 RMD160 0f3681d37a26ae6aa055ebb47a2a9179c7c28db9 SHA1 8cdd2c6bdeda8e217edafe343b51ee00ff27babf SHA256 e43438e04519fe039a264daa9c80ae00eedb40b6b5d6860d2f513479c904d4e3 +MISC ChangeLog 34574 RMD160 d18ada31c5a9ddd863ad14efbaf776002aaaa57a SHA1 f51e57fcf4d4971f08dc258dad3a0d6729d7c005 SHA256 1d0fbb9406b0109b0581ec424b47a5e093f7e4fcd854f4d705371c9140ef01d9 MISC metadata.xml 385 RMD160 c434ac5525d87786bfb7109a81bee4a5eb36f24a SHA1 473eae98f7fc44b8a373e15e18a86ea63c47d1bc SHA256 827ca0bd67c11039bbd1beb06b5219771b37e617319b83db46be716e40b6f7b7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBCgAGBQJOvin/AAoJEEqz6FtPBkyjkKEH/iwIfrE6hAB6nWWhpQbRag+K -hPt5knuJmJ0KJ2L1TlmZC4ujyjBypEEnGXXBaF6N87ckHdo1m+vvvVLJdggu6McS -otQgAwrySOdQpOnnAKj7ArkNYLKy808BUAXK9jXgIINFH0MubNLDXTzLW+SB6nDh -RUpfSMaGwp27KJ0sR3lJKQ/ZJpuo/DXiuX8m39AuGiVJsWVj7NG0oba95A9Cucc3 -DgFUBGD0W5IQz7ce2WMciT6EpV0Sn4dfHXV2R0sOZfxs98vapNrH8myL9WR+5Jkb -mNkQ2IXl6eFAGBRXm7waqMvDHUYX0FHCy5N0N+M/wCwmMV7EI0uCMN8aqrWecOU= -=qbFi +iQIcBAEBCgAGBQJPAcVpAAoJEPqDWhW0r/LCIpgQAJp1AS50E2z4OEygcNOPNbNa +qcc4RvyDjFP48iNYTlUPwzx+2VLplwqN4FXbjjWQK8hpnLqcjoMymgdBAD7ezixE +Ogp8R3EP859cvP6jSLXhVDGbkezh1WEm3lLS/Hww7OT4MV/v5MRdcaCMYAcpsXvE +TzwawuIRqT+AaDYekdi/j8/11sFRuBqctdkB59wybhdAK4WcubzItpVSEDST98tm +A81+nnrR7q7pTOy7Q1jXXkYBVHFE97avIWGHtecvg2Mv08ee0IbHNvetdHMAd7PB +v7IjBVjbumLziUkhzq/JZa7O6W9kR5aEBSST5ijwW/jG3DhMqX87RsZC4RutcS2i +D7faPkpYGQAto4TBMUaqouxrji801JOTbVAW5ogUIxbp6wL00tCps8WZphyL5qJo +11boNOBklh0H2dj3Ol/UszBtfmubNSDwhGC7EayN2PbY4DtHRZnbwgtH44lnSCPf +uYZYNVwu8NaShGMkufkl0Iaw7Rzz/plqZDQbuKxD7ZzZZHjTQ3OQBqLgdhpQbYDo +VDt9vzCQ0oBC32ybN3+Rk4a6C7CsFDUdThqdIiClVrzUmHN4RDSkO0AosQh6iDjd +HvU2xyOwLlvYVOQ2KU9G46EHII1ip1ceECUJ2GxOFZSMbLNokHcOtM1AyIWI0FfA +Q3VMLAGs66rjVQ/186Ok +=crVs -----END PGP SIGNATURE----- diff --git a/media-video/avidemux/avidemux-2.5.6.ebuild b/media-video/avidemux/avidemux-2.5.6.ebuild new file mode 100644 index 000000000000..73fd28d7377d --- /dev/null +++ b/media-video/avidemux/avidemux-2.5.6.ebuild @@ -0,0 +1,157 @@ +# 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.1 2012/01/02 14:56:21 hwoarang 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" +) + +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 -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 +} -- 2.26.2