From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7592213800E for ; Sun, 12 Aug 2012 02:16:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CB3BDE00E9; Sun, 12 Aug 2012 02:16:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 825FEE00E9 for ; Sun, 12 Aug 2012 02:16:16 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 903261B4001 for ; Sun, 12 Aug 2012 02:16:15 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2307) id 3B08A2004C; Sun, 12 Aug 2012 02:16:14 +0000 (UTC) From: "Davide Pesavento (pesa)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, pesa@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-video/avidemux: avidemux-2.5.6-r2.ebuild ChangeLog avidemux-2.5.6-r1.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: avidemux-2.5.6-r2.ebuild ChangeLog avidemux-2.5.6-r1.ebuild X-VCS-Directories: media-video/avidemux X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20120812021614.3B08A2004C@flycatcher.gentoo.org> Date: Sun, 12 Aug 2012 02:16:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ec1b92fa-8dd3-4090-8fff-8e7cad6b97b0 X-Archives-Hash: 21e67fc53c1ef9e73431d2c6b8cd3c5b pesa 12/08/12 02:16:14 Modified: ChangeLog Added: avidemux-2.5.6-r2.ebuild Removed: avidemux-2.5.6-r1.ebuild Log: Fix desktop file, thanks to redneb in bug 430500. (Portage version: 2.2.0_alpha120/cvs/Linux x86_64, RepoMan options: --force) Revision Changes Path 1.198 media-video/avidemux/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?rev=1.198&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?rev=1.198&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/ChangeLog?r1=1.197&r2=1.198 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v retrieving revision 1.197 retrieving revision 1.198 diff -u -r1.197 -r1.198 --- ChangeLog 5 May 2012 08:58:55 -0000 1.197 +++ ChangeLog 12 Aug 2012 02:16:13 -0000 1.198 @@ -1,6 +1,12 @@ # ChangeLog for media-video/avidemux # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.197 2012/05/05 08:58:55 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/ChangeLog,v 1.198 2012/08/12 02:16:13 pesa Exp $ + +*avidemux-2.5.6-r2 (12 Aug 2012) + + 12 Aug 2012; Davide Pesavento +avidemux-2.5.6-r2.ebuild, + -avidemux-2.5.6-r1.ebuild: + Fix desktop file, thanks to redneb in bug 430500. 05 May 2012; Jeff Horelick avidemux-2.5.6-r1.ebuild: dev-util/pkgconfig -> virtual/pkgconfig 1.1 media-video/avidemux/avidemux-2.5.6-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.5.6-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/avidemux/avidemux-2.5.6-r2.ebuild?rev=1.1&content-type=text/plain Index: avidemux-2.5.6-r2.ebuild =================================================================== # 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-r2.ebuild,v 1.1 2012/08/12 02:16:13 pesa Exp $ EAPI=4 inherit cmake-utils eutils 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 gtk jack +mp3 nls opengl oss pulseaudio qt4 sdl +truetype vorbis vpx +x264 +xv +xvid" RDEPEND=" dev-libs/libxml2 sys-libs/zlib aac? ( media-libs/faac media-libs/faad2 ) aften? ( media-libs/aften[cxx] ) alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) gtk? ( x11-libs/gtk+:2 ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) mp3? ( media-sound/lame ) pulseaudio? ( media-sound/pulseaudio ) qt4? ( >=x11-libs/qt-gui-4.6:4 opengl? ( virtual/opengl >=x11-libs/qt-opengl-4.6:4 ) ) sdl? ( media-libs/libsdl ) truetype? ( media-libs/freetype:2 media-libs/fontconfig ) vorbis? ( media-libs/libvorbis ) vpx? ( media-libs/libvpx ) x264? ( media-libs/x264 ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXv ) xvid? ( media-libs/xvid ) " DEPEND="${RDEPEND} dev-lang/yasm virtual/pkgconfig nls? ( sys-devel/gettext ) " AVIDEMUX_LANGS="bg ca cs de el es fr it ja pt_BR ru sr sr@latin tr zh_TW" for lang in ${AVIDEMUX_LANGS}; do IUSE+=" linguas_${lang}" done unset lang S=${WORKDIR}/${MY_P} BUILD_S=${WORKDIR}/${P}_build DOCS=( AUTHORS ) PATCHES=( "${FILESDIR}/${PN}-2.5.4-build-plugins-fix.patch" "${FILESDIR}/${P}-ffmpeg-symbol-visibility.patch" ) src_prepare() { base_src_prepare local lingua= po_files= qt_ts_files= avidemux_ts_files= for lingua in ${LINGUAS}; do if has ${lingua} ${AVIDEMUX_LANGS}; then if [[ -e ${S}/po/${lingua}.po ]]; then po_files+=" \${po_subdir}/${lingua}.po" fi if [[ -e ${S}/po/qt_${lingua}.ts ]]; then qt_ts_files+=" \${ts_subdir}/qt_${lingua}.ts" fi if [[ -e ${S}/po/${PN}_${lingua}.ts ]]; then 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 major issues in desktop files wrt bugs #291453, #316599, #430500 sed -i -re '/^(Exec|Path)/ s:\[\$e\]::' avidemux2-gtk.desktop || die sed -i -re '/^Exec/ s:(avidemux2_)gtk:\1qt4:' avidemux2.desktop || die # don't install Windows-only 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 local mycmakeargs=( -DAVIDEMUX_SOURCE_DIR="${S}" -DAVIDEMUX_INSTALL_PREFIX="${BUILD_S}" -DAVIDEMUX_CORECONFIG_DIR="${BUILD_S}/config" -DARTS=OFF -DESD=OFF $(cmake-utils_use aac FAAC) $(cmake-utils_use aac FAAD) $(cmake-utils_use aften) $(cmake-utils_use alsa) $(cmake-utils_use amr OPENCORE_AMRNB) $(cmake-utils_use amr OPENCORE_AMRWB) $(cmake-utils_use gtk) $(cmake-utils_use jack) $(cmake-utils_use mp3 LAME) $(cmake-utils_use nls GETTEXT) $(cmake-utils_use_use opengl) $(cmake-utils_use oss) $(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE) $(cmake-utils_use qt4) $(cmake-utils_use sdl) $(cmake-utils_use truetype FREETYPE2) $(cmake-utils_use truetype FONTCONFIG) $(cmake-utils_use vorbis) $(cmake-utils_use vorbis LIBVORBIS) $(cmake-utils_use vpx VPXDEC) $(cmake-utils_use x264) $(cmake-utils_use xv XVIDEO) $(cmake-utils_use xvid) ) cmake-utils_src_configure } src_compile() { # 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 newicon ${PN}_icon.png ${PN}.png use gtk && domenu avidemux2-gtk.desktop use qt4 && domenu avidemux2.desktop }