1 |
commit: 6aa27f33d47ecb9cdbcbe78b1122143ea505d3b8 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 28 22:56:03 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 29 09:34:16 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa27f33 |
7 |
|
8 |
media-libs/avidemux-plugins: Drop 2.6.8 |
9 |
|
10 |
Package-Manager: Portage-2.3.13, Repoman-2.3.4 |
11 |
|
12 |
media-libs/avidemux-plugins/Manifest | 1 - |
13 |
.../avidemux-plugins/avidemux-plugins-2.6.8.ebuild | 145 --------------------- |
14 |
.../avidemux-plugins-2.6.4-optional-pulse.patch | 21 --- |
15 |
3 files changed, 167 deletions(-) |
16 |
|
17 |
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest |
18 |
index 6f017f59f92..4bf6be8c5b5 100644 |
19 |
--- a/media-libs/avidemux-plugins/Manifest |
20 |
+++ b/media-libs/avidemux-plugins/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
DIST avidemux_2.6.20.tar.gz 20172362 SHA256 03c6cb7fc9eb74688b4fcd5eb654ed7b9c4ffc717a72cc09b08a2d10cdc7ef9f SHA512 d01d0fc24a3004770bd3923c2debc4fa2752eb71df08cfe423746b9c44a2562ca01d82965ed2563b99572a4bed8034b79487199ce330208b51a3b7f87ccf7103 WHIRLPOOL 2e2dc21bed49eeb0cdfefe75fe51f6a84226e7e8e80b063bc0b3d8711a6b91db710611dc0ec06575be69ec8e24f2f9e5b5eb363b9c095267729e85e162a4ce38 |
23 |
-DIST avidemux_2.6.8.tar.gz 17380534 SHA256 02998c235a89894d184d745c94cac37b78bc20e9eb44b318ee2bb83f2507e682 SHA512 57a4042f1a9d46462850871d36950215c5ffb5b66ce2f2cde09d747e946c05adb7a550ac7763c96f4c1bcb2c39881407d9d88bc64c93053741091751495ba0b0 WHIRLPOOL 29f8a6039d82e686e8dfbfc7b23658921834238a4cc6c4de338afdfdc032a9a7cba1c8236789aa6dbcab318ec14c344c19563f153e6cbd63cd265c5fb15b44b6 |
24 |
|
25 |
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild |
26 |
deleted file mode 100644 |
27 |
index 215b8e16ef2..00000000000 |
28 |
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.6.8.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,145 +0,0 @@ |
31 |
-# Copyright 1999-2017 Gentoo Foundation |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
- |
34 |
-EAPI="5" |
35 |
- |
36 |
-PYTHON_COMPAT=( python2_7 ) |
37 |
- |
38 |
-inherit cmake-utils eutils flag-o-matic python-single-r1 |
39 |
- |
40 |
-SLOT="2.6" |
41 |
- |
42 |
-DESCRIPTION="Plugins for the video editor media-video/avidemux" |
43 |
-HOMEPAGE="http://fixounet.free.fr/avidemux" |
44 |
- |
45 |
-# Multiple licenses because of all the bundled stuff. |
46 |
-LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" |
47 |
-IUSE="aac aften a52 alsa amr debug dts fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx opengl oss pulseaudio qt4 vorbis truetype twolame xv xvid x264 vdpau vpx" |
48 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
49 |
-KEYWORDS="~amd64 ~x86" |
50 |
- |
51 |
-MY_PN="${PN/-plugins/}" |
52 |
-if [[ ${PV} == *9999* ]] ; then |
53 |
- KEYWORDS="" |
54 |
- EGIT_REPO_URI="git://gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git https://git.gitorious.org/${MY_PN}2-6/${MY_PN}2-6.git" |
55 |
- |
56 |
- inherit git-2 |
57 |
-else |
58 |
- MY_P="${MY_PN}_${PV}" |
59 |
- SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz" |
60 |
-fi |
61 |
- |
62 |
-RDEPEND=" |
63 |
- ~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?] |
64 |
- ~media-video/avidemux-${PV}:${SLOT}[opengl?,qt4?] |
65 |
- >=dev-lang/spidermonkey-1.5-r2:0= |
66 |
- dev-libs/libxml2:2 |
67 |
- media-libs/libpng:0= |
68 |
- virtual/libiconv:0 |
69 |
- aac? ( |
70 |
- media-libs/faac:0 |
71 |
- media-libs/faad2:0 |
72 |
- ) |
73 |
- aften? ( media-libs/aften:0 ) |
74 |
- alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 ) |
75 |
- amr? ( media-libs/opencore-amr:0 ) |
76 |
- dts? ( media-libs/libdca:0 ) |
77 |
- fontconfig? ( media-libs/fontconfig:1.0 ) |
78 |
- fribidi? ( dev-libs/fribidi:0 ) |
79 |
- jack? ( |
80 |
- media-sound/jack-audio-connection-kit:0 |
81 |
- libsamplerate? ( media-libs/libsamplerate:0 ) |
82 |
- ) |
83 |
- lame? ( media-sound/lame:0 ) |
84 |
- pulseaudio? ( media-sound/pulseaudio:0 ) |
85 |
- truetype? ( media-libs/freetype:2 ) |
86 |
- twolame? ( media-sound/twolame:0 ) |
87 |
- x264? ( media-libs/x264:0= ) |
88 |
- xv? ( |
89 |
- x11-libs/libX11:0 |
90 |
- x11-libs/libXext:0 |
91 |
- x11-libs/libXv:0 |
92 |
- ) |
93 |
- xvid? ( media-libs/xvid:0 ) |
94 |
- vorbis? ( media-libs/libvorbis:0 ) |
95 |
- vpx? ( media-libs/libvpx:0 ) |
96 |
- ${PYTHON_DEPS} |
97 |
-" |
98 |
-DEPEND="${RDEPEND} |
99 |
- oss? ( virtual/os-headers:0 )" |
100 |
- |
101 |
-S="${WORKDIR}/${MY_P}" |
102 |
- |
103 |
-PATCHES=( "${FILESDIR}"/${PN}-2.6.4-optional-pulse.patch ) |
104 |
- |
105 |
-src_configure() { |
106 |
- # Add lax vector typing for PowerPC. |
107 |
- if use ppc || use ppc64 ; then |
108 |
- append-cflags -flax-vector-conversions |
109 |
- fi |
110 |
- |
111 |
- # See bug 432322. |
112 |
- use x86 && replace-flags -O0 -O1 |
113 |
- |
114 |
- processes="buildPluginsCommon:avidemux_plugins |
115 |
- buildPluginsCLI:avidemux_plugins" |
116 |
- use qt4 && processes+=" buildPluginsQt4:avidemux_plugins" |
117 |
- |
118 |
- for process in ${processes} ; do |
119 |
- local build="${process%%:*}" |
120 |
- |
121 |
- local mycmakeargs=" |
122 |
- -DAVIDEMUX_SOURCE_DIR='${S}' |
123 |
- -DPLUGIN_UI=$(echo ${build/buildPlugins/} | tr '[:lower:]' '[:upper:]') |
124 |
- $(cmake-utils_use aac FAAC) |
125 |
- $(cmake-utils_use aac FAAD) |
126 |
- $(cmake-utils_use alsa) |
127 |
- $(cmake-utils_use aften) |
128 |
- $(cmake-utils_use amr OPENCORE_AMRWB) |
129 |
- $(cmake-utils_use amr OPENCORE_AMRNB) |
130 |
- $(cmake-utils_use dts LIBDCA) |
131 |
- $(cmake-utils_use fontconfig) |
132 |
- $(cmake-utils_use jack) |
133 |
- $(cmake-utils_use lame) |
134 |
- $(cmake-utils_use oss) |
135 |
- $(cmake-utils_use pulseaudio PULSEAUDIOSIMPLE) |
136 |
- $(cmake-utils_use qt4) |
137 |
- $(cmake-utils_use truetype FREETYPE2) |
138 |
- $(cmake-utils_use twolame) |
139 |
- $(cmake-utils_use x264) |
140 |
- $(cmake-utils_use xv XVIDEO) |
141 |
- $(cmake-utils_use xvid) |
142 |
- $(cmake-utils_use vdpau) |
143 |
- $(cmake-utils_use vorbis) |
144 |
- $(cmake-utils_use vorbis LIBVORBIS) |
145 |
- $(cmake-utils_use vpx VPXDEC) |
146 |
- " |
147 |
- |
148 |
- if use debug ; then |
149 |
- mycmakeargs+=" -DVERBOSE=1 -DCMAKE_BUILD_TYPE=Debug -DADM_DEBUG=1" |
150 |
- fi |
151 |
- |
152 |
- mkdir "${S}"/${build} || die "Can't create build folder." |
153 |
- |
154 |
- CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${S}"/${build} cmake-utils_src_configure |
155 |
- done |
156 |
-} |
157 |
- |
158 |
-src_compile() { |
159 |
- for process in ${processes} ; do |
160 |
- BUILD_DIR="${S}/${process%%:*}" cmake-utils_src_compile |
161 |
- done |
162 |
-} |
163 |
- |
164 |
-src_install() { |
165 |
- for process in ${processes} ; do |
166 |
- # cmake-utils_src_install doesn't respect BUILD_DIR |
167 |
- # and there sometimes is a preinstall phase present. |
168 |
- pushd "${S}/${process%%:*}" > /dev/null || die |
169 |
- grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast |
170 |
- grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast |
171 |
- popd > /dev/null || die |
172 |
- done |
173 |
- |
174 |
- python_fix_shebang "${D}" |
175 |
-} |
176 |
|
177 |
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch |
178 |
deleted file mode 100644 |
179 |
index 78650aaa7c0..00000000000 |
180 |
--- a/media-libs/avidemux-plugins/files/avidemux-plugins-2.6.4-optional-pulse.patch |
181 |
+++ /dev/null |
182 |
@@ -1,21 +0,0 @@ |
183 |
---- a/cmake/admCheckAudioDeviceLibs.cmake |
184 |
-+++ b/cmake/admCheckAudioDeviceLibs.cmake |
185 |
-@@ -158,6 +158,8 @@ |
186 |
- |
187 |
- MESSAGE(STATUS "Checking for PULSEAUDIOSIMPLE") |
188 |
- MESSAGE(STATUS "*****************************") |
189 |
-+ |
190 |
-+ IF (PULSEAUDIOSIMPLE) |
191 |
- IF (PULSEAUDIOSIMPLE_INCLUDE_DIR AND PULSEAUDIOSIMPLE_LIBRARIES) |
192 |
- # in cache already |
193 |
- SET(PULSEAUDIOSIMPLE_FIND_QUIETLY TRUE) |
194 |
-@@ -198,6 +200,9 @@ |
195 |
- MARK_AS_ADVANCED(PULSEAUDIOSIMPLE_INCLUDE_DIR PULSEAUDIOSIMPLE_LIBRARIES) |
196 |
- |
197 |
- APPEND_SUMMARY_LIST("Audio Device" "PulseAudio" "${USE_PULSE_SIMPLE}") |
198 |
-+ ELSE (PULSEAUDIOSIMPLE) |
199 |
-+ MESSAGE("${MSG_DISABLE_OPTION}") |
200 |
-+ ENDIF (PULSEAUDIOSIMPLE) |
201 |
- ELSE (UNIX AND NOT APPLE) |
202 |
- SET(PULSEAUDIOSIMPLE_CAPABLE FALSE) |
203 |
- ENDIF (UNIX AND NOT APPLE) |