[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg2theora/files/, profiles/, media-video/ffmpeg2theora/

[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg2theora/files/, profiles/, media-video/ffmpeg2theora/

[David Seifert]

commit:     dee26cc3c59dbb56429fa768272395516957c815
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 16:43:01 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 16:43:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee26cc3

media-video/ffmpeg2theora: treeclean

Closes: https://bugs.gentoo.org/469816
Closes: https://bugs.gentoo.org/654486
Closes: https://bugs.gentoo.org/834403
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-video/ffmpeg2theora/Manifest                 |  1 -
 .../ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild     | 55 ----------------------
 .../files/ffmpeg2theora-0.29-swr.patch             | 24 ----------
 .../files/ffmpeg2theora-0.29-underlinking.patch    | 21 ---------
 media-video/ffmpeg2theora/metadata.xml             | 10 ----
 profiles/package.mask                              |  1 -
 6 files changed, 112 deletions(-)

diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest
deleted file mode 100644
index da50db965142..000000000000
--- a/media-video/ffmpeg2theora/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ffmpeg2theora-0.30.tar.bz2 91269 BLAKE2B e5a57679cb874e7052db184e8e24b60da640ed818affa228cf5353216c64d2805aee375f67cfa2653112beafa36d492a274ced745846e53f81101e0f97418c41 SHA512 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1

diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
deleted file mode 100644
index 89102c0a4714..000000000000
--- a/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit python-any-r1 scons-utils
-
-DESCRIPTION="A simple converter to create Ogg Theora files"
-HOMEPAGE="http://www.v2v.cc/~j/ffmpeg2theora/"
-SRC_URI="http://www.v2v.cc/~j/${PN}/downloads/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="kate"
-
-RDEPEND="
-	media-video/ffmpeg:0=[postproc]
-	>=media-libs/libvorbis-1.1
-	>=media-libs/libogg-1.1
-	>=media-libs/libtheora-1.1[encode]
-	kate? ( >=media-libs/libkate-0.3.7 )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.29-swr.patch
-	"${FILESDIR}"/${PN}-0.29-underlinking.patch
-)
-
-src_prepare() {
-	default
-
-	2to3 -n -w --no-diffs SConstruct || die
-}
-
-src_configure() {
-	SCONSARGS=(
-		APPEND_CCFLAGS="${CFLAGS}"
-		APPEND_LINKFLAGS="${LDFLAGS}"
-		prefix=/usr
-		mandir=PREFIX/share/man
-		libkate=$(usex kate 1 0)
-	)
-}
-
-src_compile() {
-	escons "${SCONSARGS[@]}"
-}
-
-src_install() {
-	escons "${SCONSARGS[@]}" destdir="${D}" install
-	dodoc AUTHORS ChangeLog README subtitles.txt TODO
-}

diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch
deleted file mode 100644
index b1117a87ea6f..000000000000
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit a72baecd4dc7b01c0785b481460dde0fbab9a90a
-Author: Jan Gerber <j@xiph.org>
-Date:   Fri Nov 23 20:21:54 2012 +0100
-
-    only depend on libswresample for local branch
-    
-    libav does not have libswresample so its not in ubuntu.
-
-diff --git a/SConstruct b/SConstruct
-index 90520c3..01d234a 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -152,10 +152,10 @@ if not env.GetOption('clean'):
-       "libavcodec >= 52.30.0",
-       "libpostproc",
-       "libswscale",
--      "libswresample",
-       "libavutil",
-   ]
-   if os.path.exists("./ffmpeg"):
-+    FFMPEG_LIBS.append('libswresample')
-     pkg_path = list(set(map(os.path.dirname, glob('./ffmpeg/*/*.pc'))))
-     pkg_path.append(os.environ.get('PKG_CONFIG_PATH', ''))
-     os.environ['PKG_CONFIG_PATH'] = ':'.join(pkg_path)

diff --git a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch b/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
deleted file mode 100644
index 791e39d87744..000000000000
--- a/media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-For example, pow() from mathlib is used directly in src/ffmpeg2theora.c:
-
-<snip>
-v = pow(v, g) * 255.0;    // mplayer's vf_eq2.c multiplies with 256 here, strange...
-</snip>
-
-For build failure and log, see Gentoo bug #504698
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -206,9 +206,8 @@
-   if env['crossmingw']:
-       env.Append(CCFLAGS=['-Wl,-subsystem,windows'])
-       env.Append(LIBS=['m'])
--  elif env['static']:
--      env.Append(LIBS=['m', 'dl'])
- 
-+  env.Append(LIBS=['m', 'dl'])
- 
- env = conf.Finish()
- 

diff --git a/media-video/ffmpeg2theora/metadata.xml b/media-video/ffmpeg2theora/metadata.xml
deleted file mode 100644
index dc686e6e5ae1..000000000000
--- a/media-video/ffmpeg2theora/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>media-video@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
-	</use>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index f187326122c6..195a7eb49382 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -307,7 +307,6 @@ media-libs/libextractor
 media-libs/qtav
 media-plugins/vdr-vaapidevice
 media-sound/potamus
-media-video/ffmpeg2theora
 
 # David Seifert <soap@gentoo.org> (2023-01-14)
 # Py3.8 only backports