From 75ce50ec78946b6140ee0ab08601af2d3133cebc Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Sun, 13 Jun 2010 17:16:05 +0000 Subject: [PATCH] Version bump to 2.5.3. Fixes bug #321015. Fixes desktop icon wrt bug #316599 and bug #291453 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- media-video/avidemux/ChangeLog | 9 +- media-video/avidemux/Manifest | 7 +- media-video/avidemux/avidemux-2.5.3.ebuild | 164 ++++++++++++++++++ .../avidemux-2.5.3-build-plugins-fix.patch | 13 ++ media-video/avidemux/metadata.xml | 6 +- 5 files changed, 195 insertions(+), 4 deletions(-) create mode 100644 media-video/avidemux/avidemux-2.5.3.ebuild create mode 100644 media-video/avidemux/files/avidemux-2.5.3-build-plugins-fix.patch diff --git a/media-video/avidemux/ChangeLog b/media-video/avidemux/ChangeLog index c89839915678..1dec346d9fef 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.164 2010/06/11 17:53:22 yngwin Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.165 2010/06/13 17:16:05 hwoarang Exp $ + +*avidemux-2.5.3 (13 Jun 2010) + + 13 Jun 2010; Markos Chandras +avidemux-2.5.3.ebuild, + +files/avidemux-2.5.3-build-plugins-fix.patch, metadata.xml: + Version bump to 2.5.3. Fixes bug #321015. Fixes desktop icon wrt bug + #316599 and bug #291453 11 Jun 2010; Ben de Groot metadata.xml: Removing myself as maintainer and co-assigning to qt herd diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest index c5e8e4231794..78968ea70d28 100644 --- a/media-video/avidemux/Manifest +++ b/media-video/avidemux/Manifest @@ -6,6 +6,7 @@ AUX avidemux-2.4.3-x264.patch 1484 RMD160 ed487bb8f6a65fca9180790156411d84ee18fe AUX avidemux-2.4.4-gcc-4.4.patch 3946 RMD160 1be6fb90f05befb0399ef38ccb6358d082f27b0a SHA1 63de9ce7999af1b9f94c01b14ccd049c2b27f32a SHA256 d8e2392b4eb4a0e5573fe5bac10a9ac57ae0f16207e613543d8e61d7527914af AUX avidemux-2.5.1-build-plugins-fix.patch 438 RMD160 4ddd7d69679940efbb783149e5c994e2036e65ea SHA1 5988536e2d74fe3b050026fee6a22ba0a85d037b SHA256 4316a65d59a3eedd482ae845d586d50e67311cb4a7c8680aca3d67c575c53a1f AUX avidemux-2.5.2-altivec-bool.patch 330 RMD160 694d756e3ea022b95833cbf988d363950787358d SHA1 437a342b63d66eb817e46a0a67ea3a4e4069aef8 SHA256 4fe3455a9e7441e19160814147385d98106e69ea21e7172f87c429bfca9e5744 +AUX avidemux-2.5.3-build-plugins-fix.patch 469 RMD160 9788ca88e4016b90e7e4fd2a17db0dd7abdcd324 SHA1 833d977f6ea873d611f01111de8f6e4abf43cc17 SHA256 579fd684d271e4858b35187603065e03a1fb6f2309e9d4e76ae2c30719c78d4c AUX avidemux-gcc-4.5.patch 358 RMD160 f8482b5f948d3d9f21493f3645f8ab73e24e22b5 SHA1 9c0d5bf6f2917566afc4ccf8309c8d52a4e1efec SHA256 1dee7a3433d255bb143c104ebf27accf463c4b973909c10a266f553a88e6e624 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 @@ -13,9 +14,11 @@ DIST avidemux-2.5.1-patches-1.tar.bz2 3700 RMD160 6150cef25c8411c76816f800bc1d68 DIST avidemux_2.4.4.tar.gz 6894690 RMD160 8bb2705b3e2d5379d833ec4fa06a01b897c06e04 SHA1 c50a00caf13a8ea1053e5994edeb59354192e18e SHA256 45aafd6e54047edcfe9c985f4c9523c0efd71f7d21dad5e584aceb92c63e2956 DIST avidemux_2.5.1.tar.gz 13020725 RMD160 fc12d01cf4b98ddcf635c20b32f8890cc70ab23a SHA1 50fe78548e0ebf0611d23aa4755f332056520392 SHA256 2f5546b8a95da23f5c43202d9c7b465dd7a0012d689d483ad7eb44bae8ca5c92 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 EBUILD avidemux-2.4.4-r2.ebuild 3538 RMD160 e88f8a04653b628a1300b4d73473a320f2a79655 SHA1 55b9f7303d74ecfe14f1a5a2f654e2413f1214a9 SHA256 76527af36b493063cda3442d0ad2713847a02518e767969b6fdc94b381118849 EBUILD avidemux-2.5.1-r2.ebuild 4955 RMD160 bf3971eec4b58d10c6d5241af9f8725d78c9f101 SHA1 66279aae61f9a66503f628c5358a1776e03e33e0 SHA256 4a1a5ddcef86f2e9e0d9141b8172ad31246a499415fb903ac07faf38c22ca374 EBUILD avidemux-2.5.1_p5428.ebuild 4853 RMD160 8c52be77d9944539bca654db70718ebded38c08b SHA1 b3bb73ec591e2f7f4ff187826f8db43a07318fa1 SHA256 06ac0328e1e963a17a28682cfb6a791eab190b4793b5ee892e73446ae6cc0261 EBUILD avidemux-2.5.2.ebuild 5052 RMD160 b67fa3f157486611b8640268e9e6133e8c5f6863 SHA1 84e1fe5273be09eb9478b8a09ee521a8a526d816 SHA256 970fb2c56fad5636be75f54b4e7fd3e2ca34b509feb4ffb3f4cfcddde4918a97 -MISC ChangeLog 29153 RMD160 3f6db8cfad210cf048fbb8bcd6bd76abe0f3f691 SHA1 54ed7fd193dd81c28e9da57005f0fb7bfd94b0c3 SHA256 2fd10ed1da6dcd92766ecc802e0764e9a9ec7826d88f5b758cc83aa7c32bbc64 -MISC metadata.xml 385 RMD160 55d6a5effcfb83ef2d9d55ab03f5e6b69ababb4f SHA1 5e551d16f0be7021f1546adce187c5c1b4c58a1b SHA256 a85a2bd7609544592e28fc717a62bad7f9da6e49b9398be382534db93831dbb7 +EBUILD avidemux-2.5.3.ebuild 4940 RMD160 1cea2f0db22377e0bd1ff62c637a6d1464261511 SHA1 4abbd9452834d8a90065fd09f106720f6ecc0213 SHA256 4a2f1f69e97762bf91699504fbbdf3095b27fb2a60001f3061f6e68ccd7c5399 +MISC ChangeLog 29424 RMD160 e43fd5838bd1e07c1a75390fca2cbfff60db53c0 SHA1 00a2977674eef1e2d1955657ce2f2f4f5b514c90 SHA256 1fd1128a69d74125189ecbec77e9ffc4f2cceec7e38917544f9dda5c7bce7f6d +MISC metadata.xml 485 RMD160 95a87d5c668b8ebcf81bda32aa17066dd4c8482e SHA1 0b52f00590772f6caa104e4a8ac830ddf230e95c SHA256 07609a99bbf9772db5da33f0a6fe4fd72f1e6d60ccd96961ee9032bcd331b5c6 diff --git a/media-video/avidemux/avidemux-2.5.3.ebuild b/media-video/avidemux/avidemux-2.5.3.ebuild new file mode 100644 index 000000000000..1d098f02c1a5 --- /dev/null +++ b/media-video/avidemux/avidemux-2.5.3.ebuild @@ -0,0 +1,164 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.5.3.ebuild,v 1.1 2010/06/13 17:16:05 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 ) + 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 ) + oss? ( media-libs/alsa-oss ) + 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 + dev-util/cmake" + +S=${WORKDIR}/${MY_P} + +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}-gcc-4.5.patch" + "${FILESDIR}/${P}-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 +} + +src_configure() { + ### Add lax vector typing for PowerPC + if use ppc || use ppc64; then + append-cflags "-flax-vector-conversions" + fi + + mycmakeargs="${mycmakeargs} + -DAVIDEMUX_SOURCE_DIR='${S}' + -DAVIDEMUX_INSTALL_PREFIX='${S}_build' + -DAVIDEMUX_CORECONFIG_DIR='${S}_build/config'" + + # CMakeLists.txt + use gtk || mycmakeargs="${mycmakeargs} -DGTK=0" + use qt4 || mycmakeargs="${mycmakeargs} -DQT4=0" + + # cmake/admCheckMiscLibs.cmake + use nls || mycmakeargs="${mycmakeargs} -DGETTEXT=0" + use sdl || mycmakeargs="${mycmakeargs} -DSDL=0" + use xv || mycmakeargs="${mycmakeargs} -DXVIDEO=0" + + # cmake/admCheckAudioDeviceLibs.cmake + use alsa || mycmakeargs="${mycmakeargs} -DALSA=0" + use esd || mycmakeargs="${mycmakeargs} -DESD=0" + use jack || mycmakeargs="${mycmakeargs} -DJACK=0" + use oss || mycmakeargs="${mycmakeargs} -DOSS=0" + use pulseaudio || mycmakeargs="${mycmakeargs} -DPULSEAUDIOSIMPLE=0" + + # cmake/admCheckAudioEncoderLibs.cmake + use aften || mycmakeargs="${mycmakeargs} -DAFTEN=0" + use mp3 || mycmakeargs="${mycmakeargs} -DLAME=0" + use aac || mycmakeargs="${mycmakeargs} -DFAAC=0" + use vorbis || mycmakeargs="${mycmakeargs} -DVORBIS=0" + + # plugins/ADM_audioDecoders + use aac || mycmakeargs="${mycmakeargs} -DFAAD=0" + use dts || mycmakeargs="${mycmakeargs} -DLIBDCA=0" + + # opencore + use amr || mycmakeargs="${mycmakeargs} -DOPENCORE_AMRNB=0 -DOPENCORE_AMRWB=0" + + # plugins/ADM_videoFilters + use truetype || mycmakeargs="${mycmakeargs} -DFREETYPE2=0 -DFONTCONFIG=0" + + # plugins/ADM_videoEncoder + use xvid || mycmakeargs="${mycmakeargs} -DXVID=0" + use x264 || mycmakeargs="${mycmakeargs} -DX264=0" + + cmake-utils_src_configure +} + +src_compile() { + # 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.3-build-plugins-fix.patch b/media-video/avidemux/files/avidemux-2.5.3-build-plugins-fix.patch new file mode 100644 index 000000000000..0ab277dac099 --- /dev/null +++ b/media-video/avidemux/files/avidemux-2.5.3-build-plugins-fix.patch @@ -0,0 +1,13 @@ +Index: avidemux_2.5.3/CMakeLists.txt +=================================================================== +--- avidemux_2.5.3.orig/CMakeLists.txt ++++ avidemux_2.5.3/CMakeLists.txt +@@ -191,7 +191,7 @@ MESSAGE("") + ADD_SUBDIRECTORY(avidemux) + ADD_SUBDIRECTORY(po) + ADD_SUBDIRECTORY(scripts) +-# MEANX : DOES NOT WORK ADD_SUBDIRECTORY(plugins EXCLUDE_FROM_ALL) ++ADD_SUBDIRECTORY(plugins EXCLUDE_FROM_ALL) + + ######################################## + # Config Summary diff --git a/media-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml index 6ed563f08a5a..119d7d95847c 100644 --- a/media-video/avidemux/metadata.xml +++ b/media-video/avidemux/metadata.xml @@ -1,8 +1,12 @@ - video qt + video + + hwoarang@gentoo.org + Markos Chandras + Enable A/52 (AC-3) audio encoder support Enable Adaptive Multi-Rate format support through -- 2.26.2