From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A7EEC15A7D9 for ; Sat, 18 Mar 2023 16:45:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4FBDE085A; Sat, 18 Mar 2023 16:45:32 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A9478E084A for ; Sat, 18 Mar 2023 16:45:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA77F34097F for ; Sat, 18 Mar 2023 16:45:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 09A50904 for ; Sat, 18 Mar 2023 16:45:28 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1679157781.dee26cc3c59dbb56429fa768272395516957c815.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg2theora/files/, profiles/, media-video/ffmpeg2theora/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/ffmpeg2theora/Manifest media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-swr.patch media-video/ffmpeg2theora/files/ffmpeg2theora-0.29-underlinking.patch media-video/ffmpeg2theora/metadata.xml profiles/package.mask X-VCS-Directories: media-video/ffmpeg2theora/files/ profiles/ media-video/ffmpeg2theora/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: dee26cc3c59dbb56429fa768272395516957c815 X-VCS-Branch: master Date: Sat, 18 Mar 2023 16:45:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fcfe9e62-1107-4db4-af70-84bb394280b3 X-Archives-Hash: 1bf0838d0145f3472405c0e8a253f62c commit: dee26cc3c59dbb56429fa768272395516957c815 Author: David Seifert gentoo org> AuthorDate: Sat Mar 18 16:43:01 2023 +0000 Commit: David Seifert gentoo 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 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 -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: - - -v = pow(v, g) * 255.0; // mplayer's vf_eq2.c multiplies with 256 here, strange... - - -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 @@ - - - - - media-video@gentoo.org - - - Adds support for Ogg Kate subtitles via libkate. - - 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 (2023-01-14) # Py3.8 only backports