Gentoo Archives: gentoo-commits

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