commit: 8233a5b744d1ecda160cc671ff5b4e04d16d6bae Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Jul 6 09:10:42 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Jul 6 10:22:49 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8233a5b7
media-libs/avidemux-core: Drop 2.6.20-r2 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-libs/avidemux-core/Manifest | 1 - .../avidemux-core/avidemux-core-2.6.20-r2.ebuild | 101 --------------------- .../files/avidemux-core-2.6.20-fix-cmake.patch | 18 ---- 3 files changed, 120 deletions(-) diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest index c86d53e23df..281d961cf75 100644 --- a/media-libs/avidemux-core/Manifest +++ b/media-libs/avidemux-core/Manifest @@ -1,2 +1 @@ -DIST avidemux_2.6.20.tar.gz 20172362 BLAKE2B d458749e470e60b133a177ddf97ee04a665da3f7b2c52e8cc51f907aa5b51d11338ddab9306603b615170b5cf75ec2d3444bd648756bdb724aa442abf7044553 SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015 diff --git a/media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild b/media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild deleted file mode 100644 index 1fad3f21b9f..00000000000 --- a/media-libs/avidemux-core/avidemux-core-2.6.20-r2.ebuild +++ /dev/null @@ -1,101 +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 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 ) -" -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/-/_}" - -PATCHES=("${FILESDIR}"/${P}-fix-cmake.patch ) - -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}" - 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)" - -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 -} diff --git a/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch b/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch deleted file mode 100644 index d7df42d31b5..00000000000 --- a/media-libs/avidemux-core/files/avidemux-core-2.6.20-fix-cmake.patch +++ /dev/null @@ -1,18 +0,0 @@ -Bug: https://bugs.gentoo.org/625930 -Backported from https://github.com/mean00/avidemux2/commit/c5edc6cf7b3768ac1409c6cef69ab5980a86596a - -diff -Naur a/cmake/admCheckX264.cmake b/cmake/admCheckX264.cmake ---- a/cmake/admCheckX264.cmake 2017-04-28 05:22:27.000000000 -0400 -+++ b/cmake/admCheckX264.cmake 2017-10-01 01:38:33.249996381 -0400 -@@ -20,9 +20,9 @@ - ELSE (x264_version LESS 67) - IF (x264_version GREATER 73) - FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open_${x264_version}) -+ ELSE (x264_version GREATER 73) -+ FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open) - ENDIF (x264_version GREATER 73) -- ELSE (x264_version LESS 67) -- FIND_HEADER_AND_LIB(X264 x264.h x264 x264_encoder_open) - ENDIF (x264_version LESS 67) - IF(X264_FOUND) - SET(USE_X264 True CACHE BOOL "")
