Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/avidemux-core/, media-libs/avidemux-core/files/
Date: Fri, 07 Aug 2020 23:24:54
Message-Id: 1596842606.1a0d283aac7962bf749e58c577c05f09c6fe95bf.asturm@gentoo
1 commit: 1a0d283aac7962bf749e58c577c05f09c6fe95bf
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Aug 7 20:24:32 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 7 23:23:26 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0d283a
7
8 media-libs/avidemux-core: Drop 2.7.3-r1
9
10 Package-Manager: Portage-3.0.1, Repoman-2.3.23
11 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
12
13 media-libs/avidemux-core/Manifest | 1 -
14 .../avidemux-core/avidemux-core-2.7.3-r1.ebuild | 88 ----------------------
15 .../files/avidemux-core-2.7.3-permissions.patch | 28 -------
16 3 files changed, 117 deletions(-)
17
18 diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
19 index 7d6012ce4fc..81a3ad8e8a8 100644
20 --- a/media-libs/avidemux-core/Manifest
21 +++ b/media-libs/avidemux-core/Manifest
22 @@ -1,2 +1 @@
23 -DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
24 DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
25
26 diff --git a/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild
27 deleted file mode 100644
28 index 1b987f4d1e1..00000000000
29 --- a/media-libs/avidemux-core/avidemux-core-2.7.3-r1.ebuild
30 +++ /dev/null
31 @@ -1,88 +0,0 @@
32 -# Copyright 1999-2020 Gentoo Authors
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=7
36 -
37 -CMAKE_MAKEFILE_GENERATOR="emake"
38 -
39 -inherit cmake
40 -
41 -DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
42 -HOMEPAGE="http://fixounet.free.fr/avidemux"
43 -SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
44 -
45 -# Multiple licenses because of all the bundled stuff.
46 -LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
47 -SLOT="2.7"
48 -KEYWORDS="~amd64 ~x86"
49 -IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
50 -
51 -# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
52 -DEPEND="dev-db/sqlite:3
53 - nvenc? ( media-video/nvidia_video_sdk )
54 - sdl? ( media-libs/libsdl:0 )
55 - system-ffmpeg? ( >=media-video/ffmpeg-9:0[mp3,theora] )
56 - vaapi? ( x11-libs/libva:0= )
57 - vdpau? ( x11-libs/libvdpau:0 )
58 - xv? ( x11-libs/libXv:0 )
59 -"
60 -RDEPEND="${DEPEND}
61 - !<media-libs/avidemux-core-${PV}
62 - !<media-video/avidemux-${PV}
63 - nls? ( virtual/libintl:0 )
64 -"
65 -BDEPEND="virtual/pkgconfig
66 - nls? ( sys-devel/gettext )
67 - !system-ffmpeg? ( dev-lang/yasm[nls=] )
68 -"
69 -
70 -S="${WORKDIR}/avidemux2-${PV}"
71 -CMAKE_USE_DIR="${S}/${PN/-/_}"
72 -
73 -PATCHES=( "${FILESDIR}"/${P}-permissions.patch )
74 -
75 -src_prepare() {
76 - cmake_src_prepare
77 -
78 - if use system-ffmpeg ; then
79 - # Preparations to support the system ffmpeg. Currently fails because
80 - # it depends on files the system ffmpeg doesn't install.
81 - local error="Failed to remove bundled ffmpeg."
82 -
83 - rm -r cmake/admFFmpeg* cmake/ffmpeg* avidemux_core/ffmpeg_package \
84 - buildCore/ffmpeg || die "${error}"
85 - sed -e 's/include(admFFmpegUtil)//g' -e '/registerFFmpeg/d' \
86 - -i avidemux/commonCmakeApplication.cmake || die "${error}"
87 - sed -e 's/include(admFFmpegBuild)//g' \
88 - -i avidemux_core/CMakeLists.txt || die "${error}"
89 - fi
90 -}
91 -
92 -src_configure() {
93 - # See bug 432322.
94 - use x86 && replace-flags -O0 -O1
95 -
96 - local mycmakeargs=(
97 - -DAVIDEMUX_SOURCE_DIR='${S}'
98 - -DGETTEXT="$(usex nls)"
99 - -DNVENC="$(usex nvenc)"
100 - -DSDL="$(usex sdl)"
101 - -DLIBVA="$(usex vaapi)"
102 - -DVDPAU="$(usex vdpau)"
103 - -DXVIDEO="$(usex xv)"
104 - )
105 -
106 - if use debug ; then
107 - mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
108 - fi
109 -
110 - cmake_src_configure
111 -}
112 -
113 -src_compile() {
114 - cmake_src_compile
115 -}
116 -
117 -src_install() {
118 - cmake_src_install
119 -}
120
121 diff --git a/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch b/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch
122 deleted file mode 100644
123 index 0f8ee21632e..00000000000
124 --- a/media-libs/avidemux-core/files/avidemux-core-2.7.3-permissions.patch
125 +++ /dev/null
126 @@ -1,28 +0,0 @@
127 -From 7c5c267987b90cf0b61ca98e9f8b6db2c0cdb84f Mon Sep 17 00:00:00 2001
128 -From: Stefan Strogin <steils@g.o>
129 -Date: Wed, 14 Aug 2019 03:35:01 +0300
130 -Subject: [PATCH] [cmake] Fix library permissions
131 -
132 -Upstream-Status: Submitted
133 -[https://github.com/mean00/avidemux2/pull/179]
134 -Signed-off-by: Stefan Strogin <steils@g.o>
135 ----
136 - cmake/admInstallDir.cmake | 2 +-
137 - 1 file changed, 1 insertion(+), 1 deletion(-)
138 -
139 -diff --git a/cmake/admInstallDir.cmake b/cmake/admInstallDir.cmake
140 -index ab16f283d..5af762626 100644
141 ---- a/cmake/admInstallDir.cmake
142 -+++ b/cmake/admInstallDir.cmake
143 -@@ -55,7 +55,7 @@ ENDMACRO(ADM_INSTALL_LIB )
144 - MACRO (ADM_INSTALL_LIB_FILES files)
145 - INSTALL(FILES ${files}
146 - DESTINATION ${AVIDEMUX_LIB_DIR}
147 -- PERMISSIONS WORLD_READ WORLD_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE
148 -+ PERMISSIONS WORLD_READ WORLD_EXECUTE GROUP_READ GROUP_EXECUTE OWNER_WRITE OWNER_READ OWNER_EXECUTE
149 - COMPONENT runtime
150 - )
151 - ENDMACRO (ADM_INSTALL_LIB_FILES)
152 ---
153 -2.22.0
154 -