From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-981034-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 293811396D9 for <garchives@archives.gentoo.org>; Sun, 29 Oct 2017 09:34:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 875C72BC14A; Sun, 29 Oct 2017 09:34:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 54D302BC120 for <gentoo-commits@lists.gentoo.org>; Sun, 29 Oct 2017 09:34:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50F69341669 for <gentoo-commits@lists.gentoo.org>; Sun, 29 Oct 2017 09:34:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EAB7883B for <gentoo-commits@lists.gentoo.org>; Sun, 29 Oct 2017 09:34:50 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org> Message-ID: <1509269661.ef4acc928833734f894dff8713ca92e3bdeee100.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/avidemux-core/avidemux-core-2.6.20.ebuild X-VCS-Directories: media-libs/avidemux-core/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ef4acc928833734f894dff8713ca92e3bdeee100 X-VCS-Branch: master Date: Sun, 29 Oct 2017 09:34:50 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 08be6d39-4b51-4320-b2be-33b33094e366 X-Archives-Hash: 93d4f21e52803e2e7e9a5f4a94ca2212 commit: ef4acc928833734f894dff8713ca92e3bdeee100 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Oct 28 23:01:34 2017 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sun Oct 29 09:34:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef4acc92 media-libs/avidemux-core: Drop 2.6.20 (r0) Package-Manager: Portage-2.3.13, Repoman-2.3.4 .../avidemux-core/avidemux-core-2.6.20.ebuild | 108 --------------------- 1 file changed, 108 deletions(-) diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild deleted file mode 100644 index 3a7af781cc1..00000000000 --- a/media-libs/avidemux-core/avidemux-core-2.6.20.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit cmake-utils - -DESCRIPTION="Core libraries for a video editor designed for simple cutting, filtering and encoding tasks" -HOMEPAGE="http://fixounet.free.fr/avidemux" - -# Multiple licenses because of all the bundled stuff. -LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" -SLOT="2.6" -IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau video_cards_fglrx xv" - -if [[ ${PV} == *9999* ]] ; then - EGIT_REPO_URI="https://github.com/mean00/avidemux2.git" - EGIT_CHECKOUT_DIR=${WORKDIR} - - inherit git-r3 -else - MY_PN="${PN/-core/}" - MY_P="${MY_PN}_${PV}" - SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed? -DEPEND=" - !<media-video/avidemux-${PV}:${SLOT} - dev-db/sqlite:3 - sdl? ( media-libs/libsdl:0 ) - system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] ) - xv? ( x11-libs/libXv:0 ) - vaapi? ( x11-libs/libva:0 ) - vdpau? ( x11-libs/libvdpau:0 ) - nvenc? ( media-video/nvidia_video_sdk ) - video_cards_fglrx? ( - || ( >=x11-drivers/ati-drivers-14.12-r3 - x11-libs/xvba-video:0 ) - ) -" -RDEPEND=" - $DEPEND - nls? ( virtual/libintl:0 ) -" -DEPEND=" - $DEPEND - virtual/pkgconfig - nls? ( sys-devel/gettext ) - !system-ffmpeg? ( dev-lang/yasm[nls=] ) -" - -S="${WORKDIR}/${MY_P}" -CMAKE_USE_DIR="${S}/${PN/-/_}" - -src_prepare() { - cmake-utils_src_prepare - - if use system-ffmpeg ; then - # Preparations to support the system ffmpeg. Currently fails because it depends on files the system ffmpeg doesn't install. - local error="Failed to remove ffmpeg." - - rm -rf cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package buildCore/ffmpeg || die "${error}" - sed -i -e 's/include(admFFmpegUtil)//g' avidemux/commonCmakeApplication.cmake || die "${error}" - sed -i -e '/registerFFmpeg/d' avidemux/commonCmakeApplication.cmake || die "${error}" - sed -i -e 's/include(admFFmpegBuild)//g' avidemux_core/CMakeLists.txt || die "${error}" - else - # Avoid existing avidemux installations from making the build process fail, bug #461496. - sed -i -e "s:getFfmpegLibNames(\"\${sourceDir}\"):getFfmpegLibNames(\"${WORKDIR}/${P}_build/ffmpeg/source/\"):g" cmake/admFFmpegUtil.cmake \ - || die "Failed to avoid existing avidemux installation from making the build fail." - fi -} - -src_configure() { - # 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 - - local mycmakeargs=( - -DAVIDEMUX_SOURCE_DIR='${S}' - -DGETTEXT="$(usex nls)" - -DSDL="$(usex sdl)" - -DLIBVA="$(usex vaapi)" - -DVDPAU="$(usex vdpau)" - -DXVBA="$(usex video_cards_fglrx)" - -DXVIDEO="$(usex xv)" - -DNVENC="$(usex nvenc)" - ) - - if use debug ; then - mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -j1 -} - -src_install() { - cmake-utils_src_install -j1 -}