* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2020-11-26 23:31 Thomas Deutschmann
0 siblings, 0 replies; 93+ messages in thread
From: Thomas Deutschmann @ 2020-11-26 23:31 UTC (permalink / raw
To: gentoo-commits
commit: d32c67f64ceeb6b0d71ad9a9b6ba63a65a415d3b
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 26 23:30:03 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Nov 26 23:31:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d32c67f6
media-video/mplayer: x86 stable (bug #755650)
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-video/mplayer/mplayer-1.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index 12e39fc2ea0..e1b3a1217d9 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -150,7 +150,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2024-03-11 21:33 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2024-03-11 21:33 UTC (permalink / raw
To: gentoo-commits
commit: f58be0378c335bf9725621734555ca1cf87983f7
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Mar 11 20:54:14 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 21:31:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f58be037
media-video/mplayer: mark as LTO-unsafe
It is specifically a problem when used in combination with libass and
sse4 support, so limit our filtering.
Closes: https://bugs.gentoo.org/461634
Closes: https://bugs.gentoo.org/650458
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5_p20230215.ebuild | 5 +++++
media-video/mplayer/mplayer-1.5_p20230618.ebuild | 5 +++++
media-video/mplayer/mplayer-1.5_p20231206.ebuild | 5 +++++
media-video/mplayer/mplayer-9999.ebuild | 5 +++++
4 files changed, 20 insertions(+)
diff --git a/media-video/mplayer/mplayer-1.5_p20230215.ebuild b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
index 24111b326b98..ae49ee100092 100644
--- a/media-video/mplayer/mplayer-1.5_p20230215.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
@@ -263,6 +263,11 @@ src_prepare() {
}
src_configure() {
+ # undefined reference to `sse_int32_map_factor' etc
+ # https://bugs.gentoo.org/650458
+ # https://trac.mplayerhq.hu/ticket/2408
+ use libass && use cpu_flags_x86_sse4_1 && filter-lto
+
local myconf=()
local uses i
diff --git a/media-video/mplayer/mplayer-1.5_p20230618.ebuild b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
index 7d993f709bce..60e8cf3cc9e3 100644
--- a/media-video/mplayer/mplayer-1.5_p20230618.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
@@ -270,6 +270,11 @@ src_prepare() {
}
src_configure() {
+ # undefined reference to `sse_int32_map_factor' etc
+ # https://bugs.gentoo.org/650458
+ # https://trac.mplayerhq.hu/ticket/2408
+ use libass && use cpu_flags_x86_sse4_1 && filter-lto
+
local myconf=()
local uses i
diff --git a/media-video/mplayer/mplayer-1.5_p20231206.ebuild b/media-video/mplayer/mplayer-1.5_p20231206.ebuild
index 61a74ddb2ad9..b7e9b5420e81 100644
--- a/media-video/mplayer/mplayer-1.5_p20231206.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20231206.ebuild
@@ -266,6 +266,11 @@ src_prepare() {
}
src_configure() {
+ # undefined reference to `sse_int32_map_factor' etc
+ # https://bugs.gentoo.org/650458
+ # https://trac.mplayerhq.hu/ticket/2408
+ use libass && use cpu_flags_x86_sse4_1 && filter-lto
+
local myconf=()
local uses i
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 61a74ddb2ad9..b7e9b5420e81 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -266,6 +266,11 @@ src_prepare() {
}
src_configure() {
+ # undefined reference to `sse_int32_map_factor' etc
+ # https://bugs.gentoo.org/650458
+ # https://trac.mplayerhq.hu/ticket/2408
+ use libass && use cpu_flags_x86_sse4_1 && filter-lto
+
local myconf=()
local uses i
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-12-06 8:32 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2023-12-06 8:32 UTC (permalink / raw
To: gentoo-commits
commit: e69018682821d282dcfa0c3161c0ea8359b795c5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 6 08:25:39 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 6 08:31:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6901868
media-video/mplayer: add 1.5_p20231206
Bug: https://bugs.gentoo.org/918113
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/Manifest | 1 +
...er-9999.ebuild => mplayer-1.5_p20231206.ebuild} | 23 +++++++++++++++-------
media-video/mplayer/mplayer-9999.ebuild | 23 +++++++++++++++-------
3 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 00ffd71a6226..7be42fef3422 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -3,3 +3,4 @@ DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de68
DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
DIST mplayer-1.5_p20230215.tar.xz 15454028 BLAKE2B 08012f9b955921d832ab268a6e52e22e018b669787ff5e1c1ac734bd85083138551ad1065d5e4f5f9c977b804f8135ee89d2fd0590fb7228d4916b458cc58efa SHA512 f93d222817ff59ac7708956d6e8d5e9ee2084b4e724f66ea9fe4ffd477b864c2d0546d8df97511d499495ee446239645216a1e027d70eed434a3c64331f5ac73
DIST mplayer-1.5_p20230618.tar.xz 15101476 BLAKE2B 74f1d2d579c83330d8bf1e1ce2a89592f62142f361ff0e4107710c80de4351a5807e344869cb55ff5b5856efaedb6cfe242483f8e7f97521b805f84ca23e3818 SHA512 874e76b3edfccb7475349d954ed49860f92a5e99f0374084f5da53af35326365bb064c460fb6527d2fb6d8ae20d9e059ba197f45d4de42bc7a78992b5191a7cb
+DIST mplayer-1.5_p20231206.tar.xz 15212032 BLAKE2B c4658a0070296a9e24bb8388787a2ef322fefad4f4ea095bbf3f95b20f2e32b0423814ae311e43c9a6ef20afe0970540abd5d6d0ae0ebd59df74a8beb7abe3df SHA512 480502c735fb8d24ea1761a2b3f7daf1872df268f44791c7141f5b444b583beb0e4ecebe94e04129d27aae27656baddfb2da50406a431f1df39c589baac69432
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-1.5_p20231206.ebuild
similarity index 96%
copy from media-video/mplayer/mplayer-9999.ebuild
copy to media-video/mplayer/mplayer-1.5_p20231206.ebuild
index 8abf788096fd..59ad25c596aa 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20231206.ebuild
@@ -36,12 +36,15 @@ SRC_URI="
!truetype? ( ${FONT_URI} )
"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE+=" cpu_flags_x86_fma3 cpu_flags_x86_fma4"
IUSE+=" cpu_flags_x86_mmx cpu_flags_x86_mmxext"
IUSE+=" cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1"
IUSE+=" cpu_flags_x86_sse4_2 cpu_flags_x86_xop"
IUSE+=" cpu_flags_x86_3dnow cpu_flags_x86_3dnowext"
+IUSE+=" cpu_flags_arm_thumb cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3"
+IUSE+=" cpu_flags_arm_iwmmxt"
IUSE+=" cpu_flags_ppc_altivec"
IUSE+=" a52 aalib +alsa aqua bidi bl bluray"
@@ -150,7 +153,7 @@ DEPEND="
xinerama? ( x11-base/xorg-proto )
xscreensaver? ( x11-base/xorg-proto )
"
-ASM_DEP="dev-lang/yasm"
+ASM_DEP="dev-lang/nasm"
BDEPEND="
virtual/pkgconfig
amd64? ( ${ASM_DEP} )
@@ -461,15 +464,21 @@ src_configure() {
# Platform specific flags, hardcoded on amd64 (see below)
use cpudetection && myconf+=( --enable-runtime-cpudetection )
- # TODO: refresh this list
- uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop"
- for i in ${uses}; do
+ local x86_uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop"
+ for i in ${x86_uses}; do
myconf+=( $(use_enable cpu_flags_x86_${i} ${i}) )
done
- myconf+=( $(use_enable cpu_flags_x86_sse4_1 sse4) )
- myconf+=( $(use_enable cpu_flags_x86_sse4_2 sse42) )
+ myconf+=(
+ $(use_enable cpu_flags_x86_sse4_1 sse4)
+ $(use_enable cpu_flags_x86_sse4_2 sse42)
+ )
myconf+=(
+ $(use_enable cpu_flags_arm_iwmmxt iwmmxt)
+ $(use_enable cpu_flags_arm_thumb thumb)
+ $(use_enable cpu_flags_arm_neon neon)
+ $(use_enable cpu_flags_arm_vfp armvfp)
+ $(use_enable cpu_flags_arm_vfpv3 vfpv3)
$(use_enable cpu_flags_ppc_altivec altivec)
$(use_enable shm)
)
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 8abf788096fd..59ad25c596aa 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -36,12 +36,15 @@ SRC_URI="
!truetype? ( ${FONT_URI} )
"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE+=" cpu_flags_x86_fma3 cpu_flags_x86_fma4"
IUSE+=" cpu_flags_x86_mmx cpu_flags_x86_mmxext"
IUSE+=" cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1"
IUSE+=" cpu_flags_x86_sse4_2 cpu_flags_x86_xop"
IUSE+=" cpu_flags_x86_3dnow cpu_flags_x86_3dnowext"
+IUSE+=" cpu_flags_arm_thumb cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3"
+IUSE+=" cpu_flags_arm_iwmmxt"
IUSE+=" cpu_flags_ppc_altivec"
IUSE+=" a52 aalib +alsa aqua bidi bl bluray"
@@ -150,7 +153,7 @@ DEPEND="
xinerama? ( x11-base/xorg-proto )
xscreensaver? ( x11-base/xorg-proto )
"
-ASM_DEP="dev-lang/yasm"
+ASM_DEP="dev-lang/nasm"
BDEPEND="
virtual/pkgconfig
amd64? ( ${ASM_DEP} )
@@ -461,15 +464,21 @@ src_configure() {
# Platform specific flags, hardcoded on amd64 (see below)
use cpudetection && myconf+=( --enable-runtime-cpudetection )
- # TODO: refresh this list
- uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop"
- for i in ${uses}; do
+ local x86_uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop"
+ for i in ${x86_uses}; do
myconf+=( $(use_enable cpu_flags_x86_${i} ${i}) )
done
- myconf+=( $(use_enable cpu_flags_x86_sse4_1 sse4) )
- myconf+=( $(use_enable cpu_flags_x86_sse4_2 sse42) )
+ myconf+=(
+ $(use_enable cpu_flags_x86_sse4_1 sse4)
+ $(use_enable cpu_flags_x86_sse4_2 sse42)
+ )
myconf+=(
+ $(use_enable cpu_flags_arm_iwmmxt iwmmxt)
+ $(use_enable cpu_flags_arm_thumb thumb)
+ $(use_enable cpu_flags_arm_neon neon)
+ $(use_enable cpu_flags_arm_vfp armvfp)
+ $(use_enable cpu_flags_arm_vfpv3 vfpv3)
$(use_enable cpu_flags_ppc_altivec altivec)
$(use_enable shm)
)
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-12-05 20:56 Arthur Zamarin
0 siblings, 0 replies; 93+ messages in thread
From: Arthur Zamarin @ 2023-12-05 20:56 UTC (permalink / raw
To: gentoo-commits
commit: 0045fa2b4828447d64687e01cfee101f7c22680e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 5 20:55:51 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 5 20:55:51 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0045fa2b
media-video/mplayer: Stabilize 1.5_p20230618 ppc, #914719
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5_p20230618.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.5_p20230618.ebuild b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
index a7b9e7ac6ab0..3acf8571df98 100644
--- a/media-video/mplayer/mplayer-1.5_p20230618.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
@@ -169,7 +169,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-09-27 8:02 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2023-09-27 8:02 UTC (permalink / raw
To: gentoo-commits
commit: f8e7cc10eb0fa3ebb35f022e318dbd2496e5069f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 08:02:09 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 27 08:02:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8e7cc10
media-video/mplayer: Stabilize 1.5_p20230618 arm, #914719
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5_p20230618.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.5_p20230618.ebuild b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
index 1564b70b3c92..a7b9e7ac6ab0 100644
--- a/media-video/mplayer/mplayer-1.5_p20230618.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
@@ -169,7 +169,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-09-26 0:54 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2023-09-26 0:54 UTC (permalink / raw
To: gentoo-commits
commit: b21a4ad688b74e6798286b24099566e89ad42a05
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 00:54:33 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 00:54:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21a4ad6
media-video/mplayer: Stabilize 1.5_p20230618 x86, #914719
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5_p20230618.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.5_p20230618.ebuild b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
index 4bd2a3c2dea4..1564b70b3c92 100644
--- a/media-video/mplayer/mplayer-1.5_p20230618.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
@@ -169,7 +169,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-09-25 23:08 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2023-09-25 23:08 UTC (permalink / raw
To: gentoo-commits
commit: 65a5600e2c6f98284a7da64efe1d18d7004a7e9a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 23:08:14 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 23:08:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65a5600e
media-video/mplayer: Stabilize 1.5_p20230618 ppc64, #914719
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5_p20230618.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.5_p20230618.ebuild b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
index 11804e5543e4..4bd2a3c2dea4 100644
--- a/media-video/mplayer/mplayer-1.5_p20230618.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
@@ -169,7 +169,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-09-25 22:48 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2023-09-25 22:48 UTC (permalink / raw
To: gentoo-commits
commit: 199b5a81103d37cf5bd4d1aed45b04e0641b0bee
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 22:48:02 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 22:48:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=199b5a81
media-video/mplayer: Stabilize 1.5_p20230618 amd64, #914719
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5_p20230618.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.5_p20230618.ebuild b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
index 7f503efeaf49..11804e5543e4 100644
--- a/media-video/mplayer/mplayer-1.5_p20230618.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
@@ -169,7 +169,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-06-18 21:05 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2023-06-18 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 86b79f2f09384512b5467ab67804716ec8a1e30e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 19:57:46 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 21:04:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b79f2f
media-video/mplayer: add 1.5_p20230618
Bug: https://bugs.gentoo.org/888821
Bug: https://bugs.gentoo.org/908553
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/Manifest | 1 +
...er-9999.ebuild => mplayer-1.5_p20230618.ebuild} | 26 +++++++++++++++-------
media-video/mplayer/mplayer-9999.ebuild | 7 +++---
3 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index ff9e526a0f68..00ffd71a6226 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -2,3 +2,4 @@ DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e
DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
DIST mplayer-1.5_p20230215.tar.xz 15454028 BLAKE2B 08012f9b955921d832ab268a6e52e22e018b669787ff5e1c1ac734bd85083138551ad1065d5e4f5f9c977b804f8135ee89d2fd0590fb7228d4916b458cc58efa SHA512 f93d222817ff59ac7708956d6e8d5e9ee2084b4e724f66ea9fe4ffd477b864c2d0546d8df97511d499495ee446239645216a1e027d70eed434a3c64331f5ac73
+DIST mplayer-1.5_p20230618.tar.xz 15101476 BLAKE2B 74f1d2d579c83330d8bf1e1ce2a89592f62142f361ff0e4107710c80de4351a5807e344869cb55ff5b5856efaedb6cfe242483f8e7f97521b805f84ca23e3818 SHA512 874e76b3edfccb7475349d954ed49860f92a5e99f0374084f5da53af35326365bb064c460fb6527d2fb6d8ae20d9e059ba197f45d4de42bc7a78992b5191a7cb
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
similarity index 95%
copy from media-video/mplayer/mplayer-9999.ebuild
copy to media-video/mplayer/mplayer-1.5_p20230618.ebuild
index b686cded65a2..7f503efeaf49 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230618.ebuild
@@ -36,12 +36,15 @@ SRC_URI="
!truetype? ( ${FONT_URI} )
"
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4"
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2"
+IUSE+=" cpu_flags_x86_fma3 cpu_flags_x86_fma4"
IUSE+=" cpu_flags_x86_mmx cpu_flags_x86_mmxext"
IUSE+=" cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1"
IUSE+=" cpu_flags_x86_sse4_2 cpu_flags_x86_xop"
IUSE+=" cpu_flags_x86_3dnow cpu_flags_x86_3dnowext"
+IUSE+=" cpu_flags_arm_thumb cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3"
+IUSE+=" cpu_flags_arm_iwmmxt"
IUSE+=" cpu_flags_ppc_altivec"
IUSE+=" a52 aalib +alsa aqua bidi bl bluray"
@@ -121,7 +124,7 @@ RDEPEND="
opengl? ( virtual/opengl )
png? ( media-libs/libpng:= )
pnm? ( media-libs/netpbm )
- pulseaudio? ( media-libs/libpulse )
+ pulseaudio? ( media-sound/pulseaudio )
rar? (
|| (
app-arch/unrar
@@ -268,7 +271,7 @@ src_configure() {
# Set LINGUAS
[[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/da/dk}"
- [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+ [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/zh/zh_CN}" # bug #482968
# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
# compilation in almost every situation. The reason for this is
@@ -461,14 +464,21 @@ src_configure() {
# Platform specific flags, hardcoded on amd64 (see below)
use cpudetection && myconf+=( --enable-runtime-cpudetection )
- uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop"
- for i in ${uses}; do
+ local x86_uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop"
+ for i in ${x86_uses}; do
myconf+=( $(use_enable cpu_flags_x86_${i} ${i}) )
done
- myconf+=( $(use_enable cpu_flags_x86_sse4_1 sse4) )
- myconf+=( $(use_enable cpu_flags_x86_sse4_2 sse42) )
+ myconf+=(
+ $(use_enable cpu_flags_x86_sse4_1 sse4)
+ $(use_enable cpu_flags_x86_sse4_2 sse42)
+ )
myconf+=(
+ $(use_enable cpu_flags_arm_iwmmxt iwmmxt)
+ $(use_enable cpu_flags_arm_thumb thumb)
+ $(use_enable cpu_flags_arm_neon neon)
+ $(use_enable cpu_flags_arm_vfp armvfp)
+ $(use_enable cpu_flags_arm_vfpv3 vfpv3)
$(use_enable cpu_flags_ppc_altivec altivec)
$(use_enable shm)
)
@@ -603,7 +613,7 @@ src_install() {
_EOF_
fi
- # bug 256203
+ # bug #256203
if use rar; then
cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_
unrarexec=${EPREFIX}/usr/bin/unrar
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index b686cded65a2..8abf788096fd 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -121,7 +121,7 @@ RDEPEND="
opengl? ( virtual/opengl )
png? ( media-libs/libpng:= )
pnm? ( media-libs/netpbm )
- pulseaudio? ( media-libs/libpulse )
+ pulseaudio? ( media-sound/pulseaudio )
rar? (
|| (
app-arch/unrar
@@ -268,7 +268,7 @@ src_configure() {
# Set LINGUAS
[[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/da/dk}"
- [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+ [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/zh/zh_CN}" # bug #482968
# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
# compilation in almost every situation. The reason for this is
@@ -461,6 +461,7 @@ src_configure() {
# Platform specific flags, hardcoded on amd64 (see below)
use cpudetection && myconf+=( --enable-runtime-cpudetection )
+ # TODO: refresh this list
uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop"
for i in ${uses}; do
myconf+=( $(use_enable cpu_flags_x86_${i} ${i}) )
@@ -603,7 +604,7 @@ src_install() {
_EOF_
fi
- # bug 256203
+ # bug #256203
if use rar; then
cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_
unrarexec=${EPREFIX}/usr/bin/unrar
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-06-18 19:30 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2023-06-18 19:30 UTC (permalink / raw
To: gentoo-commits
commit: 94448bc85d0a2fa38a1aff4cdac8f1be13961ded
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 18 19:29:55 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 18 19:30:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94448bc8
media-video/mplayer: drop 1.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/Manifest | 1 -
media-video/mplayer/mplayer-1.5.ebuild | 628 ---------------------------------
2 files changed, 629 deletions(-)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 9fb82b326254..ff9e526a0f68 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,3 @@
-DIST MPlayer-1.5.tar.xz 15379972 BLAKE2B 33c09025a9c521e1bc09a50fabb04e89493cbc4117afb3d5769e17b7dd621e44441a8d9f5a3cce2316c781ed701131a966abb02d64976adee9e5f40b7b475e7f SHA512 05fe1edf23cec53be676333b6299df4b3f1ee746e5ccd96dc0bed550e7a1602ba7ba182c1cc23fcac67aacde849a46628b1dcab8ee3d3d4117415c11b6a6ad74
DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
diff --git a/media-video/mplayer/mplayer-1.5.ebuild b/media-video/mplayer/mplayer-1.5.ebuild
deleted file mode 100644
index 4f171b4f094c..000000000000
--- a/media-video/mplayer/mplayer-1.5.ebuild
+++ /dev/null
@@ -1,628 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo toolchain-funcs flag-o-matic
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
- ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
- RELEASE_URI=""
-
- inherit subversion git-r3
-elif [[ "${PV%_rc*}" == "${PV}" && "${PV%_pre*}" == "${PV}" ]]; then
- MY_P="MPlayer-${PV}"
- S="${WORKDIR}/${MY_P}"
- RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
- RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-
-FONT_URI="
- mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-SRC_URI="
- ${RELEASE_URI}
- !truetype? ( ${FONT_URI} )
-"
-
-IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4"
-IUSE+=" cpu_flags_x86_mmx cpu_flags_x86_mmxext"
-IUSE+=" cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1"
-IUSE+=" cpu_flags_x86_sse4_2 cpu_flags_x86_xop"
-IUSE+=" cpu_flags_x86_3dnow cpu_flags_x86_3dnowext"
-
-IUSE+=" cpu_flags_ppc_altivec"
-
-IUSE+=" a52 aalib +alsa aqua bidi bl bluray"
-IUSE+=" bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon"
-IUSE+=" ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum"
-IUSE+=" mng mp3 nas +network openal opengl +osdmenu oss png pnm pulseaudio pvr"
-IUSE+=" radio rar rtc rtmp samba selinux +shm sdl speex"
-IUSE+=" tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix"
-IUSE+=" vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
-
-VIDEO_CARDS="mga"
-for x in ${VIDEO_CARDS}; do
- IUSE+=" video_cards_${x}"
-done
-
-FONT_RDEPS="
- media-libs/fontconfig
- >=media-libs/freetype-2.2.1:2
- virtual/ttf-fonts
-"
-X_RDEPS="
- x11-libs/libXext
- x11-libs/libXxf86vm
-"
-# - RAR: although -gpl version is nice, it can't do most functions normal rars can
-# nemesi? ( net-libs/libnemesi )
-# - mplayer relies on private APIs in giflib that have been removed:
-# https://sourceforge.net/p/giflib/bugs/132/
-# - depends on <ffmpeg-5 for bug #876760, a snapshot may help though.
-RDEPEND="
- app-arch/bzip2
- <media-video/ffmpeg-5:=[vdpau?]
- sys-libs/ncurses:=
- sys-libs/zlib
- a52? ( media-libs/a52dec )
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- bidi? ( dev-libs/fribidi )
- bluray? ( >=media-libs/libbluray-0.2.1:= )
- bs2b? ( media-libs/libbs2b )
- cdio? (
- dev-libs/libcdio:=
- dev-libs/libcdio-paranoia
- )
- cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
- dga? ( x11-libs/libXxf86dga )
- dts? ( media-libs/libdca )
- dv? ( media-libs/libdv )
- dvd? ( >=media-libs/libdvdread-4.1.3:= )
- dvdnav? ( >=media-libs/libdvdnav-4.1.3:= )
- encode? (
- !twolame? ( toolame? ( media-sound/toolame ) )
- twolame? ( media-sound/twolame )
- faac? ( media-libs/faac )
- mp3? ( media-sound/lame )
- x264? ( >=media-libs/x264-0.0.20100423:= )
- xvid? ( media-libs/xvid )
- )
- enca? ( app-i18n/enca )
- faad? ( media-libs/faad2 )
- ggi? ( media-libs/libggi media-libs/libggiwmh )
- gsm? ( media-sound/gsm )
- iconv? ( virtual/libiconv )
- jack? ( virtual/jack )
- jpeg? ( media-libs/libjpeg-turbo:= )
- ladspa? ( media-libs/ladspa-sdk )
- libass? ( >=media-libs/libass-0.9.10:= )
- libcaca? ( media-libs/libcaca )
- libmpeg2? ( media-libs/libmpeg2 )
- lirc? ( app-misc/lirc )
- live? ( media-plugins/live )
- lzo? ( >=dev-libs/lzo-2 )
- mad? ( media-libs/libmad )
- mng? ( media-libs/libmng:= )
- mp3? ( media-sound/mpg123 )
- nas? ( media-libs/nas )
- openal? ( media-libs/openal )
- opengl? ( virtual/opengl )
- png? ( media-libs/libpng:= )
- pnm? ( media-libs/netpbm )
- pulseaudio? ( media-sound/pulseaudio )
- rar? (
- || (
- app-arch/unrar
- app-arch/rar
- )
- )
- rtmp? ( media-video/rtmpdump )
- samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl )
- speex? ( media-libs/speex )
- theora? ( media-libs/libtheora[encode?] )
- tremor? ( media-libs/tremor )
- truetype? ( ${FONT_RDEPS} )
- vdpau? ( x11-libs/libvdpau )
- vorbis? ( !tremor? ( media-libs/libvorbis ) )
- X? ( ${X_RDEPS} )
- xinerama? ( x11-libs/libXinerama )
- xscreensaver? ( x11-libs/libXScrnSaver )
- xv? ( x11-libs/libXv )
-"
-DEPEND="
- ${RDEPEND}
- dga? ( x11-base/xorg-proto )
- dvb? ( virtual/linuxtv-dvb-headers )
- X? ( x11-base/xorg-proto )
- xinerama? ( x11-base/xorg-proto )
- xscreensaver? ( x11-base/xorg-proto )
-"
-ASM_DEP="dev-lang/yasm"
-BDEPEND="
- virtual/pkgconfig
- amd64? ( ${ASM_DEP} )
- doc? (
- app-text/docbook-xml-dtd
- app-text/docbook-xsl-stylesheets
- dev-libs/libxslt
- )
- x86? ( ${ASM_DEP} )
-"
-RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-REQUIRED_USE="
- dga? ( X )
- dvdnav? ( dvd )
- enca? ( iconv )
- ggi? ( X )
- libass? ( truetype )
- opengl? ( X )
- osdmenu? ( X )
- truetype? ( iconv )
- vdpau? ( X )
- vidix? ( X )
- xinerama? ( X )
- xscreensaver? ( X )
- xv? ( X )"
-RESTRICT="faac? ( bindist )"
-
-pkg_setup() {
- if [[ ${PV} == *9999* ]]; then
- elog
- elog "This is a live ebuild which installs the latest from upstream's"
- elog "subversion repository, and is unsupported by Gentoo."
- elog "Everything but bugs in the ebuild itself will be ignored."
- elog
- fi
-
- if use cpudetection; then
- ewarn
- ewarn "You've enabled the cpudetection flag. This feature is"
- ewarn "included mainly for people who want to use the same"
- ewarn "binary on another system with a different CPU architecture."
- ewarn "MPlayer will already detect your CPU settings by default at"
- ewarn "buildtime; this flag is used for runtime detection."
- ewarn "You won't need this turned on if you are only building"
- ewarn "mplayer for this system. Also, if your compile fails, try"
- ewarn "disabling this use flag."
- fi
-}
-
-src_unpack() {
- if [[ ${PV} == *9999* ]]; then
- subversion_src_unpack
-
- cd "${WORKDIR}" || die
- rm -rf "${WORKDIR}/${P}/ffmpeg/" || die
- ( EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/ffmpeg/" git-r3_src_unpack )
- else
- unpack ${A}
- fi
-
- if [[ ${PV} == *9999* || "${PV%_rc*}" == "${PV}" ]]; then
- cd "${S}" || die
- cp "${FILESDIR}/dump_ffmpeg.sh" . || die
- chmod +x dump_ffmpeg.sh || die
- ./dump_ffmpeg.sh
- fi
-
- if ! use truetype; then
- unpack font-arial-iso-8859-1.tar.bz2 \
- font-arial-iso-8859-2.tar.bz2 \
- font-arial-cp1250.tar.bz2
- fi
-}
-
-src_prepare() {
- default
-
- local svf=snapshot_version
- if [[ ${PV} == *9999* ]]; then
- # Set SVN version manually
- subversion_wc_info
- printf "${ESVN_WC_REVISION}" > ${svf} || die
- fi
-
- if [[ ! -f VERSION ]]; then
- [[ -f "${svf}" ]] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
-
- local sv=$(<${svf})
- printf "SVN-r${sv} (Gentoo)" > VERSION || die
- fi
-
- # Fix path to bash executable in configure scripts
- sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
- # Use sane default for >=virtual/udev-197
- sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-}
-
-src_configure() {
- local myconf=()
- local uses i
-
- # Set LINGUAS
- [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/da/dk}"
- [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
- # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
- # compilation in almost every situation. The reason for this is
- # because if --enable is used, it will force the build of that option,
- # regardless of whether the dependency is available or not.
-
- #####################
- # Optional features #
- #####################
- # Disable svga since we don't want it
- # Disable arts since we don't have kde3
- # Always disable internal ass
- # Disable opus and ilbc since it only controls support in internal
- # ffmpeg which we do not use
- myconf+=(
- --disable-arts
- --disable-ass-internal
- --disable-directfb
- --disable-kai
- --disable-libilbc
- --disable-libnut
- --disable-libopus
- --disable-svga --disable-svgalib_helper
- --disable-xvmc
- $(use_enable network networking)
- $(use_enable joystick)
- )
-
- uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
- myconf+=( --disable-nemesi ) # nemesi automagic disable
- for i in ${uses}; do
- use ${i} || myconf+=( --disable-${i} )
- done
- use bidi || myconf+=( --disable-fribidi )
- use ipv6 || myconf+=( --disable-inet6 )
- use libass || myconf+=( --disable-ass )
- use rar || myconf+=( --disable-unrarexec )
- use samba || myconf+=( --disable-smb )
- use lirc || myconf+=( --disable-lirc --disable-lircc --disable-apple-ir )
-
- # libcdio support: prefer libcdio over cdparanoia
- # don't check for cddb w/cdio
- if use cdio; then
- myconf+=( --disable-cdparanoia )
- else
- myconf+=( --disable-libcdio )
- use cdparanoia || myconf+=( --disable-cdparanoia )
- use cddb || myconf+=( --disable-cddb )
- fi
-
- ################################
- # DVD read, navigation support #
- ################################
- #
- # dvdread - accessing a DVD
- # dvdnav - navigation of menus
- use dvd || myconf+=( --disable-dvdread )
- use dvdnav || myconf+=( --disable-dvdnav )
-
- #############
- # Subtitles #
- #############
- #
- # SRT/ASS/SSA (subtitles) requires freetype support
- # freetype support requires iconv
- # iconv optionally can use unicode
- use truetype || myconf+=( --disable-freetype )
- use iconv || myconf+=( --disable-iconv --charset=noconv )
- use iconv && use unicode && myconf+=( --charset=UTF-8 )
-
- #####################################
- # DVB / Video4Linux / Radio support #
- #####################################
- myconf+=( --disable-tv-bsdbt848 )
- # gone since linux-headers-2.6.38
- myconf+=( --disable-tv-v4l1 )
- if { use dvb || use v4l || use pvr || use radio; }; then
- use dvb || myconf+=( --disable-dvb )
- use pvr || myconf+=( --disable-pvr )
- use v4l || myconf+=( --disable-tv-v4l2 )
- if use radio && { use dvb || use v4l; }; then
- myconf+=(
- --enable-radio
- $(use_enable encode radio-capture)
- )
- else
- myconf+=(
- --disable-radio-v4l2
- --disable-radio-bsdbt848
- )
- fi
- else
- myconf+=(
- --disable-tv
- --disable-tv-v4l2
- --disable-radio
- --disable-radio-v4l2
- --disable-radio-bsdbt848
- --disable-dvb
- --disable-v4l2
- --disable-pvr
- )
- fi
-
- ##########
- # Codecs #
- ##########
- myconf+=( --disable-musepack ) # Use internal musepack codecs for SV7 and SV8 support
- myconf+=( --disable-libmpeg2-internal ) # always use system media-libs/libmpeg2
- myconf+=( --disable-gif ) # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/
- use dts || myconf+=( --disable-libdca )
- if ! use mp3; then
- myconf+=(
- --disable-mp3lame
- --disable-mpg123
- )
- fi
- uses="a52 bs2b dv gsm lzo rtmp vorbis"
- for i in ${uses}; do
- use ${i} || myconf+=( --disable-lib${i} )
- done
-
- uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
- for i in ${uses}; do
- use ${i} || myconf+=( --disable-${i} )
- done
- # Pulls an outdated libopenjpeg, ffmpeg provides better support for it
- myconf+=( --disable-libopenjpeg )
-
- # Encoding
- uses="faac x264 xvid toolame twolame"
- if use encode; then
- for i in ${uses}; do
- use ${i} || myconf+=( --disable-${i} )
- done
- else
- myconf+=( --disable-mencoder )
- for i in ${uses}; do
- myconf+=( --disable-${i} )
- use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
- done
- fi
-
- #################
- # Binary codecs #
- #################
- myconf+=( --disable-qtx --disable-real --disable-win32dll )
-
- ################
- # Video Output #
- ################
- uses="md5sum sdl yuv4mpeg"
- for i in ${uses}; do
- use ${i} || myconf+=( --disable-${i} )
- done
- use aalib || myconf+=( --disable-aa )
- use fbcon || myconf+=( --disable-fbdev )
- use libcaca || myconf+=( --disable-caca )
- use zoran || myconf+=( --disable-zr )
-
- if ! use kernel_linux || ! use video_cards_mga; then
- myconf+=( --disable-mga --disable-xmga )
- fi
-
- myconf+=(
- --disable-3dfx
- --disable-tdfxvid
- --disable-tdfxfb
- )
-
- # sun card, disable by default, see bug #258729
- myconf+=( --disable-xvr100 )
-
- ################
- # Audio Output #
- ################
- myconf+=( --disable-esd )
- uses="alsa jack ladspa nas openal"
- for i in ${uses}; do
- use ${i} || myconf+=( --disable-${i} )
- done
- use pulseaudio || myconf+=( --disable-pulse )
- if ! use radio; then
- use oss || myconf+=( --disable-ossaudio )
- fi
-
- ####################
- # Advanced Options #
- ####################
- # Platform specific flags, hardcoded on amd64 (see below)
- use cpudetection && myconf+=( --enable-runtime-cpudetection )
-
- uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop"
- for i in ${uses}; do
- myconf+=( $(use_enable cpu_flags_x86_${i} ${i}) )
- done
- myconf+=( $(use_enable cpu_flags_x86_sse4_1 sse4) )
- myconf+=( $(use_enable cpu_flags_x86_sse4_2 sse42) )
-
- myconf+=(
- $(use_enable cpu_flags_ppc_altivec altivec)
- $(use_enable shm)
- )
-
- use debug && myconf+=( --enable-debug=3 )
-
- if use x86 && gcc-specs-pie; then
- filter-flags -fPIC -fPIE
- append-ldflags -nopie
- fi
-
- ###########################
- # X enabled configuration #
- ###########################
- myconf+=( --disable-gui )
- myconf+=( --disable-vesa )
- uses="ggi vdpau xinerama xv"
- for i in ${uses}; do
- use ${i} || myconf+=( --disable-${i} )
- done
- use dga || myconf+=( --disable-dga1 --disable-dga2 )
- use opengl || myconf+=( --disable-gl )
- use osdmenu && myconf+=( --enable-menu )
- use vidix || myconf+=( --disable-vidix --disable-vidix-pcidb )
- use xscreensaver || myconf+=( --disable-xss )
- use X || myconf+=( --disable-x11 )
-
- ############################
- # OSX (aqua) configuration #
- ############################
- if use aqua; then
- myconf+=(
- --enable-macosx-finder
- --enable-macosx-bundle
- )
- fi
-
- # Note: --enable-gnutls only makes sense with --enable-ffmpeg_a
- edo ./configure \
- --cc="$(tc-getCC)" \
- --host-cc="$(tc-getBUILD_CC)" \
- --prefix="${EPREFIX}/usr" \
- --bindir="${EPREFIX}/usr/bin" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --confdir="${EPREFIX}/etc/mplayer" \
- --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
- --mandir="${EPREFIX}/usr/share/man" \
- --disable-ffmpeg_a \
- --disable-gnutls \
- "${myconf[@]}"
-}
-
-src_compile() {
- default
-
- # Build only user-requested docs if they're available.
- if use doc ; then
- # Select available languages from ${LINGUAS}
- local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
- local BUILT_DOCS=()
- local i
-
- for i in ${LINGUAS} ; do
- has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=( ${i} )
- done
-
- if [[ -z ${BUILT_DOCS[@]} ]]; then
- emake -j1 html-chunked
- else
- for i in ${BUILT_DOCS[@]}; do
- emake -j1 html-chunked-${i}
- done
- fi
- fi
-}
-
-src_install() {
- local i
-
- emake \
- DESTDIR="${D}" \
- INSTALLSTRIP="" \
- install
-
- dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
- docinto tech/
- dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
- docinto TOOLS/
- dodoc -r TOOLS/*
- docinto tech/mirrors/
- dodoc DOCS/tech/mirrors/*
-
- if use doc; then
- docinto html/
- dodoc -r "${S}"/DOCS/HTML/*
- fi
-
- if ! use truetype; then
- dodir /usr/share/mplayer/fonts
-
- # Do this generic, as the mplayer people like to change the structure
- # of their zips ...
- local i
- for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
- cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
- done
-
- # Fix the font symlink ...
- rm -rf "${ED}/usr/share/mplayer/font"
- dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
- fi
-
- insinto /etc/mplayer
- newins "${S}/etc/example.conf" mplayer.conf
- cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_
- # Config options can be section specific, global
- # options should go in the default section
- [default]
- _EOF_
-
- doins "${S}/etc/input.conf"
- if use osdmenu; then
- doins "${S}/etc/menu.conf"
- fi
-
- if use truetype; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_
- fontconfig=1
- subfont-osd-scale=4
- subfont-text-scale=3
- _EOF_
- fi
-
- # bug 256203
- if use rar; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_
- unrarexec=${EPREFIX}/usr/bin/unrar
- _EOF_
- fi
-
- dosym -r /etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
- newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
- [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
- rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
- # Cleanup stale symlinks
- [[ -L "${EROOT}/usr/share/mplayer/font" &&
- ! -e "${EROOT}/usr/share/mplayer/font" ]] && \
- rm -f "${EROOT}/usr/share/mplayer/font"
-
- [[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" &&
- ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ]] && \
- rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-06-01 16:43 Arthur Zamarin
0 siblings, 0 replies; 93+ messages in thread
From: Arthur Zamarin @ 2023-06-01 16:43 UTC (permalink / raw
To: gentoo-commits
commit: 7b1d190102bc5b4ab42c46337484b3b6c5eaac05
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 1 16:42:34 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 1 16:42:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1d1901
media-video/mplayer: Stabilize 1.5_p20230215 amd64, #907574
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5_p20230215.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.5_p20230215.ebuild b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
index 31b6e932c741..02a665bdb3cb 100644
--- a/media-video/mplayer/mplayer-1.5_p20230215.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
@@ -166,7 +166,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-06-01 7:33 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2023-06-01 7:33 UTC (permalink / raw
To: gentoo-commits
commit: 02b002a0c79b157a83235ce99aa8d37483189a50
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 1 07:29:05 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 1 07:32:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b002a0
media-video/mplayer: Stabilize 1.5_p20230215 ppc, #907574
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5_p20230215.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.5_p20230215.ebuild b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
index 28c56025d948..d6bc5e5f9ad6 100644
--- a/media-video/mplayer/mplayer-1.5_p20230215.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
@@ -166,7 +166,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-06-01 7:24 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2023-06-01 7:24 UTC (permalink / raw
To: gentoo-commits
commit: 2e23687ba23f0777e30ba166de64ee88250ad30a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 1 07:24:28 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 1 07:24:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e23687b
media-video/mplayer: Stabilize 1.5_p20230215 ppc64, #907574
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5_p20230215.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.5_p20230215.ebuild b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
index 31de25e10b42..28c56025d948 100644
--- a/media-video/mplayer/mplayer-1.5_p20230215.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
@@ -166,7 +166,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-05-29 13:11 Andreas Sturmlechner
0 siblings, 0 replies; 93+ messages in thread
From: Andreas Sturmlechner @ 2023-05-29 13:11 UTC (permalink / raw
To: gentoo-commits
commit: a56df0e40157d9023b38756083b01aebe4765308
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 09:29:02 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 29 13:10:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a56df0e4
media-video/mplayer: Switch IUSE=pulseaudio to media-libs/libpulse
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-video/mplayer/mplayer-9999.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 31de25e10b42..b686cded65a2 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -121,7 +121,7 @@ RDEPEND="
opengl? ( virtual/opengl )
png? ( media-libs/libpng:= )
pnm? ( media-libs/netpbm )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-libs/libpulse )
rar? (
|| (
app-arch/unrar
^ permalink raw reply related [flat|nested] 93+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-02-27 0:20 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2023-02-27 0:20 UTC (permalink / raw
To: gentoo-commits
commit: 2566c84b1919e75accde108f7673a9b6705bda1b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 00:19:32 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 00:19:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2566c84b
media-video/mplayer: keyword 1.5_p20230215
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5_p20230215.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.5_p20230215.ebuild b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
index b74a6e409f8e..31de25e10b42 100644
--- a/media-video/mplayer/mplayer-1.5_p20230215.ebuild
+++ b/media-video/mplayer/mplayer-1.5_p20230215.ebuild
@@ -165,9 +165,9 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
-#if [[ ${PV} != *9999* ]]; then
-# KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-#fi
+if [[ ${PV} != *9999* ]]; then
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
# faac codecs are nonfree
# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-02-15 6:23 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2023-02-15 6:23 UTC (permalink / raw
To: gentoo-commits
commit: f1e4f232f247abdb1cc98c6647688184e89a9c84
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 06:20:02 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 06:20:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1e4f232
media-video/mplayer: depend on <ffmpeg-5
A snapshot may help.
Bug: https://bugs.gentoo.org/876760
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.5.ebuild b/media-video/mplayer/mplayer-1.5.ebuild
index 372909e99730..4f171b4f094c 100644
--- a/media-video/mplayer/mplayer-1.5.ebuild
+++ b/media-video/mplayer/mplayer-1.5.ebuild
@@ -66,9 +66,10 @@ X_RDEPS="
# nemesi? ( net-libs/libnemesi )
# - mplayer relies on private APIs in giflib that have been removed:
# https://sourceforge.net/p/giflib/bugs/132/
+# - depends on <ffmpeg-5 for bug #876760, a snapshot may help though.
RDEPEND="
app-arch/bzip2
- >=media-video/ffmpeg-4.0:=[vdpau?]
+ <media-video/ffmpeg-5:=[vdpau?]
sys-libs/ncurses:=
sys-libs/zlib
a52? ( media-libs/a52dec )
^ permalink raw reply related [flat|nested] 93+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-01-07 11:30 Arthur Zamarin
0 siblings, 0 replies; 93+ messages in thread
From: Arthur Zamarin @ 2023-01-07 11:30 UTC (permalink / raw
To: gentoo-commits
commit: a867de9e3be01697a371f3c6e90d6679aa8ad002
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 11:30:39 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 11:30:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a867de9e
media-video/mplayer: Stabilize 1.5 amd64, #889970
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.5.ebuild b/media-video/mplayer/mplayer-1.5.ebuild
index 4935ba4a7c29..73db039c553d 100644
--- a/media-video/mplayer/mplayer-1.5.ebuild
+++ b/media-video/mplayer/mplayer-1.5.ebuild
@@ -162,7 +162,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-01-07 11:30 Arthur Zamarin
0 siblings, 0 replies; 93+ messages in thread
From: Arthur Zamarin @ 2023-01-07 11:30 UTC (permalink / raw
To: gentoo-commits
commit: c4f92665ce162d455b94f1f146d95e4241e912e1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 11:30:38 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 11:30:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f92665
media-video/mplayer: Stabilize 1.5 x86, #889970
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.5.ebuild b/media-video/mplayer/mplayer-1.5.ebuild
index 93b6234dc8d4..4935ba4a7c29 100644
--- a/media-video/mplayer/mplayer-1.5.ebuild
+++ b/media-video/mplayer/mplayer-1.5.ebuild
@@ -162,7 +162,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-01-07 0:06 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2023-01-07 0:06 UTC (permalink / raw
To: gentoo-commits
commit: 4d9e01ab73994fa8e008db90703a0af9aa104688
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 7 00:06:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 7 00:06:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d9e01ab
media-video/mplayer: Stabilize 1.5 ppc64, #889970
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.5.ebuild b/media-video/mplayer/mplayer-1.5.ebuild
index 943b4090ac21..93b6234dc8d4 100644
--- a/media-video/mplayer/mplayer-1.5.ebuild
+++ b/media-video/mplayer/mplayer-1.5.ebuild
@@ -162,7 +162,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2023-01-06 21:51 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2023-01-06 21:51 UTC (permalink / raw
To: gentoo-commits
commit: 7734cf2e5a0314a7a34c6c17ba3a8c1888a4a6be
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 6 21:51:17 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 6 21:51:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7734cf2e
media-video/mplayer: Stabilize 1.5 ppc, #889970
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.5.ebuild b/media-video/mplayer/mplayer-1.5.ebuild
index c938cefbf668..943b4090ac21 100644
--- a/media-video/mplayer/mplayer-1.5.ebuild
+++ b/media-video/mplayer/mplayer-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -162,7 +162,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
LICENSE="GPL-2"
SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc ~x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2022-12-24 10:21 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2022-12-24 10:21 UTC (permalink / raw
To: gentoo-commits
commit: 8cdb49a98ff943afe53695735fb3eed4b77c3b28
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 10:16:46 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 10:19:57 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cdb49a9
media-video/mplayer: add 1.5
Unclear if anything happened with security bug #858107 though.
Bug: https://bugs.gentoo.org/858107
Bug: https://bugs.gentoo.org/870406
Closes: https://bugs.gentoo.org/728640
Closes: https://bugs.gentoo.org/836428
Closes: https://bugs.gentoo.org/870649
Closes: https://bugs.gentoo.org/888073
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/Manifest | 1 +
.../{mplayer-9999.ebuild => mplayer-1.5.ebuild} | 378 +++++++++++----------
media-video/mplayer/mplayer-9999.ebuild | 378 +++++++++++----------
3 files changed, 403 insertions(+), 354 deletions(-)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index bd9910e5e79e..765a041aebe3 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,5 @@
DIST MPlayer-1.4.tar.xz 15054920 BLAKE2B 4777cb31a32d62c393778c581c1913fbf355a36cbe6bcf6f426c90c2c8c70123e8aed4d01faf52ee6b1fba3c49e11fa13185f81ae8582f90c901b90955a1f42b SHA512 8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34
+DIST MPlayer-1.5.tar.xz 15379972 BLAKE2B 33c09025a9c521e1bc09a50fabb04e89493cbc4117afb3d5769e17b7dd621e44441a8d9f5a3cce2316c781ed701131a966abb02d64976adee9e5f40b7b475e7f SHA512 05fe1edf23cec53be676333b6299df4b3f1ee746e5ccd96dc0bed550e7a1602ba7ba182c1cc23fcac67aacde849a46628b1dcab8ee3d3d4117415c11b6a6ad74
DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-1.5.ebuild
similarity index 60%
copy from media-video/mplayer/mplayer-9999.ebuild
copy to media-video/mplayer/mplayer-1.5.ebuild
index e07e9e46bd59..c938cefbf668 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-1.5.ebuild
@@ -1,80 +1,92 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3"
+inherit edo toolchain-funcs flag-o-matic
-inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
-
-IUSE="cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
-
-VIDEO_CARDS="mga"
-for x in ${VIDEO_CARDS}; do
- IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
- mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
+ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+
+ inherit subversion git-r3
+elif [[ "${PV%_rc*}" == "${PV}" && "${PV%_pre*}" == "${PV}" ]]; then
MY_P="MPlayer-${PV}"
S="${WORKDIR}/${MY_P}"
RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
else
RELEASE_URI="mirror://gentoo/${P}.tar.xz"
fi
-SRC_URI="${RELEASE_URI}
- !truetype? ( ${FONT_URI} )"
+
+FONT_URI="
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
DESCRIPTION="Media Player for Linux"
HOMEPAGE="http://www.mplayerhq.hu/"
+SRC_URI="
+ ${RELEASE_URI}
+ !truetype? ( ${FONT_URI} )
+"
+
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4"
+IUSE+=" cpu_flags_x86_mmx cpu_flags_x86_mmxext"
+IUSE+=" cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1"
+IUSE+=" cpu_flags_x86_sse4_2 cpu_flags_x86_xop"
+IUSE+=" cpu_flags_x86_3dnow cpu_flags_x86_3dnowext"
+
+IUSE+=" cpu_flags_ppc_altivec"
+
+IUSE+=" a52 aalib +alsa aqua bidi bl bluray"
+IUSE+=" bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon"
+IUSE+=" ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum"
+IUSE+=" mng mp3 nas +network openal opengl +osdmenu oss png pnm pulseaudio pvr"
+IUSE+=" radio rar rtc rtmp samba selinux +shm sdl speex"
+IUSE+=" tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix"
+IUSE+=" vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
+
+VIDEO_CARDS="mga"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
FONT_RDEPS="
- virtual/ttf-fonts
media-libs/fontconfig
>=media-libs/freetype-2.2.1:2
+ virtual/ttf-fonts
"
X_RDEPS="
x11-libs/libXext
x11-libs/libXxf86vm
"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+# - RAR: although -gpl version is nice, it can't do most functions normal rars can
# nemesi? ( net-libs/libnemesi )
-# mplayer relies on private APIs in giflib that have been removed:
+# - mplayer relies on private APIs in giflib that have been removed:
# https://sourceforge.net/p/giflib/bugs/132/
-RDEPEND+="
- sys-libs/ncurses:0=
+RDEPEND="
app-arch/bzip2
+ >=media-video/ffmpeg-4.0:=[vdpau?]
+ sys-libs/ncurses:=
sys-libs/zlib
- >=media-video/ffmpeg-4.0:0=[vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
bidi? ( dev-libs/fribidi )
bluray? ( >=media-libs/libbluray-0.2.1:= )
bs2b? ( media-libs/libbs2b )
- cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
+ cdio? (
+ dev-libs/libcdio:=
+ dev-libs/libcdio-paranoia
+ )
cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
dga? ( x11-libs/libXxf86dga )
dts? ( media-libs/libdca )
dv? ( media-libs/libdv )
- dvd? ( >=media-libs/libdvdread-4.1.3:0= )
- dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= )
+ dvd? ( >=media-libs/libdvdread-4.1.3:= )
+ dvdnav? ( >=media-libs/libdvdnav-4.1.3:= )
encode? (
!twolame? ( toolame? ( media-sound/toolame ) )
twolame? ( media-sound/twolame )
@@ -103,7 +115,7 @@ RDEPEND+="
nas? ( media-libs/nas )
openal? ( media-libs/openal )
opengl? ( virtual/opengl )
- png? ( media-libs/libpng:0= )
+ png? ( media-libs/libpng:= )
pnm? ( media-libs/netpbm )
pulseaudio? ( media-sound/pulseaudio )
rar? (
@@ -126,30 +138,31 @@ RDEPEND+="
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
"
-
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
+DEPEND="
+ ${RDEPEND}
dga? ( x11-base/xorg-proto )
dvb? ( virtual/linuxtv-dvb-headers )
X? ( x11-base/xorg-proto )
xinerama? ( x11-base/xorg-proto )
xscreensaver? ( x11-base/xorg-proto )
+"
+ASM_DEP="dev-lang/yasm"
+BDEPEND="
+ virtual/pkgconfig
amd64? ( ${ASM_DEP} )
doc? (
- dev-libs/libxslt app-text/docbook-xml-dtd
+ app-text/docbook-xml-dtd
app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
)
x86? ( ${ASM_DEP} )
"
-RDEPEND+="
- selinux? ( sec-policy/selinux-mplayer )
-"
+RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
# faac codecs are nonfree
@@ -197,20 +210,21 @@ pkg_setup() {
}
src_unpack() {
- if [[ ${PV} = *9999* ]]; then
+ if [[ ${PV} == *9999* ]]; then
subversion_src_unpack
- cd "${WORKDIR}"
- rm -rf "${WORKDIR}/${P}/ffmpeg/"
+
+ cd "${WORKDIR}" || die
+ rm -rf "${WORKDIR}/${P}/ffmpeg/" || die
( EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/ffmpeg/" git-r3_src_unpack )
else
unpack ${A}
fi
- if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
- cd "${S}"
+ if [[ ${PV} == *9999* || "${PV%_rc*}" == "${PV}" ]]; then
+ cd "${S}" || die
cp "${FILESDIR}/dump_ffmpeg.sh" . || die
- chmod +x dump_ffmpeg.sh
- ./dump_ffmpeg.sh || die
+ chmod +x dump_ffmpeg.sh || die
+ ./dump_ffmpeg.sh
fi
if ! use truetype; then
@@ -224,20 +238,20 @@ src_prepare() {
default
local svf=snapshot_version
- if [[ ${PV} = *9999* ]]; then
+ if [[ ${PV} == *9999* ]]; then
# Set SVN version manually
subversion_wc_info
- printf "${ESVN_WC_REVISION}" > $svf
- else
- eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
+ printf "${ESVN_WC_REVISION}" > ${svf} || die
fi
- if [ ! -f VERSION ] ; then
- [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
- local sv=$(<$svf)
- printf "SVN-r${sv} (Gentoo)" > VERSION
+
+ if [[ ! -f VERSION ]]; then
+ [[ -f "${svf}" ]] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+
+ local sv=$(<${svf})
+ printf "SVN-r${sv} (Gentoo)" > VERSION || die
fi
- # fix path to bash executable in configure scripts
+ # Fix path to bash executable in configure scripts
sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
# Use sane default for >=virtual/udev-197
@@ -245,27 +259,27 @@ src_prepare() {
}
src_configure() {
- local myconf=""
+ local myconf=()
local uses i
- # set LINGUAS
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+ # Set LINGUAS
+ [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/da/dk}"
+ [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
# compilation in almost every situation. The reason for this is
# because if --enable is used, it will force the build of that option,
# regardless of whether the dependency is available or not.
- ###################
- #Optional features#
- ###################
- # disable svga since we don't want it
- # disable arts since we don't have kde3
- # always disable internal ass
- # disable opus and ilbc since it only controls support in internal
- # ffmpeg which we do not use
- myconf+="
+ #####################
+ # Optional features #
+ #####################
+ # Disable svga since we don't want it
+ # Disable arts since we don't have kde3
+ # Always disable internal ass
+ # Disable opus and ilbc since it only controls support in internal
+ # ffmpeg which we do not use
+ myconf+=(
--disable-arts
--disable-ass-internal
--disable-directfb
@@ -277,27 +291,28 @@ src_configure() {
--disable-xvmc
$(use_enable network networking)
$(use_enable joystick)
- "
+ )
+
uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
- myconf+=" --disable-nemesi" # nemesi automagic disable
+ myconf+=( --disable-nemesi ) # nemesi automagic disable
for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
+ use ${i} || myconf+=( --disable-${i} )
done
- use bidi || myconf+=" --disable-fribidi"
- use ipv6 || myconf+=" --disable-inet6"
- use libass || myconf+=" --disable-ass"
- use rar || myconf+=" --disable-unrarexec"
- use samba || myconf+=" --disable-smb"
- use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+ use bidi || myconf+=( --disable-fribidi )
+ use ipv6 || myconf+=( --disable-inet6 )
+ use libass || myconf+=( --disable-ass )
+ use rar || myconf+=( --disable-unrarexec )
+ use samba || myconf+=( --disable-smb )
+ use lirc || myconf+=( --disable-lirc --disable-lircc --disable-apple-ir )
# libcdio support: prefer libcdio over cdparanoia
# don't check for cddb w/cdio
if use cdio; then
- myconf+=" --disable-cdparanoia"
+ myconf+=( --disable-cdparanoia )
else
- myconf+=" --disable-libcdio"
- use cdparanoia || myconf+=" --disable-cdparanoia"
- use cddb || myconf+=" --disable-cddb"
+ myconf+=( --disable-libcdio )
+ use cdparanoia || myconf+=( --disable-cdparanoia )
+ use cddb || myconf+=( --disable-cddb )
fi
################################
@@ -306,8 +321,8 @@ src_configure() {
#
# dvdread - accessing a DVD
# dvdnav - navigation of menus
- use dvd || myconf+=" --disable-dvdread"
- use dvdnav || myconf+=" --disable-dvdnav"
+ use dvd || myconf+=( --disable-dvdread )
+ use dvdnav || myconf+=( --disable-dvdnav )
#############
# Subtitles #
@@ -316,35 +331,33 @@ src_configure() {
# SRT/ASS/SSA (subtitles) requires freetype support
# freetype support requires iconv
# iconv optionally can use unicode
- use truetype || myconf+=" --disable-freetype"
- use iconv || myconf+=" --disable-iconv --charset=noconv"
- use iconv && use unicode && myconf+=" --charset=UTF-8"
+ use truetype || myconf+=( --disable-freetype )
+ use iconv || myconf+=( --disable-iconv --charset=noconv )
+ use iconv && use unicode && myconf+=( --charset=UTF-8 )
#####################################
# DVB / Video4Linux / Radio support #
#####################################
- myconf+=" --disable-tv-bsdbt848"
- # broken upstream, won't work with recent kernels
- myconf+=" --disable-ivtv"
+ myconf+=( --disable-tv-bsdbt848 )
# gone since linux-headers-2.6.38
- myconf+=" --disable-tv-v4l1"
+ myconf+=( --disable-tv-v4l1 )
if { use dvb || use v4l || use pvr || use radio; }; then
- use dvb || myconf+=" --disable-dvb"
- use pvr || myconf+=" --disable-pvr"
- use v4l || myconf+=" --disable-tv-v4l2"
+ use dvb || myconf+=( --disable-dvb )
+ use pvr || myconf+=( --disable-pvr )
+ use v4l || myconf+=( --disable-tv-v4l2 )
if use radio && { use dvb || use v4l; }; then
- myconf+="
+ myconf+=(
--enable-radio
$(use_enable encode radio-capture)
- "
+ )
else
- myconf+="
+ myconf+=(
--disable-radio-v4l2
--disable-radio-bsdbt848
- "
+ )
fi
else
- myconf+="
+ myconf+=(
--disable-tv
--disable-tv-v4l2
--disable-radio
@@ -352,44 +365,45 @@ src_configure() {
--disable-radio-bsdbt848
--disable-dvb
--disable-v4l2
- --disable-pvr"
+ --disable-pvr
+ )
fi
##########
# Codecs #
##########
- myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
- myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
- myconf+=" --disable-gif" # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/
- use dts || myconf+=" --disable-libdca"
+ myconf+=( --disable-musepack ) # Use internal musepack codecs for SV7 and SV8 support
+ myconf+=( --disable-libmpeg2-internal ) # always use system media-libs/libmpeg2
+ myconf+=( --disable-gif ) # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/
+ use dts || myconf+=( --disable-libdca )
if ! use mp3; then
- myconf+="
+ myconf+=(
--disable-mp3lame
--disable-mpg123
- "
+ )
fi
uses="a52 bs2b dv gsm lzo rtmp vorbis"
for i in ${uses}; do
- use ${i} || myconf+=" --disable-lib${i}"
+ use ${i} || myconf+=( --disable-lib${i} )
done
uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
+ use ${i} || myconf+=( --disable-${i} )
done
# Pulls an outdated libopenjpeg, ffmpeg provides better support for it
- myconf+=" --disable-libopenjpeg"
+ myconf+=( --disable-libopenjpeg )
# Encoding
uses="faac x264 xvid toolame twolame"
if use encode; then
for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
+ use ${i} || myconf+=( --disable-${i} )
done
else
- myconf+=" --disable-mencoder"
+ myconf+=( --disable-mencoder )
for i in ${uses}; do
- myconf+=" --disable-${i}"
+ myconf+=( --disable-${i} )
use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
done
fi
@@ -397,62 +411,65 @@ src_configure() {
#################
# Binary codecs #
#################
- myconf+=" --disable-qtx --disable-real --disable-win32dll"
+ myconf+=( --disable-qtx --disable-real --disable-win32dll )
################
# Video Output #
################
uses="md5sum sdl yuv4mpeg"
for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
+ use ${i} || myconf+=( --disable-${i} )
done
- use aalib || myconf+=" --disable-aa"
- use fbcon || myconf+=" --disable-fbdev"
- use libcaca || myconf+=" --disable-caca"
- use zoran || myconf+=" --disable-zr"
+ use aalib || myconf+=( --disable-aa )
+ use fbcon || myconf+=( --disable-fbdev )
+ use libcaca || myconf+=( --disable-caca )
+ use zoran || myconf+=( --disable-zr )
if ! use kernel_linux || ! use video_cards_mga; then
- myconf+=" --disable-mga --disable-xmga"
+ myconf+=( --disable-mga --disable-xmga )
fi
- myconf+="
+ myconf+=(
--disable-3dfx
--disable-tdfxvid
--disable-tdfxfb
- "
+ )
# sun card, disable by default, see bug #258729
- myconf+=" --disable-xvr100"
+ myconf+=( --disable-xvr100 )
################
# Audio Output #
################
- myconf+=" --disable-esd"
+ myconf+=( --disable-esd )
uses="alsa jack ladspa nas openal"
for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
+ use ${i} || myconf+=( --disable-${i} )
done
- use pulseaudio || myconf+=" --disable-pulse"
+ use pulseaudio || myconf+=( --disable-pulse )
if ! use radio; then
- use oss || myconf+=" --disable-ossaudio"
+ use oss || myconf+=( --disable-ossaudio )
fi
####################
# Advanced Options #
####################
# Platform specific flags, hardcoded on amd64 (see below)
- use cpudetection && myconf+=" --enable-runtime-cpudetection"
+ use cpudetection && myconf+=( --enable-runtime-cpudetection )
- uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+ uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop"
for i in ${uses}; do
- myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+ myconf+=( $(use_enable cpu_flags_x86_${i} ${i}) )
done
+ myconf+=( $(use_enable cpu_flags_x86_sse4_1 sse4) )
+ myconf+=( $(use_enable cpu_flags_x86_sse4_2 sse42) )
- myconf+="
+ myconf+=(
$(use_enable cpu_flags_ppc_altivec altivec)
- $(use_enable shm)"
+ $(use_enable shm)
+ )
- use debug && myconf+=" --enable-debug=3"
+ use debug && myconf+=( --enable-debug=3 )
if use x86 && gcc-specs-pie; then
filter-flags -fPIC -fPIE
@@ -462,31 +479,31 @@ src_configure() {
###########################
# X enabled configuration #
###########################
- myconf+=" --disable-gui"
- myconf+=" --disable-vesa"
+ myconf+=( --disable-gui )
+ myconf+=( --disable-vesa )
uses="ggi vdpau xinerama xv"
for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
+ use ${i} || myconf+=( --disable-${i} )
done
- use dga || myconf+=" --disable-dga1 --disable-dga2"
- use opengl || myconf+=" --disable-gl"
- use osdmenu && myconf+=" --enable-menu"
- use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
- use xscreensaver || myconf+=" --disable-xss"
- use X || myconf+=" --disable-x11"
+ use dga || myconf+=( --disable-dga1 --disable-dga2 )
+ use opengl || myconf+=( --disable-gl )
+ use osdmenu && myconf+=( --enable-menu )
+ use vidix || myconf+=( --disable-vidix --disable-vidix-pcidb )
+ use xscreensaver || myconf+=( --disable-xss )
+ use X || myconf+=( --disable-x11 )
############################
# OSX (aqua) configuration #
############################
if use aqua; then
- myconf+="
+ myconf+=(
--enable-macosx-finder
--enable-macosx-bundle
- "
+ )
fi
# Note: --enable-gnutls only makes sense with --enable-ffmpeg_a
- ./configure \
+ edo ./configure \
--cc="$(tc-getCC)" \
--host-cc="$(tc-getBUILD_CC)" \
--prefix="${EPREFIX}/usr" \
@@ -497,7 +514,7 @@ src_configure() {
--mandir="${EPREFIX}/usr/share/man" \
--disable-ffmpeg_a \
--disable-gnutls \
- ${myconf} || die
+ "${myconf[@]}"
}
src_compile() {
@@ -505,16 +522,19 @@ src_compile() {
# Build only user-requested docs if they're available.
if use doc ; then
- # select available languages from $LINGUAS
+ # Select available languages from ${LINGUAS}
local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
- local BUILT_DOCS=""
+ local BUILT_DOCS=()
+ local i
+
for i in ${LINGUAS} ; do
- has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+ has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=( ${i} )
done
- if [[ -z $BUILT_DOCS ]]; then
+
+ if [[ -z ${BUILT_DOCS[@]} ]]; then
emake -j1 html-chunked
else
- for i in ${BUILT_DOCS}; do
+ for i in ${BUILT_DOCS[@]}; do
emake -j1 html-chunked-${i}
done
fi
@@ -545,11 +565,14 @@ src_install() {
if ! use truetype; then
dodir /usr/share/mplayer/fonts
+
# Do this generic, as the mplayer people like to change the structure
# of their zips ...
+ local i
for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
done
+
# Fix the font symlink ...
rm -rf "${ED}/usr/share/mplayer/font"
dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
@@ -557,32 +580,33 @@ src_install() {
insinto /etc/mplayer
newins "${S}/etc/example.conf" mplayer.conf
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
+ cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_
+ # Config options can be section specific, global
+ # options should go in the default section
+ [default]
+ _EOF_
+
doins "${S}/etc/input.conf"
if use osdmenu; then
doins "${S}/etc/menu.conf"
fi
if use truetype; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
+ cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_
+ fontconfig=1
+ subfont-osd-scale=4
+ subfont-text-scale=3
+ _EOF_
fi
# bug 256203
if use rar; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
+ cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_
+ unrarexec=${EPREFIX}/usr/bin/unrar
+ _EOF_
fi
- dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+ dosym -r /etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
newbin "${S}/TOOLS/midentify.sh" midentify
}
@@ -593,11 +617,11 @@ pkg_preinst() {
pkg_postrm() {
# Cleanup stale symlinks
- [ -L "${EROOT}/usr/share/mplayer/font" -a \
- ! -e "${EROOT}/usr/share/mplayer/font" ] && \
+ [[ -L "${EROOT}/usr/share/mplayer/font" &&
+ ! -e "${EROOT}/usr/share/mplayer/font" ]] && \
rm -f "${EROOT}/usr/share/mplayer/font"
- [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
- ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+ [[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" &&
+ ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ]] && \
rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
}
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index e07e9e46bd59..c938cefbf668 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,80 +1,92 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
-EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3"
+inherit edo toolchain-funcs flag-o-matic
-inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
-
-IUSE="cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
-
-VIDEO_CARDS="mga"
-for x in ${VIDEO_CARDS}; do
- IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
- mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
if [[ ${PV} == *9999* ]]; then
+ EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
+ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+
+ inherit subversion git-r3
+elif [[ "${PV%_rc*}" == "${PV}" && "${PV%_pre*}" == "${PV}" ]]; then
MY_P="MPlayer-${PV}"
S="${WORKDIR}/${MY_P}"
RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
else
RELEASE_URI="mirror://gentoo/${P}.tar.xz"
fi
-SRC_URI="${RELEASE_URI}
- !truetype? ( ${FONT_URI} )"
+
+FONT_URI="
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
DESCRIPTION="Media Player for Linux"
HOMEPAGE="http://www.mplayerhq.hu/"
+SRC_URI="
+ ${RELEASE_URI}
+ !truetype? ( ${FONT_URI} )
+"
+
+IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4"
+IUSE+=" cpu_flags_x86_mmx cpu_flags_x86_mmxext"
+IUSE+=" cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1"
+IUSE+=" cpu_flags_x86_sse4_2 cpu_flags_x86_xop"
+IUSE+=" cpu_flags_x86_3dnow cpu_flags_x86_3dnowext"
+
+IUSE+=" cpu_flags_ppc_altivec"
+
+IUSE+=" a52 aalib +alsa aqua bidi bl bluray"
+IUSE+=" bs2b cddb +cdio cdparanoia cpudetection debug dga doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon"
+IUSE+=" ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa +libass libcaca libmpeg2 lirc live lzo mad md5sum"
+IUSE+=" mng mp3 nas +network openal opengl +osdmenu oss png pnm pulseaudio pvr"
+IUSE+=" radio rar rtc rtmp samba selinux +shm sdl speex"
+IUSE+=" tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix"
+IUSE+=" vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
+
+VIDEO_CARDS="mga"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
FONT_RDEPS="
- virtual/ttf-fonts
media-libs/fontconfig
>=media-libs/freetype-2.2.1:2
+ virtual/ttf-fonts
"
X_RDEPS="
x11-libs/libXext
x11-libs/libXxf86vm
"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+# - RAR: although -gpl version is nice, it can't do most functions normal rars can
# nemesi? ( net-libs/libnemesi )
-# mplayer relies on private APIs in giflib that have been removed:
+# - mplayer relies on private APIs in giflib that have been removed:
# https://sourceforge.net/p/giflib/bugs/132/
-RDEPEND+="
- sys-libs/ncurses:0=
+RDEPEND="
app-arch/bzip2
+ >=media-video/ffmpeg-4.0:=[vdpau?]
+ sys-libs/ncurses:=
sys-libs/zlib
- >=media-video/ffmpeg-4.0:0=[vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
bidi? ( dev-libs/fribidi )
bluray? ( >=media-libs/libbluray-0.2.1:= )
bs2b? ( media-libs/libbs2b )
- cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
+ cdio? (
+ dev-libs/libcdio:=
+ dev-libs/libcdio-paranoia
+ )
cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
dga? ( x11-libs/libXxf86dga )
dts? ( media-libs/libdca )
dv? ( media-libs/libdv )
- dvd? ( >=media-libs/libdvdread-4.1.3:0= )
- dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= )
+ dvd? ( >=media-libs/libdvdread-4.1.3:= )
+ dvdnav? ( >=media-libs/libdvdnav-4.1.3:= )
encode? (
!twolame? ( toolame? ( media-sound/toolame ) )
twolame? ( media-sound/twolame )
@@ -103,7 +115,7 @@ RDEPEND+="
nas? ( media-libs/nas )
openal? ( media-libs/openal )
opengl? ( virtual/opengl )
- png? ( media-libs/libpng:0= )
+ png? ( media-libs/libpng:= )
pnm? ( media-libs/netpbm )
pulseaudio? ( media-sound/pulseaudio )
rar? (
@@ -126,30 +138,31 @@ RDEPEND+="
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
"
-
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
+DEPEND="
+ ${RDEPEND}
dga? ( x11-base/xorg-proto )
dvb? ( virtual/linuxtv-dvb-headers )
X? ( x11-base/xorg-proto )
xinerama? ( x11-base/xorg-proto )
xscreensaver? ( x11-base/xorg-proto )
+"
+ASM_DEP="dev-lang/yasm"
+BDEPEND="
+ virtual/pkgconfig
amd64? ( ${ASM_DEP} )
doc? (
- dev-libs/libxslt app-text/docbook-xml-dtd
+ app-text/docbook-xml-dtd
app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
)
x86? ( ${ASM_DEP} )
"
-RDEPEND+="
- selinux? ( sec-policy/selinux-mplayer )
-"
+RDEPEND+="selinux? ( sec-policy/selinux-mplayer )"
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
# faac codecs are nonfree
@@ -197,20 +210,21 @@ pkg_setup() {
}
src_unpack() {
- if [[ ${PV} = *9999* ]]; then
+ if [[ ${PV} == *9999* ]]; then
subversion_src_unpack
- cd "${WORKDIR}"
- rm -rf "${WORKDIR}/${P}/ffmpeg/"
+
+ cd "${WORKDIR}" || die
+ rm -rf "${WORKDIR}/${P}/ffmpeg/" || die
( EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/ffmpeg/" git-r3_src_unpack )
else
unpack ${A}
fi
- if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
- cd "${S}"
+ if [[ ${PV} == *9999* || "${PV%_rc*}" == "${PV}" ]]; then
+ cd "${S}" || die
cp "${FILESDIR}/dump_ffmpeg.sh" . || die
- chmod +x dump_ffmpeg.sh
- ./dump_ffmpeg.sh || die
+ chmod +x dump_ffmpeg.sh || die
+ ./dump_ffmpeg.sh
fi
if ! use truetype; then
@@ -224,20 +238,20 @@ src_prepare() {
default
local svf=snapshot_version
- if [[ ${PV} = *9999* ]]; then
+ if [[ ${PV} == *9999* ]]; then
# Set SVN version manually
subversion_wc_info
- printf "${ESVN_WC_REVISION}" > $svf
- else
- eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
+ printf "${ESVN_WC_REVISION}" > ${svf} || die
fi
- if [ ! -f VERSION ] ; then
- [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
- local sv=$(<$svf)
- printf "SVN-r${sv} (Gentoo)" > VERSION
+
+ if [[ ! -f VERSION ]]; then
+ [[ -f "${svf}" ]] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+
+ local sv=$(<${svf})
+ printf "SVN-r${sv} (Gentoo)" > VERSION || die
fi
- # fix path to bash executable in configure scripts
+ # Fix path to bash executable in configure scripts
sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
# Use sane default for >=virtual/udev-197
@@ -245,27 +259,27 @@ src_prepare() {
}
src_configure() {
- local myconf=""
+ local myconf=()
local uses i
- # set LINGUAS
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+ # Set LINGUAS
+ [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/da/dk}"
+ [[ -n ${LINGUAS} ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
# mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
# compilation in almost every situation. The reason for this is
# because if --enable is used, it will force the build of that option,
# regardless of whether the dependency is available or not.
- ###################
- #Optional features#
- ###################
- # disable svga since we don't want it
- # disable arts since we don't have kde3
- # always disable internal ass
- # disable opus and ilbc since it only controls support in internal
- # ffmpeg which we do not use
- myconf+="
+ #####################
+ # Optional features #
+ #####################
+ # Disable svga since we don't want it
+ # Disable arts since we don't have kde3
+ # Always disable internal ass
+ # Disable opus and ilbc since it only controls support in internal
+ # ffmpeg which we do not use
+ myconf+=(
--disable-arts
--disable-ass-internal
--disable-directfb
@@ -277,27 +291,28 @@ src_configure() {
--disable-xvmc
$(use_enable network networking)
$(use_enable joystick)
- "
+ )
+
uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
- myconf+=" --disable-nemesi" # nemesi automagic disable
+ myconf+=( --disable-nemesi ) # nemesi automagic disable
for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
+ use ${i} || myconf+=( --disable-${i} )
done
- use bidi || myconf+=" --disable-fribidi"
- use ipv6 || myconf+=" --disable-inet6"
- use libass || myconf+=" --disable-ass"
- use rar || myconf+=" --disable-unrarexec"
- use samba || myconf+=" --disable-smb"
- use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+ use bidi || myconf+=( --disable-fribidi )
+ use ipv6 || myconf+=( --disable-inet6 )
+ use libass || myconf+=( --disable-ass )
+ use rar || myconf+=( --disable-unrarexec )
+ use samba || myconf+=( --disable-smb )
+ use lirc || myconf+=( --disable-lirc --disable-lircc --disable-apple-ir )
# libcdio support: prefer libcdio over cdparanoia
# don't check for cddb w/cdio
if use cdio; then
- myconf+=" --disable-cdparanoia"
+ myconf+=( --disable-cdparanoia )
else
- myconf+=" --disable-libcdio"
- use cdparanoia || myconf+=" --disable-cdparanoia"
- use cddb || myconf+=" --disable-cddb"
+ myconf+=( --disable-libcdio )
+ use cdparanoia || myconf+=( --disable-cdparanoia )
+ use cddb || myconf+=( --disable-cddb )
fi
################################
@@ -306,8 +321,8 @@ src_configure() {
#
# dvdread - accessing a DVD
# dvdnav - navigation of menus
- use dvd || myconf+=" --disable-dvdread"
- use dvdnav || myconf+=" --disable-dvdnav"
+ use dvd || myconf+=( --disable-dvdread )
+ use dvdnav || myconf+=( --disable-dvdnav )
#############
# Subtitles #
@@ -316,35 +331,33 @@ src_configure() {
# SRT/ASS/SSA (subtitles) requires freetype support
# freetype support requires iconv
# iconv optionally can use unicode
- use truetype || myconf+=" --disable-freetype"
- use iconv || myconf+=" --disable-iconv --charset=noconv"
- use iconv && use unicode && myconf+=" --charset=UTF-8"
+ use truetype || myconf+=( --disable-freetype )
+ use iconv || myconf+=( --disable-iconv --charset=noconv )
+ use iconv && use unicode && myconf+=( --charset=UTF-8 )
#####################################
# DVB / Video4Linux / Radio support #
#####################################
- myconf+=" --disable-tv-bsdbt848"
- # broken upstream, won't work with recent kernels
- myconf+=" --disable-ivtv"
+ myconf+=( --disable-tv-bsdbt848 )
# gone since linux-headers-2.6.38
- myconf+=" --disable-tv-v4l1"
+ myconf+=( --disable-tv-v4l1 )
if { use dvb || use v4l || use pvr || use radio; }; then
- use dvb || myconf+=" --disable-dvb"
- use pvr || myconf+=" --disable-pvr"
- use v4l || myconf+=" --disable-tv-v4l2"
+ use dvb || myconf+=( --disable-dvb )
+ use pvr || myconf+=( --disable-pvr )
+ use v4l || myconf+=( --disable-tv-v4l2 )
if use radio && { use dvb || use v4l; }; then
- myconf+="
+ myconf+=(
--enable-radio
$(use_enable encode radio-capture)
- "
+ )
else
- myconf+="
+ myconf+=(
--disable-radio-v4l2
--disable-radio-bsdbt848
- "
+ )
fi
else
- myconf+="
+ myconf+=(
--disable-tv
--disable-tv-v4l2
--disable-radio
@@ -352,44 +365,45 @@ src_configure() {
--disable-radio-bsdbt848
--disable-dvb
--disable-v4l2
- --disable-pvr"
+ --disable-pvr
+ )
fi
##########
# Codecs #
##########
- myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
- myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
- myconf+=" --disable-gif" # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/
- use dts || myconf+=" --disable-libdca"
+ myconf+=( --disable-musepack ) # Use internal musepack codecs for SV7 and SV8 support
+ myconf+=( --disable-libmpeg2-internal ) # always use system media-libs/libmpeg2
+ myconf+=( --disable-gif ) # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/
+ use dts || myconf+=( --disable-libdca )
if ! use mp3; then
- myconf+="
+ myconf+=(
--disable-mp3lame
--disable-mpg123
- "
+ )
fi
uses="a52 bs2b dv gsm lzo rtmp vorbis"
for i in ${uses}; do
- use ${i} || myconf+=" --disable-lib${i}"
+ use ${i} || myconf+=( --disable-lib${i} )
done
uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
+ use ${i} || myconf+=( --disable-${i} )
done
# Pulls an outdated libopenjpeg, ffmpeg provides better support for it
- myconf+=" --disable-libopenjpeg"
+ myconf+=( --disable-libopenjpeg )
# Encoding
uses="faac x264 xvid toolame twolame"
if use encode; then
for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
+ use ${i} || myconf+=( --disable-${i} )
done
else
- myconf+=" --disable-mencoder"
+ myconf+=( --disable-mencoder )
for i in ${uses}; do
- myconf+=" --disable-${i}"
+ myconf+=( --disable-${i} )
use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
done
fi
@@ -397,62 +411,65 @@ src_configure() {
#################
# Binary codecs #
#################
- myconf+=" --disable-qtx --disable-real --disable-win32dll"
+ myconf+=( --disable-qtx --disable-real --disable-win32dll )
################
# Video Output #
################
uses="md5sum sdl yuv4mpeg"
for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
+ use ${i} || myconf+=( --disable-${i} )
done
- use aalib || myconf+=" --disable-aa"
- use fbcon || myconf+=" --disable-fbdev"
- use libcaca || myconf+=" --disable-caca"
- use zoran || myconf+=" --disable-zr"
+ use aalib || myconf+=( --disable-aa )
+ use fbcon || myconf+=( --disable-fbdev )
+ use libcaca || myconf+=( --disable-caca )
+ use zoran || myconf+=( --disable-zr )
if ! use kernel_linux || ! use video_cards_mga; then
- myconf+=" --disable-mga --disable-xmga"
+ myconf+=( --disable-mga --disable-xmga )
fi
- myconf+="
+ myconf+=(
--disable-3dfx
--disable-tdfxvid
--disable-tdfxfb
- "
+ )
# sun card, disable by default, see bug #258729
- myconf+=" --disable-xvr100"
+ myconf+=( --disable-xvr100 )
################
# Audio Output #
################
- myconf+=" --disable-esd"
+ myconf+=( --disable-esd )
uses="alsa jack ladspa nas openal"
for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
+ use ${i} || myconf+=( --disable-${i} )
done
- use pulseaudio || myconf+=" --disable-pulse"
+ use pulseaudio || myconf+=( --disable-pulse )
if ! use radio; then
- use oss || myconf+=" --disable-ossaudio"
+ use oss || myconf+=( --disable-ossaudio )
fi
####################
# Advanced Options #
####################
# Platform specific flags, hardcoded on amd64 (see below)
- use cpudetection && myconf+=" --enable-runtime-cpudetection"
+ use cpudetection && myconf+=( --enable-runtime-cpudetection )
- uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+ uses="3dnow 3dnowext avx avx2 fma3 fma4 mmx mmxext sse sse2 sse3 ssse3 xop"
for i in ${uses}; do
- myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+ myconf+=( $(use_enable cpu_flags_x86_${i} ${i}) )
done
+ myconf+=( $(use_enable cpu_flags_x86_sse4_1 sse4) )
+ myconf+=( $(use_enable cpu_flags_x86_sse4_2 sse42) )
- myconf+="
+ myconf+=(
$(use_enable cpu_flags_ppc_altivec altivec)
- $(use_enable shm)"
+ $(use_enable shm)
+ )
- use debug && myconf+=" --enable-debug=3"
+ use debug && myconf+=( --enable-debug=3 )
if use x86 && gcc-specs-pie; then
filter-flags -fPIC -fPIE
@@ -462,31 +479,31 @@ src_configure() {
###########################
# X enabled configuration #
###########################
- myconf+=" --disable-gui"
- myconf+=" --disable-vesa"
+ myconf+=( --disable-gui )
+ myconf+=( --disable-vesa )
uses="ggi vdpau xinerama xv"
for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
+ use ${i} || myconf+=( --disable-${i} )
done
- use dga || myconf+=" --disable-dga1 --disable-dga2"
- use opengl || myconf+=" --disable-gl"
- use osdmenu && myconf+=" --enable-menu"
- use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
- use xscreensaver || myconf+=" --disable-xss"
- use X || myconf+=" --disable-x11"
+ use dga || myconf+=( --disable-dga1 --disable-dga2 )
+ use opengl || myconf+=( --disable-gl )
+ use osdmenu && myconf+=( --enable-menu )
+ use vidix || myconf+=( --disable-vidix --disable-vidix-pcidb )
+ use xscreensaver || myconf+=( --disable-xss )
+ use X || myconf+=( --disable-x11 )
############################
# OSX (aqua) configuration #
############################
if use aqua; then
- myconf+="
+ myconf+=(
--enable-macosx-finder
--enable-macosx-bundle
- "
+ )
fi
# Note: --enable-gnutls only makes sense with --enable-ffmpeg_a
- ./configure \
+ edo ./configure \
--cc="$(tc-getCC)" \
--host-cc="$(tc-getBUILD_CC)" \
--prefix="${EPREFIX}/usr" \
@@ -497,7 +514,7 @@ src_configure() {
--mandir="${EPREFIX}/usr/share/man" \
--disable-ffmpeg_a \
--disable-gnutls \
- ${myconf} || die
+ "${myconf[@]}"
}
src_compile() {
@@ -505,16 +522,19 @@ src_compile() {
# Build only user-requested docs if they're available.
if use doc ; then
- # select available languages from $LINGUAS
+ # Select available languages from ${LINGUAS}
local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
- local BUILT_DOCS=""
+ local BUILT_DOCS=()
+ local i
+
for i in ${LINGUAS} ; do
- has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+ has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=( ${i} )
done
- if [[ -z $BUILT_DOCS ]]; then
+
+ if [[ -z ${BUILT_DOCS[@]} ]]; then
emake -j1 html-chunked
else
- for i in ${BUILT_DOCS}; do
+ for i in ${BUILT_DOCS[@]}; do
emake -j1 html-chunked-${i}
done
fi
@@ -545,11 +565,14 @@ src_install() {
if ! use truetype; then
dodir /usr/share/mplayer/fonts
+
# Do this generic, as the mplayer people like to change the structure
# of their zips ...
+ local i
for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
done
+
# Fix the font symlink ...
rm -rf "${ED}/usr/share/mplayer/font"
dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
@@ -557,32 +580,33 @@ src_install() {
insinto /etc/mplayer
newins "${S}/etc/example.conf" mplayer.conf
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
+ cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_
+ # Config options can be section specific, global
+ # options should go in the default section
+ [default]
+ _EOF_
+
doins "${S}/etc/input.conf"
if use osdmenu; then
doins "${S}/etc/menu.conf"
fi
if use truetype; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
+ cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_
+ fontconfig=1
+ subfont-osd-scale=4
+ subfont-text-scale=3
+ _EOF_
fi
# bug 256203
if use rar; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
+ cat >> "${ED}/etc/mplayer/mplayer.conf" <<- _EOF_
+ unrarexec=${EPREFIX}/usr/bin/unrar
+ _EOF_
fi
- dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+ dosym -r /etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
newbin "${S}/TOOLS/midentify.sh" midentify
}
@@ -593,11 +617,11 @@ pkg_preinst() {
pkg_postrm() {
# Cleanup stale symlinks
- [ -L "${EROOT}/usr/share/mplayer/font" -a \
- ! -e "${EROOT}/usr/share/mplayer/font" ] && \
+ [[ -L "${EROOT}/usr/share/mplayer/font" &&
+ ! -e "${EROOT}/usr/share/mplayer/font" ]] && \
rm -f "${EROOT}/usr/share/mplayer/font"
- [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
- ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+ [[ -L "${EROOT}/usr/share/mplayer/subfont.ttf" &&
+ ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ]] && \
rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
}
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2022-07-15 7:58 David Seifert
0 siblings, 0 replies; 93+ messages in thread
From: David Seifert @ 2022-07-15 7:58 UTC (permalink / raw
To: gentoo-commits
commit: a96b5680d4ffe2733bec1494310a93763b46f99f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 15 07:58:03 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jul 15 07:58:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a96b5680
media-video/mplayer: altivec -> cpu_flags_ppc_altivec
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-video/mplayer/mplayer-1.4-r1.ebuild | 11 +++++------
media-video/mplayer/mplayer-9999.ebuild | 11 +++++------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index a6f47c026ec8..732273bcd899 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -9,7 +9,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa aqua bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa
@@ -90,7 +90,7 @@ RDEPEND+="
gsm? ( media-sound/gsm )
iconv? ( virtual/libiconv )
jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
+ jpeg? ( media-libs/libjpeg-turbo:= )
ladspa? ( media-libs/ladspa-sdk )
libass? ( >=media-libs/libass-0.9.10:= )
libcaca? ( media-libs/libcaca )
@@ -454,10 +454,9 @@ src_configure() {
myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
done
- uses="altivec shm"
- for i in ${uses}; do
- myconf+=" $(use_enable ${i})"
- done
+ myconf+="
+ $(use_enable cpu_flags_ppc_altivec altivec)
+ $(use_enable shm)"
use debug && myconf+=" --enable-debug=3"
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 247a9c42852a..e07e9e46bd59 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -9,7 +9,7 @@ ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+IUSE="cpu_flags_ppc_altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa aqua bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa
@@ -89,7 +89,7 @@ RDEPEND+="
gsm? ( media-sound/gsm )
iconv? ( virtual/libiconv )
jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
+ jpeg? ( media-libs/libjpeg-turbo:= )
ladspa? ( media-libs/ladspa-sdk )
libass? ( >=media-libs/libass-0.9.10:= )
libcaca? ( media-libs/libcaca )
@@ -448,10 +448,9 @@ src_configure() {
myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
done
- uses="altivec shm"
- for i in ${uses}; do
- myconf+=" $(use_enable ${i})"
- done
+ myconf+="
+ $(use_enable cpu_flags_ppc_altivec altivec)
+ $(use_enable shm)"
use debug && myconf+=" --enable-debug=3"
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2022-03-14 10:48 Yixun Lan
0 siblings, 0 replies; 93+ messages in thread
From: Yixun Lan @ 2022-03-14 10:48 UTC (permalink / raw
To: gentoo-commits
commit: 68fe335796dbcd3ba4b47d6ab8d725ca8757183f
Author: Han Gao <rabenda.cn <AT> gmail <DOT> com>
AuthorDate: Sat Mar 12 13:29:08 2022 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 10:47:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68fe3357
media-video/mplayer: ~riscv keywording
Bug: https://bugs.gentoo.org/812855
Closes: https://github.com/gentoo/gentoo/pull/24506
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Han Gao <rabenda.cn <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
media-video/mplayer/mplayer-1.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index a73a14ac67fb..a6f47c026ec8 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -150,7 +150,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2022-02-19 10:27 Alexis Ballier
0 siblings, 0 replies; 93+ messages in thread
From: Alexis Ballier @ 2022-02-19 10:27 UTC (permalink / raw
To: gentoo-commits
commit: 96c387e9f4dda0f3a8689ccf823dda4fa8bc0a87
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 10:26:39 2022 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 10:26:51 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96c387e9
media-video/mplayer: backport upstream fixes for ffmpeg5
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/mplayer/Manifest | 1 +
media-video/mplayer/mplayer-1.4-r1.ebuild | 7 +++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 4fd4e60d3630..bd9910e5e79e 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -2,3 +2,4 @@ DIST MPlayer-1.4.tar.xz 15054920 BLAKE2B 4777cb31a32d62c393778c581c1913fbf355a36
DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
+DIST mplayer-1.4-ffmpeg5.patch.bz2 11428 BLAKE2B 2cc9839333161fd00db87b7dd103e10414c910eb5b21b39454daed36440d54f5947216b80ac91947932c760c21c275328b3a642d0a2c8cd6963fe4b7671c9f90 SHA512 61038ad8ef8a55a99dd7e7a20ff38805c86f6a6ecb876261d0e3f4db7f30f36a9dfedbd6c895fd8168fef8833b856b3d3501a89fd041365ba07c81c3ebd36a69
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index daf58bcdb444..e9da1de4a0b1 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -39,6 +39,7 @@ else
RELEASE_URI="mirror://gentoo/${P}.tar.xz"
fi
SRC_URI="${RELEASE_URI}
+ https://dev.gentoo.org/~aballier/distfiles/${P}-ffmpeg5.patch.bz2
!truetype? ( ${FONT_URI} )"
DESCRIPTION="Media Player for Linux"
@@ -229,9 +230,11 @@ src_prepare() {
subversion_wc_info
printf "${ESVN_WC_REVISION}" > $svf
else
- eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
+ eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch \
+ "${FILESDIR}"/ffmpeg44.patch
+ has_version '>=media-video/ffmpeg-5' && eapply \
+ "${WORKDIR}"/${P}-ffmpeg5.patch
fi
- eapply "${FILESDIR}"/ffmpeg44.patch
if [ ! -f VERSION ] ; then
[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
local sv=$(<$svf)
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2022-01-05 10:01 David Seifert
0 siblings, 0 replies; 93+ messages in thread
From: David Seifert @ 2022-01-05 10:01 UTC (permalink / raw
To: gentoo-commits
commit: c503b643993a363a97ddf6a55a185ed8e2000e68
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 5 10:01:27 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jan 5 10:01:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c503b643
media-video/mplayer: remove x86-fbsd
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-video/mplayer/mplayer-1.4-r1.ebuild | 1 -
media-video/mplayer/mplayer-9999.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index b833caf68835..daf58bcdb444 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -141,7 +141,6 @@ DEPEND="${RDEPEND}
app-text/docbook-xsl-stylesheets
)
x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
"
RDEPEND+="
selinux? ( sec-policy/selinux-mplayer )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 76b9f02f6fd3..247a9c42852a 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -141,7 +141,6 @@ DEPEND="${RDEPEND}
app-text/docbook-xsl-stylesheets
)
x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
"
RDEPEND+="
selinux? ( sec-policy/selinux-mplayer )
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2022-01-04 13:18 David Seifert
0 siblings, 0 replies; 93+ messages in thread
From: David Seifert @ 2022-01-04 13:18 UTC (permalink / raw
To: gentoo-commits
commit: 8d695974b627083d35895abb58844142b7ef49e2
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 4 13:16:43 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 4 13:16:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d695974
media-video/mplayer: remove implicit kernel_linux
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-video/mplayer/mplayer-1.4-r1.ebuild | 4 ++--
media-video/mplayer/mplayer-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index 097379320a81..b833caf68835 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 44bc6b156c21..76b9f02f6fd3 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+ftp ggi gsm +iconv ipv6 jack joystick jpeg ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2021-09-08 1:30 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2021-09-08 1:30 UTC (permalink / raw
To: gentoo-commits
commit: c4f420dde4ed14bbc46a3eb38b73b16cf8255d15
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 8 01:27:07 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 8 01:30:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4f420dd
media-video/mplayer: Keyword 1.4-r1 arm64, #809806
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index e3f376cc706..097379320a8 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -150,7 +150,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2021-03-25 14:39 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2021-03-25 14:39 UTC (permalink / raw
To: gentoo-commits
commit: 3ac2c05ecd09c85cedeff063fac8333e8b56271f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 25 14:33:19 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 25 14:39:20 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ac2c05e
media-video/mplayer: fix cpu_flags_* default (disable)
We shouldn't enable CPU_FLAGS_* by default. Users don't
mask or explicitly disable flags they don't have, they just
enable the ones they _do_ have.
Reported-by: ggabriel
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.3.0-r6.ebuild | 4 ++--
media-video/mplayer/mplayer-1.4-r1.ebuild | 4 ++--
media-video/mplayer/mplayer-9999.ebuild | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r6.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
index 1bdf32fb43c..cc6c4c2db4c 100644
--- a/media-video/mplayer/mplayer-1.3.0-r6.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bi
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index cc2bb32bc28..c3f5a2e913c 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bi
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 12e39fc2ea0..44bc6b156c2 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -13,7 +13,7 @@ IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bi
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++libass libcaca libmpeg2 lirc live lzo mad md5sum cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
^ permalink raw reply related [flat|nested] 93+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2020-12-13 8:51 Sam James
0 siblings, 0 replies; 93+ messages in thread
From: Sam James @ 2020-12-13 8:51 UTC (permalink / raw
To: gentoo-commits
commit: 20aac74f573606b66708f683e4cb0f39c0638116
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 13 08:51:03 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 08:51:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20aac74f
media-video/mplayer: arm stable (bug #755650)
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-video/mplayer/mplayer-1.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index 6be49c30001..cc2bb32bc28 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -150,7 +150,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2020-11-28 9:14 Agostino Sarubbo
0 siblings, 0 replies; 93+ messages in thread
From: Agostino Sarubbo @ 2020-11-28 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 5b14d4c1f04e4e318e1da4c7abe703b115136cbb
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 09:14:04 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 09:14:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b14d4c1
media-video/mplayer: ppc64 stable wrt bug #755650
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-video/mplayer/mplayer-1.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index 9cc73383642..6be49c30001 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -150,7 +150,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2020-11-27 16:08 Agostino Sarubbo
0 siblings, 0 replies; 93+ messages in thread
From: Agostino Sarubbo @ 2020-11-27 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 34615bfbac6c373c2004335601afcafa3275432b
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 16:07:54 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 16:07:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34615bfb
media-video/mplayer: ppc stable wrt bug #755650
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-video/mplayer/mplayer-1.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index 09fcb114f7f..9cc73383642 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -150,7 +150,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2020-07-23 5:15 Kent Fredric
0 siblings, 0 replies; 93+ messages in thread
From: Kent Fredric @ 2020-07-23 5:15 UTC (permalink / raw
To: gentoo-commits
commit: 1f880413f30493df4af453eeddddd2486efc0d2a
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 23 05:06:14 2020 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Thu Jul 23 05:13:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f880413
media-video/mplayer: Drop macos and solaris prefixes 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>
media-video/mplayer/mplayer-1.3.0-r6.ebuild | 2 +-
media-video/mplayer/mplayer-1.4-r1.ebuild | 2 +-
media-video/mplayer/mplayer-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r6.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
index 25e24f49c4c..425e4c483f2 100644
--- a/media-video/mplayer/mplayer-1.3.0-r6.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
@@ -151,7 +151,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
fi
# faac codecs are nonfree
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index 93dbc986c80..12e39fc2ea0 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -150,7 +150,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi
# faac codecs are nonfree
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 93dbc986c80..12e39fc2ea0 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -150,7 +150,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2020-07-21 23:15 Kent Fredric
0 siblings, 0 replies; 93+ messages in thread
From: Kent Fredric @ 2020-07-21 23:15 UTC (permalink / raw
To: gentoo-commits
commit: f5175b5f4aae5ebce207b71b5153d926f711f367
Author: Kent Fredric <kentnl <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 21 21:57:04 2020 +0000
Commit: Kent Fredric <kentnl <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 23:13:39 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5175b5f
media-video/mplayer: Drop x64-macos re bug #690140
Depends:
- 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>
media-video/mplayer/mplayer-1.3.0-r6.ebuild | 2 +-
media-video/mplayer/mplayer-1.4-r1.ebuild | 2 +-
media-video/mplayer/mplayer-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r6.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
index f03b8e204b7..25e24f49c4c 100644
--- a/media-video/mplayer/mplayer-1.3.0-r6.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
@@ -151,7 +151,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
# faac codecs are nonfree
diff --git a/media-video/mplayer/mplayer-1.4-r1.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
index cc11341688b..93dbc986c80 100644
--- a/media-video/mplayer/mplayer-1.4-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -150,7 +150,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
# faac codecs are nonfree
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index cc11341688b..93dbc986c80 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -150,7 +150,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2020-06-18 13:10 Thomas Deutschmann
0 siblings, 0 replies; 93+ messages in thread
From: Thomas Deutschmann @ 2020-06-18 13:10 UTC (permalink / raw
To: gentoo-commits
commit: ebab2e6f202ce0be36a89330110bb41968699249
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 18 12:42:09 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Jun 18 13:10:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebab2e6f
media-video/mplayer: drop USE=openssl and USE=gnutls
This commit will partly revert commit 6aa84187fb7703127477455b57e2ad41b4f6bcdd.
After discussion on IRC we agreed that these no-op USE flags don't make
any sense.
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-video/mplayer/metadata.xml | 1 -
media-video/mplayer/{mplayer-1.4.ebuild => mplayer-1.4-r1.ebuild} | 6 +++---
media-video/mplayer/mplayer-9999.ebuild | 6 +++---
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index e0687a95818..5f4a3dfe1b7 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -21,7 +21,6 @@
<flag name="mng">MNG input support</flag>
<flag name="network">Enables network streaming support</flag>
<flag name="nut">Enables support for the NUT container format</flag>
- <flag name="openssl">Request OpenSSL support in <pkg>media-video/ffmpeg</pkg> to enable encrypted network protocols (TLS/HTTPS)</flag>
<flag name="osdmenu">Enables support for on-screen display (OSD) menus</flag>
<flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag>
<flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
diff --git a/media-video/mplayer/mplayer-1.4.ebuild b/media-video/mplayer/mplayer-1.4-r1.ebuild
similarity index 98%
rename from media-video/mplayer/mplayer-1.4.ebuild
rename to media-video/mplayer/mplayer-1.4-r1.ebuild
index 4ce8fdded4c..cc11341688b 100644
--- a/media-video/mplayer/mplayer-1.4.ebuild
+++ b/media-video/mplayer/mplayer-1.4-r1.ebuild
@@ -12,9 +12,9 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp ggi gnutls gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network openal opengl openssl +osdmenu oss png pnm pulseaudio pvr
++network openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
@@ -61,7 +61,7 @@ RDEPEND+="
sys-libs/ncurses:0=
app-arch/bzip2
sys-libs/zlib
- >=media-video/ffmpeg-4.0:0=[gnutls?,openssl?,vdpau?]
+ >=media-video/ffmpeg-4.0:0=[vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 4ce8fdded4c..cc11341688b 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -12,9 +12,9 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp ggi gnutls gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network openal opengl openssl +osdmenu oss png pnm pulseaudio pvr
++network openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
@@ -61,7 +61,7 @@ RDEPEND+="
sys-libs/ncurses:0=
app-arch/bzip2
sys-libs/zlib
- >=media-video/ffmpeg-4.0:0=[gnutls?,openssl?,vdpau?]
+ >=media-video/ffmpeg-4.0:0=[vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2020-06-17 17:18 Thomas Deutschmann
0 siblings, 0 replies; 93+ messages in thread
From: Thomas Deutschmann @ 2020-06-17 17:18 UTC (permalink / raw
To: gentoo-commits
commit: a52471c76d636e90d1a2367285e73c1f122b67eb
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 17 17:18:43 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 17:18:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a52471c7
media-video/mplayer: sync live ebuild
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-video/mplayer/mplayer-9999.ebuild | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index c43a664ee9e..4ce8fdded4c 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -12,9 +12,9 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+ftp ggi gnutls gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
++network openal opengl openssl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
@@ -61,7 +61,7 @@ RDEPEND+="
sys-libs/ncurses:0=
app-arch/bzip2
sys-libs/zlib
- >=media-video/ffmpeg-3.0:0=[vdpau?]
+ >=media-video/ffmpeg-4.0:0=[gnutls?,openssl?,vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
@@ -101,7 +101,6 @@ RDEPEND+="
mng? ( media-libs/libmng:= )
mp3? ( media-sound/mpg123 )
nas? ( media-libs/nas )
- nut? ( >=media-libs/libnut-661 )
openal? ( media-libs/openal )
opengl? ( virtual/opengl )
png? ( media-libs/libpng:0= )
@@ -151,7 +150,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
fi
# faac codecs are nonfree
@@ -230,6 +229,8 @@ src_prepare() {
# Set SVN version manually
subversion_wc_info
printf "${ESVN_WC_REVISION}" > $svf
+ else
+ eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
fi
if [ ! -f VERSION ] ; then
[ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
@@ -266,13 +267,14 @@ src_configure() {
# disable opus and ilbc since it only controls support in internal
# ffmpeg which we do not use
myconf+="
- --disable-svga --disable-svgalib_helper
- --disable-ass-internal
--disable-arts
+ --disable-ass-internal
--disable-directfb
--disable-kai
- --disable-libopus
--disable-libilbc
+ --disable-libnut
+ --disable-libopus
+ --disable-svga --disable-svgalib_helper
--disable-xvmc
$(use_enable network networking)
$(use_enable joystick)
@@ -285,7 +287,6 @@ src_configure() {
use bidi || myconf+=" --disable-fribidi"
use ipv6 || myconf+=" --disable-inet6"
use libass || myconf+=" --disable-ass"
- use nut || myconf+=" --disable-libnut"
use rar || myconf+=" --disable-unrarexec"
use samba || myconf+=" --disable-smb"
use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
@@ -324,6 +325,8 @@ src_configure() {
# DVB / Video4Linux / Radio support #
#####################################
myconf+=" --disable-tv-bsdbt848"
+ # broken upstream, won't work with recent kernels
+ myconf+=" --disable-ivtv"
# gone since linux-headers-2.6.38
myconf+=" --disable-tv-v4l1"
if { use dvb || use v4l || use pvr || use radio; }; then
@@ -484,6 +487,7 @@ src_configure() {
"
fi
+ # Note: --enable-gnutls only makes sense with --enable-ffmpeg_a
./configure \
--cc="$(tc-getCC)" \
--host-cc="$(tc-getBUILD_CC)" \
@@ -494,6 +498,7 @@ src_configure() {
--datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
--mandir="${EPREFIX}/usr/share/man" \
--disable-ffmpeg_a \
+ --disable-gnutls \
${myconf} || die
}
@@ -537,7 +542,7 @@ src_install() {
if use doc; then
docinto html/
- dohtml -r "${S}"/DOCS/HTML/*
+ dodoc -r "${S}"/DOCS/HTML/*
fi
if ! use truetype; then
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2020-06-17 17:15 Thomas Deutschmann
0 siblings, 0 replies; 93+ messages in thread
From: Thomas Deutschmann @ 2020-06-17 17:15 UTC (permalink / raw
To: gentoo-commits
commit: 6aa84187fb7703127477455b57e2ad41b4f6bcdd
Author: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail <DOT> com>
AuthorDate: Mon May 11 11:49:52 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 17 17:15:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa84187
media-video/mplayer: bump to version 1.4
Note on OpenSSL: Mplayer is linking to OpenSSL's libs only if configured
to use its internal copy of `ffmpeg`. The ebuild passes --disable-ffmpeg_a
to mplayer's configure script and so mplayer will link to ffmpeg's shared
libraries provided by Gentoo package media-video/ffmpeg. Thus, adding
support for OpenSSL means to pass the requirement to media-libs/ffmpeg.
Using the internal copy of the ffmpeg library could affect binary
distribution of a locally built mplayer package.
Closes: https://bugs.gentoo.org/683972
Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/15745
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-video/mplayer/Manifest | 1 +
media-video/mplayer/metadata.xml | 1 +
media-video/mplayer/mplayer-1.4.ebuild | 605 +++++++++++++++++++++++++++++++++
3 files changed, 607 insertions(+)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index c4ee2354054..e33d1bde68c 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,5 @@
DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a38b2bc6a2ce0ce062f213bf46c11c67b0d93dd53ea3bd618c74df08bf756e8872d172c1b27e0e175fc67c236a077 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
+DIST MPlayer-1.4.tar.xz 15054920 BLAKE2B 4777cb31a32d62c393778c581c1913fbf355a36cbe6bcf6f426c90c2c8c70123e8aed4d01faf52ee6b1fba3c49e11fa13185f81ae8582f90c901b90955a1f42b SHA512 8ef71cad187d8c8f81c837279bd3a421b440c892d3347a667670b21c954007e35cf0d15828f0901f347b9c1b053e8da4bc7f0fb6de34382d1e463074923d7b34
DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e761f751bd637deddcb801855296c525bf3b5e8feb1cb11cef282c0269f2c963ded22846089076e7e6763f258b8a932af454 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 5f4a3dfe1b7..e0687a95818 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -21,6 +21,7 @@
<flag name="mng">MNG input support</flag>
<flag name="network">Enables network streaming support</flag>
<flag name="nut">Enables support for the NUT container format</flag>
+ <flag name="openssl">Request OpenSSL support in <pkg>media-video/ffmpeg</pkg> to enable encrypted network protocols (TLS/HTTPS)</flag>
<flag name="osdmenu">Enables support for on-screen display (OSD) menus</flag>
<flag name="pnm">Add PNM video output option, to create PPM/PGM/PGMYUV images</flag>
<flag name="pvr">Enable Video4Linux2 MPEG PVR</flag>
diff --git a/media-video/mplayer/mplayer-1.4.ebuild b/media-video/mplayer/mplayer-1.4.ebuild
new file mode 100644
index 00000000000..4ce8fdded4c
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.4.ebuild
@@ -0,0 +1,605 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
+ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3"
+
+inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
+
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+bs2b cddb +cdio cdparanoia cpudetection debug dga
+doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+ftp ggi gnutls gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++network openal opengl openssl +osdmenu oss png pnm pulseaudio pvr
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
+tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
+vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
+
+VIDEO_CARDS="mga"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+FONT_URI="
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
+if [[ ${PV} == *9999* ]]; then
+ RELEASE_URI=""
+elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+ MY_P="MPlayer-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
+else
+ RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+fi
+SRC_URI="${RELEASE_URI}
+ !truetype? ( ${FONT_URI} )"
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+FONT_RDEPS="
+ virtual/ttf-fonts
+ media-libs/fontconfig
+ >=media-libs/freetype-2.2.1:2
+"
+X_RDEPS="
+ x11-libs/libXext
+ x11-libs/libXxf86vm
+"
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+# nemesi? ( net-libs/libnemesi )
+# mplayer relies on private APIs in giflib that have been removed:
+# https://sourceforge.net/p/giflib/bugs/132/
+RDEPEND+="
+ sys-libs/ncurses:0=
+ app-arch/bzip2
+ sys-libs/zlib
+ >=media-video/ffmpeg-4.0:0=[gnutls?,openssl?,vdpau?]
+ a52? ( media-libs/a52dec )
+ aalib? ( media-libs/aalib )
+ alsa? ( media-libs/alsa-lib )
+ bidi? ( dev-libs/fribidi )
+ bluray? ( >=media-libs/libbluray-0.2.1:= )
+ bs2b? ( media-libs/libbs2b )
+ cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
+ cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+ dga? ( x11-libs/libXxf86dga )
+ dts? ( media-libs/libdca )
+ dv? ( media-libs/libdv )
+ dvd? ( >=media-libs/libdvdread-4.1.3:0= )
+ dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= )
+ encode? (
+ !twolame? ( toolame? ( media-sound/toolame ) )
+ twolame? ( media-sound/twolame )
+ faac? ( media-libs/faac )
+ mp3? ( media-sound/lame )
+ x264? ( >=media-libs/x264-0.0.20100423:= )
+ xvid? ( media-libs/xvid )
+ )
+ enca? ( app-i18n/enca )
+ faad? ( media-libs/faad2 )
+ ggi? ( media-libs/libggi media-libs/libggiwmh )
+ gsm? ( media-sound/gsm )
+ iconv? ( virtual/libiconv )
+ jack? ( virtual/jack )
+ jpeg? ( virtual/jpeg:0 )
+ ladspa? ( media-libs/ladspa-sdk )
+ libass? ( >=media-libs/libass-0.9.10:= )
+ libcaca? ( media-libs/libcaca )
+ libmpeg2? ( media-libs/libmpeg2 )
+ lirc? ( app-misc/lirc )
+ live? ( media-plugins/live )
+ lzo? ( >=dev-libs/lzo-2 )
+ mad? ( media-libs/libmad )
+ mng? ( media-libs/libmng:= )
+ mp3? ( media-sound/mpg123 )
+ nas? ( media-libs/nas )
+ openal? ( media-libs/openal )
+ opengl? ( virtual/opengl )
+ png? ( media-libs/libpng:0= )
+ pnm? ( media-libs/netpbm )
+ pulseaudio? ( media-sound/pulseaudio )
+ rar? (
+ || (
+ app-arch/unrar
+ app-arch/rar
+ )
+ )
+ rtmp? ( media-video/rtmpdump )
+ samba? ( net-fs/samba )
+ sdl? ( media-libs/libsdl )
+ speex? ( media-libs/speex )
+ theora? ( media-libs/libtheora[encode?] )
+ tremor? ( media-libs/tremor )
+ truetype? ( ${FONT_RDEPS} )
+ vdpau? ( x11-libs/libvdpau )
+ vorbis? ( !tremor? ( media-libs/libvorbis ) )
+ X? ( ${X_RDEPS} )
+ xinerama? ( x11-libs/libXinerama )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ xv? ( x11-libs/libXv )
+"
+
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dga? ( x11-base/xorg-proto )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ X? ( x11-base/xorg-proto )
+ xinerama? ( x11-base/xorg-proto )
+ xscreensaver? ( x11-base/xorg-proto )
+ amd64? ( ${ASM_DEP} )
+ doc? (
+ dev-libs/libxslt app-text/docbook-xml-dtd
+ app-text/docbook-xsl-stylesheets
+ )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+"
+RDEPEND+="
+ selinux? ( sec-policy/selinux-mplayer )
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+if [[ ${PV} != *9999* ]]; then
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+fi
+
+# faac codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# radio requires oss or alsa backend
+REQUIRED_USE="
+ dga? ( X )
+ dvdnav? ( dvd )
+ enca? ( iconv )
+ ggi? ( X )
+ libass? ( truetype )
+ opengl? ( X )
+ osdmenu? ( X )
+ truetype? ( iconv )
+ vdpau? ( X )
+ vidix? ( X )
+ xinerama? ( X )
+ xscreensaver? ( X )
+ xv? ( X )"
+RESTRICT="faac? ( bindist )"
+
+pkg_setup() {
+ if [[ ${PV} == *9999* ]]; then
+ elog
+ elog "This is a live ebuild which installs the latest from upstream's"
+ elog "subversion repository, and is unsupported by Gentoo."
+ elog "Everything but bugs in the ebuild itself will be ignored."
+ elog
+ fi
+
+ if use cpudetection; then
+ ewarn
+ ewarn "You've enabled the cpudetection flag. This feature is"
+ ewarn "included mainly for people who want to use the same"
+ ewarn "binary on another system with a different CPU architecture."
+ ewarn "MPlayer will already detect your CPU settings by default at"
+ ewarn "buildtime; this flag is used for runtime detection."
+ ewarn "You won't need this turned on if you are only building"
+ ewarn "mplayer for this system. Also, if your compile fails, try"
+ ewarn "disabling this use flag."
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} = *9999* ]]; then
+ subversion_src_unpack
+ cd "${WORKDIR}"
+ rm -rf "${WORKDIR}/${P}/ffmpeg/"
+ ( EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/ffmpeg/" git-r3_src_unpack )
+ else
+ unpack ${A}
+ fi
+
+ if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
+ cd "${S}"
+ cp "${FILESDIR}/dump_ffmpeg.sh" . || die
+ chmod +x dump_ffmpeg.sh
+ ./dump_ffmpeg.sh || die
+ fi
+
+ if ! use truetype; then
+ unpack font-arial-iso-8859-1.tar.bz2 \
+ font-arial-iso-8859-2.tar.bz2 \
+ font-arial-cp1250.tar.bz2
+ fi
+}
+
+src_prepare() {
+ default
+
+ local svf=snapshot_version
+ if [[ ${PV} = *9999* ]]; then
+ # Set SVN version manually
+ subversion_wc_info
+ printf "${ESVN_WC_REVISION}" > $svf
+ else
+ eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
+ fi
+ if [ ! -f VERSION ] ; then
+ [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+ local sv=$(<$svf)
+ printf "SVN-r${sv} (Gentoo)" > VERSION
+ fi
+
+ # fix path to bash executable in configure scripts
+ sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
+
+ # Use sane default for >=virtual/udev-197
+ sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+}
+
+src_configure() {
+ local myconf=""
+ local uses i
+
+ # set LINGUAS
+ [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+ [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+
+ # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+ # compilation in almost every situation. The reason for this is
+ # because if --enable is used, it will force the build of that option,
+ # regardless of whether the dependency is available or not.
+
+ ###################
+ #Optional features#
+ ###################
+ # disable svga since we don't want it
+ # disable arts since we don't have kde3
+ # always disable internal ass
+ # disable opus and ilbc since it only controls support in internal
+ # ffmpeg which we do not use
+ myconf+="
+ --disable-arts
+ --disable-ass-internal
+ --disable-directfb
+ --disable-kai
+ --disable-libilbc
+ --disable-libnut
+ --disable-libopus
+ --disable-svga --disable-svgalib_helper
+ --disable-xvmc
+ $(use_enable network networking)
+ $(use_enable joystick)
+ "
+ uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
+ myconf+=" --disable-nemesi" # nemesi automagic disable
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use bidi || myconf+=" --disable-fribidi"
+ use ipv6 || myconf+=" --disable-inet6"
+ use libass || myconf+=" --disable-ass"
+ use rar || myconf+=" --disable-unrarexec"
+ use samba || myconf+=" --disable-smb"
+ use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+ # libcdio support: prefer libcdio over cdparanoia
+ # don't check for cddb w/cdio
+ if use cdio; then
+ myconf+=" --disable-cdparanoia"
+ else
+ myconf+=" --disable-libcdio"
+ use cdparanoia || myconf+=" --disable-cdparanoia"
+ use cddb || myconf+=" --disable-cddb"
+ fi
+
+ ################################
+ # DVD read, navigation support #
+ ################################
+ #
+ # dvdread - accessing a DVD
+ # dvdnav - navigation of menus
+ use dvd || myconf+=" --disable-dvdread"
+ use dvdnav || myconf+=" --disable-dvdnav"
+
+ #############
+ # Subtitles #
+ #############
+ #
+ # SRT/ASS/SSA (subtitles) requires freetype support
+ # freetype support requires iconv
+ # iconv optionally can use unicode
+ use truetype || myconf+=" --disable-freetype"
+ use iconv || myconf+=" --disable-iconv --charset=noconv"
+ use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+ #####################################
+ # DVB / Video4Linux / Radio support #
+ #####################################
+ myconf+=" --disable-tv-bsdbt848"
+ # broken upstream, won't work with recent kernels
+ myconf+=" --disable-ivtv"
+ # gone since linux-headers-2.6.38
+ myconf+=" --disable-tv-v4l1"
+ if { use dvb || use v4l || use pvr || use radio; }; then
+ use dvb || myconf+=" --disable-dvb"
+ use pvr || myconf+=" --disable-pvr"
+ use v4l || myconf+=" --disable-tv-v4l2"
+ if use radio && { use dvb || use v4l; }; then
+ myconf+="
+ --enable-radio
+ $(use_enable encode radio-capture)
+ "
+ else
+ myconf+="
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ "
+ fi
+ else
+ myconf+="
+ --disable-tv
+ --disable-tv-v4l2
+ --disable-radio
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ --disable-dvb
+ --disable-v4l2
+ --disable-pvr"
+ fi
+
+ ##########
+ # Codecs #
+ ##########
+ myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
+ myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+ myconf+=" --disable-gif" # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/
+ use dts || myconf+=" --disable-libdca"
+ if ! use mp3; then
+ myconf+="
+ --disable-mp3lame
+ --disable-mpg123
+ "
+ fi
+ uses="a52 bs2b dv gsm lzo rtmp vorbis"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-lib${i}"
+ done
+
+ uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ # Pulls an outdated libopenjpeg, ffmpeg provides better support for it
+ myconf+=" --disable-libopenjpeg"
+
+ # Encoding
+ uses="faac x264 xvid toolame twolame"
+ if use encode; then
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ else
+ myconf+=" --disable-mencoder"
+ for i in ${uses}; do
+ myconf+=" --disable-${i}"
+ use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
+ done
+ fi
+
+ #################
+ # Binary codecs #
+ #################
+ myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+ ################
+ # Video Output #
+ ################
+ uses="md5sum sdl yuv4mpeg"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use aalib || myconf+=" --disable-aa"
+ use fbcon || myconf+=" --disable-fbdev"
+ use libcaca || myconf+=" --disable-caca"
+ use zoran || myconf+=" --disable-zr"
+
+ if ! use kernel_linux || ! use video_cards_mga; then
+ myconf+=" --disable-mga --disable-xmga"
+ fi
+
+ myconf+="
+ --disable-3dfx
+ --disable-tdfxvid
+ --disable-tdfxfb
+ "
+
+ # sun card, disable by default, see bug #258729
+ myconf+=" --disable-xvr100"
+
+ ################
+ # Audio Output #
+ ################
+ myconf+=" --disable-esd"
+ uses="alsa jack ladspa nas openal"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use pulseaudio || myconf+=" --disable-pulse"
+ if ! use radio; then
+ use oss || myconf+=" --disable-ossaudio"
+ fi
+
+ ####################
+ # Advanced Options #
+ ####################
+ # Platform specific flags, hardcoded on amd64 (see below)
+ use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+ uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+ for i in ${uses}; do
+ myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+ done
+
+ uses="altivec shm"
+ for i in ${uses}; do
+ myconf+=" $(use_enable ${i})"
+ done
+
+ use debug && myconf+=" --enable-debug=3"
+
+ if use x86 && gcc-specs-pie; then
+ filter-flags -fPIC -fPIE
+ append-ldflags -nopie
+ fi
+
+ ###########################
+ # X enabled configuration #
+ ###########################
+ myconf+=" --disable-gui"
+ myconf+=" --disable-vesa"
+ uses="ggi vdpau xinerama xv"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use dga || myconf+=" --disable-dga1 --disable-dga2"
+ use opengl || myconf+=" --disable-gl"
+ use osdmenu && myconf+=" --enable-menu"
+ use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
+ use xscreensaver || myconf+=" --disable-xss"
+ use X || myconf+=" --disable-x11"
+
+ ############################
+ # OSX (aqua) configuration #
+ ############################
+ if use aqua; then
+ myconf+="
+ --enable-macosx-finder
+ --enable-macosx-bundle
+ "
+ fi
+
+ # Note: --enable-gnutls only makes sense with --enable-ffmpeg_a
+ ./configure \
+ --cc="$(tc-getCC)" \
+ --host-cc="$(tc-getBUILD_CC)" \
+ --prefix="${EPREFIX}/usr" \
+ --bindir="${EPREFIX}/usr/bin" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --confdir="${EPREFIX}/etc/mplayer" \
+ --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
+ --mandir="${EPREFIX}/usr/share/man" \
+ --disable-ffmpeg_a \
+ --disable-gnutls \
+ ${myconf} || die
+}
+
+src_compile() {
+ default
+
+ # Build only user-requested docs if they're available.
+ if use doc ; then
+ # select available languages from $LINGUAS
+ local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+ local BUILT_DOCS=""
+ for i in ${LINGUAS} ; do
+ has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+ done
+ if [[ -z $BUILT_DOCS ]]; then
+ emake -j1 html-chunked
+ else
+ for i in ${BUILT_DOCS}; do
+ emake -j1 html-chunked-${i}
+ done
+ fi
+ fi
+}
+
+src_install() {
+ local i
+
+ emake \
+ DESTDIR="${D}" \
+ INSTALLSTRIP="" \
+ install
+
+ dodoc AUTHORS Changelog Copyright README etc/codecs.conf
+
+ docinto tech/
+ dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
+ docinto TOOLS/
+ dodoc -r TOOLS/*
+ docinto tech/mirrors/
+ dodoc DOCS/tech/mirrors/*
+
+ if use doc; then
+ docinto html/
+ dodoc -r "${S}"/DOCS/HTML/*
+ fi
+
+ if ! use truetype; then
+ dodir /usr/share/mplayer/fonts
+ # Do this generic, as the mplayer people like to change the structure
+ # of their zips ...
+ for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
+ cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
+ done
+ # Fix the font symlink ...
+ rm -rf "${ED}/usr/share/mplayer/font"
+ dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+ fi
+
+ insinto /etc/mplayer
+ newins "${S}/etc/example.conf" mplayer.conf
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+ doins "${S}/etc/input.conf"
+ if use osdmenu; then
+ doins "${S}/etc/menu.conf"
+ fi
+
+ if use truetype; then
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+_EOF_
+ fi
+
+ # bug 256203
+ if use rar; then
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+ fi
+
+ dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+ newbin "${S}/TOOLS/midentify.sh" midentify
+}
+
+pkg_preinst() {
+ [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
+ rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
+}
+
+pkg_postrm() {
+ # Cleanup stale symlinks
+ [ -L "${EROOT}/usr/share/mplayer/font" -a \
+ ! -e "${EROOT}/usr/share/mplayer/font" ] && \
+ rm -f "${EROOT}/usr/share/mplayer/font"
+
+ [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
+ ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+ rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
+}
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2020-04-26 12:05 David Seifert
0 siblings, 0 replies; 93+ messages in thread
From: David Seifert @ 2020-04-26 12:05 UTC (permalink / raw
To: gentoo-commits
commit: 6a6ade6df97982b8ec3a77742372b5d026d42245
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 12:04:42 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 12:04:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a6ade6d
media-video/mplayer: Remove media-video/libav
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-video/mplayer/mplayer-1.3.0-r6.ebuild | 6 ------
media-video/mplayer/mplayer-9999.ebuild | 6 ------
2 files changed, 12 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r6.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
index 5b834d90e39..f03b8e204b7 100644
--- a/media-video/mplayer/mplayer-1.3.0-r6.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
@@ -198,12 +198,6 @@ pkg_setup() {
ewarn "mplayer for this system. Also, if your compile fails, try"
ewarn "disabling this use flag."
fi
-
- if has_version 'media-video/libav' ; then
- ewarn "Please note that upstream uses media-video/ffmpeg."
- ewarn "media-video/libav should be fine in theory but if you"
- ewarn "experience any problem, try to move to media-video/ffmpeg."
- fi
}
src_unpack() {
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index ab5fe353ff5..c43a664ee9e 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -196,12 +196,6 @@ pkg_setup() {
ewarn "mplayer for this system. Also, if your compile fails, try"
ewarn "disabling this use flag."
fi
-
- if has_version 'media-video/libav' ; then
- ewarn "Please note that upstream uses media-video/ffmpeg."
- ewarn "media-video/libav should be fine in theory but if you"
- ewarn "experience any problem, try to move to media-video/ffmpeg."
- fi
}
src_unpack() {
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2020-02-22 23:17 David Seifert
0 siblings, 0 replies; 93+ messages in thread
From: David Seifert @ 2020-02-22 23:17 UTC (permalink / raw
To: gentoo-commits
commit: 568f99f6c440db42edc001e6074a50eb614ae131
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 22 23:17:34 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 22 23:17:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568f99f6
media-video/mplayer: Disable GIF support
* mplayer relies on private APIs of giflib that
have been moved around and will be removed in
a future release.
Bug: https://bugs.gentoo.org/682198
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../{mplayer-1.3.0-r5.ebuild => mplayer-1.3.0-r6.ebuild} | 8 +++++---
media-video/mplayer/mplayer-9999.ebuild | 10 ++++++----
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
similarity index 97%
rename from media-video/mplayer/mplayer-1.3.0-r5.ebuild
rename to media-video/mplayer/mplayer-1.3.0-r6.ebuild
index 925a8f47c76..7163acf21ea 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r6.ebuild
@@ -12,7 +12,7 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
@@ -55,6 +55,8 @@ X_RDEPS="
"
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
# nemesi? ( net-libs/libnemesi )
+# mplayer relies on private APIs in giflib that have been removed:
+# https://sourceforge.net/p/giflib/bugs/132/
RDEPEND+="
sys-libs/ncurses:0=
app-arch/bzip2
@@ -84,7 +86,6 @@ RDEPEND+="
enca? ( app-i18n/enca )
faad? ( media-libs/faad2 )
ggi? ( media-libs/libggi media-libs/libggiwmh )
- gif? ( media-libs/giflib:0= )
gsm? ( media-sound/gsm )
iconv? ( virtual/libiconv )
jack? ( virtual/jack )
@@ -371,6 +372,7 @@ src_configure() {
##########
myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+ myconf+=" --disable-gif" # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/
use dts || myconf+=" --disable-libdca"
if ! use mp3; then
myconf+="
@@ -383,7 +385,7 @@ src_configure() {
use ${i} || myconf+=" --disable-lib${i}"
done
- uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
+ uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 8ca4b4a54f5..ab5fe353ff5 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+ftp ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
@@ -55,6 +55,8 @@ X_RDEPS="
"
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
# nemesi? ( net-libs/libnemesi )
+# mplayer relies on private APIs in giflib that have been removed:
+# https://sourceforge.net/p/giflib/bugs/132/
RDEPEND+="
sys-libs/ncurses:0=
app-arch/bzip2
@@ -84,7 +86,6 @@ RDEPEND+="
enca? ( app-i18n/enca )
faad? ( media-libs/faad2 )
ggi? ( media-libs/libggi media-libs/libggiwmh )
- gif? ( media-libs/giflib:0= )
gsm? ( media-sound/gsm )
iconv? ( virtual/libiconv )
jack? ( virtual/jack )
@@ -363,6 +364,7 @@ src_configure() {
##########
myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+ myconf+=" --disable-gif" # relies on to-be-removed giflib internals https://sourceforge.net/p/giflib/bugs/132/
use dts || myconf+=" --disable-libdca"
if ! use mp3; then
myconf+="
@@ -375,7 +377,7 @@ src_configure() {
use ${i} || myconf+=" --disable-lib${i}"
done
- uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
+ uses="faad jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2019-09-29 2:56 Mike Gilbert
0 siblings, 0 replies; 93+ messages in thread
From: Mike Gilbert @ 2019-09-29 2:56 UTC (permalink / raw
To: gentoo-commits
commit: 0b112cf2b00b4cac0371833318fe3e1bd7085661
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Sep 28 18:42:04 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 02:56:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b112cf2
media-video/mplayer: Drop no longer supported --disable-ivtv option.
Fixes: https://bugs.gentoo.org/688972
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
media-video/mplayer/mplayer-9999.ebuild | 2 --
1 file changed, 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 501fc9f6208..138386fa52b 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -329,8 +329,6 @@ src_configure() {
# DVB / Video4Linux / Radio support #
#####################################
myconf+=" --disable-tv-bsdbt848"
- # broken upstream, won't work with recent kernels
- myconf+=" --disable-ivtv"
# gone since linux-headers-2.6.38
myconf+=" --disable-tv-v4l1"
if { use dvb || use v4l || use pvr || use radio; }; then
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2019-09-29 2:56 Mike Gilbert
0 siblings, 0 replies; 93+ messages in thread
From: Mike Gilbert @ 2019-09-29 2:56 UTC (permalink / raw
To: gentoo-commits
commit: 027d261d24649a83d854dff4ce2d7516d3b5605d
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Sep 28 18:37:27 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 02:56:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=027d261d
media-video/mplayer: Depend on media-libs/libdvdread and media-libs/libdvdnav with :0=.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
media-video/mplayer/mplayer-1.3.0-r5.ebuild | 4 ++--
media-video/mplayer/mplayer-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index b3c344f98b8..838455a9693 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -71,8 +71,8 @@ RDEPEND+="
dga? ( x11-libs/libXxf86dga )
dts? ( media-libs/libdca )
dv? ( media-libs/libdv )
- dvd? ( >=media-libs/libdvdread-4.1.3 )
- dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+ dvd? ( >=media-libs/libdvdread-4.1.3:0= )
+ dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= )
encode? (
!twolame? ( toolame? ( media-sound/toolame ) )
twolame? ( media-sound/twolame )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 62db816aa75..501fc9f6208 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -71,8 +71,8 @@ RDEPEND+="
dga? ( x11-libs/libXxf86dga )
dts? ( media-libs/libdca )
dv? ( media-libs/libdv )
- dvd? ( >=media-libs/libdvdread-4.1.3 )
- dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+ dvd? ( >=media-libs/libdvdread-4.1.3:0= )
+ dvdnav? ( >=media-libs/libdvdnav-4.1.3:0= )
encode? (
!twolame? ( toolame? ( media-sound/toolame ) )
twolame? ( media-sound/twolame )
^ permalink raw reply related [flat|nested] 93+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2019-09-15 14:55 Michał Górny
0 siblings, 0 replies; 93+ messages in thread
From: Michał Górny @ 2019-09-15 14:55 UTC (permalink / raw
To: gentoo-commits
commit: eb3a4212271df856df81aae09e3c8d5f2a5bce67
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 14:43:59 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 14:43:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb3a4212
media-video/mplayer: Make USE=cdparanoia local
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-video/mplayer/metadata.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index d4d955ac250..5f4a3dfe1b7 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -9,6 +9,7 @@
<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
<flag name="cdio">Use libcdio for CD support (instead of cdparanoia)</flag>
+ <flag name="cdparanoia">Enable cdparanoia (audio CD ripper) support</flag>
<flag name="cpudetection">Enables runtime CPU detection (useful for binpkgs, compatibility on other CPUs)</flag>
<flag name="dvdnav">Use forked libdvdnav, navigate menus in GUIs</flag>
<flag name="enca">Enables support for charset discovery and conversion</flag>
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2019-04-02 7:36 Matt Turner
0 siblings, 0 replies; 93+ messages in thread
From: Matt Turner @ 2019-04-02 7:36 UTC (permalink / raw
To: gentoo-commits
commit: fee77ef7b68de9661bdf0742c44872c2fc4f2697
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 2 07:35:18 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 2 07:36:13 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fee77ef7
media-video/mplayer: Remove tdfx framebuffer support
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-video/mplayer/mplayer-1.3.0-r5.ebuild | 19 ++++++-------------
media-video/mplayer/mplayer-9999.ebuild | 19 ++++++-------------
2 files changed, 12 insertions(+), 26 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index b7f1b8d3f16..b3c344f98b8 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -19,7 +19,7 @@ radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
-VIDEO_CARDS="mga tdfx"
+VIDEO_CARDS="mga"
for x in ${VIDEO_CARDS}; do
IUSE+=" video_cards_${x}"
done
@@ -425,18 +425,11 @@ src_configure() {
myconf+=" --disable-mga --disable-xmga"
fi
- if use video_cards_tdfx; then
- myconf+="
- $(use_enable video_cards_tdfx tdfxvid)
- $(use_enable fbcon tdfxfb)
- "
- else
- myconf+="
- --disable-3dfx
- --disable-tdfxvid
- --disable-tdfxfb
- "
- fi
+ myconf+="
+ --disable-3dfx
+ --disable-tdfxvid
+ --disable-tdfxfb
+ "
# sun card, disable by default, see bug #258729
myconf+=" --disable-xvr100"
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 8d1ad1c2a30..62db816aa75 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -19,7 +19,7 @@ radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
-VIDEO_CARDS="mga tdfx"
+VIDEO_CARDS="mga"
for x in ${VIDEO_CARDS}; do
IUSE+=" video_cards_${x}"
done
@@ -419,18 +419,11 @@ src_configure() {
myconf+=" --disable-mga --disable-xmga"
fi
- if use video_cards_tdfx; then
- myconf+="
- $(use_enable video_cards_tdfx tdfxvid)
- $(use_enable fbcon tdfxfb)
- "
- else
- myconf+="
- --disable-3dfx
- --disable-tdfxvid
- --disable-tdfxfb
- "
- fi
+ myconf+="
+ --disable-3dfx
+ --disable-tdfxvid
+ --disable-tdfxfb
+ "
# sun card, disable by default, see bug #258729
myconf+=" --disable-xvr100"
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2019-02-25 21:25 Mike Gilbert
0 siblings, 0 replies; 93+ messages in thread
From: Mike Gilbert @ 2019-02-25 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 6dc56f40692d0aa69e4419805d8b8efd6c7cb7ac
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Mon Feb 25 02:02:29 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Feb 25 21:24:55 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc56f40
media-video/mplayer: Use the same EGIT_REPO_URI for ffmpeg as value used in media-video/ffmpeg.
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
media-video/mplayer/mplayer-1.3.0-r5.ebuild | 4 ++--
media-video/mplayer/mplayer-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index b5a27b3c40e..b7f1b8d3f16 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 248afbd492b..8d1ad1c2a30 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-EGIT_REPO_URI="https://git.videolan.org/git/ffmpeg.git"
+EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3"
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-11-06 11:20 Alexis Ballier
0 siblings, 0 replies; 93+ messages in thread
From: Alexis Ballier @ 2018-11-06 11:20 UTC (permalink / raw
To: gentoo-commits
commit: a9a5d9df5ef6a1104566844cab0432240033b3cf
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 6 11:07:03 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Nov 6 11:20:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9a5d9df
media-video/mplayer: move dvb headers to depend
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/mplayer/mplayer-1.3.0-r5.ebuild | 2 +-
media-video/mplayer/mplayer-9999.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index 82a02d5718b..23d607fa3d2 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -71,7 +71,6 @@ RDEPEND+="
dga? ( x11-libs/libXxf86dga )
dts? ( media-libs/libdca )
dv? ( media-libs/libdv )
- dvb? ( virtual/linuxtv-dvb-headers )
dvd? ( >=media-libs/libdvdread-4.1.3 )
dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
encode? (
@@ -132,6 +131,7 @@ ASM_DEP="dev-lang/yasm"
DEPEND="${RDEPEND}
virtual/pkgconfig
dga? ( x11-base/xorg-proto )
+ dvb? ( virtual/linuxtv-dvb-headers )
X? ( x11-base/xorg-proto )
xinerama? ( x11-base/xorg-proto )
xscreensaver? ( x11-base/xorg-proto )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index c93bd317481..248afbd492b 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -71,7 +71,6 @@ RDEPEND+="
dga? ( x11-libs/libXxf86dga )
dts? ( media-libs/libdca )
dv? ( media-libs/libdv )
- dvb? ( virtual/linuxtv-dvb-headers )
dvd? ( >=media-libs/libdvdread-4.1.3 )
dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
encode? (
@@ -132,6 +131,7 @@ ASM_DEP="dev-lang/yasm"
DEPEND="${RDEPEND}
virtual/pkgconfig
dga? ( x11-base/xorg-proto )
+ dvb? ( virtual/linuxtv-dvb-headers )
X? ( x11-base/xorg-proto )
xinerama? ( x11-base/xorg-proto )
xscreensaver? ( x11-base/xorg-proto )
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-11-06 11:20 Alexis Ballier
0 siblings, 0 replies; 93+ messages in thread
From: Alexis Ballier @ 2018-11-06 11:20 UTC (permalink / raw
To: gentoo-commits
commit: d276334e02fd4748584aad9bc304d598d805dd52
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 6 11:04:47 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Nov 6 11:20:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d276334e
media-video/mplayer: Backport xvmc removal.
Manually cherry picked from 68ad2898bf0b99a7b0cd9ef94d7cc926fb100487
Closes: https://bugs.gentoo.org/655442
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/mplayer/metadata.xml | 1 -
media-video/mplayer/mplayer-1.3.0-r5.ebuild | 15 ++++-----------
2 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index d6c05ce054c..d4d955ac250 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -34,7 +34,6 @@
<flag name="twolame">Enable twolame MPEG-2 encoding</flag>
<flag name="vcd">Enables VCD support</flag>
<flag name="vidix">Support for vidix video output</flag>
- <flag name="xvmc">Enables X-Video Motion Compensation support</flag>
<flag name="yuv4mpeg">Enables yuv4mpeg video output</flag>
<flag name="zoran">Enables ZR360[56]7/ZR36060 video output</flag>
</use>
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index bd0a05495e9..82a02d5718b 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
+vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
VIDEO_CARDS="mga tdfx"
for x in ${VIDEO_CARDS}; do
@@ -126,7 +126,6 @@ RDEPEND+="
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
- xvmc? ( x11-libs/libXvMC )
"
ASM_DEP="dev-lang/yasm"
@@ -160,7 +159,6 @@ fi
# ass and freetype font require iconv and ass requires freetype fonts
# unicode transformations are usefull only with iconv
# radio requires oss or alsa backend
-# xvmc requires xvideo support
REQUIRED_USE="
dga? ( X )
dvdnav? ( dvd )
@@ -174,8 +172,7 @@ REQUIRED_USE="
vidix? ( X )
xinerama? ( X )
xscreensaver? ( X )
- xv? ( X )
- xvmc? ( xv )"
+ xv? ( X )"
RESTRICT="faac? ( bindist )"
PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" )
@@ -287,6 +284,7 @@ src_configure() {
--disable-kai
--disable-libopus
--disable-libilbc
+ --disable-xvmc
$(use_enable network networking)
$(use_enable joystick)
"
@@ -494,11 +492,6 @@ src_configure() {
use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
use xscreensaver || myconf+=" --disable-xss"
use X || myconf+=" --disable-x11"
- if use xvmc; then
- myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
- else
- myconf+=" --disable-xvmc"
- fi
############################
# OSX (aqua) configuration #
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-09-16 17:47 Andreas Sturmlechner
0 siblings, 0 replies; 93+ messages in thread
From: Andreas Sturmlechner @ 2018-09-16 17:47 UTC (permalink / raw
To: gentoo-commits
commit: 68ad2898bf0b99a7b0cd9ef94d7cc926fb100487
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 17:46:49 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 17:46:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ad2898
media-video/mplayer: Drop USE xvmc
support is gone in ffmpeg upstream.
Bug: https://bugs.gentoo.org/655442
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-video/mplayer/mplayer-9999.ebuild | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index c32bc38e1cd..c93bd317481 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -17,7 +17,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
+vorbis +X x264 xinerama +xscreensaver +xv xvid yuv4mpeg zoran"
VIDEO_CARDS="mga tdfx"
for x in ${VIDEO_CARDS}; do
@@ -126,7 +126,6 @@ RDEPEND+="
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
- xvmc? ( x11-libs/libXvMC )
"
ASM_DEP="dev-lang/yasm"
@@ -160,7 +159,6 @@ fi
# ass and freetype font require iconv and ass requires freetype fonts
# unicode transformations are usefull only with iconv
# radio requires oss or alsa backend
-# xvmc requires xvideo support
REQUIRED_USE="
dga? ( X )
dvdnav? ( dvd )
@@ -174,8 +172,7 @@ REQUIRED_USE="
vidix? ( X )
xinerama? ( X )
xscreensaver? ( X )
- xv? ( X )
- xvmc? ( xv )"
+ xv? ( X )"
RESTRICT="faac? ( bindist )"
pkg_setup() {
@@ -281,6 +278,7 @@ src_configure() {
--disable-kai
--disable-libopus
--disable-libilbc
+ --disable-xvmc
$(use_enable network networking)
$(use_enable joystick)
"
@@ -488,11 +486,6 @@ src_configure() {
use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
use xscreensaver || myconf+=" --disable-xss"
use X || myconf+=" --disable-x11"
- if use xvmc; then
- myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
- else
- myconf+=" --disable-xvmc"
- fi
############################
# OSX (aqua) configuration #
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-09-16 17:41 Andreas Sturmlechner
0 siblings, 0 replies; 93+ messages in thread
From: Andreas Sturmlechner @ 2018-09-16 17:41 UTC (permalink / raw
To: gentoo-commits
commit: 76730b8b9e691d70e2151727e362efed5fc9d262
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 17:38:10 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 17:41:06 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76730b8b
media-video/mplayer: Drop duplicate KEYWORDS line
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-video/mplayer/mplayer-1.3.0-r5.ebuild | 2 --
media-video/mplayer/mplayer-9999.ebuild | 4 +---
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
index 6b515f5212d..bd0a05495e9 100644
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -152,8 +152,6 @@ SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
- KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 x86"
fi
# faac codecs are nonfree
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 2c207676063..c32bc38e1cd 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=6
EGIT_REPO_URI="https://git.videolan.org/git/ffmpeg.git"
ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3" || SVN_ECLASS=""
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3"
inherit toolchain-funcs flag-o-matic ${SVN_ECLASS}
@@ -152,8 +152,6 @@ SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
- KEYWORDS=""
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-09-16 17:41 Andreas Sturmlechner
0 siblings, 0 replies; 93+ messages in thread
From: Andreas Sturmlechner @ 2018-09-16 17:41 UTC (permalink / raw
To: gentoo-commits
commit: 46cbfd73748ba646515a82e03c367e1033416087
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 17:35:28 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 17:41:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46cbfd73
media-video/mplayer: --disable-directfb also in 9999
Bug: https://bugs.gentoo.org/647720
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-video/mplayer/mplayer-9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 1e4bb407e61..2c207676063 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -279,6 +279,7 @@ src_configure() {
--disable-svga --disable-svgalib_helper
--disable-ass-internal
--disable-arts
+ --disable-directfb
--disable-kai
--disable-libopus
--disable-libilbc
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-09-16 17:41 Andreas Sturmlechner
0 siblings, 0 replies; 93+ messages in thread
From: Andreas Sturmlechner @ 2018-09-16 17:41 UTC (permalink / raw
To: gentoo-commits
commit: cac7054009d9ada9f50be2b6b7b405fa62d25b42
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 17:29:56 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 17:41:05 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cac70540
media-video/mplayer: Fix git-r3 migration
Thanks-to: Christian Hagau <ach <AT> hagau.se>
Closes: https://bugs.gentoo.org/647720
Package-Manager: Portage-2.3.49, Repoman-2.3.10
media-video/mplayer/mplayer-9999.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 252dcec7163..1e4bb407e61 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+EGIT_REPO_URI="https://git.videolan.org/git/ffmpeg.git"
ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-r3" || SVN_ECLASS=""
@@ -213,7 +213,7 @@ src_unpack() {
subversion_src_unpack
cd "${WORKDIR}"
rm -rf "${WORKDIR}/${P}/ffmpeg/"
- ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+ ( EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/ffmpeg/" git-r3_src_unpack )
else
unpack ${A}
fi
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-05-20 19:10 Andreas Sturmlechner
0 siblings, 0 replies; 93+ messages in thread
From: Andreas Sturmlechner @ 2018-05-20 19:10 UTC (permalink / raw
To: gentoo-commits
commit: 9fa755e9dfa496ece52b287a3afc09d074a9fb0e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 15:37:47 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 20 19:09:21 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fa755e9
media-video/mplayer: Drop old
Closes: https://bugs.gentoo.org/642506
Package-Manager: Portage-2.3.38, Repoman-2.3.9
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 626 ----------------------------
1 file changed, 626 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
deleted file mode 100644
index c48e3a8e79d..00000000000
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ /dev/null
@@ -1,626 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
-
-VIDEO_CARDS="mga tdfx"
-for x in ${VIDEO_CARDS}; do
- IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
- mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
- RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
- MY_P="MPlayer-${PV}"
- S="${WORKDIR}/${MY_P}"
- RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
- RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
- !truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
- virtual/ttf-fonts
- media-libs/fontconfig
- >=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
- x11-libs/libXext
- x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-# nemesi? ( net-libs/libnemesi )
-RDEPEND+="
- sys-libs/ncurses:0=
- app-arch/bzip2
- sys-libs/zlib
- >=media-video/ffmpeg-3.0:0=[vdpau?]
- a52? ( media-libs/a52dec )
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- bidi? ( dev-libs/fribidi )
- bluray? ( >=media-libs/libbluray-0.2.1:= )
- bs2b? ( media-libs/libbs2b )
- cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
- cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
- dga? ( x11-libs/libXxf86dga )
- directfb? ( dev-libs/DirectFB )
- dts? ( media-libs/libdca )
- dv? ( media-libs/libdv )
- dvb? ( virtual/linuxtv-dvb-headers )
- dvd? ( >=media-libs/libdvdread-4.1.3 )
- dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
- encode? (
- !twolame? ( toolame? ( media-sound/toolame ) )
- twolame? ( media-sound/twolame )
- faac? ( media-libs/faac )
- mp3? ( media-sound/lame )
- x264? ( >=media-libs/x264-0.0.20100423:= )
- xvid? ( media-libs/xvid )
- )
- enca? ( app-i18n/enca )
- faad? ( media-libs/faad2 )
- ggi? ( media-libs/libggi media-libs/libggiwmh )
- gif? ( media-libs/giflib:0= )
- gsm? ( media-sound/gsm )
- iconv? ( virtual/libiconv )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- ladspa? ( media-libs/ladspa-sdk )
- libass? ( >=media-libs/libass-0.9.10:= )
- libcaca? ( media-libs/libcaca )
- libmpeg2? ( media-libs/libmpeg2 )
- lirc? ( app-misc/lirc )
- live? ( media-plugins/live )
- lzo? ( >=dev-libs/lzo-2 )
- mad? ( media-libs/libmad )
- mng? ( media-libs/libmng:= )
- mp3? ( media-sound/mpg123 )
- nas? ( media-libs/nas )
- nut? ( >=media-libs/libnut-661 )
- openal? ( media-libs/openal )
- opengl? ( virtual/opengl )
- png? ( media-libs/libpng:0= )
- pnm? ( media-libs/netpbm )
- pulseaudio? ( media-sound/pulseaudio )
- rar? (
- || (
- app-arch/unrar
- app-arch/rar
- )
- )
- rtmp? ( media-video/rtmpdump )
- samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl )
- speex? ( media-libs/speex )
- theora? ( media-libs/libtheora[encode?] )
- tremor? ( media-libs/tremor )
- truetype? ( ${FONT_RDEPS} )
- vdpau? ( x11-libs/libvdpau )
- vorbis? ( !tremor? ( media-libs/libvorbis ) )
- X? ( ${X_RDEPS} )
- xinerama? ( x11-libs/libXinerama )
- xscreensaver? ( x11-libs/libXScrnSaver )
- xv? ( x11-libs/libXv )
- xvmc? ( x11-libs/libXvMC )
-"
-
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- dga? ( x11-base/xorg-proto )
- X? ( x11-base/xorg-proto )
- xinerama? ( x11-base/xorg-proto )
- xscreensaver? ( x11-base/xorg-proto )
- amd64? ( ${ASM_DEP} )
- doc? (
- dev-libs/libxslt app-text/docbook-xml-dtd
- app-text/docbook-xsl-stylesheets
- )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
- selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
- KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
- dga? ( X )
- dvdnav? ( dvd )
- enca? ( iconv )
- ggi? ( X )
- libass? ( truetype )
- opengl? ( X )
- osdmenu? ( X )
- truetype? ( iconv )
- vdpau? ( X )
- vidix? ( X )
- xinerama? ( X )
- xscreensaver? ( X )
- xv? ( X )
- xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3-vdpau-x11.patch" )
-
-pkg_setup() {
- if [[ ${PV} == *9999* ]]; then
- elog
- elog "This is a live ebuild which installs the latest from upstream's"
- elog "subversion repository, and is unsupported by Gentoo."
- elog "Everything but bugs in the ebuild itself will be ignored."
- elog
- fi
-
- if use cpudetection; then
- ewarn
- ewarn "You've enabled the cpudetection flag. This feature is"
- ewarn "included mainly for people who want to use the same"
- ewarn "binary on another system with a different CPU architecture."
- ewarn "MPlayer will already detect your CPU settings by default at"
- ewarn "buildtime; this flag is used for runtime detection."
- ewarn "You won't need this turned on if you are only building"
- ewarn "mplayer for this system. Also, if your compile fails, try"
- ewarn "disabling this use flag."
- fi
-
- if has_version 'media-video/libav' ; then
- ewarn "Please note that upstream uses media-video/ffmpeg."
- ewarn "media-video/libav should be fine in theory but if you"
- ewarn "experience any problem, try to move to media-video/ffmpeg."
- fi
-}
-
-src_unpack() {
- if [[ ${PV} = *9999* ]]; then
- subversion_src_unpack
- cd "${WORKDIR}"
- rm -rf "${WORKDIR}/${P}/ffmpeg/"
- ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
- else
- unpack ${A}
- fi
-
- if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
- cd "${S}"
- cp "${FILESDIR}/dump_ffmpeg.sh" . || die
- chmod +x dump_ffmpeg.sh
- ./dump_ffmpeg.sh || die
- fi
-
- if ! use truetype; then
- unpack font-arial-iso-8859-1.tar.bz2 \
- font-arial-iso-8859-2.tar.bz2 \
- font-arial-cp1250.tar.bz2
- fi
-}
-
-src_prepare() {
- local svf=snapshot_version
- if [[ ${PV} = *9999* ]]; then
- # Set SVN version manually
- subversion_wc_info
- printf "${ESVN_WC_REVISION}" > $svf
- else
- epatch "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240
- epatch "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch
- fi
- if [ ! -f VERSION ] ; then
- [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
- local sv=$(<$svf)
- printf "SVN-r${sv} (Gentoo)" > VERSION
- fi
-
- # fix path to bash executable in configure scripts
- sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
- base_src_prepare
-
- # Use sane default for >=virtual/udev-197
- sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-}
-
-src_configure() {
- local myconf=""
- local uses i
-
- # set LINGUAS
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
- # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
- # compilation in almost every situation. The reason for this is
- # because if --enable is used, it will force the build of that option,
- # regardless of whether the dependency is available or not.
-
- ###################
- #Optional features#
- ###################
- # disable svga since we don't want it
- # disable arts since we don't have kde3
- # always disable internal ass
- # disable opus and ilbc since it only controls support in internal
- # ffmpeg which we do not use
- myconf+="
- --disable-svga --disable-svgalib_helper
- --disable-ass-internal
- --disable-arts
- --disable-kai
- --disable-libopus
- --disable-libilbc
- $(use_enable network networking)
- $(use_enable joystick)
- "
- uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
- myconf+=" --disable-nemesi" # nemesi automagic disable
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use bidi || myconf+=" --disable-fribidi"
- use ipv6 || myconf+=" --disable-inet6"
- use libass || myconf+=" --disable-ass"
- use nut || myconf+=" --disable-libnut"
- use rar || myconf+=" --disable-unrarexec"
- use samba || myconf+=" --disable-smb"
- use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
- # libcdio support: prefer libcdio over cdparanoia
- # don't check for cddb w/cdio
- if use cdio; then
- myconf+=" --disable-cdparanoia"
- else
- myconf+=" --disable-libcdio"
- use cdparanoia || myconf+=" --disable-cdparanoia"
- use cddb || myconf+=" --disable-cddb"
- fi
-
- ################################
- # DVD read, navigation support #
- ################################
- #
- # dvdread - accessing a DVD
- # dvdnav - navigation of menus
- use dvd || myconf+=" --disable-dvdread"
- use dvdnav || myconf+=" --disable-dvdnav"
-
- #############
- # Subtitles #
- #############
- #
- # SRT/ASS/SSA (subtitles) requires freetype support
- # freetype support requires iconv
- # iconv optionally can use unicode
- use truetype || myconf+=" --disable-freetype"
- use iconv || myconf+=" --disable-iconv --charset=noconv"
- use iconv && use unicode && myconf+=" --charset=UTF-8"
-
- #####################################
- # DVB / Video4Linux / Radio support #
- #####################################
- myconf+=" --disable-tv-bsdbt848"
- # broken upstream, won't work with recent kernels
- myconf+=" --disable-ivtv"
- # gone since linux-headers-2.6.38
- myconf+=" --disable-tv-v4l1"
- if { use dvb || use v4l || use pvr || use radio; }; then
- use dvb || myconf+=" --disable-dvb"
- use pvr || myconf+=" --disable-pvr"
- use v4l || myconf+=" --disable-tv-v4l2"
- if use radio && { use dvb || use v4l; }; then
- myconf+="
- --enable-radio
- $(use_enable encode radio-capture)
- "
- else
- myconf+="
- --disable-radio-v4l2
- --disable-radio-bsdbt848
- "
- fi
- else
- myconf+="
- --disable-tv
- --disable-tv-v4l2
- --disable-radio
- --disable-radio-v4l2
- --disable-radio-bsdbt848
- --disable-dvb
- --disable-v4l2
- --disable-pvr"
- fi
-
- ##########
- # Codecs #
- ##########
- myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
- myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
- use dts || myconf+=" --disable-libdca"
- if ! use mp3; then
- myconf+="
- --disable-mp3lame
- --disable-mpg123
- "
- fi
- uses="a52 bs2b dv gsm lzo rtmp vorbis"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-lib${i}"
- done
-
- uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- # Pulls an outdated libopenjpeg, ffmpeg provides better support for it
- myconf+=" --disable-libopenjpeg"
-
- # Encoding
- uses="faac x264 xvid toolame twolame"
- if use encode; then
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- else
- myconf+=" --disable-mencoder"
- for i in ${uses}; do
- myconf+=" --disable-${i}"
- use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
- done
- fi
-
- #################
- # Binary codecs #
- #################
- myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
- ################
- # Video Output #
- ################
- uses="directfb md5sum sdl yuv4mpeg"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use aalib || myconf+=" --disable-aa"
- use fbcon || myconf+=" --disable-fbdev"
- use libcaca || myconf+=" --disable-caca"
- use zoran || myconf+=" --disable-zr"
-
- if ! use kernel_linux || ! use video_cards_mga; then
- myconf+=" --disable-mga --disable-xmga"
- fi
-
- if use video_cards_tdfx; then
- myconf+="
- $(use_enable video_cards_tdfx tdfxvid)
- $(use_enable fbcon tdfxfb)
- "
- else
- myconf+="
- --disable-3dfx
- --disable-tdfxvid
- --disable-tdfxfb
- "
- fi
-
- # sun card, disable by default, see bug #258729
- myconf+=" --disable-xvr100"
-
- ################
- # Audio Output #
- ################
- myconf+=" --disable-esd"
- uses="alsa jack ladspa nas openal"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use pulseaudio || myconf+=" --disable-pulse"
- if ! use radio; then
- use oss || myconf+=" --disable-ossaudio"
- fi
-
- ####################
- # Advanced Options #
- ####################
- # Platform specific flags, hardcoded on amd64 (see below)
- use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
- uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
- for i in ${uses}; do
- myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
- done
-
- uses="altivec shm"
- for i in ${uses}; do
- myconf+=" $(use_enable ${i})"
- done
-
- use debug && myconf+=" --enable-debug=3"
-
- if use x86 && gcc-specs-pie; then
- filter-flags -fPIC -fPIE
- append-ldflags -nopie
- fi
-
- ###########################
- # X enabled configuration #
- ###########################
- myconf+=" --disable-gui"
- myconf+=" --disable-vesa"
- uses="ggi vdpau xinerama xv"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use dga || myconf+=" --disable-dga1 --disable-dga2"
- use opengl || myconf+=" --disable-gl"
- use osdmenu && myconf+=" --enable-menu"
- use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
- use xscreensaver || myconf+=" --disable-xss"
- use X || myconf+=" --disable-x11"
- if use xvmc; then
- myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
- else
- myconf+=" --disable-xvmc"
- fi
-
- ############################
- # OSX (aqua) configuration #
- ############################
- if use aqua; then
- myconf+="
- --enable-macosx-finder
- --enable-macosx-bundle
- "
- fi
-
- ./configure \
- --cc="$(tc-getCC)" \
- --host-cc="$(tc-getBUILD_CC)" \
- --prefix="${EPREFIX}/usr" \
- --bindir="${EPREFIX}/usr/bin" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --confdir="${EPREFIX}/etc/mplayer" \
- --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
- --mandir="${EPREFIX}/usr/share/man" \
- --disable-ffmpeg_a \
- ${myconf} || die
-}
-
-src_compile() {
- base_src_compile
- # Build only user-requested docs if they're available.
- if use doc ; then
- # select available languages from $LINGUAS
- local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
- local BUILT_DOCS=""
- for i in ${LINGUAS} ; do
- has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
- done
- if [[ -z $BUILT_DOCS ]]; then
- emake -j1 html-chunked
- else
- for i in ${BUILT_DOCS}; do
- emake -j1 html-chunked-${i}
- done
- fi
- fi
-}
-
-src_install() {
- local i
-
- emake \
- DESTDIR="${D}" \
- INSTALLSTRIP="" \
- install
-
- dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
- docinto tech/
- dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
- docinto TOOLS/
- dodoc -r TOOLS
- docinto tech/mirrors/
- dodoc DOCS/tech/mirrors/*
-
- if use doc; then
- docinto html/
- dohtml -r "${S}"/DOCS/HTML/*
- fi
-
- if ! use truetype; then
- dodir /usr/share/mplayer/fonts
- # Do this generic, as the mplayer people like to change the structure
- # of their zips ...
- for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
- cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
- done
- # Fix the font symlink ...
- rm -rf "${ED}/usr/share/mplayer/font"
- dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
- fi
-
- insinto /etc/mplayer
- newins "${S}/etc/example.conf" mplayer.conf
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
- doins "${S}/etc/input.conf"
- if use osdmenu; then
- doins "${S}/etc/menu.conf"
- fi
-
- if use truetype; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
- fi
-
- # bug 256203
- if use rar; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
- fi
-
- dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
- newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
- [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
- rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
- # Cleanup stale symlinks
- [ -L "${EROOT}/usr/share/mplayer/font" -a \
- ! -e "${EROOT}/usr/share/mplayer/font" ] && \
- rm -f "${EROOT}/usr/share/mplayer/font"
-
- [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
- ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
- rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-04-15 8:16 Pacho Ramos
0 siblings, 0 replies; 93+ messages in thread
From: Pacho Ramos @ 2018-04-15 8:16 UTC (permalink / raw
To: gentoo-commits
commit: fed6d1d9508cd13ca98cef113328b0ba82365f93
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 15 08:15:17 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Apr 15 08:15:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed6d1d9
media-video/mplayer: Really disable directfb (#650454)
Package-Manager: Portage-2.3.28, Repoman-2.3.9
RepoMan-Options: --force
media-video/mplayer/{mplayer-1.3.0-r4.ebuild => mplayer-1.3.0-r5.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-video/mplayer/mplayer-1.3.0-r4.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
similarity index 99%
rename from media-video/mplayer/mplayer-1.3.0-r4.ebuild
rename to media-video/mplayer/mplayer-1.3.0-r5.ebuild
index cac5328245e..c8966dd2f50 100644
--- a/media-video/mplayer/mplayer-1.3.0-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild
@@ -287,6 +287,7 @@ src_configure() {
--disable-svga --disable-svgalib_helper
--disable-ass-internal
--disable-arts
+ --disable-directfb
--disable-kai
--disable-libopus
--disable-libilbc
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-03-23 4:48 Markus Meier
0 siblings, 0 replies; 93+ messages in thread
From: Markus Meier @ 2018-03-23 4:48 UTC (permalink / raw
To: gentoo-commits
commit: 6ff21735e4e0b9a3270321d37ae8d4d5a2645cc9
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 23 04:47:18 2018 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Fri Mar 23 04:47:18 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff21735
media-video/mplayer: arm stable, bug #642506
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="arm"
media-video/mplayer/mplayer-1.3.0-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r4.ebuild b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
index 51751dbceaa..cac5328245e 100644
--- a/media-video/mplayer/mplayer-1.3.0-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
@@ -155,9 +155,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86"
+ KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-03-23 0:02 Sergei Trofimovich
0 siblings, 0 replies; 93+ messages in thread
From: Sergei Trofimovich @ 2018-03-23 0:02 UTC (permalink / raw
To: gentoo-commits
commit: 7f58ffe0bf5016a63a36748367c543b96d322fe1
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 23 00:00:48 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Mar 23 00:00:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f58ffe0
media-video/mplayer: stable 1.3.0-r4 for ppc64, bug #642506
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc64"
media-video/mplayer/mplayer-1.3.0-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r4.ebuild b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
index 50cd82d2ee4..51751dbceaa 100644
--- a/media-video/mplayer/mplayer-1.3.0-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
@@ -155,9 +155,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 x86"
+ KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-03-18 22:59 Sergei Trofimovich
0 siblings, 0 replies; 93+ messages in thread
From: Sergei Trofimovich @ 2018-03-18 22:59 UTC (permalink / raw
To: gentoo-commits
commit: 3a19f4f0473d6db7541b4d4d73370351a3063913
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 22:59:02 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 22:59:02 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a19f4f0
media-video/mplayer: stable 1.3.0-r4 for ppc, bug #642506
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc"
media-video/mplayer/mplayer-1.3.0-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r4.ebuild b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
index d2550372fca..50cd82d2ee4 100644
--- a/media-video/mplayer/mplayer-1.3.0-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
@@ -155,9 +155,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ~ppc64 x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-03-08 19:33 Mike Gilbert
0 siblings, 0 replies; 93+ messages in thread
From: Mike Gilbert @ 2018-03-08 19:33 UTC (permalink / raw
To: gentoo-commits
commit: af80f4c2b54911bd39eb9f49e9c1834d08f5d55b
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Thu Mar 8 18:59:29 2018 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 8 19:32:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af80f4c2
media-video/mplayer: Improve installation of documentation.
Closes: https://bugs.gentoo.org/634134
media-video/mplayer/mplayer-1.3.0-r4.ebuild | 2 +-
media-video/mplayer/mplayer-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r4.ebuild b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
index c7488bc9867..d2550372fca 100644
--- a/media-video/mplayer/mplayer-1.3.0-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
@@ -560,7 +560,7 @@ src_install() {
docinto tech/
dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
docinto TOOLS/
- dodoc -r TOOLS
+ dodoc -r TOOLS/*
docinto tech/mirrors/
dodoc DOCS/tech/mirrors/*
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index bc3255c4703..0ca08a83c5c 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -556,7 +556,7 @@ src_install() {
docinto tech/
dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
docinto TOOLS/
- dodoc -r TOOLS
+ dodoc -r TOOLS/*
docinto tech/mirrors/
dodoc DOCS/tech/mirrors/*
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-03-03 13:12 Tobias Klausmann
0 siblings, 0 replies; 93+ messages in thread
From: Tobias Klausmann @ 2018-03-03 13:12 UTC (permalink / raw
To: gentoo-commits
commit: d69e2e4c908caee62bbeef2e924aadb80f3fcc94
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 3 12:17:35 2018 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Sat Mar 3 13:12:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d69e2e4c
media-video/mplayer-1.3.0-r4: alpha stable
Gentoo-Bug: http://bugs.gentoo.org/642506
media-video/mplayer/mplayer-1.3.0-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r4.ebuild b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
index 7a561715f69..c7488bc9867 100644
--- a/media-video/mplayer/mplayer-1.3.0-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
@@ -155,9 +155,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-02-25 18:21 Thomas Deutschmann
0 siblings, 0 replies; 93+ messages in thread
From: Thomas Deutschmann @ 2018-02-25 18:21 UTC (permalink / raw
To: gentoo-commits
commit: 5ba5bd052020b10f02ab0de704789c6447364b41
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 18:09:10 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 18:09:10 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ba5bd05
media-video/mplayer: x86 stable (bug #642506)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-video/mplayer/mplayer-1.3.0-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r4.ebuild b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
index 0555deef2b4..7a561715f69 100644
--- a/media-video/mplayer/mplayer-1.3.0-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
@@ -155,9 +155,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-02-22 9:15 Jason Zaman
0 siblings, 0 replies; 93+ messages in thread
From: Jason Zaman @ 2018-02-22 9:15 UTC (permalink / raw
To: gentoo-commits
commit: 1a42995ca71fcc37f0fee41570fdaed782885ef7
Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 08:06:37 2018 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 09:15:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a42995c
media-video/mplayer: amd64 stable
Gentoo-bug: 642506
Package-Manager: Portage-2.3.19, Repoman-2.3.6
media-video/mplayer/mplayer-1.3.0-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r4.ebuild b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
index d33ad17b9d1..0555deef2b4 100644
--- a/media-video/mplayer/mplayer-1.3.0-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
@@ -155,9 +155,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-02-21 22:34 Sergei Trofimovich
0 siblings, 0 replies; 93+ messages in thread
From: Sergei Trofimovich @ 2018-02-21 22:34 UTC (permalink / raw
To: gentoo-commits
commit: 741388b9d0918aa3351a56e85befee2123f3e997
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 22:34:03 2018 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 22:34:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=741388b9
media-video/mplayer: stable 1.3.0-r4 for ia64, bug #642506
Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"
media-video/mplayer/mplayer-1.3.0-r4.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r4.ebuild b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
index d1f122ab57d..d33ad17b9d1 100644
--- a/media-video/mplayer/mplayer-1.3.0-r4.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r4.ebuild
@@ -155,9 +155,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-01-28 2:06 Matt Turner
0 siblings, 0 replies; 93+ messages in thread
From: Matt Turner @ 2018-01-28 2:06 UTC (permalink / raw
To: gentoo-commits
commit: 0b1cde3eb04df77d282bcf25ae155b39f8398356
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 02:06:13 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 02:06:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b1cde3e
media-video/mplayer: Drop s3virge framebuffer support
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 5 ++---
media-video/mplayer/mplayer-9999.ebuild | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index 9283124a63f..db84aec79d5 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,7 +19,7 @@ radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
-VIDEO_CARDS="s3virge mga tdfx"
+VIDEO_CARDS="mga tdfx"
for x in ${VIDEO_CARDS}; do
IUSE+=" video_cards_${x}"
done
@@ -424,7 +424,6 @@ src_configure() {
done
use aalib || myconf+=" --disable-aa"
use fbcon || myconf+=" --disable-fbdev"
- use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
use libcaca || myconf+=" --disable-caca"
use zoran || myconf+=" --disable-zr"
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 61554438bfc..b75b7dbc479 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,7 +19,7 @@ radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
-VIDEO_CARDS="s3virge mga tdfx"
+VIDEO_CARDS="mga tdfx"
for x in ${VIDEO_CARDS}; do
IUSE+=" video_cards_${x}"
done
@@ -420,7 +420,6 @@ src_configure() {
done
use aalib || myconf+=" --disable-aa"
use fbcon || myconf+=" --disable-fbdev"
- use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
use libcaca || myconf+=" --disable-caca"
use zoran || myconf+=" --disable-zr"
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2018-01-25 0:18 Aaron Bauman
0 siblings, 0 replies; 93+ messages in thread
From: Aaron Bauman @ 2018-01-25 0:18 UTC (permalink / raw
To: gentoo-commits
commit: 2bdc8cad948e968bc80411e5db3baab5b70c86d4
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 25 00:18:39 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Jan 25 00:18:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bdc8cad
media-video/mplayer: cleanup vulnerable wrt bug #581952
media-video/mplayer/Manifest | 1 -
media-video/mplayer/mplayer-1.2.1-r1.ebuild | 632 ----------------------------
media-video/mplayer/mplayer-1.3.0-r2.ebuild | 626 ---------------------------
3 files changed, 1259 deletions(-)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index a47a5093bae..c4ee2354054 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,3 @@
-DIST MPlayer-1.2.1.tar.xz 13029936 BLAKE2B 1aa7afdbfbc9319d0e4051c61f95dc15a1597d0317313a574332bd4aeb5d3c8ea61fc1aebb969047f2bb61c25a617d1c2948f4b9941d4f8a080e6bcee7282f98 SHA512 e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506
DIST MPlayer-1.3.0.tar.xz 13278984 BLAKE2B 4e2d67f6fda893f3b200bc92598c23410a2a38b2bc6a2ce0ce062f213bf46c11c67b0d93dd53ea3bd618c74df08bf756e8872d172c1b27e0e175fc67c236a077 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae
DIST font-arial-cp1250.tar.bz2 249705 BLAKE2B eb4366a110d917dc975b8add168ab43b1e8a0db7342647f69f5421fc1170719015c97ffa770e89892cbb4cee8e5b2fb74a4772c8f6cbef9606ee12c3746d78c9 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340
DIST font-arial-iso-8859-1.tar.bz2 234242 BLAKE2B 0671854e1a257d27b502affb59de681942a93990d3ac2575bbf1a6dd9eef026969f2f9ce4e9c11a68ea3d8aed48063f826a1e153f7468437a39791672c92a5d0 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029
diff --git a/media-video/mplayer/mplayer-1.2.1-r1.ebuild b/media-video/mplayer/mplayer-1.2.1-r1.ebuild
deleted file mode 100644
index da0d2b6068c..00000000000
--- a/media-video/mplayer/mplayer-1.2.1-r1.ebuild
+++ /dev/null
@@ -1,632 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
-
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
- IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
- mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
- RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
- MY_P="MPlayer-${PV}"
- S="${WORKDIR}/${MY_P}"
- RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
- RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
- !truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
- virtual/ttf-fonts
- media-libs/fontconfig
- >=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
- x11-libs/libXext
- x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-# nemesi? ( net-libs/libnemesi )
-RDEPEND+="
- sys-libs/ncurses:0=
- app-arch/bzip2
- sys-libs/zlib
- >=media-video/ffmpeg-2.6:0=[vdpau?]
- a52? ( media-libs/a52dec )
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- bidi? ( dev-libs/fribidi )
- bluray? ( >=media-libs/libbluray-0.2.1 )
- bs2b? ( media-libs/libbs2b )
- cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia )
- cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
- dga? ( x11-libs/libXxf86dga )
- directfb? ( dev-libs/DirectFB )
- dts? ( media-libs/libdca )
- dv? ( media-libs/libdv )
- dvb? ( virtual/linuxtv-dvb-headers )
- dvd? ( >=media-libs/libdvdread-4.1.3 )
- dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
- encode? (
- !twolame? ( toolame? ( media-sound/toolame ) )
- twolame? ( media-sound/twolame )
- faac? ( media-libs/faac )
- mp3? ( media-sound/lame )
- x264? ( >=media-libs/x264-0.0.20100423:= )
- xvid? ( media-libs/xvid )
- )
- enca? ( app-i18n/enca )
- faad? ( media-libs/faad2 )
- ggi? ( media-libs/libggi media-libs/libggiwmh )
- gif? ( media-libs/giflib:0= )
- gsm? ( media-sound/gsm )
- iconv? ( virtual/libiconv )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0 )
- ladspa? ( media-libs/ladspa-sdk )
- libass? ( >=media-libs/libass-0.9.10:= )
- libcaca? ( media-libs/libcaca )
- libmpeg2? ( media-libs/libmpeg2 )
- lirc? ( app-misc/lirc )
- live? ( media-plugins/live )
- lzo? ( >=dev-libs/lzo-2 )
- mad? ( media-libs/libmad )
- mng? ( media-libs/libmng:= )
- mp3? ( media-sound/mpg123 )
- nas? ( media-libs/nas )
- nut? ( >=media-libs/libnut-661 )
- openal? ( media-libs/openal )
- opengl? ( virtual/opengl )
- png? ( media-libs/libpng:0= )
- pnm? ( media-libs/netpbm )
- pulseaudio? ( media-sound/pulseaudio )
- rar? (
- || (
- app-arch/unrar
- app-arch/rar
- )
- )
- rtmp? ( media-video/rtmpdump )
- samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl )
- speex? ( media-libs/speex )
- theora? ( media-libs/libtheora[encode?] )
- tremor? ( media-libs/tremor )
- truetype? ( ${FONT_RDEPS} )
- vdpau? ( x11-libs/libvdpau )
- vorbis? ( !tremor? ( media-libs/libvorbis ) )
- X? ( ${X_RDEPS} )
- xinerama? ( x11-libs/libXinerama )
- xscreensaver? ( x11-libs/libXScrnSaver )
- xv? ( x11-libs/libXv )
- xvmc? ( x11-libs/libXvMC )
-"
-
-X_DEPS="
- x11-proto/videoproto
- x11-proto/xf86vidmodeproto
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- dga? ( x11-proto/xf86dgaproto )
- X? ( ${X_DEPS} )
- xinerama? ( x11-proto/xineramaproto )
- xscreensaver? ( x11-proto/scrnsaverproto )
- amd64? ( ${ASM_DEP} )
- doc? (
- dev-libs/libxslt app-text/docbook-xml-dtd
- app-text/docbook-xsl-stylesheets
- )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
- selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
- KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
- dga? ( X )
- dvdnav? ( dvd )
- enca? ( iconv )
- ggi? ( X )
- libass? ( truetype )
- opengl? ( X )
- osdmenu? ( X )
- truetype? ( iconv )
- vdpau? ( X )
- vidix? ( X )
- xinerama? ( X )
- xscreensaver? ( X )
- xv? ( X )
- xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-pkg_setup() {
- if [[ ${PV} == *9999* ]]; then
- elog
- elog "This is a live ebuild which installs the latest from upstream's"
- elog "subversion repository, and is unsupported by Gentoo."
- elog "Everything but bugs in the ebuild itself will be ignored."
- elog
- fi
-
- if use cpudetection; then
- ewarn
- ewarn "You've enabled the cpudetection flag. This feature is"
- ewarn "included mainly for people who want to use the same"
- ewarn "binary on another system with a different CPU architecture."
- ewarn "MPlayer will already detect your CPU settings by default at"
- ewarn "buildtime; this flag is used for runtime detection."
- ewarn "You won't need this turned on if you are only building"
- ewarn "mplayer for this system. Also, if your compile fails, try"
- ewarn "disabling this use flag."
- fi
-
- if has_version 'media-video/libav' ; then
- ewarn "Please note that upstream uses media-video/ffmpeg."
- ewarn "media-video/libav should be fine in theory but if you"
- ewarn "experience any problem, try to move to media-video/ffmpeg."
- fi
-}
-
-src_unpack() {
- if [[ ${PV} = *9999* ]]; then
- subversion_src_unpack
- cd "${WORKDIR}"
- rm -rf "${WORKDIR}/${P}/ffmpeg/"
- ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
- else
- unpack ${A}
- fi
-
- if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
- cd "${S}"
- cp "${FILESDIR}/dump_ffmpeg.sh" . || die
- chmod +x dump_ffmpeg.sh
- ./dump_ffmpeg.sh || die
- fi
-
- if ! use truetype; then
- unpack font-arial-iso-8859-1.tar.bz2 \
- font-arial-iso-8859-2.tar.bz2 \
- font-arial-cp1250.tar.bz2
- fi
-}
-
-src_prepare() {
- local svf=snapshot_version
- if [[ ${PV} = *9999* ]]; then
- # Set SVN version manually
- subversion_wc_info
- printf "${ESVN_WC_REVISION}" > $svf
- fi
- if [ ! -f VERSION ] ; then
- [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
- local sv=$(<$svf)
- printf "SVN-r${sv} (Gentoo)" > VERSION
- fi
-
- # fix path to bash executable in configure scripts
- sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
- base_src_prepare
-
- # Use sane default for >=virtual/udev-197
- sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-
- if has_version '>=media-video/ffmpeg-2.9'; then
- epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch"
- epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch"
- epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch"
- fi
-}
-
-src_configure() {
- local myconf=""
- local uses i
-
- # set LINGUAS
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
- # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
- # compilation in almost every situation. The reason for this is
- # because if --enable is used, it will force the build of that option,
- # regardless of whether the dependency is available or not.
-
- ###################
- #Optional features#
- ###################
- # disable svga since we don't want it
- # disable arts since we don't have kde3
- # always disable internal ass
- # disable opus and ilbc since it only controls support in internal
- # ffmpeg which we do not use
- myconf+="
- --disable-svga --disable-svgalib_helper
- --disable-ass-internal
- --disable-arts
- --disable-kai
- --disable-libopus
- --disable-libilbc
- $(use_enable network networking)
- $(use_enable joystick)
- "
- uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
- myconf+=" --disable-nemesi" # nemesi automagic disable
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use bidi || myconf+=" --disable-fribidi"
- use ipv6 || myconf+=" --disable-inet6"
- use libass || myconf+=" --disable-ass"
- use nut || myconf+=" --disable-libnut"
- use rar || myconf+=" --disable-unrarexec"
- use samba || myconf+=" --disable-smb"
- use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
- # libcdio support: prefer libcdio over cdparanoia
- # don't check for cddb w/cdio
- if use cdio; then
- myconf+=" --disable-cdparanoia"
- else
- myconf+=" --disable-libcdio"
- use cdparanoia || myconf+=" --disable-cdparanoia"
- use cddb || myconf+=" --disable-cddb"
- fi
-
- ################################
- # DVD read, navigation support #
- ################################
- #
- # dvdread - accessing a DVD
- # dvdnav - navigation of menus
- use dvd || myconf+=" --disable-dvdread"
- use dvdnav || myconf+=" --disable-dvdnav"
-
- #############
- # Subtitles #
- #############
- #
- # SRT/ASS/SSA (subtitles) requires freetype support
- # freetype support requires iconv
- # iconv optionally can use unicode
- use truetype || myconf+=" --disable-freetype"
- use iconv || myconf+=" --disable-iconv --charset=noconv"
- use iconv && use unicode && myconf+=" --charset=UTF-8"
-
- #####################################
- # DVB / Video4Linux / Radio support #
- #####################################
- myconf+=" --disable-tv-bsdbt848"
- # broken upstream, won't work with recent kernels
- myconf+=" --disable-ivtv"
- # gone since linux-headers-2.6.38
- myconf+=" --disable-tv-v4l1"
- if { use dvb || use v4l || use pvr || use radio; }; then
- use dvb || myconf+=" --disable-dvb"
- use pvr || myconf+=" --disable-pvr"
- use v4l || myconf+=" --disable-tv-v4l2"
- if use radio && { use dvb || use v4l; }; then
- myconf+="
- --enable-radio
- $(use_enable encode radio-capture)
- "
- else
- myconf+="
- --disable-radio-v4l2
- --disable-radio-bsdbt848
- "
- fi
- else
- myconf+="
- --disable-tv
- --disable-tv-v4l2
- --disable-radio
- --disable-radio-v4l2
- --disable-radio-bsdbt848
- --disable-dvb
- --disable-v4l2
- --disable-pvr"
- fi
-
- ##########
- # Codecs #
- ##########
- myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
- myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
- use dts || myconf+=" --disable-libdca"
- if ! use mp3; then
- myconf+="
- --disable-mp3lame
- --disable-mpg123
- "
- fi
- uses="a52 bs2b dv gsm lzo rtmp vorbis"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-lib${i}"
- done
-
- uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use jpeg2k || myconf+=" --disable-libopenjpeg"
-
- # Encoding
- uses="faac x264 xvid toolame twolame"
- if use encode; then
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- else
- myconf+=" --disable-mencoder"
- for i in ${uses}; do
- myconf+=" --disable-${i}"
- use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
- done
- fi
-
- #################
- # Binary codecs #
- #################
- myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
- ################
- # Video Output #
- ################
- uses="directfb md5sum sdl yuv4mpeg"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use aalib || myconf+=" --disable-aa"
- use fbcon || myconf+=" --disable-fbdev"
- use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
- use libcaca || myconf+=" --disable-caca"
- use zoran || myconf+=" --disable-zr"
-
- if ! use kernel_linux || ! use video_cards_mga; then
- myconf+=" --disable-mga --disable-xmga"
- fi
-
- if use video_cards_tdfx; then
- myconf+="
- $(use_enable video_cards_tdfx tdfxvid)
- $(use_enable fbcon tdfxfb)
- "
- else
- myconf+="
- --disable-3dfx
- --disable-tdfxvid
- --disable-tdfxfb
- "
- fi
-
- # sun card, disable by default, see bug #258729
- myconf+=" --disable-xvr100"
-
- ################
- # Audio Output #
- ################
- myconf+=" --disable-esd"
- uses="alsa jack ladspa nas openal"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use pulseaudio || myconf+=" --disable-pulse"
- if ! use radio; then
- use oss || myconf+=" --disable-ossaudio"
- fi
-
- ####################
- # Advanced Options #
- ####################
- # Platform specific flags, hardcoded on amd64 (see below)
- use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
- uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
- for i in ${uses}; do
- myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
- done
-
- uses="altivec shm"
- for i in ${uses}; do
- myconf+=" $(use_enable ${i})"
- done
-
- use debug && myconf+=" --enable-debug=3"
-
- if use x86 && gcc-specs-pie; then
- filter-flags -fPIC -fPIE
- append-ldflags -nopie
- fi
-
- ###########################
- # X enabled configuration #
- ###########################
- myconf+=" --disable-gui"
- myconf+=" --disable-vesa"
- uses="ggi vdpau xinerama xv"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use dga || myconf+=" --disable-dga1 --disable-dga2"
- use opengl || myconf+=" --disable-gl"
- use osdmenu && myconf+=" --enable-menu"
- use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
- use xscreensaver || myconf+=" --disable-xss"
- use X || myconf+=" --disable-x11"
- if use xvmc; then
- myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
- else
- myconf+=" --disable-xvmc"
- fi
-
- ############################
- # OSX (aqua) configuration #
- ############################
- if use aqua; then
- myconf+="
- --enable-macosx-finder
- --enable-macosx-bundle
- "
- fi
-
- ./configure \
- --cc="$(tc-getCC)" \
- --host-cc="$(tc-getBUILD_CC)" \
- --prefix="${EPREFIX}/usr" \
- --bindir="${EPREFIX}/usr/bin" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --confdir="${EPREFIX}/etc/mplayer" \
- --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
- --mandir="${EPREFIX}/usr/share/man" \
- --disable-ffmpeg_a \
- ${myconf} || die
-}
-
-src_compile() {
- base_src_compile
- # Build only user-requested docs if they're available.
- if use doc ; then
- # select available languages from $LINGUAS
- local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
- local BUILT_DOCS=""
- for i in ${LINGUAS} ; do
- has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
- done
- if [[ -z $BUILT_DOCS ]]; then
- emake -j1 html-chunked
- else
- for i in ${BUILT_DOCS}; do
- emake -j1 html-chunked-${i}
- done
- fi
- fi
-}
-
-src_install() {
- local i
-
- emake \
- DESTDIR="${D}" \
- INSTALLSTRIP="" \
- install
-
- dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
- docinto tech/
- dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
- docinto TOOLS/
- dodoc -r TOOLS
- docinto tech/mirrors/
- dodoc DOCS/tech/mirrors/*
-
- if use doc; then
- docinto html/
- dohtml -r "${S}"/DOCS/HTML/*
- fi
-
- if ! use truetype; then
- dodir /usr/share/mplayer/fonts
- # Do this generic, as the mplayer people like to change the structure
- # of their zips ...
- for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
- cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
- done
- # Fix the font symlink ...
- rm -rf "${ED}/usr/share/mplayer/font"
- dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
- fi
-
- insinto /etc/mplayer
- newins "${S}/etc/example.conf" mplayer.conf
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
- doins "${S}/etc/input.conf"
- if use osdmenu; then
- doins "${S}/etc/menu.conf"
- fi
-
- if use truetype; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
- fi
-
- # bug 256203
- if use rar; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
- fi
-
- dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
- newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
- [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
- rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
- # Cleanup stale symlinks
- [ -L "${EROOT}/usr/share/mplayer/font" -a \
- ! -e "${EROOT}/usr/share/mplayer/font" ] && \
- rm -f "${EROOT}/usr/share/mplayer/font"
-
- [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
- ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
- rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
diff --git a/media-video/mplayer/mplayer-1.3.0-r2.ebuild b/media-video/mplayer/mplayer-1.3.0-r2.ebuild
deleted file mode 100644
index d6bfb7e6ba2..00000000000
--- a/media-video/mplayer/mplayer-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,626 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
-[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
-
-inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
-
-IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
-bs2b cddb +cdio cdparanoia cpudetection debug dga
-directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
-+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
-+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
-radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
-
-VIDEO_CARDS="s3virge mga tdfx"
-for x in ${VIDEO_CARDS}; do
- IUSE+=" video_cards_${x}"
-done
-
-FONT_URI="
- mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
- mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
-"
-if [[ ${PV} == *9999* ]]; then
- RELEASE_URI=""
-elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
- MY_P="MPlayer-${PV}"
- S="${WORKDIR}/${MY_P}"
- RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
-else
- RELEASE_URI="mirror://gentoo/${P}.tar.xz"
-fi
-SRC_URI="${RELEASE_URI}
- !truetype? ( ${FONT_URI} )"
-
-DESCRIPTION="Media Player for Linux"
-HOMEPAGE="http://www.mplayerhq.hu/"
-
-FONT_RDEPS="
- virtual/ttf-fonts
- media-libs/fontconfig
- >=media-libs/freetype-2.2.1:2
-"
-X_RDEPS="
- x11-libs/libXext
- x11-libs/libXxf86vm
-"
-# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
-# nemesi? ( net-libs/libnemesi )
-RDEPEND+="
- sys-libs/ncurses:0=
- app-arch/bzip2
- sys-libs/zlib
- >=media-video/ffmpeg-3.0:0=[vdpau?]
- a52? ( media-libs/a52dec )
- aalib? ( media-libs/aalib )
- alsa? ( media-libs/alsa-lib )
- bidi? ( dev-libs/fribidi )
- bluray? ( >=media-libs/libbluray-0.2.1:= )
- bs2b? ( media-libs/libbs2b )
- cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
- cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
- dga? ( x11-libs/libXxf86dga )
- directfb? ( dev-libs/DirectFB )
- dts? ( media-libs/libdca )
- dv? ( media-libs/libdv )
- dvb? ( virtual/linuxtv-dvb-headers )
- dvd? ( >=media-libs/libdvdread-4.1.3 )
- dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
- encode? (
- !twolame? ( toolame? ( media-sound/toolame ) )
- twolame? ( media-sound/twolame )
- faac? ( media-libs/faac )
- mp3? ( media-sound/lame )
- x264? ( >=media-libs/x264-0.0.20100423:= )
- xvid? ( media-libs/xvid )
- )
- enca? ( app-i18n/enca )
- faad? ( media-libs/faad2 )
- ggi? ( media-libs/libggi media-libs/libggiwmh )
- gif? ( media-libs/giflib:0= )
- gsm? ( media-sound/gsm )
- iconv? ( virtual/libiconv )
- jack? ( virtual/jack )
- jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0 )
- ladspa? ( media-libs/ladspa-sdk )
- libass? ( >=media-libs/libass-0.9.10:= )
- libcaca? ( media-libs/libcaca )
- libmpeg2? ( media-libs/libmpeg2 )
- lirc? ( app-misc/lirc )
- live? ( media-plugins/live )
- lzo? ( >=dev-libs/lzo-2 )
- mad? ( media-libs/libmad )
- mng? ( media-libs/libmng:= )
- mp3? ( media-sound/mpg123 )
- nas? ( media-libs/nas )
- nut? ( >=media-libs/libnut-661 )
- openal? ( media-libs/openal )
- opengl? ( virtual/opengl )
- png? ( media-libs/libpng:0= )
- pnm? ( media-libs/netpbm )
- pulseaudio? ( media-sound/pulseaudio )
- rar? (
- || (
- app-arch/unrar
- app-arch/rar
- )
- )
- rtmp? ( media-video/rtmpdump )
- samba? ( net-fs/samba )
- sdl? ( media-libs/libsdl )
- speex? ( media-libs/speex )
- theora? ( media-libs/libtheora[encode?] )
- tremor? ( media-libs/tremor )
- truetype? ( ${FONT_RDEPS} )
- vdpau? ( x11-libs/libvdpau )
- vorbis? ( !tremor? ( media-libs/libvorbis ) )
- X? ( ${X_RDEPS} )
- xinerama? ( x11-libs/libXinerama )
- xscreensaver? ( x11-libs/libXScrnSaver )
- xv? ( x11-libs/libXv )
- xvmc? ( x11-libs/libXvMC )
-"
-
-X_DEPS="
- x11-proto/videoproto
- x11-proto/xf86vidmodeproto
-"
-ASM_DEP="dev-lang/yasm"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- dga? ( x11-proto/xf86dgaproto )
- X? ( ${X_DEPS} )
- xinerama? ( x11-proto/xineramaproto )
- xscreensaver? ( x11-proto/scrnsaverproto )
- amd64? ( ${ASM_DEP} )
- doc? (
- dev-libs/libxslt app-text/docbook-xml-dtd
- app-text/docbook-xsl-stylesheets
- )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )
-"
-RDEPEND+="
- selinux? ( sec-policy/selinux-mplayer )
-"
-
-SLOT="0"
-LICENSE="GPL-2"
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-else
- KEYWORDS="~alpha ~arm ~hppa ~ia64"
-fi
-
-# faac codecs are nonfree
-# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
-# dvd navigation requires dvd read support
-# ass and freetype font require iconv and ass requires freetype fonts
-# unicode transformations are usefull only with iconv
-# radio requires oss or alsa backend
-# xvmc requires xvideo support
-REQUIRED_USE="
- dga? ( X )
- dvdnav? ( dvd )
- enca? ( iconv )
- ggi? ( X )
- libass? ( truetype )
- opengl? ( X )
- osdmenu? ( X )
- truetype? ( iconv )
- vdpau? ( X )
- vidix? ( X )
- xinerama? ( X )
- xscreensaver? ( X )
- xv? ( X )
- xvmc? ( xv )"
-RESTRICT="faac? ( bindist )"
-
-pkg_setup() {
- if [[ ${PV} == *9999* ]]; then
- elog
- elog "This is a live ebuild which installs the latest from upstream's"
- elog "subversion repository, and is unsupported by Gentoo."
- elog "Everything but bugs in the ebuild itself will be ignored."
- elog
- fi
-
- if use cpudetection; then
- ewarn
- ewarn "You've enabled the cpudetection flag. This feature is"
- ewarn "included mainly for people who want to use the same"
- ewarn "binary on another system with a different CPU architecture."
- ewarn "MPlayer will already detect your CPU settings by default at"
- ewarn "buildtime; this flag is used for runtime detection."
- ewarn "You won't need this turned on if you are only building"
- ewarn "mplayer for this system. Also, if your compile fails, try"
- ewarn "disabling this use flag."
- fi
-
- if has_version 'media-video/libav' ; then
- ewarn "Please note that upstream uses media-video/ffmpeg."
- ewarn "media-video/libav should be fine in theory but if you"
- ewarn "experience any problem, try to move to media-video/ffmpeg."
- fi
-}
-
-src_unpack() {
- if [[ ${PV} = *9999* ]]; then
- subversion_src_unpack
- cd "${WORKDIR}"
- rm -rf "${WORKDIR}/${P}/ffmpeg/"
- ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
- else
- unpack ${A}
- fi
-
- if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
- cd "${S}"
- cp "${FILESDIR}/dump_ffmpeg.sh" . || die
- chmod +x dump_ffmpeg.sh
- ./dump_ffmpeg.sh || die
- fi
-
- if ! use truetype; then
- unpack font-arial-iso-8859-1.tar.bz2 \
- font-arial-iso-8859-2.tar.bz2 \
- font-arial-cp1250.tar.bz2
- fi
-}
-
-src_prepare() {
- local svf=snapshot_version
- if [[ ${PV} = *9999* ]]; then
- # Set SVN version manually
- subversion_wc_info
- printf "${ESVN_WC_REVISION}" > $svf
- fi
- if [ ! -f VERSION ] ; then
- [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
- local sv=$(<$svf)
- printf "SVN-r${sv} (Gentoo)" > VERSION
- fi
-
- # fix path to bash executable in configure scripts
- sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
-
- base_src_prepare
-
- # Use sane default for >=virtual/udev-197
- sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
-}
-
-src_configure() {
- local myconf=""
- local uses i
-
- # set LINGUAS
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
- [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
-
- # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
- # compilation in almost every situation. The reason for this is
- # because if --enable is used, it will force the build of that option,
- # regardless of whether the dependency is available or not.
-
- ###################
- #Optional features#
- ###################
- # disable svga since we don't want it
- # disable arts since we don't have kde3
- # always disable internal ass
- # disable opus and ilbc since it only controls support in internal
- # ffmpeg which we do not use
- myconf+="
- --disable-svga --disable-svgalib_helper
- --disable-ass-internal
- --disable-arts
- --disable-kai
- --disable-libopus
- --disable-libilbc
- $(use_enable network networking)
- $(use_enable joystick)
- "
- uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
- myconf+=" --disable-nemesi" # nemesi automagic disable
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use bidi || myconf+=" --disable-fribidi"
- use ipv6 || myconf+=" --disable-inet6"
- use libass || myconf+=" --disable-ass"
- use nut || myconf+=" --disable-libnut"
- use rar || myconf+=" --disable-unrarexec"
- use samba || myconf+=" --disable-smb"
- use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
-
- # libcdio support: prefer libcdio over cdparanoia
- # don't check for cddb w/cdio
- if use cdio; then
- myconf+=" --disable-cdparanoia"
- else
- myconf+=" --disable-libcdio"
- use cdparanoia || myconf+=" --disable-cdparanoia"
- use cddb || myconf+=" --disable-cddb"
- fi
-
- ################################
- # DVD read, navigation support #
- ################################
- #
- # dvdread - accessing a DVD
- # dvdnav - navigation of menus
- use dvd || myconf+=" --disable-dvdread"
- use dvdnav || myconf+=" --disable-dvdnav"
-
- #############
- # Subtitles #
- #############
- #
- # SRT/ASS/SSA (subtitles) requires freetype support
- # freetype support requires iconv
- # iconv optionally can use unicode
- use truetype || myconf+=" --disable-freetype"
- use iconv || myconf+=" --disable-iconv --charset=noconv"
- use iconv && use unicode && myconf+=" --charset=UTF-8"
-
- #####################################
- # DVB / Video4Linux / Radio support #
- #####################################
- myconf+=" --disable-tv-bsdbt848"
- # broken upstream, won't work with recent kernels
- myconf+=" --disable-ivtv"
- # gone since linux-headers-2.6.38
- myconf+=" --disable-tv-v4l1"
- if { use dvb || use v4l || use pvr || use radio; }; then
- use dvb || myconf+=" --disable-dvb"
- use pvr || myconf+=" --disable-pvr"
- use v4l || myconf+=" --disable-tv-v4l2"
- if use radio && { use dvb || use v4l; }; then
- myconf+="
- --enable-radio
- $(use_enable encode radio-capture)
- "
- else
- myconf+="
- --disable-radio-v4l2
- --disable-radio-bsdbt848
- "
- fi
- else
- myconf+="
- --disable-tv
- --disable-tv-v4l2
- --disable-radio
- --disable-radio-v4l2
- --disable-radio-bsdbt848
- --disable-dvb
- --disable-v4l2
- --disable-pvr"
- fi
-
- ##########
- # Codecs #
- ##########
- myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
- myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
- use dts || myconf+=" --disable-libdca"
- if ! use mp3; then
- myconf+="
- --disable-mp3lame
- --disable-mpg123
- "
- fi
- uses="a52 bs2b dv gsm lzo rtmp vorbis"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-lib${i}"
- done
-
- uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use jpeg2k || myconf+=" --disable-libopenjpeg"
-
- # Encoding
- uses="faac x264 xvid toolame twolame"
- if use encode; then
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- else
- myconf+=" --disable-mencoder"
- for i in ${uses}; do
- myconf+=" --disable-${i}"
- use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
- done
- fi
-
- #################
- # Binary codecs #
- #################
- myconf+=" --disable-qtx --disable-real --disable-win32dll"
-
- ################
- # Video Output #
- ################
- uses="directfb md5sum sdl yuv4mpeg"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use aalib || myconf+=" --disable-aa"
- use fbcon || myconf+=" --disable-fbdev"
- use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
- use libcaca || myconf+=" --disable-caca"
- use zoran || myconf+=" --disable-zr"
-
- if ! use kernel_linux || ! use video_cards_mga; then
- myconf+=" --disable-mga --disable-xmga"
- fi
-
- if use video_cards_tdfx; then
- myconf+="
- $(use_enable video_cards_tdfx tdfxvid)
- $(use_enable fbcon tdfxfb)
- "
- else
- myconf+="
- --disable-3dfx
- --disable-tdfxvid
- --disable-tdfxfb
- "
- fi
-
- # sun card, disable by default, see bug #258729
- myconf+=" --disable-xvr100"
-
- ################
- # Audio Output #
- ################
- myconf+=" --disable-esd"
- uses="alsa jack ladspa nas openal"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use pulseaudio || myconf+=" --disable-pulse"
- if ! use radio; then
- use oss || myconf+=" --disable-ossaudio"
- fi
-
- ####################
- # Advanced Options #
- ####################
- # Platform specific flags, hardcoded on amd64 (see below)
- use cpudetection && myconf+=" --enable-runtime-cpudetection"
-
- uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
- for i in ${uses}; do
- myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
- done
-
- uses="altivec shm"
- for i in ${uses}; do
- myconf+=" $(use_enable ${i})"
- done
-
- use debug && myconf+=" --enable-debug=3"
-
- if use x86 && gcc-specs-pie; then
- filter-flags -fPIC -fPIE
- append-ldflags -nopie
- fi
-
- ###########################
- # X enabled configuration #
- ###########################
- myconf+=" --disable-gui"
- myconf+=" --disable-vesa"
- uses="ggi vdpau xinerama xv"
- for i in ${uses}; do
- use ${i} || myconf+=" --disable-${i}"
- done
- use dga || myconf+=" --disable-dga1 --disable-dga2"
- use opengl || myconf+=" --disable-gl"
- use osdmenu && myconf+=" --enable-menu"
- use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
- use xscreensaver || myconf+=" --disable-xss"
- use X || myconf+=" --disable-x11"
- if use xvmc; then
- myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
- else
- myconf+=" --disable-xvmc"
- fi
-
- ############################
- # OSX (aqua) configuration #
- ############################
- if use aqua; then
- myconf+="
- --enable-macosx-finder
- --enable-macosx-bundle
- "
- fi
-
- ./configure \
- --cc="$(tc-getCC)" \
- --host-cc="$(tc-getBUILD_CC)" \
- --prefix="${EPREFIX}/usr" \
- --bindir="${EPREFIX}/usr/bin" \
- --libdir="${EPREFIX}/usr/$(get_libdir)" \
- --confdir="${EPREFIX}/etc/mplayer" \
- --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
- --mandir="${EPREFIX}/usr/share/man" \
- --disable-ffmpeg_a \
- ${myconf} || die
-}
-
-src_compile() {
- base_src_compile
- # Build only user-requested docs if they're available.
- if use doc ; then
- # select available languages from $LINGUAS
- local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
- local BUILT_DOCS=""
- for i in ${LINGUAS} ; do
- has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
- done
- if [[ -z $BUILT_DOCS ]]; then
- emake -j1 html-chunked
- else
- for i in ${BUILT_DOCS}; do
- emake -j1 html-chunked-${i}
- done
- fi
- fi
-}
-
-src_install() {
- local i
-
- emake \
- DESTDIR="${D}" \
- INSTALLSTRIP="" \
- install
-
- dodoc AUTHORS Changelog Copyright README etc/codecs.conf
-
- docinto tech/
- dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
- docinto TOOLS/
- dodoc -r TOOLS
- docinto tech/mirrors/
- dodoc DOCS/tech/mirrors/*
-
- if use doc; then
- docinto html/
- dohtml -r "${S}"/DOCS/HTML/*
- fi
-
- if ! use truetype; then
- dodir /usr/share/mplayer/fonts
- # Do this generic, as the mplayer people like to change the structure
- # of their zips ...
- for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
- cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
- done
- # Fix the font symlink ...
- rm -rf "${ED}/usr/share/mplayer/font"
- dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
- fi
-
- insinto /etc/mplayer
- newins "${S}/etc/example.conf" mplayer.conf
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-# Config options can be section specific, global
-# options should go in the default section
-[default]
-_EOF_
- doins "${S}/etc/input.conf"
- if use osdmenu; then
- doins "${S}/etc/menu.conf"
- fi
-
- if use truetype; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-fontconfig=1
-subfont-osd-scale=4
-subfont-text-scale=3
-_EOF_
- fi
-
- # bug 256203
- if use rar; then
- cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
-unrarexec=${EPREFIX}/usr/bin/unrar
-_EOF_
- fi
-
- dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
- newbin "${S}/TOOLS/midentify.sh" midentify
-}
-
-pkg_preinst() {
- [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
- rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
-}
-
-pkg_postrm() {
- # Cleanup stale symlinks
- [ -L "${EROOT}/usr/share/mplayer/font" -a \
- ! -e "${EROOT}/usr/share/mplayer/font" ] && \
- rm -f "${EROOT}/usr/share/mplayer/font"
-
- [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
- ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
- rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
-}
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2017-10-14 6:18 Markus Meier
0 siblings, 0 replies; 93+ messages in thread
From: Markus Meier @ 2017-10-14 6:18 UTC (permalink / raw
To: gentoo-commits
commit: 1e2bc4bc1c2286174bc25d7194a20ce590d45427
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 14 06:15:27 2017 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Oct 14 06:15:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e2bc4bc
media-video/mplayer: arm stable, bug #581952
Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="arm"
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index 98a7e338b0a..ef36667a318 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -156,9 +156,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 x86"
+ KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2017-10-13 19:20 Sergei Trofimovich
0 siblings, 0 replies; 93+ messages in thread
From: Sergei Trofimovich @ 2017-10-13 19:20 UTC (permalink / raw
To: gentoo-commits
commit: 0fea4f18997538b4742e7dae05d2ed918e206f51
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 19:19:59 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 19:20:09 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fea4f18
media-video/mplayer: stable 1.3.0-r3 for hppa, bug #581952
Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="hppa"
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index 5a9dd132068..98a7e338b0a 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -156,9 +156,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86"
+ KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2017-10-13 9:50 Sergei Trofimovich
0 siblings, 0 replies; 93+ messages in thread
From: Sergei Trofimovich @ 2017-10-13 9:50 UTC (permalink / raw
To: gentoo-commits
commit: b188f313d5e78d4d79ca850868ef8f201dada7ff
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 09:50:24 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 09:50:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b188f313
media-video/mplayer: stable 1.3.0-r3 for ppc/ppc64, bug #581952
Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc ppc64"
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index 63793c18fc5..5a9dd132068 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -156,9 +156,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2017-10-13 0:13 Sergei Trofimovich
0 siblings, 0 replies; 93+ messages in thread
From: Sergei Trofimovich @ 2017-10-13 0:13 UTC (permalink / raw
To: gentoo-commits
commit: 2bbe7502ab3fdfed318d2f993329882aea1c8992
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 12 21:21:09 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 00:13:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbe7502
media-video/mplayer: stable 1.3.0-r3 for ia64, bug #581952
Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="ia64"
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index 56c6166d7be..63793c18fc5 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -156,9 +156,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2017-10-12 21:19 Thomas Deutschmann
0 siblings, 0 replies; 93+ messages in thread
From: Thomas Deutschmann @ 2017-10-12 21:19 UTC (permalink / raw
To: gentoo-commits
commit: c8baa6ce9e2babb17e59ed0c2d40a2b0ade93b37
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 12 21:16:58 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 21:18:55 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8baa6ce
media-video/mplayer: x86 stable (bug #581952)
Package-Manager: Portage-2.3.10, Repoman-2.3.3
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index b0404afad77..56c6166d7be 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -156,9 +156,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2017-10-11 17:44 Manuel Rüger
0 siblings, 0 replies; 93+ messages in thread
From: Manuel Rüger @ 2017-10-11 17:44 UTC (permalink / raw
To: gentoo-commits
commit: 74ae0073de356736b660d6c83de457c0b60bdc4c
Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 11 17:44:10 2017 +0000
Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Wed Oct 11 17:44:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74ae0073
media-video/mplayer: Stable on amd64
Package-Manager: Portage-2.3.11, Repoman-2.3.3
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index 68459860f46..b0404afad77 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -156,9 +156,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="~alpha ~arm ~hppa ~ia64 ~ppc ~ppc64"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2017-10-08 12:36 Alexis Ballier
0 siblings, 0 replies; 93+ messages in thread
From: Alexis Ballier @ 2017-10-08 12:36 UTC (permalink / raw
To: gentoo-commits
commit: a03fbb42e806e947a9156c23ee980233f6cec2e0
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 8 12:36:24 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 12:36:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a03fbb42
media-video/mplayer: drop native jpeg2k support. FFmpeg provides better support for it and mplayer uses an outdated slot.
Package-Manager: Portage-2.3.11, Repoman-2.3.3
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 6 +++---
media-video/mplayer/mplayer-9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index 0e699eb6890..68459860f46 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -12,7 +12,7 @@ inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
@@ -91,7 +91,6 @@ RDEPEND+="
iconv? ( virtual/libiconv )
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0 )
ladspa? ( media-libs/ladspa-sdk )
libass? ( >=media-libs/libass-0.9.10:= )
libcaca? ( media-libs/libcaca )
@@ -392,7 +391,8 @@ src_configure() {
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
- use jpeg2k || myconf+=" --disable-libopenjpeg"
+ # Pulls an outdated libopenjpeg, ffmpeg provides better support for it
+ myconf+=" --disable-libopenjpeg"
# Encoding
uses="faac x264 xvid toolame twolame"
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 6257dc214ad..61554438bfc 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -12,7 +12,7 @@ inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
bs2b cddb +cdio cdparanoia cpudetection debug dga
directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
-ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
@@ -91,7 +91,6 @@ RDEPEND+="
iconv? ( virtual/libiconv )
jack? ( virtual/jack )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0 )
ladspa? ( media-libs/ladspa-sdk )
libass? ( >=media-libs/libass-0.9.10:= )
libcaca? ( media-libs/libcaca )
@@ -390,7 +389,8 @@ src_configure() {
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
- use jpeg2k || myconf+=" --disable-libopenjpeg"
+ # Pulls an outdated libopenjpeg, ffmpeg provides better support for it
+ myconf+=" --disable-libopenjpeg"
# Encoding
uses="faac x264 xvid toolame twolame"
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2017-09-10 20:02 Sergei Trofimovich
0 siblings, 0 replies; 93+ messages in thread
From: Sergei Trofimovich @ 2017-09-10 20:02 UTC (permalink / raw
To: gentoo-commits
commit: 69a2e1c84aac1ae3637b80329bbd55e4b93cfed8
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 10 20:02:27 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 10 20:02:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69a2e1c8
media-video/mplayer: keyworded 1.3.0-r3 for ppc/ppc64, bug #627498 (thanks to ernsteiswuerfel)
Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc ppc64"
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
index 8cfb4f4b72a..0e699eb6890 100644
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild
@@ -157,9 +157,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="~alpha ~arm ~hppa ~ia64"
+ KEYWORDS="~alpha ~arm ~hppa ~ia64 ~ppc ~ppc64"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2017-06-12 20:44 Sergei Trofimovich
0 siblings, 0 replies; 93+ messages in thread
From: Sergei Trofimovich @ 2017-06-12 20:44 UTC (permalink / raw
To: gentoo-commits
commit: d5141c5ac2f91a2fdd789466fba606bf04c330e6
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 11 22:25:14 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jun 12 20:38:02 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5141c5a
media-video/mplayer: ia64 keyworded, bug #478700
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-video/mplayer/mplayer-1.3.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0.ebuild b/media-video/mplayer/mplayer-1.3.0.ebuild
index 92eaae0a317..507ad23d136 100644
--- a/media-video/mplayer/mplayer-1.3.0.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0.ebuild
@@ -157,9 +157,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="~alpha ~arm ~hppa"
+ KEYWORDS="~alpha ~arm ~hppa ~ia64"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2017-03-04 13:37 Alexis Ballier
0 siblings, 0 replies; 93+ messages in thread
From: Alexis Ballier @ 2017-03-04 13:37 UTC (permalink / raw
To: gentoo-commits
commit: e5b3a7fe5a5708593a82c7dbbd25de5343444fdc
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 13:27:12 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 13:36:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b3a7fe
media-video/mplayer: Add := dep on libbluray
Package-Manager: Portage-2.3.4, Repoman-2.3.2
media-video/mplayer/mplayer-1.3.0.ebuild | 2 +-
media-video/mplayer/mplayer-9999.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0.ebuild b/media-video/mplayer/mplayer-1.3.0.ebuild
index 8d52b6dec1c..ae1d15a55c9 100644
--- a/media-video/mplayer/mplayer-1.3.0.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0.ebuild
@@ -64,7 +64,7 @@ RDEPEND+="
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
bidi? ( dev-libs/fribidi )
- bluray? ( >=media-libs/libbluray-0.2.1 )
+ bluray? ( >=media-libs/libbluray-0.2.1:= )
bs2b? ( media-libs/libbs2b )
cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 4e2fbbbb47c..1306b016c86 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -64,7 +64,7 @@ RDEPEND+="
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
bidi? ( dev-libs/fribidi )
- bluray? ( >=media-libs/libbluray-0.2.1 )
+ bluray? ( >=media-libs/libbluray-0.2.1:= )
bs2b? ( media-libs/libbs2b )
cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
^ permalink raw reply related [flat|nested] 93+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2017-02-25 14:22 Markus Meier
0 siblings, 0 replies; 93+ messages in thread
From: Markus Meier @ 2017-02-25 14:22 UTC (permalink / raw
To: gentoo-commits
commit: aa3671b3c109e1841fcf83ac386b77e546f8da17
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 25 14:22:05 2017 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Sat Feb 25 14:22:05 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa3671b3
media-video/mplayer: add ~arm, bug #601662
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
media-video/mplayer/mplayer-1.3.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0.ebuild b/media-video/mplayer/mplayer-1.3.0.ebuild
index 23b7911d35..b4796765af 100644
--- a/media-video/mplayer/mplayer-1.3.0.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0.ebuild
@@ -158,9 +158,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64 ~hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="~hppa"
+ KEYWORDS="~arm ~hppa"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2017-02-05 12:09 Jeroen Roovers
0 siblings, 0 replies; 93+ messages in thread
From: Jeroen Roovers @ 2017-02-05 12:09 UTC (permalink / raw
To: gentoo-commits
commit: 6213d27999a6b71f2a71db39b85c9e4b78bc1958
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 5 12:08:56 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Feb 5 12:08:56 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6213d279
media-video/mplayer: Mark ~hppa (bug #601662).
Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches
media-video/mplayer/mplayer-1.3.0.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0.ebuild b/media-video/mplayer/mplayer-1.3.0.ebuild
index 73ff872..23b7911 100644
--- a/media-video/mplayer/mplayer-1.3.0.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -158,9 +158,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~hppa ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS=""
+ KEYWORDS="~hppa"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2016-12-28 11:58 Pacho Ramos
0 siblings, 0 replies; 93+ messages in thread
From: Pacho Ramos @ 2016-12-28 11:58 UTC (permalink / raw
To: gentoo-commits
commit: 32cd64757b683aa5bd4c5177a4564e8efae8dcb2
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 28 11:44:33 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Dec 28 11:58:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32cd6475
media-video/mplayer: Needs to be rebuilt with libcdio subslot bumps
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-video/mplayer/mplayer-1.3.0.ebuild | 2 +-
media-video/mplayer/mplayer-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.3.0.ebuild b/media-video/mplayer/mplayer-1.3.0.ebuild
index 0094290..73ff872 100644
--- a/media-video/mplayer/mplayer-1.3.0.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0.ebuild
@@ -67,7 +67,7 @@ RDEPEND+="
bidi? ( dev-libs/fribidi )
bluray? ( >=media-libs/libbluray-0.2.1 )
bs2b? ( media-libs/libbs2b )
- cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia )
+ cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
dga? ( x11-libs/libXxf86dga )
directfb? ( dev-libs/DirectFB )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index a898de8..c55bf5a 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -67,7 +67,7 @@ RDEPEND+="
bidi? ( dev-libs/fribidi )
bluray? ( >=media-libs/libbluray-0.2.1 )
bs2b? ( media-libs/libbs2b )
- cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia )
+ cdio? ( dev-libs/libcdio:0= dev-libs/libcdio-paranoia )
cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
dga? ( x11-libs/libXxf86dga )
directfb? ( dev-libs/DirectFB )
^ permalink raw reply related [flat|nested] 93+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2016-12-05 13:02 Alexis Ballier
0 siblings, 0 replies; 93+ messages in thread
From: Alexis Ballier @ 2016-12-05 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 4e58dbe29ab7a44c7e6350f73c6e3b63a7425ec4
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 5 12:21:22 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Dec 5 13:02:21 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e58dbe2
media-video/mplayer: drop xanim useflag
Package-Manager: portage-2.3.2
media-video/mplayer/metadata.xml | 1 -
media-video/mplayer/mplayer-1.2-r2.ebuild | 7 +++----
media-video/mplayer/mplayer-1.2.1.ebuild | 5 ++---
media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild | 7 +++----
media-video/mplayer/mplayer-1.3.0.ebuild | 5 ++---
media-video/mplayer/mplayer-9999.ebuild | 5 ++---
6 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 0bde382..d6c05ce 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -34,7 +34,6 @@
<flag name="twolame">Enable twolame MPEG-2 encoding</flag>
<flag name="vcd">Enables VCD support</flag>
<flag name="vidix">Support for vidix video output</flag>
- <flag name="xanim">Enables support for xanim based codecs</flag>
<flag name="xvmc">Enables X-Video Motion Compensation support</flag>
<flag name="yuv4mpeg">Enables yuv4mpeg video output</flag>
<flag name="zoran">Enables ZR360[56]7/ZR36060 video output</flag>
diff --git a/media-video/mplayer/mplayer-1.2-r2.ebuild b/media-video/mplayer/mplayer-1.2-r2.ebuild
index 245aa04..2e7b8e5 100644
--- a/media-video/mplayer/mplayer-1.2-r2.ebuild
+++ b/media-video/mplayer/mplayer-1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,7 +18,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
+vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc zoran"
VIDEO_CARDS="s3virge mga tdfx"
for x in ${VIDEO_CARDS}; do
@@ -126,7 +126,6 @@ RDEPEND+="
vdpau? ( x11-libs/libvdpau )
vorbis? ( !tremor? ( media-libs/libvorbis ) )
X? ( ${X_RDEPS} )
- xanim? ( media-video/xanim )
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
@@ -399,7 +398,7 @@ src_configure() {
use ${i} || myconf+=" --disable-lib${i}"
done
- uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
+ uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1.ebuild
index 9ede554..c3cd5bf 100644
--- a/media-video/mplayer/mplayer-1.2.1.ebuild
+++ b/media-video/mplayer/mplayer-1.2.1.ebuild
@@ -18,7 +18,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
+vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
VIDEO_CARDS="s3virge mga tdfx"
for x in ${VIDEO_CARDS}; do
@@ -126,7 +126,6 @@ RDEPEND+="
vdpau? ( x11-libs/libvdpau )
vorbis? ( !tremor? ( media-libs/libvorbis ) )
X? ( ${X_RDEPS} )
- xanim? ( media-video/xanim )
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
@@ -394,7 +393,7 @@ src_configure() {
use ${i} || myconf+=" --disable-lib${i}"
done
- uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
+ uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
diff --git a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
index 8496435..1dae7c9 100644
--- a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,7 +18,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
+vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc zoran"
VIDEO_CARDS="s3virge mga tdfx"
for x in ${VIDEO_CARDS}; do
@@ -126,7 +126,6 @@ RDEPEND+="
vdpau? ( x11-libs/libvdpau )
vorbis? ( !tremor? ( media-libs/libvorbis ) )
X? ( ${X_RDEPS} )
- xanim? ( media-video/xanim )
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
@@ -393,7 +392,7 @@ src_configure() {
use ${i} || myconf+=" --disable-lib${i}"
done
- uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
+ uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
diff --git a/media-video/mplayer/mplayer-1.3.0.ebuild b/media-video/mplayer/mplayer-1.3.0.ebuild
index ee6d828..0094290 100644
--- a/media-video/mplayer/mplayer-1.3.0.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0.ebuild
@@ -18,7 +18,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
+vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
VIDEO_CARDS="s3virge mga tdfx"
for x in ${VIDEO_CARDS}; do
@@ -126,7 +126,6 @@ RDEPEND+="
vdpau? ( x11-libs/libvdpau )
vorbis? ( !tremor? ( media-libs/libvorbis ) )
X? ( ${X_RDEPS} )
- xanim? ( media-video/xanim )
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
@@ -388,7 +387,7 @@ src_configure() {
use ${i} || myconf+=" --disable-lib${i}"
done
- uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
+ uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index f54abd9..a898de8 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -18,7 +18,7 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
+vorbis +X x264 xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
VIDEO_CARDS="s3virge mga tdfx"
for x in ${VIDEO_CARDS}; do
@@ -126,7 +126,6 @@ RDEPEND+="
vdpau? ( x11-libs/libvdpau )
vorbis? ( !tremor? ( media-libs/libvorbis ) )
X? ( ${X_RDEPS} )
- xanim? ( media-video/xanim )
xinerama? ( x11-libs/libXinerama )
xscreensaver? ( x11-libs/libXScrnSaver )
xv? ( x11-libs/libXv )
@@ -388,7 +387,7 @@ src_configure() {
use ${i} || myconf+=" --disable-lib${i}"
done
- uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
+ uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2016-12-05 12:16 Alexis Ballier
0 siblings, 0 replies; 93+ messages in thread
From: Alexis Ballier @ 2016-12-05 12:16 UTC (permalink / raw
To: gentoo-commits
commit: 5519a6278ce3a1de12aa125cf40bba6aa4af5e1c
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 5 12:15:33 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Dec 5 12:16:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5519a627
media-video/mplayer: drop keywords for arches not having ffmpeg 3 keyworded
Package-Manager: portage-2.3.2
media-video/mplayer/mplayer-1.3.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.3.0.ebuild b/media-video/mplayer/mplayer-1.3.0.ebuild
index 38bb01a..ee6d828 100644
--- a/media-video/mplayer/mplayer-1.3.0.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0.ebuild
@@ -159,7 +159,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
KEYWORDS=""
fi
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2016-10-24 9:34 Pacho Ramos
0 siblings, 0 replies; 93+ messages in thread
From: Pacho Ramos @ 2016-10-24 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 8ba692b3ce31d95e84cb09fedd55137681a6b2b0
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 24 09:19:30 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Oct 24 09:34:48 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba692b3
media-video/mplayer: Will need to be rebuilt with giflib update
Package-Manager: portage-2.3.2
RepoMan-Options: --force
media-video/mplayer/mplayer-1.2.1.ebuild | 2 +-
media-video/mplayer/mplayer-1.3.0.ebuild | 4 ++--
media-video/mplayer/mplayer-9999.ebuild | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1.ebuild
index 21ac103..9ede554 100644
--- a/media-video/mplayer/mplayer-1.2.1.ebuild
+++ b/media-video/mplayer/mplayer-1.2.1.ebuild
@@ -87,7 +87,7 @@ RDEPEND+="
enca? ( app-i18n/enca )
faad? ( media-libs/faad2 )
ggi? ( media-libs/libggi media-libs/libggiwmh )
- gif? ( media-libs/giflib )
+ gif? ( media-libs/giflib:0= )
gsm? ( media-sound/gsm )
iconv? ( virtual/libiconv )
jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-video/mplayer/mplayer-1.3.0.ebuild b/media-video/mplayer/mplayer-1.3.0.ebuild
index c5eb085..38bb01a 100644
--- a/media-video/mplayer/mplayer-1.3.0.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -87,7 +87,7 @@ RDEPEND+="
enca? ( app-i18n/enca )
faad? ( media-libs/faad2 )
ggi? ( media-libs/libggi media-libs/libggiwmh )
- gif? ( media-libs/giflib )
+ gif? ( media-libs/giflib:0= )
gsm? ( media-sound/gsm )
iconv? ( virtual/libiconv )
jack? ( media-sound/jack-audio-connection-kit )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 1e3a45b..f54abd9 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -87,7 +87,7 @@ RDEPEND+="
enca? ( app-i18n/enca )
faad? ( media-libs/faad2 )
ggi? ( media-libs/libggi media-libs/libggiwmh )
- gif? ( media-libs/giflib )
+ gif? ( media-libs/giflib:0= )
gsm? ( media-sound/gsm )
iconv? ( virtual/libiconv )
jack? ( media-sound/jack-audio-connection-kit )
^ permalink raw reply related [flat|nested] 93+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2016-09-08 7:41 Jeroen Roovers
0 siblings, 0 replies; 93+ messages in thread
From: Jeroen Roovers @ 2016-09-08 7:41 UTC (permalink / raw
To: gentoo-commits
commit: db850057899a178054d4893700b4550aa2129583
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 8 07:40:59 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Thu Sep 8 07:40:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db850057
media-video/mplayer: Stable for HPPA (bug #575196).
Package-Manager: portage-2.3.0
RepoMan-Options: --ignore-arches
media-video/mplayer/mplayer-1.2.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1.ebuild
index 8b407f7..21ac103 100644
--- a/media-video/mplayer/mplayer-1.2.1.ebuild
+++ b/media-video/mplayer/mplayer-1.2.1.ebuild
@@ -159,9 +159,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="alpha arm ia64 ppc ppc64 sparc"
+ KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2016-05-26 9:37 Tobias Klausmann
0 siblings, 0 replies; 93+ messages in thread
From: Tobias Klausmann @ 2016-05-26 9:37 UTC (permalink / raw
To: gentoo-commits
commit: 0cb0f14005d663e2974b2ce91e124578c8667fdf
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 09:37:25 2016 +0000
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Thu May 26 09:37:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb0f140
media-video/mplayer-1.2.1-r0: add alpha keyword
Gentoo-Bug: 575196
Package-Manager: portage-2.3.0_rc1
media-video/mplayer/mplayer-1.2.1.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1.ebuild
index 7551ba4..8b407f7 100644
--- a/media-video/mplayer/mplayer-1.2.1.ebuild
+++ b/media-video/mplayer/mplayer-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -159,9 +159,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="arm ia64 ppc ppc64 sparc"
+ KEYWORDS="alpha arm ia64 ppc ppc64 sparc"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2016-03-20 11:53 Agostino Sarubbo
0 siblings, 0 replies; 93+ messages in thread
From: Agostino Sarubbo @ 2016-03-20 11:53 UTC (permalink / raw
To: gentoo-commits
commit: 97ec0696d031b85551643d627601d96d15518c6b
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 11:51:17 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 11:51:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ec0696
media-video/mplayer: ia64 stable wrt bug #575196
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-video/mplayer/mplayer-1.2.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1.ebuild
index 905572b..7551ba4 100644
--- a/media-video/mplayer/mplayer-1.2.1.ebuild
+++ b/media-video/mplayer/mplayer-1.2.1.ebuild
@@ -159,9 +159,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="arm ppc ppc64 sparc"
+ KEYWORDS="arm ia64 ppc ppc64 sparc"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2016-03-17 10:50 Agostino Sarubbo
0 siblings, 0 replies; 93+ messages in thread
From: Agostino Sarubbo @ 2016-03-17 10:50 UTC (permalink / raw
To: gentoo-commits
commit: af084a6f91648b3bad7f70a560a1b3937dd29c10
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 10:48:35 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Mar 17 10:48:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af084a6f
media-video/mplayer: ppc64 stable wrt bug #575196
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-video/mplayer/mplayer-1.2.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1.ebuild
index fbc0ebe..af01b1e 100644
--- a/media-video/mplayer/mplayer-1.2.1.ebuild
+++ b/media-video/mplayer/mplayer-1.2.1.ebuild
@@ -159,9 +159,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 arm ~hppa ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="arm ppc"
+ KEYWORDS="arm ppc ppc64"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2016-03-15 17:27 Markus Meier
0 siblings, 0 replies; 93+ messages in thread
From: Markus Meier @ 2016-03-15 17:27 UTC (permalink / raw
To: gentoo-commits
commit: 3d16ead2518423168bd4842131025cad85021dc2
Author: Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 15 17:26:46 2016 +0000
Commit: Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 17:26:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d16ead2
media-video/mplayer: arm stable, bug #575196
Package-Manager: portage-2.2.27
RepoMan-Options: --include-arches="arm"
media-video/mplayer/mplayer-1.2.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1.ebuild
index c779e4e..85cb862 100644
--- a/media-video/mplayer/mplayer-1.2.1.ebuild
+++ b/media-video/mplayer/mplayer-1.2.1.ebuild
@@ -159,9 +159,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS=""
+ KEYWORDS="arm"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2016-03-06 12:58 Agostino Sarubbo
0 siblings, 0 replies; 93+ messages in thread
From: Agostino Sarubbo @ 2016-03-06 12:58 UTC (permalink / raw
To: gentoo-commits
commit: a173bf1c93d56a20b5e5f4f4fc473b2c4f5cf445
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 6 12:55:56 2016 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 6 12:58:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a173bf1c
media-video/mplayer: amd64 stable wrt bug #575196
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
media-video/mplayer/mplayer-1.2.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1.ebuild
index c2a89ed..c0951c3 100644
--- a/media-video/mplayer/mplayer-1.2.1.ebuild
+++ b/media-video/mplayer/mplayer-1.2.1.ebuild
@@ -159,7 +159,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
KEYWORDS=""
fi
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2016-03-04 10:03 Alexis Ballier
0 siblings, 0 replies; 93+ messages in thread
From: Alexis Ballier @ 2016-03-04 10:03 UTC (permalink / raw
To: gentoo-commits
commit: c9a513f5fca425af368156b1272145ce6a9a6980
Author: hkgz <hkgz <AT> localhost <DOT> localdomain>
AuthorDate: Thu Mar 3 13:14:47 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 3 13:14:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a513f5
media-video/mplayer: added vcd and yuv4mpeg USE flags, bug #574806
media-video/mplayer/metadata.xml | 2 ++
media-video/mplayer/mplayer-1.2.1.ebuild | 8 ++++----
media-video/mplayer/mplayer-1.3.0.ebuild | 8 ++++----
media-video/mplayer/mplayer-9999.ebuild | 8 ++++----
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/media-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index c6d7f2f..0bde382 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/mplayer/metadata.xml
@@ -32,9 +32,11 @@
<flag name="toolame">Enable toolame MPEG-2 encoding</flag>
<flag name="tremor">Enable internal support for Vorbis</flag>
<flag name="twolame">Enable twolame MPEG-2 encoding</flag>
+ <flag name="vcd">Enables VCD support</flag>
<flag name="vidix">Support for vidix video output</flag>
<flag name="xanim">Enables support for xanim based codecs</flag>
<flag name="xvmc">Enables X-Video Motion Compensation support</flag>
+ <flag name="yuv4mpeg">Enables yuv4mpeg video output</flag>
<flag name="zoran">Enables ZR360[56]7/ZR36060 video output</flag>
</use>
</pkgmetadata>
diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1.ebuild
index e524a12..c2a89ed 100644
--- a/media-video/mplayer/mplayer-1.2.1.ebuild
+++ b/media-video/mplayer/mplayer-1.2.1.ebuild
@@ -17,8 +17,8 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
+tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
+vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
VIDEO_CARDS="s3virge mga tdfx"
for x in ${VIDEO_CARDS}; do
@@ -299,7 +299,7 @@ src_configure() {
$(use_enable network networking)
$(use_enable joystick)
"
- uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
+ uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
myconf+=" --disable-nemesi" # nemesi automagic disable
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
@@ -422,7 +422,7 @@ src_configure() {
################
# Video Output #
################
- uses="directfb md5sum sdl"
+ uses="directfb md5sum sdl yuv4mpeg"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
diff --git a/media-video/mplayer/mplayer-1.3.0.ebuild b/media-video/mplayer/mplayer-1.3.0.ebuild
index 8a5b401..c5eb085 100644
--- a/media-video/mplayer/mplayer-1.3.0.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0.ebuild
@@ -17,8 +17,8 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
+tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
+vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
VIDEO_CARDS="s3virge mga tdfx"
for x in ${VIDEO_CARDS}; do
@@ -293,7 +293,7 @@ src_configure() {
$(use_enable network networking)
$(use_enable joystick)
"
- uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
+ uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
myconf+=" --disable-nemesi" # nemesi automagic disable
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
@@ -416,7 +416,7 @@ src_configure() {
################
# Video Output #
################
- uses="directfb md5sum sdl"
+ uses="directfb md5sum sdl yuv4mpeg"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 586f70a..1e3a45b 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -17,8 +17,8 @@ ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
+libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
+network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
-tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
-vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
+tga theora tremor +truetype toolame twolame +unicode v4l vcd vdpau vidix
+vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc yuv4mpeg zoran"
VIDEO_CARDS="s3virge mga tdfx"
for x in ${VIDEO_CARDS}; do
@@ -293,7 +293,7 @@ src_configure() {
$(use_enable network networking)
$(use_enable joystick)
"
- uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
+ uses="bl bluray enca ftp rtc vcd" # nemesi <- not working with in-tree ebuild
myconf+=" --disable-nemesi" # nemesi automagic disable
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
@@ -416,7 +416,7 @@ src_configure() {
################
# Video Output #
################
- uses="directfb md5sum sdl"
+ uses="directfb md5sum sdl yuv4mpeg"
for i in ${uses}; do
use ${i} || myconf+=" --disable-${i}"
done
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2016-02-17 22:16 Alexis Ballier
0 siblings, 0 replies; 93+ messages in thread
From: Alexis Ballier @ 2016-02-17 22:16 UTC (permalink / raw
To: gentoo-commits
commit: 5b0405a4c5df5b73c29a53e2c89e7780e05c8f86
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 17 22:15:10 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 22:15:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b0405a4
media-video/mplayer: bump to 1.3.0 and update ffmpeg dep in live ebuild.
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/mplayer/Manifest | 1 +
media-video/mplayer/{mplayer-9999.ebuild => mplayer-1.3.0.ebuild} | 4 ++--
media-video/mplayer/mplayer-9999.ebuild | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 409cd85..9ea4a43 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,6 +1,7 @@
DIST MPlayer-1.1.1.tar.xz 11202492 SHA256 ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76 SHA512 06371d47b02caec83c7662f6bb4a827eafb7f3309f6cda959a0f49b647df031166a6e7c5d530b57b580104289ee260aa96f3f43cbfffcef816cea776b0d5aed0 WHIRLPOOL 3cd0f3845cd45961b778c384a322bc628cc9cd6fef3801b62389bd616a443ba5270c378a889412a7dc72d37ff26704d5d989d2c995a2a4a6540f6313ccacbb63
DIST MPlayer-1.2.1.tar.xz 13029936 SHA256 831baf097d899bdfcdad0cb80f33cc8dff77fa52cb306bee5dee6843b5c52b5f SHA512 e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506 WHIRLPOOL d8f056a8a1d6cf2a7c99687bec9e34d123f574391df02a29959355c6e44f35f1f9a56ea5f2d0f6d1037d94de0897689429e78aa7e15f29f3df3042bbfc579c72
DIST MPlayer-1.2.tar.xz 13019196 SHA256 ffe7f6f10adf2920707e8d6c04f0d3ed34c307efc6cd90ac46593ee8fba2e2b6 SHA512 ac10dd4facd0d8fbc3454a3a2eae0e0d2ed76fa60f30ebd6f8495632e4541af712ab2d005e88bc2baa8302ccb98d63ba80a051db80d2b76ac928a2bd779b47aa WHIRLPOOL 65bcda55684dced6b286e505df4180f849d6a9f2e1e44560f3393311694ea5a0e96cd7c454b8bbc4198b92c1fd3b0fb4f7c5f6842710b40dc47216037a88b33b
+DIST MPlayer-1.3.0.tar.xz 13278984 SHA256 3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843 SHA512 10007e471a941f8a3dabf6149e6e44fc1a364a9ccb5cd08c670fc22560e5053a15f3249e9d3e18cdda06b6b7e77e537026b5d33dc356e928c63747d6ed73dbae WHIRLPOOL 4aaa9609b0c27c0363671e32fb6b7cac8d2c0944c3425c8e76de0250fb76865d5f47c341b11704a0ea980401288d1d28fcd172a5f8469c9713ec37f977bcb088
DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 WHIRLPOOL d635f54be65b0ca1047d943b6f6da433cda9fce6ed74fcab993501cf7f6b443eb711e182cd7fff09e553d251b5fd1c60196aa22e8370cba99fa175ed5ecdb47f
DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25
DIST font-arial-iso-8859-2.tar.bz2 222208 SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 SHA512 5671e628303fd816f64a51ad10e2f4dd9c3dc1b34c379a2ecf489b83931db7af668aaa4e00e96a00cacd63ed98daeae6b6a4d5925edfb06fc98d3a923f70257d WHIRLPOOL 08178087b4ea1dfb2250f4673785e31dd876b06af51c51b2bddc172b23e6e33cbc1b2c6b710a317e42dc05486974b26ed0ad3ca50a185567aa77d49bd1e72aee
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-1.3.0.ebuild
similarity index 98%
copy from media-video/mplayer/mplayer-9999.ebuild
copy to media-video/mplayer/mplayer-1.3.0.ebuild
index 32c7fad..8a5b401 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-1.3.0.ebuild
@@ -60,7 +60,7 @@ RDEPEND+="
sys-libs/ncurses:0=
app-arch/bzip2
sys-libs/zlib
- >=media-video/ffmpeg-2.8:0=[vdpau?]
+ >=media-video/ffmpeg-3.0:0=[vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
@@ -159,7 +159,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
KEYWORDS=""
fi
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 32c7fad..586f70a 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -60,7 +60,7 @@ RDEPEND+="
sys-libs/ncurses:0=
app-arch/bzip2
sys-libs/zlib
- >=media-video/ffmpeg-2.8:0=[vdpau?]
+ >=media-video/ffmpeg-3.0:0=[vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2016-01-25 12:27 Alexis Ballier
0 siblings, 0 replies; 93+ messages in thread
From: Alexis Ballier @ 2016-01-25 12:27 UTC (permalink / raw
To: gentoo-commits
commit: ca19e1d409a6bf4a5b564743008dcb835f51f412
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 12:25:22 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 12:27:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca19e1d4
media-video/mplayer: bump to 1.2.1
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/mplayer/Manifest | 1 +
media-video/mplayer/mplayer-1.2.1.ebuild | 634 +++++++++++++++++++++++++++++++
2 files changed, 635 insertions(+)
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 7c8b970..409cd85 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,4 +1,5 @@
DIST MPlayer-1.1.1.tar.xz 11202492 SHA256 ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76 SHA512 06371d47b02caec83c7662f6bb4a827eafb7f3309f6cda959a0f49b647df031166a6e7c5d530b57b580104289ee260aa96f3f43cbfffcef816cea776b0d5aed0 WHIRLPOOL 3cd0f3845cd45961b778c384a322bc628cc9cd6fef3801b62389bd616a443ba5270c378a889412a7dc72d37ff26704d5d989d2c995a2a4a6540f6313ccacbb63
+DIST MPlayer-1.2.1.tar.xz 13029936 SHA256 831baf097d899bdfcdad0cb80f33cc8dff77fa52cb306bee5dee6843b5c52b5f SHA512 e6dd6de73ede9743855fab7f7316de2e957ac5a5b8fc8324ef3d57ca9796b0cb03676dee46b3827d932050836d43a6ad08f925cad3d28493a26933dbafdbb506 WHIRLPOOL d8f056a8a1d6cf2a7c99687bec9e34d123f574391df02a29959355c6e44f35f1f9a56ea5f2d0f6d1037d94de0897689429e78aa7e15f29f3df3042bbfc579c72
DIST MPlayer-1.2.tar.xz 13019196 SHA256 ffe7f6f10adf2920707e8d6c04f0d3ed34c307efc6cd90ac46593ee8fba2e2b6 SHA512 ac10dd4facd0d8fbc3454a3a2eae0e0d2ed76fa60f30ebd6f8495632e4541af712ab2d005e88bc2baa8302ccb98d63ba80a051db80d2b76ac928a2bd779b47aa WHIRLPOOL 65bcda55684dced6b286e505df4180f849d6a9f2e1e44560f3393311694ea5a0e96cd7c454b8bbc4198b92c1fd3b0fb4f7c5f6842710b40dc47216037a88b33b
DIST font-arial-cp1250.tar.bz2 249705 SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 SHA512 4f77ff5ceb8ec6e5d9f8f34d8950a6a6276d1fd5a947772fcbdb6554988b1ea665c12b82f45164f91fb7bd08000cb4afc26fa35beb4c760464160e22b9b8c340 WHIRLPOOL d635f54be65b0ca1047d943b6f6da433cda9fce6ed74fcab993501cf7f6b443eb711e182cd7fff09e553d251b5fd1c60196aa22e8370cba99fa175ed5ecdb47f
DIST font-arial-iso-8859-1.tar.bz2 234242 SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 SHA512 a1d03b6f09c48f48b7733f3bc0402ceab239a9abf88b860d852ea9fe69b4da690208a79d6f29d30204f5b37becf10672e8e8c0bfef201846d80ec54df617d029 WHIRLPOOL 8050362b125d3ca98214526cee2fa685e31487d13a6483c765bfc844bdc5e07beeba2c1ba313458096d43a63edd6c5e80b8b388c2792fc0ec7421e4072d8ca25
diff --git a/media-video/mplayer/mplayer-1.2.1.ebuild b/media-video/mplayer/mplayer-1.2.1.ebuild
new file mode 100644
index 0000000..e524a12
--- /dev/null
+++ b/media-video/mplayer/mplayer-1.2.1.ebuild
@@ -0,0 +1,634 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+ESVN_REPO_URI="svn://svn.mplayerhq.hu/mplayer/trunk"
+[[ ${PV} = *9999* ]] && SVN_ECLASS="subversion git-2" || SVN_ECLASS=""
+
+inherit toolchain-funcs eutils flag-o-matic multilib base ${SVN_ECLASS}
+
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext a52 aalib +alsa altivec aqua bidi bl bluray
+bs2b cddb +cdio cdparanoia cpudetection debug dga
+directfb doc dts dv dvb +dvd +dvdnav +enca +encode faac faad fbcon
+ftp gif ggi gsm +iconv ipv6 jack joystick jpeg jpeg2k kernel_linux ladspa
++libass libcaca libmpeg2 lirc live lzo mad md5sum +cpu_flags_x86_mmx cpu_flags_x86_mmxext mng mp3 nas
++network nut openal opengl +osdmenu oss png pnm pulseaudio pvr
+radio rar rtc rtmp samba selinux +shm sdl speex cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_ssse3
+tga theora tremor +truetype toolame twolame +unicode v4l vdpau vidix
+vorbis +X x264 xanim xinerama +xscreensaver +xv xvid xvmc zoran"
+
+VIDEO_CARDS="s3virge mga tdfx"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+FONT_URI="
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-1.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
+ mirror://mplayer/releases/fonts/font-arial-cp1250.tar.bz2
+"
+if [[ ${PV} == *9999* ]]; then
+ RELEASE_URI=""
+elif [ "${PV%_rc*}" = "${PV}" -a "${PV%_pre*}" = "${PV}" ]; then
+ MY_P="MPlayer-${PV}"
+ S="${WORKDIR}/${MY_P}"
+ RELEASE_URI="mirror://mplayer/releases/${MY_P}.tar.xz"
+else
+ RELEASE_URI="mirror://gentoo/${P}.tar.xz"
+fi
+SRC_URI="${RELEASE_URI}
+ !truetype? ( ${FONT_URI} )"
+
+DESCRIPTION="Media Player for Linux"
+HOMEPAGE="http://www.mplayerhq.hu/"
+
+FONT_RDEPS="
+ virtual/ttf-fonts
+ media-libs/fontconfig
+ >=media-libs/freetype-2.2.1:2
+"
+X_RDEPS="
+ x11-libs/libXext
+ x11-libs/libXxf86vm
+"
+# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
+# nemesi? ( net-libs/libnemesi )
+RDEPEND+="
+ sys-libs/ncurses:0=
+ app-arch/bzip2
+ sys-libs/zlib
+ >=media-video/ffmpeg-2.6:0=[vdpau?]
+ a52? ( media-libs/a52dec )
+ aalib? ( media-libs/aalib )
+ alsa? ( media-libs/alsa-lib )
+ bidi? ( dev-libs/fribidi )
+ bluray? ( >=media-libs/libbluray-0.2.1 )
+ bs2b? ( media-libs/libbs2b )
+ cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia )
+ cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
+ dga? ( x11-libs/libXxf86dga )
+ directfb? ( dev-libs/DirectFB )
+ dts? ( media-libs/libdca )
+ dv? ( media-libs/libdv )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ dvd? ( >=media-libs/libdvdread-4.1.3 )
+ dvdnav? ( >=media-libs/libdvdnav-4.1.3 )
+ encode? (
+ !twolame? ( toolame? ( media-sound/toolame ) )
+ twolame? ( media-sound/twolame )
+ faac? ( media-libs/faac )
+ mp3? ( media-sound/lame )
+ x264? ( >=media-libs/x264-0.0.20100423:= )
+ xvid? ( media-libs/xvid )
+ )
+ enca? ( app-i18n/enca )
+ faad? ( media-libs/faad2 )
+ ggi? ( media-libs/libggi media-libs/libggiwmh )
+ gif? ( media-libs/giflib )
+ gsm? ( media-sound/gsm )
+ iconv? ( virtual/libiconv )
+ jack? ( media-sound/jack-audio-connection-kit )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:0 )
+ ladspa? ( media-libs/ladspa-sdk )
+ libass? ( >=media-libs/libass-0.9.10:= )
+ libcaca? ( media-libs/libcaca )
+ libmpeg2? ( media-libs/libmpeg2 )
+ lirc? ( app-misc/lirc )
+ live? ( media-plugins/live )
+ lzo? ( >=dev-libs/lzo-2 )
+ mad? ( media-libs/libmad )
+ mng? ( media-libs/libmng:= )
+ mp3? ( media-sound/mpg123 )
+ nas? ( media-libs/nas )
+ nut? ( >=media-libs/libnut-661 )
+ openal? ( media-libs/openal )
+ opengl? ( virtual/opengl )
+ png? ( media-libs/libpng:0= )
+ pnm? ( media-libs/netpbm )
+ pulseaudio? ( media-sound/pulseaudio )
+ rar? (
+ || (
+ app-arch/unrar
+ app-arch/rar
+ )
+ )
+ rtmp? ( media-video/rtmpdump )
+ samba? ( net-fs/samba )
+ sdl? ( media-libs/libsdl )
+ speex? ( media-libs/speex )
+ theora? ( media-libs/libtheora[encode?] )
+ tremor? ( media-libs/tremor )
+ truetype? ( ${FONT_RDEPS} )
+ vdpau? ( x11-libs/libvdpau )
+ vorbis? ( !tremor? ( media-libs/libvorbis ) )
+ X? ( ${X_RDEPS} )
+ xanim? ( media-video/xanim )
+ xinerama? ( x11-libs/libXinerama )
+ xscreensaver? ( x11-libs/libXScrnSaver )
+ xv? ( x11-libs/libXv )
+ xvmc? ( x11-libs/libXvMC )
+"
+
+X_DEPS="
+ x11-proto/videoproto
+ x11-proto/xf86vidmodeproto
+"
+ASM_DEP="dev-lang/yasm"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ dga? ( x11-proto/xf86dgaproto )
+ X? ( ${X_DEPS} )
+ xinerama? ( x11-proto/xineramaproto )
+ xscreensaver? ( x11-proto/scrnsaverproto )
+ amd64? ( ${ASM_DEP} )
+ doc? (
+ dev-libs/libxslt app-text/docbook-xml-dtd
+ app-text/docbook-xsl-stylesheets
+ )
+ x86? ( ${ASM_DEP} )
+ x86-fbsd? ( ${ASM_DEP} )
+"
+RDEPEND+="
+ selinux? ( sec-policy/selinux-mplayer )
+"
+
+SLOT="0"
+LICENSE="GPL-2"
+if [[ ${PV} != *9999* ]]; then
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+ KEYWORDS=""
+fi
+
+# faac codecs are nonfree
+# libcdio support: prefer libcdio over cdparanoia and don't check for cddb w/cdio
+# dvd navigation requires dvd read support
+# ass and freetype font require iconv and ass requires freetype fonts
+# unicode transformations are usefull only with iconv
+# radio requires oss or alsa backend
+# xvmc requires xvideo support
+REQUIRED_USE="
+ dga? ( X )
+ dvdnav? ( dvd )
+ enca? ( iconv )
+ ggi? ( X )
+ libass? ( truetype )
+ opengl? ( X )
+ osdmenu? ( X )
+ truetype? ( iconv )
+ vdpau? ( X )
+ vidix? ( X )
+ xinerama? ( X )
+ xscreensaver? ( X )
+ xv? ( X )
+ xvmc? ( xv )"
+RESTRICT="faac? ( bindist )"
+
+pkg_setup() {
+ if [[ ${PV} == *9999* ]]; then
+ elog
+ elog "This is a live ebuild which installs the latest from upstream's"
+ elog "subversion repository, and is unsupported by Gentoo."
+ elog "Everything but bugs in the ebuild itself will be ignored."
+ elog
+ fi
+
+ if use cpudetection; then
+ ewarn
+ ewarn "You've enabled the cpudetection flag. This feature is"
+ ewarn "included mainly for people who want to use the same"
+ ewarn "binary on another system with a different CPU architecture."
+ ewarn "MPlayer will already detect your CPU settings by default at"
+ ewarn "buildtime; this flag is used for runtime detection."
+ ewarn "You won't need this turned on if you are only building"
+ ewarn "mplayer for this system. Also, if your compile fails, try"
+ ewarn "disabling this use flag."
+ fi
+
+ if has_version 'media-video/libav' ; then
+ ewarn "Please note that upstream uses media-video/ffmpeg."
+ ewarn "media-video/libav should be fine in theory but if you"
+ ewarn "experience any problem, try to move to media-video/ffmpeg."
+ fi
+}
+
+src_unpack() {
+ if [[ ${PV} = *9999* ]]; then
+ subversion_src_unpack
+ cd "${WORKDIR}"
+ rm -rf "${WORKDIR}/${P}/ffmpeg/"
+ ( S="${WORKDIR}/${P}/ffmpeg/" git-2_src_unpack )
+ else
+ unpack ${A}
+ fi
+
+ if [[ ${PV} = *9999* ]] || [[ "${PV%_rc*}" = "${PV}" ]]; then
+ cd "${S}"
+ cp "${FILESDIR}/dump_ffmpeg.sh" . || die
+ chmod +x dump_ffmpeg.sh
+ ./dump_ffmpeg.sh || die
+ fi
+
+ if ! use truetype; then
+ unpack font-arial-iso-8859-1.tar.bz2 \
+ font-arial-iso-8859-2.tar.bz2 \
+ font-arial-cp1250.tar.bz2
+ fi
+}
+
+src_prepare() {
+ local svf=snapshot_version
+ if [[ ${PV} = *9999* ]]; then
+ # Set SVN version manually
+ subversion_wc_info
+ printf "${ESVN_WC_REVISION}" > $svf
+ fi
+ if [ ! -f VERSION ] ; then
+ [ -f "$svf" ] || die "Missing ${svf}. Did you generate your snapshot with prepare_mplayer.sh?"
+ local sv=$(<$svf)
+ printf "SVN-r${sv} (Gentoo)" > VERSION
+ fi
+
+ # fix path to bash executable in configure scripts
+ sed -i -e "1c\#!${EPREFIX}/bin/bash" configure version.sh || die
+
+ base_src_prepare
+
+ # Use sane default for >=virtual/udev-197
+ sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+
+ if has_version '>=media-video/ffmpeg-2.9'; then
+ epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch"
+ epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch"
+ epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch"
+ fi
+}
+
+src_configure() {
+ local myconf=""
+ local uses i
+
+ # set LINGUAS
+ [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/da/dk}"
+ [[ -n $LINGUAS ]] && LINGUAS="${LINGUAS/zh/zh_CN}" #482968
+
+ # mplayer ebuild uses "use foo || --disable-foo" to forcibly disable
+ # compilation in almost every situation. The reason for this is
+ # because if --enable is used, it will force the build of that option,
+ # regardless of whether the dependency is available or not.
+
+ ###################
+ #Optional features#
+ ###################
+ # disable svga since we don't want it
+ # disable arts since we don't have kde3
+ # always disable internal ass
+ # disable opus and ilbc since it only controls support in internal
+ # ffmpeg which we do not use
+ myconf+="
+ --disable-svga --disable-svgalib_helper
+ --disable-ass-internal
+ --disable-arts
+ --disable-kai
+ --disable-libopus
+ --disable-libilbc
+ $(use_enable network networking)
+ $(use_enable joystick)
+ "
+ uses="bl bluray enca ftp rtc" # nemesi <- not working with in-tree ebuild
+ myconf+=" --disable-nemesi" # nemesi automagic disable
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use bidi || myconf+=" --disable-fribidi"
+ use ipv6 || myconf+=" --disable-inet6"
+ use libass || myconf+=" --disable-ass"
+ use nut || myconf+=" --disable-libnut"
+ use rar || myconf+=" --disable-unrarexec"
+ use samba || myconf+=" --disable-smb"
+ use lirc || myconf+=" --disable-lirc --disable-lircc --disable-apple-ir"
+
+ # libcdio support: prefer libcdio over cdparanoia
+ # don't check for cddb w/cdio
+ if use cdio; then
+ myconf+=" --disable-cdparanoia"
+ else
+ myconf+=" --disable-libcdio"
+ use cdparanoia || myconf+=" --disable-cdparanoia"
+ use cddb || myconf+=" --disable-cddb"
+ fi
+
+ ################################
+ # DVD read, navigation support #
+ ################################
+ #
+ # dvdread - accessing a DVD
+ # dvdnav - navigation of menus
+ use dvd || myconf+=" --disable-dvdread"
+ use dvdnav || myconf+=" --disable-dvdnav"
+
+ #############
+ # Subtitles #
+ #############
+ #
+ # SRT/ASS/SSA (subtitles) requires freetype support
+ # freetype support requires iconv
+ # iconv optionally can use unicode
+ use truetype || myconf+=" --disable-freetype"
+ use iconv || myconf+=" --disable-iconv --charset=noconv"
+ use iconv && use unicode && myconf+=" --charset=UTF-8"
+
+ #####################################
+ # DVB / Video4Linux / Radio support #
+ #####################################
+ myconf+=" --disable-tv-bsdbt848"
+ # broken upstream, won't work with recent kernels
+ myconf+=" --disable-ivtv"
+ # gone since linux-headers-2.6.38
+ myconf+=" --disable-tv-v4l1"
+ if { use dvb || use v4l || use pvr || use radio; }; then
+ use dvb || myconf+=" --disable-dvb"
+ use pvr || myconf+=" --disable-pvr"
+ use v4l || myconf+=" --disable-tv-v4l2"
+ if use radio && { use dvb || use v4l; }; then
+ myconf+="
+ --enable-radio
+ $(use_enable encode radio-capture)
+ "
+ else
+ myconf+="
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ "
+ fi
+ else
+ myconf+="
+ --disable-tv
+ --disable-tv-v4l2
+ --disable-radio
+ --disable-radio-v4l2
+ --disable-radio-bsdbt848
+ --disable-dvb
+ --disable-v4l2
+ --disable-pvr"
+ fi
+
+ ##########
+ # Codecs #
+ ##########
+ myconf+=" --disable-musepack" # Use internal musepack codecs for SV7 and SV8 support
+ myconf+=" --disable-libmpeg2-internal" # always use system media-libs/libmpeg2
+ use dts || myconf+=" --disable-libdca"
+ if ! use mp3; then
+ myconf+="
+ --disable-mp3lame
+ --disable-mpg123
+ "
+ fi
+ uses="a52 bs2b dv gsm lzo rtmp vorbis"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-lib${i}"
+ done
+
+ uses="faad gif jpeg libmpeg2 live mad mng png pnm speex tga theora tremor xanim"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use jpeg2k || myconf+=" --disable-libopenjpeg"
+
+ # Encoding
+ uses="faac x264 xvid toolame twolame"
+ if use encode; then
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ else
+ myconf+=" --disable-mencoder"
+ for i in ${uses}; do
+ myconf+=" --disable-${i}"
+ use ${i} && elog "Useflag \"${i}\" will only be useful for encoding, i.e., with \"encode\" useflag enabled."
+ done
+ fi
+
+ #################
+ # Binary codecs #
+ #################
+ myconf+=" --disable-qtx --disable-real --disable-win32dll"
+
+ ################
+ # Video Output #
+ ################
+ uses="directfb md5sum sdl"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use aalib || myconf+=" --disable-aa"
+ use fbcon || myconf+=" --disable-fbdev"
+ use fbcon && use video_cards_s3virge && myconf+=" --enable-s3fb"
+ use libcaca || myconf+=" --disable-caca"
+ use zoran || myconf+=" --disable-zr"
+
+ if ! use kernel_linux || ! use video_cards_mga; then
+ myconf+=" --disable-mga --disable-xmga"
+ fi
+
+ if use video_cards_tdfx; then
+ myconf+="
+ $(use_enable video_cards_tdfx tdfxvid)
+ $(use_enable fbcon tdfxfb)
+ "
+ else
+ myconf+="
+ --disable-3dfx
+ --disable-tdfxvid
+ --disable-tdfxfb
+ "
+ fi
+
+ # sun card, disable by default, see bug #258729
+ myconf+=" --disable-xvr100"
+
+ ################
+ # Audio Output #
+ ################
+ myconf+=" --disable-esd"
+ uses="alsa jack ladspa nas openal"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use pulseaudio || myconf+=" --disable-pulse"
+ if ! use radio; then
+ use oss || myconf+=" --disable-ossaudio"
+ fi
+
+ ####################
+ # Advanced Options #
+ ####################
+ # Platform specific flags, hardcoded on amd64 (see below)
+ use cpudetection && myconf+=" --enable-runtime-cpudetection"
+
+ uses="3dnow 3dnowext mmx mmxext sse sse2 ssse3"
+ for i in ${uses}; do
+ myconf+=" $(use_enable cpu_flags_x86_${i} ${i})"
+ done
+
+ uses="altivec shm"
+ for i in ${uses}; do
+ myconf+=" $(use_enable ${i})"
+ done
+
+ use debug && myconf+=" --enable-debug=3"
+
+ if use x86 && gcc-specs-pie; then
+ filter-flags -fPIC -fPIE
+ append-ldflags -nopie
+ fi
+
+ ###########################
+ # X enabled configuration #
+ ###########################
+ myconf+=" --disable-gui"
+ myconf+=" --disable-vesa"
+ uses="ggi vdpau xinerama xv"
+ for i in ${uses}; do
+ use ${i} || myconf+=" --disable-${i}"
+ done
+ use dga || myconf+=" --disable-dga1 --disable-dga2"
+ use opengl || myconf+=" --disable-gl"
+ use osdmenu && myconf+=" --enable-menu"
+ use vidix || myconf+=" --disable-vidix --disable-vidix-pcidb"
+ use xscreensaver || myconf+=" --disable-xss"
+ use X || myconf+=" --disable-x11"
+ if use xvmc; then
+ myconf+=" --enable-xvmc --with-xvmclib=XvMCW"
+ else
+ myconf+=" --disable-xvmc"
+ fi
+
+ ############################
+ # OSX (aqua) configuration #
+ ############################
+ if use aqua; then
+ myconf+="
+ --enable-macosx-finder
+ --enable-macosx-bundle
+ "
+ fi
+
+ ./configure \
+ --cc="$(tc-getCC)" \
+ --host-cc="$(tc-getBUILD_CC)" \
+ --prefix="${EPREFIX}/usr" \
+ --bindir="${EPREFIX}/usr/bin" \
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \
+ --confdir="${EPREFIX}/etc/mplayer" \
+ --datadir="${EPREFIX}/usr/share/mplayer${namesuf}" \
+ --mandir="${EPREFIX}/usr/share/man" \
+ --disable-ffmpeg_a \
+ ${myconf} || die
+}
+
+src_compile() {
+ base_src_compile
+ # Build only user-requested docs if they're available.
+ if use doc ; then
+ # select available languages from $LINGUAS
+ local ALLOWED_LINGUAS="cs de en es fr hu it pl ru zh_CN"
+ local BUILT_DOCS=""
+ for i in ${LINGUAS} ; do
+ has ${i} ${ALLOWED_LINGUAS} && BUILT_DOCS+=" ${i}"
+ done
+ if [[ -z $BUILT_DOCS ]]; then
+ emake -j1 html-chunked
+ else
+ for i in ${BUILT_DOCS}; do
+ emake -j1 html-chunked-${i}
+ done
+ fi
+ fi
+}
+
+src_install() {
+ local i
+
+ emake \
+ DESTDIR="${D}" \
+ INSTALLSTRIP="" \
+ install
+
+ dodoc AUTHORS Changelog Copyright README etc/codecs.conf
+
+ docinto tech/
+ dodoc DOCS/tech/{*.txt,MAINTAINERS,mpsub.sub,playtree,TODO,wishlist}
+ docinto TOOLS/
+ dodoc -r TOOLS
+ docinto tech/mirrors/
+ dodoc DOCS/tech/mirrors/*
+
+ if use doc; then
+ docinto html/
+ dohtml -r "${S}"/DOCS/HTML/*
+ fi
+
+ if ! use truetype; then
+ dodir /usr/share/mplayer/fonts
+ # Do this generic, as the mplayer people like to change the structure
+ # of their zips ...
+ for i in $(find "${WORKDIR}/" -type d -name 'font-arial-*'); do
+ cp -pPR "${i}" "${ED}/usr/share/mplayer/fonts"
+ done
+ # Fix the font symlink ...
+ rm -rf "${ED}/usr/share/mplayer/font"
+ dosym fonts/font-arial-14-iso-8859-1 /usr/share/mplayer/font
+ fi
+
+ insinto /etc/mplayer
+ newins "${S}/etc/example.conf" mplayer.conf
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+# Config options can be section specific, global
+# options should go in the default section
+[default]
+_EOF_
+ doins "${S}/etc/input.conf"
+ if use osdmenu; then
+ doins "${S}/etc/menu.conf"
+ fi
+
+ if use truetype; then
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+fontconfig=1
+subfont-osd-scale=4
+subfont-text-scale=3
+_EOF_
+ fi
+
+ # bug 256203
+ if use rar; then
+ cat >> "${ED}/etc/mplayer/mplayer.conf" << _EOF_
+unrarexec=${EPREFIX}/usr/bin/unrar
+_EOF_
+ fi
+
+ dosym ../../../etc/mplayer/mplayer.conf /usr/share/mplayer/mplayer.conf
+ newbin "${S}/TOOLS/midentify.sh" midentify
+}
+
+pkg_preinst() {
+ [[ -d ${EROOT}/usr/share/mplayer/Skin/default ]] && \
+ rm -rf "${EROOT}/usr/share/mplayer/Skin/default"
+}
+
+pkg_postrm() {
+ # Cleanup stale symlinks
+ [ -L "${EROOT}/usr/share/mplayer/font" -a \
+ ! -e "${EROOT}/usr/share/mplayer/font" ] && \
+ rm -f "${EROOT}/usr/share/mplayer/font"
+
+ [ -L "${EROOT}/usr/share/mplayer/subfont.ttf" -a \
+ ! -e "${EROOT}/usr/share/mplayer/subfont.ttf" ] && \
+ rm -f "${EROOT}/usr/share/mplayer/subfont.ttf"
+}
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2015-11-18 10:53 Agostino Sarubbo
0 siblings, 0 replies; 93+ messages in thread
From: Agostino Sarubbo @ 2015-11-18 10:53 UTC (permalink / raw
To: gentoo-commits
commit: 276c9e434685cfca7e4a42c5afcc9f73ad32dbb6
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 10:53:04 2015 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 10:53:04 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=276c9e43
media-video/mplayer: ia64 stable wrt bug #551972
Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ia64"
media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
index 380deaa..8496435 100644
--- a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
@@ -159,9 +159,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2015-11-13 6:01 Alexis Ballier
0 siblings, 0 replies; 93+ messages in thread
From: Alexis Ballier @ 2015-11-13 6:01 UTC (permalink / raw
To: gentoo-commits
commit: 9181eec3ca9ca03ba5e68d33622c4a337d21624a
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 13 06:00:59 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 06:01:10 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9181eec3
media-video/mplayer: add missing cdio-paranoia dep. Bug #565492.
Package-Manager: portage-2.2.24
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/mplayer/{mplayer-1.2-r1.ebuild => mplayer-1.2-r2.ebuild} | 2 +-
media-video/mplayer/mplayer-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.2-r1.ebuild b/media-video/mplayer/mplayer-1.2-r2.ebuild
similarity index 99%
rename from media-video/mplayer/mplayer-1.2-r1.ebuild
rename to media-video/mplayer/mplayer-1.2-r2.ebuild
index 33a2fc0..245aa04 100644
--- a/media-video/mplayer/mplayer-1.2-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.2-r2.ebuild
@@ -67,7 +67,7 @@ RDEPEND+="
bidi? ( dev-libs/fribidi )
bluray? ( >=media-libs/libbluray-0.2.1 )
bs2b? ( media-libs/libbs2b )
- cdio? ( dev-libs/libcdio )
+ cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia )
cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
dga? ( x11-libs/libXxf86dga )
directfb? ( dev-libs/DirectFB )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 666fcca..32c7fad 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -67,7 +67,7 @@ RDEPEND+="
bidi? ( dev-libs/fribidi )
bluray? ( >=media-libs/libbluray-0.2.1 )
bs2b? ( media-libs/libbs2b )
- cdio? ( dev-libs/libcdio )
+ cdio? ( dev-libs/libcdio dev-libs/libcdio-paranoia )
cdparanoia? ( !cdio? ( media-sound/cdparanoia ) )
dga? ( x11-libs/libXxf86dga )
directfb? ( dev-libs/DirectFB )
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2015-10-07 8:18 Alexis Ballier
0 siblings, 0 replies; 93+ messages in thread
From: Alexis Ballier @ 2015-10-07 8:18 UTC (permalink / raw
To: gentoo-commits
commit: 2d771155b7364db76c3253624e0334a41b96c1a5
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 7 08:16:22 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Oct 7 08:16:56 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d771155
media-video/mplayer: drop enca usedep on libass, which has been removed upstream.
Package-Manager: portage-2.2.22
.../{mplayer-9999.ebuild => mplayer-1.2-r1.ebuild} | 17 ++++++++++++++---
media-video/mplayer/mplayer-9999.ebuild | 2 +-
2 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-1.2-r1.ebuild
similarity index 96%
copy from media-video/mplayer/mplayer-9999.ebuild
copy to media-video/mplayer/mplayer-1.2-r1.ebuild
index 04b762c..33a2fc0 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-1.2-r1.ebuild
@@ -60,7 +60,7 @@ RDEPEND+="
sys-libs/ncurses:0=
app-arch/bzip2
sys-libs/zlib
- >=media-video/ffmpeg-2.8:0=[vdpau?]
+ >=media-video/ffmpeg-2.6:0=[vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
@@ -94,7 +94,7 @@ RDEPEND+="
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )
ladspa? ( media-libs/ladspa-sdk )
- libass? ( >=media-libs/libass-0.9.10:=[enca?] )
+ libass? ( >=media-libs/libass-0.9.10:= )
libcaca? ( media-libs/libcaca )
libmpeg2? ( media-libs/libmpeg2 )
lirc? ( app-misc/lirc )
@@ -159,7 +159,7 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
KEYWORDS=""
fi
@@ -188,6 +188,11 @@ REQUIRED_USE="
xvmc? ( xv )"
RESTRICT="faac? ( bindist )"
+PATCHES=(
+ # Work with pulseaudio-6, bug #549680, https://trac.mplayerhq.hu/ticket/2241
+ "${FILESDIR}"/${PN}-1.2_pre20150214-pulseaudio-6.0.patch
+)
+
pkg_setup() {
if [[ ${PV} == *9999* ]]; then
elog
@@ -260,6 +265,12 @@ src_prepare() {
# Use sane default for >=virtual/udev-197
sed -i -e '/default_dvd_device/s:/dev/dvd:/dev/cdrom:' configure || die
+
+ if has_version '>=media-video/ffmpeg-2.9'; then
+ epatch "${FILESDIR}/${PN}-1.2_pre20150730-chan.patch"
+ epatch "${FILESDIR}/${PN}-1.2-get_buffer.patch"
+ epatch "${FILESDIR}/${PN}-1.2_pre20150730-encode.patch"
+ fi
}
src_configure() {
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 04b762c..666fcca 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -94,7 +94,7 @@ RDEPEND+="
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )
ladspa? ( media-libs/ladspa-sdk )
- libass? ( >=media-libs/libass-0.9.10:=[enca?] )
+ libass? ( >=media-libs/libass-0.9.10:= )
libcaca? ( media-libs/libcaca )
libmpeg2? ( media-libs/libmpeg2 )
lirc? ( app-misc/lirc )
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2015-09-05 15:35 Pacho Ramos
0 siblings, 0 replies; 93+ messages in thread
From: Pacho Ramos @ 2015-09-05 15:35 UTC (permalink / raw
To: gentoo-commits
commit: 9d5bee2647bdc95547dbca2a67a0d5d0c346fbe6
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 15:35:25 2015 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 15:35:25 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d5bee26
media-video/mplayer: x86 stable, bug #551972
Package-Manager: portage-2.2.20.1
media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
index 2f489b5..380deaa 100644
--- a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
@@ -159,9 +159,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc"
+ KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2015-08-25 4:35 Jeroen Roovers
0 siblings, 0 replies; 93+ messages in thread
From: Jeroen Roovers @ 2015-08-25 4:35 UTC (permalink / raw
To: gentoo-commits
commit: 6c9faddf5cb955b851ccb72ae31abd19a9e2cafb
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 25 04:34:04 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Aug 25 04:34:38 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c9faddf
media-video/mplayer: Stable for HPPA (bug #551972).
Package-Manager: portage-2.2.20.1
media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
index 2702262..e77c176 100644
--- a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
@@ -159,9 +159,9 @@ RDEPEND+="
SLOT="0"
LICENSE="GPL-2"
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
else
- KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 sparc"
+ KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc"
fi
# faac codecs are nonfree
^ permalink raw reply related [flat|nested] 93+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2015-08-21 9:14 Alexis Ballier
0 siblings, 0 replies; 93+ messages in thread
From: Alexis Ballier @ 2015-08-21 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 7912400700ee97fd7faec825edcbea35e2b1e085
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 09:13:45 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 09:13:45 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79124007
media-video/mplayer: Propagate vdpau dep to ffmpeg.
https://bugs.gentoo.org/show_bug.cgi?id=557564
Package-Manager: portage-2.2.20.1
media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild | 2 +-
media-video/mplayer/mplayer-1.2_pre20150730.ebuild | 2 +-
media-video/mplayer/mplayer-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
index a7dfffe..2702262 100644
--- a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
@@ -60,7 +60,7 @@ RDEPEND+="
sys-libs/ncurses:5=
app-arch/bzip2
sys-libs/zlib
- >=media-video/ffmpeg-2.0:0=
+ >=media-video/ffmpeg-2.0:0=[vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
diff --git a/media-video/mplayer/mplayer-1.2_pre20150730.ebuild b/media-video/mplayer/mplayer-1.2_pre20150730.ebuild
index 4f35b85..62a8514 100644
--- a/media-video/mplayer/mplayer-1.2_pre20150730.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20150730.ebuild
@@ -60,7 +60,7 @@ RDEPEND+="
sys-libs/ncurses:5=
app-arch/bzip2
sys-libs/zlib
- >=media-video/ffmpeg-2.6:0=
+ >=media-video/ffmpeg-2.6:0=[vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 58d6ddc..df13a085 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -60,7 +60,7 @@ RDEPEND+="
sys-libs/ncurses:5=
app-arch/bzip2
sys-libs/zlib
- >=media-video/ffmpeg-2.6:0=
+ >=media-video/ffmpeg-2.6:0=[vdpau?]
a52? ( media-libs/a52dec )
aalib? ( media-libs/aalib )
alsa? ( media-libs/alsa-lib )
^ permalink raw reply related [flat|nested] 93+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/
@ 2015-08-21 7:06 Justin Lecher
0 siblings, 0 replies; 93+ messages in thread
From: Justin Lecher @ 2015-08-21 7:06 UTC (permalink / raw
To: gentoo-commits
commit: e399d2efc0f6aa0f1114e352cf5cd208c227a67f
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 21 07:06:17 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Aug 21 07:06:29 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e399d2ef
media-video/mplayer: Set correct subslot dependency for ncurses
Package-Manager: portage-2.2.20.1
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
media-video/mplayer/mplayer-1.2_pre20130729.ebuild | 2 +-
media-video/mplayer/mplayer-1.2_pre20141011.ebuild | 2 +-
media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild | 2 +-
media-video/mplayer/mplayer-1.2_pre20150214.ebuild | 2 +-
media-video/mplayer/mplayer-1.2_pre20150730.ebuild | 2 +-
media-video/mplayer/mplayer-9999.ebuild | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
index b3503ef..2a86fba 100644
--- a/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20130729.ebuild
@@ -57,7 +57,7 @@ X_RDEPS="
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
# nemesi? ( net-libs/libnemesi )
RDEPEND+="
- sys-libs/ncurses
+ sys-libs/ncurses:5=
app-arch/bzip2
sys-libs/zlib
|| ( >=media-video/ffmpeg-1.2.1:0 >=media-video/libav-9.8 )
diff --git a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild b/media-video/mplayer/mplayer-1.2_pre20141011.ebuild
index 53ca60c..f1a5150 100644
--- a/media-video/mplayer/mplayer-1.2_pre20141011.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20141011.ebuild
@@ -57,7 +57,7 @@ X_RDEPS="
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
# nemesi? ( net-libs/libnemesi )
RDEPEND+="
- sys-libs/ncurses
+ sys-libs/ncurses:5=
app-arch/bzip2
sys-libs/zlib
>=media-video/ffmpeg-2.0:0
diff --git a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
index 8a08432..a7dfffe 100644
--- a/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20150214-r1.ebuild
@@ -57,7 +57,7 @@ X_RDEPS="
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
# nemesi? ( net-libs/libnemesi )
RDEPEND+="
- sys-libs/ncurses
+ sys-libs/ncurses:5=
app-arch/bzip2
sys-libs/zlib
>=media-video/ffmpeg-2.0:0=
diff --git a/media-video/mplayer/mplayer-1.2_pre20150214.ebuild b/media-video/mplayer/mplayer-1.2_pre20150214.ebuild
index a386d88..8bb26ca 100644
--- a/media-video/mplayer/mplayer-1.2_pre20150214.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20150214.ebuild
@@ -57,7 +57,7 @@ X_RDEPS="
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
# nemesi? ( net-libs/libnemesi )
RDEPEND+="
- sys-libs/ncurses
+ sys-libs/ncurses:5=
app-arch/bzip2
sys-libs/zlib
>=media-video/ffmpeg-2.0:0
diff --git a/media-video/mplayer/mplayer-1.2_pre20150730.ebuild b/media-video/mplayer/mplayer-1.2_pre20150730.ebuild
index 633438f..4f35b85 100644
--- a/media-video/mplayer/mplayer-1.2_pre20150730.ebuild
+++ b/media-video/mplayer/mplayer-1.2_pre20150730.ebuild
@@ -57,7 +57,7 @@ X_RDEPS="
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
# nemesi? ( net-libs/libnemesi )
RDEPEND+="
- sys-libs/ncurses
+ sys-libs/ncurses:5=
app-arch/bzip2
sys-libs/zlib
>=media-video/ffmpeg-2.6:0=
diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild
index 1722052..58d6ddc 100644
--- a/media-video/mplayer/mplayer-9999.ebuild
+++ b/media-video/mplayer/mplayer-9999.ebuild
@@ -57,7 +57,7 @@ X_RDEPS="
# Rar: althrought -gpl version is nice, it cant do most functions normal rars can
# nemesi? ( net-libs/libnemesi )
RDEPEND+="
- sys-libs/ncurses
+ sys-libs/ncurses:5=
app-arch/bzip2
sys-libs/zlib
>=media-video/ffmpeg-2.6:0=
^ permalink raw reply related [flat|nested] 93+ messages in thread
end of thread, other threads:[~2024-03-11 21:33 UTC | newest]
Thread overview: 93+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-26 23:31 [gentoo-commits] repo/gentoo:master commit in: media-video/mplayer/ Thomas Deutschmann
-- strict thread matches above, loose matches on Subject: below --
2024-03-11 21:33 Sam James
2023-12-06 8:32 Sam James
2023-12-05 20:56 Arthur Zamarin
2023-09-27 8:02 Sam James
2023-09-26 0:54 Sam James
2023-09-25 23:08 Sam James
2023-09-25 22:48 Sam James
2023-06-18 21:05 Sam James
2023-06-18 19:30 Sam James
2023-06-01 16:43 Arthur Zamarin
2023-06-01 7:33 Sam James
2023-06-01 7:24 Sam James
2023-05-29 13:11 Andreas Sturmlechner
2023-02-27 0:20 Sam James
2023-02-15 6:23 Sam James
2023-01-07 11:30 Arthur Zamarin
2023-01-07 11:30 Arthur Zamarin
2023-01-07 0:06 Sam James
2023-01-06 21:51 Sam James
2022-12-24 10:21 Sam James
2022-07-15 7:58 David Seifert
2022-03-14 10:48 Yixun Lan
2022-02-19 10:27 Alexis Ballier
2022-01-05 10:01 David Seifert
2022-01-04 13:18 David Seifert
2021-09-08 1:30 Sam James
2021-03-25 14:39 Sam James
2020-12-13 8:51 Sam James
2020-11-28 9:14 Agostino Sarubbo
2020-11-27 16:08 Agostino Sarubbo
2020-07-23 5:15 Kent Fredric
2020-07-21 23:15 Kent Fredric
2020-06-18 13:10 Thomas Deutschmann
2020-06-17 17:18 Thomas Deutschmann
2020-06-17 17:15 Thomas Deutschmann
2020-04-26 12:05 David Seifert
2020-02-22 23:17 David Seifert
2019-09-29 2:56 Mike Gilbert
2019-09-29 2:56 Mike Gilbert
2019-09-15 14:55 Michał Górny
2019-04-02 7:36 Matt Turner
2019-02-25 21:25 Mike Gilbert
2018-11-06 11:20 Alexis Ballier
2018-11-06 11:20 Alexis Ballier
2018-09-16 17:47 Andreas Sturmlechner
2018-09-16 17:41 Andreas Sturmlechner
2018-09-16 17:41 Andreas Sturmlechner
2018-09-16 17:41 Andreas Sturmlechner
2018-05-20 19:10 Andreas Sturmlechner
2018-04-15 8:16 Pacho Ramos
2018-03-23 4:48 Markus Meier
2018-03-23 0:02 Sergei Trofimovich
2018-03-18 22:59 Sergei Trofimovich
2018-03-08 19:33 Mike Gilbert
2018-03-03 13:12 Tobias Klausmann
2018-02-25 18:21 Thomas Deutschmann
2018-02-22 9:15 Jason Zaman
2018-02-21 22:34 Sergei Trofimovich
2018-01-28 2:06 Matt Turner
2018-01-25 0:18 Aaron Bauman
2017-10-14 6:18 Markus Meier
2017-10-13 19:20 Sergei Trofimovich
2017-10-13 9:50 Sergei Trofimovich
2017-10-13 0:13 Sergei Trofimovich
2017-10-12 21:19 Thomas Deutschmann
2017-10-11 17:44 Manuel Rüger
2017-10-08 12:36 Alexis Ballier
2017-09-10 20:02 Sergei Trofimovich
2017-06-12 20:44 Sergei Trofimovich
2017-03-04 13:37 Alexis Ballier
2017-02-25 14:22 Markus Meier
2017-02-05 12:09 Jeroen Roovers
2016-12-28 11:58 Pacho Ramos
2016-12-05 13:02 Alexis Ballier
2016-12-05 12:16 Alexis Ballier
2016-10-24 9:34 Pacho Ramos
2016-09-08 7:41 Jeroen Roovers
2016-05-26 9:37 Tobias Klausmann
2016-03-20 11:53 Agostino Sarubbo
2016-03-17 10:50 Agostino Sarubbo
2016-03-15 17:27 Markus Meier
2016-03-06 12:58 Agostino Sarubbo
2016-03-04 10:03 Alexis Ballier
2016-02-17 22:16 Alexis Ballier
2016-01-25 12:27 Alexis Ballier
2015-11-18 10:53 Agostino Sarubbo
2015-11-13 6:01 Alexis Ballier
2015-10-07 8:18 Alexis Ballier
2015-09-05 15:35 Pacho Ramos
2015-08-25 4:35 Jeroen Roovers
2015-08-21 9:14 Alexis Ballier
2015-08-21 7:06 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox