1 |
commit: dee26cc3c59dbb56429fa768272395516957c815 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Mar 18 16:43:01 2023 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 18 16:43:01 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee26cc3 |
7 |
|
8 |
media-video/ffmpeg2theora: treeclean |
9 |
|
10 |
Closes: https://bugs.gentoo.org/469816 |
11 |
Closes: https://bugs.gentoo.org/654486 |
12 |
Closes: https://bugs.gentoo.org/834403 |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
media-video/ffmpeg2theora/Manifest | 1 - |
16 |
.../ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild | 55 ---------------------- |
17 |
.../files/ffmpeg2theora-0.29-swr.patch | 24 ---------- |
18 |
.../files/ffmpeg2theora-0.29-underlinking.patch | 21 --------- |
19 |
media-video/ffmpeg2theora/metadata.xml | 10 ---- |
20 |
profiles/package.mask | 1 - |
21 |
6 files changed, 112 deletions(-) |
22 |
|
23 |
diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest |
24 |
deleted file mode 100644 |
25 |
index da50db965142..000000000000 |
26 |
--- a/media-video/ffmpeg2theora/Manifest |
27 |
+++ /dev/null |
28 |
@@ -1 +0,0 @@ |
29 |
-DIST ffmpeg2theora-0.30.tar.bz2 91269 BLAKE2B e5a57679cb874e7052db184e8e24b60da640ed818affa228cf5353216c64d2805aee375f67cfa2653112beafa36d492a274ced745846e53f81101e0f97418c41 SHA512 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1 |
30 |
|
31 |
diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild |
32 |
deleted file mode 100644 |
33 |
index 89102c0a4714..000000000000 |
34 |
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,55 +0,0 @@ |
37 |
-# Copyright 1999-2023 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=7 |
41 |
- |
42 |
-PYTHON_COMPAT=( python3_{9..10} ) |
43 |
-inherit python-any-r1 scons-utils |
44 |
- |
45 |
-DESCRIPTION="A simple converter to create Ogg Theora files" |
46 |
-HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/" |
47 |
-SRC_URI="http://www.v2v.cc/~j/${PN}/downloads/${P}.tar.bz2" |
48 |
- |
49 |
-LICENSE="GPL-3" |
50 |
-SLOT="0" |
51 |
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86" |
52 |
-IUSE="kate" |
53 |
- |
54 |
-RDEPEND=" |
55 |
- media-video/ffmpeg:0=[postproc] |
56 |
- >=media-libs/libvorbis-1.1 |
57 |
- >=media-libs/libogg-1.1 |
58 |
- >=media-libs/libtheora-1.1[encode] |
59 |
- kate? ( >=media-libs/libkate-0.3.7 )" |
60 |
-DEPEND="${RDEPEND}" |
61 |
-BDEPEND="virtual/pkgconfig" |
62 |
- |
63 |
-PATCHES=( |
64 |
- "${FILESDIR}"/${PN}-0.29-swr.patch |
65 |
- "${FILESDIR}"/${PN}-0.29-underlinking.patch |
66 |
-) |
67 |
- |
68 |
-src_prepare() { |
69 |
- default |
70 |
- |
71 |
- 2to3 -n -w --no-diffs SConstruct || die |
72 |
-} |
73 |
- |
74 |
-src_configure() { |
75 |
- SCONSARGS=( |
76 |
- APPEND_CCFLAGS="${CFLAGS}" |
77 |
- APPEND_LINKFLAGS="${LDFLAGS}" |
78 |
- prefix=/usr |
79 |
- mandir=PREFIX/share/man |
80 |
- libkate=$(usex kate 1 0) |
81 |
- ) |
82 |
-} |
83 |
- |
84 |
-src_compile() { |
85 |
- escons "${SCONSARGS[@]}" |
86 |
-} |
87 |
- |
88 |
-src_install() { |
89 |
- escons "${SCONSARGS[@]}" destdir="${D}" install |
90 |
- dodoc AUTHORS ChangeLog README subtitles.txt TODO |
91 |
-} |
92 |
|
93 |
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch |
94 |
deleted file mode 100644 |
95 |
index b1117a87ea6f..000000000000 |
96 |
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch |
97 |
+++ /dev/null |
98 |
@@ -1,24 +0,0 @@ |
99 |
-commit a72baecd4dc7b01c0785b481460dde0fbab9a90a |
100 |
-Author: Jan Gerber <j@××××.org> |
101 |
-Date: Fri Nov 23 20:21:54 2012 +0100 |
102 |
- |
103 |
- only depend on libswresample for local branch |
104 |
- |
105 |
- libav does not have libswresample so its not in ubuntu. |
106 |
- |
107 |
-diff --git a/SConstruct b/SConstruct |
108 |
-index 90520c3..01d234a 100644 |
109 |
---- a/SConstruct |
110 |
-+++ b/SConstruct |
111 |
-@@ -152,10 +152,10 @@ if not env.GetOption('clean'): |
112 |
- "libavcodec >= 52.30.0", |
113 |
- "libpostproc", |
114 |
- "libswscale", |
115 |
-- "libswresample", |
116 |
- "libavutil", |
117 |
- ] |
118 |
- if os.path.exists("./ffmpeg"): |
119 |
-+ FFMPEG_LIBS.append('libswresample') |
120 |
- pkg_path = list(set(map(os.path.dirname, glob('./ffmpeg/*/*.pc')))) |
121 |
- pkg_path.append(os.environ.get('PKG_CONFIG_PATH', '')) |
122 |
- os.environ['PKG_CONFIG_PATH'] = ':'.join(pkg_path) |
123 |
|
124 |
diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch |
125 |
deleted file mode 100644 |
126 |
index 791e39d87744..000000000000 |
127 |
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch |
128 |
+++ /dev/null |
129 |
@@ -1,21 +0,0 @@ |
130 |
-For example, pow() from mathlib is used directly in src/ffmpeg2theora.c: |
131 |
- |
132 |
-<snip> |
133 |
-v = pow(v, g) * 255.0; // mplayer's vf_eq2.c multiplies with 256 here, strange... |
134 |
-</snip> |
135 |
- |
136 |
-For build failure and log, see Gentoo bug #504698 |
137 |
- |
138 |
---- a/SConstruct |
139 |
-+++ b/SConstruct |
140 |
-@@ -206,9 +206,8 @@ |
141 |
- if env['crossmingw']: |
142 |
- env.Append(CCFLAGS=['-Wl,-subsystem,windows']) |
143 |
- env.Append(LIBS=['m']) |
144 |
-- elif env['static']: |
145 |
-- env.Append(LIBS=['m', 'dl']) |
146 |
- |
147 |
-+ env.Append(LIBS=['m', 'dl']) |
148 |
- |
149 |
- env = conf.Finish() |
150 |
- |
151 |
|
152 |
diff --git a/media-video/ffmpeg2theora/metadata.xml b/media-video/ffmpeg2theora/metadata.xml |
153 |
deleted file mode 100644 |
154 |
index dc686e6e5ae1..000000000000 |
155 |
--- a/media-video/ffmpeg2theora/metadata.xml |
156 |
+++ /dev/null |
157 |
@@ -1,10 +0,0 @@ |
158 |
-<?xml version="1.0" encoding="UTF-8"?> |
159 |
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
160 |
-<pkgmetadata> |
161 |
- <maintainer type="project"> |
162 |
- <email>media-video@g.o</email> |
163 |
- </maintainer> |
164 |
- <use> |
165 |
- <flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag> |
166 |
- </use> |
167 |
-</pkgmetadata> |
168 |
|
169 |
diff --git a/profiles/package.mask b/profiles/package.mask |
170 |
index f187326122c6..195a7eb49382 100644 |
171 |
--- a/profiles/package.mask |
172 |
+++ b/profiles/package.mask |
173 |
@@ -307,7 +307,6 @@ media-libs/libextractor |
174 |
media-libs/qtav |
175 |
media-plugins/vdr-vaapidevice |
176 |
media-sound/potamus |
177 |
-media-video/ffmpeg2theora |
178 |
|
179 |
# David Seifert <soap@g.o> (2023-01-14) |
180 |
# Py3.8 only backports |