[gentoo-commits] repo/gentoo:master commit in: virtual/ffmpeg/

[gentoo-commits] repo/gentoo:master commit in: virtual/ffmpeg/

[Alexis Ballier]

commit:     04801267a8008f61c44cb50a1d4af0b64aac75e0
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 09:46:52 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri May 26 08:51:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04801267

virtual/ffmpeg: Drop multilib flags. Those are not needed for executables and packages usedeping on the flags here likely should be converted to USE=libav

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 virtual/ffmpeg/ffmpeg-9-r2.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/virtual/ffmpeg/ffmpeg-9-r2.ebuild b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
index 23f3412012d..f9b41e7f78b 100644
--- a/virtual/ffmpeg/ffmpeg-9-r2.ebuild
+++ b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=5
 
-inherit multilib-build
-
 DESCRIPTION="Virtual package for FFmpeg executable implementation"
 
 # Please note that this virtual is only suited for packages that call
@@ -19,6 +17,6 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
 IUSE="X +encode gsm jpeg2k libav mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
 
 RDEPEND="
-	libav? ( >=media-video/libav-9.12[${MULTILIB_USEDEP},X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
-	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0[${MULTILIB_USEDEP},X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
+	libav? ( >=media-video/libav-9.12[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
+	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
 "

[gentoo-commits] repo/gentoo:master commit in: virtual/ffmpeg/

[Alexis Ballier]

commit:     ca56f875aa50e7454f573370153cae9955814cf7
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 11 09:45:28 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri May 26 08:51:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca56f875

virtual/ffmpeg: remove old

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 virtual/ffmpeg/ffmpeg-0.10.3-r1.ebuild | 14 --------------
 virtual/ffmpeg/ffmpeg-0.10.3.ebuild    | 16 ----------------
 virtual/ffmpeg/ffmpeg-9-r1.ebuild      | 18 ------------------
 virtual/ffmpeg/ffmpeg-9.ebuild         | 16 ----------------
 4 files changed, 64 deletions(-)

diff --git a/virtual/ffmpeg/ffmpeg-0.10.3-r1.ebuild b/virtual/ffmpeg/ffmpeg-0.10.3-r1.ebuild
deleted file mode 100644
index c219cb8d832..00000000000
--- a/virtual/ffmpeg/ffmpeg-0.10.3-r1.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Virtual package for FFmpeg implementation"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="X +encode gsm jpeg2k libav mp3 sdl speex theora threads truetype vaapi vdpau x264"
-
-RDEPEND="
-	!libav? ( >=media-video/ffmpeg-0.10.3:0[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
-	libav? ( >=media-video/libav-0.8.4[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
-"

diff --git a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild b/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
deleted file mode 100644
index c5e9602e2b5..00000000000
--- a/virtual/ffmpeg/ffmpeg-0.10.3.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Virtual package for FFmpeg implementation"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="X +encode gsm jpeg2k mp3 sdl speex theora threads truetype vaapi vdpau x264"
-
-RDEPEND="
-	|| (
-		>=media-video/ffmpeg-0.10.3:0[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
-		>=media-video/libav-0.8.4[X?,encode?,gsm?,jpeg2k?,mp3?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
-	)
-"

diff --git a/virtual/ffmpeg/ffmpeg-9-r1.ebuild b/virtual/ffmpeg/ffmpeg-9-r1.ebuild
deleted file mode 100644
index a0ebd313a73..00000000000
--- a/virtual/ffmpeg/ffmpeg-9-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit multilib-build
-
-DESCRIPTION="Virtual package for FFmpeg implementation"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="X +encode gsm jpeg2k mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
-
-RDEPEND="
-	|| (
-		>=media-video/libav-9.12[${MULTILIB_USEDEP},X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
-		>=media-video/ffmpeg-1.2.6-r1:0[${MULTILIB_USEDEP},X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
-	)
-"

diff --git a/virtual/ffmpeg/ffmpeg-9.ebuild b/virtual/ffmpeg/ffmpeg-9.ebuild
deleted file mode 100644
index 07e8e7f6a9d..00000000000
--- a/virtual/ffmpeg/ffmpeg-9.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Virtual package for FFmpeg implementation"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="X +encode gsm jpeg2k mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
-
-RDEPEND="
-	|| (
-		>=media-video/libav-9[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
-		>=media-video/ffmpeg-1.0:0[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
-	)
-"

[gentoo-commits] repo/gentoo:master commit in: virtual/ffmpeg/

[Aaron Bauman]

commit:     95ff06c36cd9a8d32fe64b7b0e5acceb23015867
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Wed May 29 01:08:25 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed May 29 01:08:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ff06c3

virtual/ffmpeg: arm64 stable

Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.67, Repoman-2.3.13
RepoMan-Options: --include-arches="arm64"

 virtual/ffmpeg/ffmpeg-9-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/virtual/ffmpeg/ffmpeg-9-r2.ebuild b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
index f9b41e7f78b..84ec5b1a409 100644
--- a/virtual/ffmpeg/ffmpeg-9-r2.ebuild
+++ b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ DESCRIPTION="Virtual package for FFmpeg executable implementation"
 #	!libav? ( media-video/ffmpeg:0= )
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="X +encode gsm jpeg2k libav mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: virtual/ffmpeg/

[Kent Fredric]

commit:     2aebde0ed39f61b1324ea5efc7c5340803131da8
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 21 22:20:29 2020 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 23:13:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2aebde0e

virtual/ffmpeg: Drop x64-macos re bug #690140

Depends:
- media-video/ffmpeg
 - media-libs/x264
  - dev-lang/nasm
   - dev-perl/Font-TTF

Bug: https://bugs.gentoo.org/690140
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org>

 virtual/ffmpeg/ffmpeg-9-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virtual/ffmpeg/ffmpeg-9-r2.ebuild b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
index 2ba9728ada1..c0a3c3dc1ef 100644
--- a/virtual/ffmpeg/ffmpeg-9-r2.ebuild
+++ b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Virtual package for FFmpeg executable implementation"
 #	!libav? ( media-video/ffmpeg:0= )
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="X +encode gsm jpeg2k libav mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: virtual/ffmpeg/

[Kent Fredric]

commit:     8343df6f8d2a6d75c05d2b5f563a39f1882deda1
Author:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 04:27:53 2020 +0000
Commit:     Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 05:13:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8343df6f

virtual/ffmpeg: Drop x86-solaris re bug #690140

Depends:
- media-video/ffmpeg
 - net-misc/wget
  - dev-perl/IO-Socket-SSL

Bug: https://bugs.gentoo.org/690140
Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Kent Fredric <kentnl <AT> gentoo.org>

 virtual/ffmpeg/ffmpeg-9-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virtual/ffmpeg/ffmpeg-9-r2.ebuild b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
index c0a3c3dc1ef..ffcd5fe138b 100644
--- a/virtual/ffmpeg/ffmpeg-9-r2.ebuild
+++ b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Virtual package for FFmpeg executable implementation"
 #	!libav? ( media-video/ffmpeg:0= )
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="X +encode gsm jpeg2k libav mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
 
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: virtual/ffmpeg/

[Michał Górny]

commit:     8458d232c433916d271c34f97d59b1f80c5fb338
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  7 05:41:02 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Aug  7 05:41:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8458d232

virtual/ffmpeg: Remove stale USE=libav

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 virtual/ffmpeg/ffmpeg-9-r2.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/virtual/ffmpeg/ffmpeg-9-r2.ebuild b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
index ffcd5fe138b..2abb4da05df 100644
--- a/virtual/ffmpeg/ffmpeg-9-r2.ebuild
+++ b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
@@ -14,9 +14,8 @@ DESCRIPTION="Virtual package for FFmpeg executable implementation"
 
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="X +encode gsm jpeg2k libav mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
+IUSE="X +encode gsm jpeg2k mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
 
 RDEPEND="
-	libav? ( >=media-video/libav-9.12[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
-	!libav? ( >=media-video/ffmpeg-1.2.6-r1:0[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?] )
+	>=media-video/ffmpeg-1.2.6-r1:0[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
 "

[gentoo-commits] repo/gentoo:master commit in: virtual/ffmpeg/

[Michał Górny]

commit:     0e5b93b5315bdedab7c37f5bbe66b7fd60ba51ec
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 24 08:51:54 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 24 10:01:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e5b93b5

virtual/ffmpeg: Remove, all revdeps updated

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 virtual/ffmpeg/ffmpeg-9-r2.ebuild | 21 ---------------------
 virtual/ffmpeg/metadata.xml       | 10 ----------
 2 files changed, 31 deletions(-)

diff --git a/virtual/ffmpeg/ffmpeg-9-r2.ebuild b/virtual/ffmpeg/ffmpeg-9-r2.ebuild
deleted file mode 100644
index 2abb4da05df..00000000000
--- a/virtual/ffmpeg/ffmpeg-9-r2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Virtual package for FFmpeg executable implementation"
-
-# Please note that this virtual is only suited for packages that call
-# ffmpeg/avconv or one of the remaining executables. If your package
-# links to one of the libraries, you need to use the following
-# dependency instead (adding IUSE=libav):
-#	libav? ( media-video/libav:0= )
-#	!libav? ( media-video/ffmpeg:0= )
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="X +encode gsm jpeg2k mp3 opus sdl speex theora threads truetype vaapi vdpau x264"
-
-RDEPEND="
-	>=media-video/ffmpeg-1.2.6-r1:0[X?,encode?,gsm?,jpeg2k?,mp3?,opus?,sdl?,speex?,theora?,threads?,truetype?,vaapi?,vdpau?,x264?]
-"

diff --git a/virtual/ffmpeg/metadata.xml b/virtual/ffmpeg/metadata.xml
deleted file mode 100644
index 9638faee419..00000000000
--- a/virtual/ffmpeg/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>media-video@gentoo.org</email>
-</maintainer>
-<use>
-	<flag name="opus">Use the external opus library for encoding and decoding.</flag>
-</use>
-</pkgmetadata>