[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 8b87169bd784d2437cf7c4980f4cf596bc919adf
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat May 11 03:56:15 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat May 11 03:59:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b87169b
media-video/mpv: reword yt-dlp optfeature
USE=lua led to confusion that some action is needed, let's be
more verbose and only mention it when it's not set.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.38.0.ebuild | 3 ++-
media-video/mpv/mpv-.ebuild | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/media-video/mpv/mpv-0.38.0.ebuild
b/media-video/mpv/mpv-0.38.0.ebuild
index bc585e8fdb66..a44f459bb171 100644
--- a/media-video/mpv/mpv-0.38.0.ebuild
+++ b/media-video/mpv/mpv-0.38.0.ebuild
@@ -271,5 +271,6 @@ src_install() {
pkg_postinst() {
xdg_pkg_postinst
- optfeature "URL support with USE=lua" net-misc/yt-dlp
+ optfeature "various websites URL support$(usev !lua \
+ " (requires ${PN} with USE=lua)")" net-misc/yt-dlp
}
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 43d88a932570..3825d102d45b 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -271,5 +271,6 @@ src_install() {
pkg_postinst() {
xdg_pkg_postinst
- optfeature "URL support with USE=lua" net-misc/yt-dlp
+ optfeature "various websites URL support$(usev !lua \
+ " (requires ${PN} with USE=lua)")" net-misc/yt-dlp
}
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: ad33cb4eb3dbff18c1aa954ae5f6bcd6684243db
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri May 10 04:06:42 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri May 10 04:07:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad33cb4e
media-video/mpv: enable py3.13
umpv seems fine at a glance, not that messed with it much
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.38.0.ebuild | 2 +-
media-video/mpv/mpv-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mpv/mpv-0.38.0.ebuild
b/media-video/mpv/mpv-0.38.0.ebuild
index 1ec8efe52cec..bc585e8fdb66 100644
--- a/media-video/mpv/mpv-0.38.0.ebuild
+++ b/media-video/mpv/mpv-0.38.0.ebuild
@@ -4,7 +4,7 @@
EAPI=8
LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
if [[ ${PV} == ]]; then
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index a79aeac37bd3..43d88a932570 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -4,7 +4,7 @@
EAPI=8
LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
if [[ ${PV} == ]]; then
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: aa0724ad9b73679d792fab4b1ed5a3dcd121c30c
Author: Sam James gentoo org>
AuthorDate: Tue May 7 10:29:10 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue May 7 10:29:10 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa0724ad
media-video/mpv: Stabilize 0.38.0 ppc64, #931332
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.38.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.38.0.ebuild
b/media-video/mpv/mpv-0.38.0.ebuild
index b354911fa0cc..1ec8efe52cec 100644
--- a/media-video/mpv/mpv-0.38.0.ebuild
+++ b/media-video/mpv/mpv-0.38.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 70e00553d2a03b4264ef368d99ebfb7491c4272c
Author: Sam James gentoo org>
AuthorDate: Tue May 7 10:29:09 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue May 7 10:29:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e00553
media-video/mpv: Stabilize 0.38.0 arm64, #931332
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.38.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.38.0.ebuild
b/media-video/mpv/mpv-0.38.0.ebuild
index a508af983c28..b354911fa0cc 100644
--- a/media-video/mpv/mpv-0.38.0.ebuild
+++ b/media-video/mpv/mpv-0.38.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: e4e76b1ef9ede4afa3660930468dd3057a58093d
Author: Sam James gentoo org>
AuthorDate: Tue May 7 10:29:07 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue May 7 10:29:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4e76b1e
media-video/mpv: Stabilize 0.38.0 ppc, #931332
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.38.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.38.0.ebuild
b/media-video/mpv/mpv-0.38.0.ebuild
index 535673009dae..a508af983c28 100644
--- a/media-video/mpv/mpv-0.38.0.ebuild
+++ b/media-video/mpv/mpv-0.38.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 265232ddded44253bd45458b1c50bde1c3f84924
Author: Sam James gentoo org>
AuthorDate: Tue May 7 10:04:29 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue May 7 10:04:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=265232dd
media-video/mpv: Stabilize 0.38.0 x86, #931332
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.38.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.38.0.ebuild
b/media-video/mpv/mpv-0.38.0.ebuild
index 0be43015b552..535673009dae 100644
--- a/media-video/mpv/mpv-0.38.0.ebuild
+++ b/media-video/mpv/mpv-0.38.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: ccf02ef5e150ddc4224c9787afae3a6944493eb9
Author: Sam James gentoo org>
AuthorDate: Tue May 7 10:04:28 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue May 7 10:04:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf02ef5
media-video/mpv: Stabilize 0.38.0 amd64, #931332
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.38.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.38.0.ebuild
b/media-video/mpv/mpv-0.38.0.ebuild
index a79aeac37bd3..0be43015b552 100644
--- a/media-video/mpv/mpv-0.38.0.ebuild
+++ b/media-video/mpv/mpv-0.38.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: 4e091b5132f293fe93791bafd379666f89481191
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Apr 27 11:43:37 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Apr 27 12:10:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e091b51
media-video/mpv: drop 0.37.0-r1
No real need to keep this -r1, will stable 0.38 soon'ish.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch | 45
media-video/mpv/mpv-0.37.0-r1.ebuild | 284 -
2 files changed, 329 deletions(-)
diff --git a/media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch
b/media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch
deleted file mode 100644
index 3ac8d9b7b8dc..
--- a/media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://github.com/mpv-player/mpv/pull/13659
-From: Dudemanguy
-Date: Thu, 7 Mar 2024 13:42:25 -0600
-Subject: [PATCH 1/2] ad_spdif: handle const buf pointee in avio_alloc_context
-
-ffmpeg recently changed this field to be const which causes our CI to
-fail on newer versions.
-
-See:
https://github.com/FFmpeg/FFmpeg/commit/2a68d945cd74265bb71c3d38b7a2e7f7d7e87be5
a/audio/decode/ad_spdif.c
-+++ b/audio/decode/ad_spdif.c
-@@ -59,7 +59,11 @@ struct spdifContext {
- struct mp_decoder public;
- };
-
-+#if LIBAVCODEC_VERSION_MAJOR < 61
- static int write_packet(void *p, uint8_t *buf, int buf_size)
-+#else
-+static int write_packet(void *p, const uint8_t *buf, int buf_size)
-+#endif
- {
- struct spdifContext *ctx = p;
-
-
-From 7f9eabfb023611565db8b6cce9a3473a6eb6c731 Mon Sep 17 00:00:00 2001
-From: Dudemanguy
-Date: Thu, 7 Mar 2024 14:12:15 -0600
-Subject: [PATCH 2/2] filters/f_lavfi: handle removed
- AV_OPT_TYPE_CHANNEL_LAYOUT
-
-See:
https://github.com/FFmpeg/FFmpeg/commit/65ddc74988245a01421a63c5cffa4d900c47117c
a/filters/f_lavfi.c
-+++ b/filters/f_lavfi.c
-@@ -1034,7 +1034,11 @@ static const char *get_avopt_type_name(enum
AVOptionType type)
- case AV_OPT_TYPE_VIDEO_RATE:return "fps";
- case AV_OPT_TYPE_DURATION: return "duration";
- case AV_OPT_TYPE_COLOR: return "color";
-+#if LIBAVUTIL_VERSION_MAJOR < 59
- case AV_OPT_TYPE_CHANNEL_LAYOUT:return "channellayout";
-+#else
-+case AV_OPT_TYPE_CHLAYOUT: return "channellayout";
-+#endif
- case AV_OPT_TYPE_BOOL: return "bool";
- case AV_OPT_TYPE_CONST: // fallthrough
- default:
diff --git a/media-video/mpv/mpv-0.37.0-r1.ebuild
b/media-video/mpv/mpv-0.37.0-r1.ebuild
deleted file mode 100644
index a0cb7dee8450..
--- a/media-video/mpv/mpv-0.37.0-r1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
-else
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
-fi
-
-DESCRIPTION="Media player for the command line"
-HOMEPAGE="https://mpv.io/;
-
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
-SLOT="0/2" # soname
-IUSE="
- +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
- dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
- +lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux
- sixel sndio soc test tools +uchardet vaapi vdpau vulkan wayland xv
- zimg zlib
-"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( cli libmpv )
- egl? ( || ( X drm wayland ) )
- lua? ( ${LUA_REQUIRED_USE} )
- nvenc? ( || ( egl opengl vulkan ) )
- opengl? ( || ( X aqua ) )
- test? ( cli )
- tools? ( cli )
- uchardet? ( iconv )
- vaapi? ( || ( X drm wayland ) )
- vdpau? ( X )
- vulkan? ( || ( X wayland ) )
- xv? ( X )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- media-libs/libass:=[fontconfig]
- >=media-libs/libplacebo-6.338:=[opengl?,vulkan?]
- >=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?]
- X? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXext
- x11-libs/libXpresent
- x11-libs/libXrandr
- xv? ( x11-libs/libXv )
- )
- alsa? ( media-libs/alsa-lib )
- archive? ( app-arch/libarchive:= )
- bluray? ( media-libs/libbluray:= )
- cdda? (
- dev-libs/libcdio-paranoia:=
- dev-libs/libcdio:=
- )
- drm? (
- x11-libs/libdrm
- egl? ( media-libs/mesa[gbm(+)] )
- )
-
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 7858dc16920fc6a55f469b8c8b7407810063a34c
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Apr 17 19:31:03 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Apr 17 19:31:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7858dc16
media-video/mpv: add 0.38.0
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/Manifest | 1 +
media-video/mpv/mpv-0.38.0.ebuild | 275 ++
2 files changed, 276 insertions(+)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 8e655e8b32c6..0e7c6d471455 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1 +1,2 @@
DIST mpv-0.37.0.tar.gz 3384190 BLAKE2B
31d8d47ed7ae94540189fe05b7ea63f5b0d5c987a22191f931e4bd90664d05dca4c7e0bd0e05fcdf48b977e38e5f8eec0d2572265f2cf4a969a8a9a9dbf83d68
SHA512
a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
+DIST mpv-0.38.0.tar.gz 3419741 BLAKE2B
3ff59d30bc305394f58a1fff4f24540aa3be9412bc3cad27bec0c3478f4b7c13190e26847f38edc52996bb9f9a36dd6832c6fccebd6d873058acf78a320e42e4
SHA512
b5b2af59039ef4711814f94bbdfedb37f8ce914301670e42d4ed05fe1900025a3d3a2f3d5e69628a8aad115a647a27c386718959e2df1a18740468b3a84f8975
diff --git a/media-video/mpv/mpv-0.38.0.ebuild
b/media-video/mpv/mpv-0.38.0.ebuild
new file mode 100644
index ..a79aeac37bd3
--- /dev/null
+++ b/media-video/mpv/mpv-0.38.0.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
+else
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
+fi
+
+DESCRIPTION="Media player for the command line"
+HOMEPAGE="https://mpv.io/;
+
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
+SLOT="0/2" # soname
+IUSE="
+ +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
+ dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
+ +lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux
+ sixel sndio soc test tools +uchardet vaapi vdpau vulkan wayland xv
+ zimg zlib
+"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ || ( cli libmpv )
+ egl? ( || ( X drm wayland ) )
+ lua? ( ${LUA_REQUIRED_USE} )
+ nvenc? ( || ( egl opengl vulkan ) )
+ opengl? ( || ( X aqua ) )
+ test? ( cli )
+ tools? ( cli )
+ uchardet? ( iconv )
+ vaapi? ( || ( X drm wayland ) )
+ vdpau? ( X )
+ vulkan? ( || ( X wayland ) )
+ xv? ( X )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ media-libs/libass:=[fontconfig]
+ >=media-libs/libplacebo-6.338.2:=[opengl?,vulkan?]
+ >=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?]
+ X? (
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXext
+ x11-libs/libXpresent
+ x11-libs/libXrandr
+ xv? ( x11-libs/libXv )
+ )
+ alsa? ( media-libs/alsa-lib )
+ archive? ( app-arch/libarchive:= )
+ bluray? ( media-libs/libbluray:= )
+ cdda? (
+ dev-libs/libcdio-paranoia:=
+ dev-libs/libcdio:=
+ )
+ drm? (
+ x11-libs/libdrm
+ egl? ( media-libs/mesa[gbm(+)] )
+ )
+ dvd? (
+ media-libs/libdvdnav
+ media-libs/libdvdread:=
+ )
+ egl? (
+ media-libs/libglvnd
+ media-libs/libplacebo[opengl]
+ )
+ gamepad? ( media-libs/libsdl2[joystick] )
+ iconv? (
+ virtual/libiconv
+ uchardet? ( app-i18n/uchardet )
+ )
+ jack? ( virtual/jack )
+ javascript? ( dev-lang/mujs:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ lcms? ( media-libs/lcms:2 )
+ libcaca? ( media-libs/libcaca )
+ lua? ( ${LUA_DEPS} )
+ openal? ( media-libs/openal )
+ opengl? ( media-libs/libglvnd[X?] )
+ pipewire? ( media-video/pipewire:= )
+ pulseaudio? ( media-libs/libpulse )
+ rubberband? ( media-libs/rubberband )
+ sdl? ( media-libs/libsdl2[sound,threads,video] )
+ sixel? ( media-libs/libsixel )
+ sndio? ( media-sound/sndio:= )
+ vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] )
+ vdpau? ( x11-libs/libvdpau )
+ vulkan? ( media-libs/vulkan-loader[X?,wayland?] )
+ wayland? (
+ dev-libs/wayland
+ dev-libs/wayland-protocols
+
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/, media-video/mpv/files/
commit: d57dc127880c0528ac9f1da04cd86ffef5425887
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Apr 5 03:05:29 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Apr 5 03:11:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57dc127
media-video/mpv: backport build fix for ffmpeg-7.0
Not that ffmpeg-7.0 is in tree yet (just released), and when it
is it'll start out masked.
Odds are that mpv-0.38 will release before ffmpeg-7.0 is unmasked,
but it'll be one less issue to hit for those testing it early.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch | 45 ++
media-video/mpv/mpv-0.37.0-r1.ebuild | 1 +
2 files changed, 46 insertions(+)
diff --git a/media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch
b/media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch
new file mode 100644
index ..3ac8d9b7b8dc
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.37.0-ffmpeg7.patch
@@ -0,0 +1,45 @@
+https://github.com/mpv-player/mpv/pull/13659
+From: Dudemanguy
+Date: Thu, 7 Mar 2024 13:42:25 -0600
+Subject: [PATCH 1/2] ad_spdif: handle const buf pointee in avio_alloc_context
+
+ffmpeg recently changed this field to be const which causes our CI to
+fail on newer versions.
+
+See:
https://github.com/FFmpeg/FFmpeg/commit/2a68d945cd74265bb71c3d38b7a2e7f7d7e87be5
+--- a/audio/decode/ad_spdif.c
b/audio/decode/ad_spdif.c
+@@ -59,7 +59,11 @@ struct spdifContext {
+ struct mp_decoder public;
+ };
+
++#if LIBAVCODEC_VERSION_MAJOR < 61
+ static int write_packet(void *p, uint8_t *buf, int buf_size)
++#else
++static int write_packet(void *p, const uint8_t *buf, int buf_size)
++#endif
+ {
+ struct spdifContext *ctx = p;
+
+
+From 7f9eabfb023611565db8b6cce9a3473a6eb6c731 Mon Sep 17 00:00:00 2001
+From: Dudemanguy
+Date: Thu, 7 Mar 2024 14:12:15 -0600
+Subject: [PATCH 2/2] filters/f_lavfi: handle removed
+ AV_OPT_TYPE_CHANNEL_LAYOUT
+
+See:
https://github.com/FFmpeg/FFmpeg/commit/65ddc74988245a01421a63c5cffa4d900c47117c
+--- a/filters/f_lavfi.c
b/filters/f_lavfi.c
+@@ -1034,7 +1034,11 @@ static const char *get_avopt_type_name(enum
AVOptionType type)
+ case AV_OPT_TYPE_VIDEO_RATE:return "fps";
+ case AV_OPT_TYPE_DURATION: return "duration";
+ case AV_OPT_TYPE_COLOR: return "color";
++#if LIBAVUTIL_VERSION_MAJOR < 59
+ case AV_OPT_TYPE_CHANNEL_LAYOUT:return "channellayout";
++#else
++case AV_OPT_TYPE_CHLAYOUT: return "channellayout";
++#endif
+ case AV_OPT_TYPE_BOOL: return "bool";
+ case AV_OPT_TYPE_CONST: // fallthrough
+ default:
diff --git a/media-video/mpv/mpv-0.37.0-r1.ebuild
b/media-video/mpv/mpv-0.37.0-r1.ebuild
index 9ac7b7e545b7..a0cb7dee8450 100644
--- a/media-video/mpv/mpv-0.37.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.37.0-r1.ebuild
@@ -129,6 +129,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-0.37.0-drm-fix.patch
+ "${FILESDIR}"/${PN}-0.37.0-ffmpeg7.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 579783a46f99c552b9da28f4f97161b19355cfe8
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Feb 11 21:51:03 2024 +
Commit: James Le Cuirot gentoo org>
CommitDate: Tue Feb 13 21:11:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=579783a4
media-video/mpv: Add soc USE flag to ensure ffmpeg also has this flag
The additional patches we apply to media-video/ffmpeg may not always be
immediately available following an upstream release. Adding the soc USE flag to
this package ensures that users don't accidentally upgrade to an ffmpeg version
that lacks them.
Signed-off-by: James Le Cuirot gentoo.org>
media-video/mpv/metadata.xml | 1 +
media-video/mpv/mpv-0.37.0-r1.ebuild | 6 +++---
media-video/mpv/mpv-.ebuild | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index e6f3a0a8f95c..560695642b8f 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -24,6 +24,7 @@
(Note: these outputs exist for compatibility reasons
only, avoid if possible)
Enable support for the sixel video backend
using media-libs/libsixel
Enable sound support via
media-sound/sndio
+ Use additional media-video/ffmpeg
patches for efficient playback on some SoCs (e.g. ARM, RISC-V)
Install extra tools: mpv_identify.sh,
mpv_idet.sh, and umpv
Enable subtitles charset discovery via
app-i18n/uchardet
Enable libzimg support (for
vf_fingerprint)
diff --git a/media-video/mpv/mpv-0.37.0-r1.ebuild
b/media-video/mpv/mpv-0.37.0-r1.ebuild
index 731cc45c2106..df733bafe674 100644
--- a/media-video/mpv/mpv-0.37.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.37.0-r1.ebuild
@@ -24,8 +24,8 @@ IUSE="
+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
+lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux
- sixel sndio test tools +uchardet vaapi vdpau vulkan wayland xv zimg
- zlib
+ sixel sndio soc test tools +uchardet vaapi vdpau vulkan wayland xv
+ zimg zlib
"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -47,7 +47,7 @@ RESTRICT="!test? ( test )"
COMMON_DEPEND="
media-libs/libass:=[fontconfig]
>=media-libs/libplacebo-6.338:=[opengl?,vulkan?]
- >=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?]
+ >=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?]
X? (
x11-libs/libX11
x11-libs/libXScrnSaver
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 6c05026b003d..c10b20b3c11a 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -24,8 +24,8 @@ IUSE="
+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
+lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux
- sixel sndio test tools +uchardet vaapi vdpau vulkan wayland xv zimg
- zlib
+ sixel sndio soc test tools +uchardet vaapi vdpau vulkan wayland xv
+ zimg zlib
"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -47,7 +47,7 @@ RESTRICT="!test? ( test )"
COMMON_DEPEND="
media-libs/libass:=[fontconfig]
>=media-libs/libplacebo-6.338.2:=[opengl?,vulkan?]
- >=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?]
+ >=media-video/ffmpeg-4.4:=[encode,soc(-)?,threads,vaapi?,vdpau?]
X? (
x11-libs/libX11
x11-libs/libXScrnSaver
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 9f8229de49c3505b7116dfd58bc343ee8e5b03ea
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Feb 11 08:09:27 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Feb 11 08:24:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f8229de
media-video/mpv: skip ffmpeg suite for tests
Could adjust or skip only with USE=-vulkan wrt bug #924276, but ffmpeg
tests have caused other issues before depending on ffmpeg version and
BE arches (seen on hppa, and formerly on ppc64be). They also do not
seem very interesitng downstream as their purpose seem to be to track
subtle changes in ffmpeg versions without necessarily meaning there is
a notable runtime issue.
Was going to skip only img-format but the other ffmpeg test has also
caused issues on e.g. hppa and meson still doesn't allow to skip
specific tests currently (only suites).
hppa still has the timer test failing which is likely an actual
problem though (not really looked into but it's unkeyworded now).
Bug: https://bugs.gentoo.org/921091
Closes: https://bugs.gentoo.org/924276
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.37.0-r1.ebuild | 8 +++-
media-video/mpv/mpv-.ebuild | 6 ++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.37.0-r1.ebuild
b/media-video/mpv/mpv-0.37.0-r1.ebuild
index 8af7096f3205..731cc45c2106 100644
--- a/media-video/mpv/mpv-0.37.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.37.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -242,6 +242,12 @@ src_configure() {
meson_src_configure
}
+src_test() {
+ # ffmpeg tests are picky and easily break without necessarily
+ # meaning that there are runtime issues (bug #921091,#924276)
+ meson_src_test --no-suite ffmpeg
+}
+
src_install() {
meson_src_install
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 6e1221693cb7..6c05026b003d 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -234,6 +234,12 @@ src_configure() {
meson_src_configure
}
+src_test() {
+ # ffmpeg tests are picky and easily break without necessarily
+ # meaning that there are runtime issues (bug #921091,#924276)
+ meson_src_test --no-suite ffmpeg
+}
+
src_install() {
meson_src_install
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 1a1b254da2129d14d2d695d4578985b106dff53a
Author: James Le Cuirot gentoo org>
AuthorDate: Fri Dec 15 22:41:07 2023 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Feb 10 21:23:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1b254d
media-video/mpv: Drop Raspberry Pi support in revbump
media-libs/raspberrypi-userland(-bin) is being last-rited. The Linux
kernel and FFmpeg now support the Pi, among other devices, natively.
Enable media-video/ffmpeg's "soc" USE flag to enable that support.
Signed-off-by: James Le Cuirot gentoo.org>
media-video/mpv/mpv-0.37.0-r1.ebuild | 277 +++
1 file changed, 277 insertions(+)
diff --git a/media-video/mpv/mpv-0.37.0-r1.ebuild
b/media-video/mpv/mpv-0.37.0-r1.ebuild
new file mode 100644
index ..8af7096f3205
--- /dev/null
+++ b/media-video/mpv/mpv-0.37.0-r1.ebuild
@@ -0,0 +1,277 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
+else
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
+fi
+
+DESCRIPTION="Media player for the command line"
+HOMEPAGE="https://mpv.io/;
+
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
+SLOT="0/2" # soname
+IUSE="
+ +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
+ dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
+ +lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux
+ sixel sndio test tools +uchardet vaapi vdpau vulkan wayland xv zimg
+ zlib
+"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ || ( cli libmpv )
+ egl? ( || ( X drm wayland ) )
+ lua? ( ${LUA_REQUIRED_USE} )
+ nvenc? ( || ( egl opengl vulkan ) )
+ opengl? ( || ( X aqua ) )
+ test? ( cli )
+ tools? ( cli )
+ uchardet? ( iconv )
+ vaapi? ( || ( X drm wayland ) )
+ vdpau? ( X )
+ vulkan? ( || ( X wayland ) )
+ xv? ( X )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ media-libs/libass:=[fontconfig]
+ >=media-libs/libplacebo-6.338:=[opengl?,vulkan?]
+ >=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?]
+ X? (
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXext
+ x11-libs/libXpresent
+ x11-libs/libXrandr
+ xv? ( x11-libs/libXv )
+ )
+ alsa? ( media-libs/alsa-lib )
+ archive? ( app-arch/libarchive:= )
+ bluray? ( media-libs/libbluray:= )
+ cdda? (
+ dev-libs/libcdio-paranoia:=
+ dev-libs/libcdio:=
+ )
+ drm? (
+ x11-libs/libdrm
+ egl? ( media-libs/mesa[gbm(+)] )
+ )
+ dvd? (
+ media-libs/libdvdnav
+ media-libs/libdvdread:=
+ )
+ egl? (
+ media-libs/libglvnd
+ media-libs/libplacebo[opengl]
+ )
+ gamepad? ( media-libs/libsdl2[joystick] )
+ iconv? (
+ virtual/libiconv
+ uchardet? ( app-i18n/uchardet )
+ )
+ jack? ( virtual/jack )
+ javascript? ( dev-lang/mujs:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ lcms? ( media-libs/lcms:2 )
+ libcaca? ( media-libs/libcaca )
+ lua? ( ${LUA_DEPS} )
+ openal? ( media-libs/openal )
+ opengl? ( media-libs/libglvnd[X?] )
+ pipewire? ( media-video/pipewire:= )
+ pulseaudio? ( media-libs/libpulse )
+ rubberband? ( media-libs/rubberband )
+ sdl? ( media-libs/libsdl2[sound,threads,video] )
+ sixel? ( media-libs/libsixel )
+ sndio? ( media-sound/sndio:= )
+ vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] )
+ vdpau? ( x11-libs/libvdpau )
+ vulkan? (
+ media-libs/shaderc
+ media-libs/vulkan-loader[X?,wayland?]
+ )
+ wayland? (
+ dev-libs/wayland
+ dev-libs/wayland-protocols
+ x11-libs/libxkbcommon
+ )
+ zimg? ( media-libs/zimg )
+ zlib? ( sys-libs/zlib:= )
+"
+RDEPEND="
+ ${COMMON_DEPEND}
+ selinux? ( sec-policy/selinux-mplayer )
+ tools? ( ${PYTHON_DEPS} )
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ X? ( x11-base/xorg-proto )
+ dvb? ( virtual/linuxtv-dvb-headers )
+ nvenc? ( media-libs/nv-codec-headers )
+ wayland? ( dev-libs/wayland-protocols )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ cli? ( dev-python/docutils )
+ wayland? (
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 837c06e420122ffba98f1741863bc4c1e8b03789
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Feb 6 05:05:02 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Feb 6 05:09:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=837c06e4
media-video/mpv: update live, drop IUSE=raspberry-pi
Related code was removed upstream, it was supposedly broken
for a while and went unnoticed too.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 17 -
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 924fb6cf04f2..6e1221693cb7 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -23,9 +23,9 @@ SLOT="0/2" # soname
IUSE="
+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
- +lua mmal nvenc openal opengl pipewire pulseaudio raspberry-pi
- rubberband sdl selinux sixel sndio test tools +uchardet vaapi
- vdpau vulkan wayland xv zimg zlib
+ +lua nvenc openal opengl pipewire pulseaudio rubberband sdl selinux
+ sixel sndio test tools +uchardet vaapi vdpau vulkan wayland xv zimg
+ zlib
"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -44,7 +44,6 @@ REQUIRED_USE="
"
RESTRICT="!test? ( test )"
-# raspberry-pi: default to -bin given non-bin is known broken (bug #893422)
COMMON_DEPEND="
media-libs/libass:=[fontconfig]
>=media-libs/libplacebo-6.338.2:=[opengl?,vulkan?]
@@ -91,12 +90,6 @@ COMMON_DEPEND="
opengl? ( media-libs/libglvnd[X?] )
pipewire? ( media-video/pipewire:= )
pulseaudio? ( media-libs/libpulse )
- raspberry-pi? (
- || (
- media-libs/raspberrypi-userland-bin
- media-libs/raspberrypi-userland
- )
- )
rubberband? ( media-libs/rubberband )
sdl? ( media-libs/libsdl2[sound,threads,video] )
sixel? ( media-libs/libsixel )
@@ -200,13 +193,12 @@ src_configure() {
$(meson_feature drm)
$(meson_feature jpeg)
$(meson_feature libcaca caca)
- $(meson_feature mmal rpi-mmal)
$(meson_feature sdl sdl2-video)
$(meson_feature sixel)
$(meson_feature wayland)
$(meson_feature xv)
- -Dgl=$(use egl || use libmpv || use opengl || use raspberry-pi
&&
+ -Dgl=$(use egl || use libmpv || use opengl &&
echo enabled || echo disabled)
$(meson_feature egl)
$(mpv_feature_multi egl X egl-x11)
@@ -216,7 +208,6 @@ src_configure() {
$(meson_feature libmpv plain-gl)
$(mpv_feature_multi opengl X gl-x11)
$(mpv_feature_multi opengl aqua gl-cocoa)
- $(meson_feature raspberry-pi rpi)
$(meson_feature vulkan)
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 431cb963a0225ac580e240d7bda26fded365031b Author: Ionen Wolkens gentoo org> AuthorDate: Mon Jan 22 18:41:05 2024 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Jan 22 23:31:20 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431cb963 media-video/mpv: update live in advance This will be needed likely soon when cache PR is merged and no harm in sorting it out now. Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/mpv-.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild index 2db1284a5961..924fb6cf04f2 100644 --- a/media-video/mpv/mpv-.ebuild +++ b/media-video/mpv/mpv-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -47,7 +47,7 @@ RESTRICT="!test? ( test )" # raspberry-pi: default to -bin given non-bin is known broken (bug #893422) COMMON_DEPEND=" media-libs/libass:=[fontconfig] - >=media-libs/libplacebo-6.338:=[opengl?,vulkan?] + >=media-libs/libplacebo-6.338.2:=[opengl?,vulkan?] >=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?] X? ( x11-libs/libX11
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 34b8ffe170a721ff72c2c5eed46c6e3bb7cd16d4
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Dec 30 19:09:19 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Dec 30 19:09:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b8ffe1
media-video/mpv: sync live keywords
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 3c28f760365f..2db1284a5961 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 16e6fcf77dfbe09ec81d761b00e768cd3256a32b
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Dec 30 17:41:25 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Dec 30 17:48:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16e6fcf7
media-video/mpv: unkeyword 0.36.0-r1 for ~hppa
Could revisit if there's real interest, but let's keep it simple
otherwise.
Not dropping 0.36.0-r1 itself just yet due to the changes in
scaling profile defaults (users may want to try 0.36.0 to check
what's wrong with performance and need --profile=fast, esp. on
rpis and similar).
Closes: https://bugs.gentoo.org/921091
Closes: https://bugs.gentoo.org/917682
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.36.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.36.0-r1.ebuild
b/media-video/mpv/mpv-0.36.0-r1.ebuild
index 63b54c674210..7aa8c51ed9aa 100644
--- a/media-video/mpv/mpv-0.36.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.36.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86
~amd64-linux"
+ KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: c2c3e7b6ef19fe6a68cd2a4e4fb21b64304bc741
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Dec 21 07:50:31 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Dec 21 07:50:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2c3e7b6
media-video/mpv: Stabilize 0.37.0 ppc, #919770
Signed-off-by: Arthur Zamarin gentoo.org>
media-video/mpv/mpv-0.37.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.37.0.ebuild
b/media-video/mpv/mpv-0.37.0.ebuild
index 07592c56700a..4120f51db273 100644
--- a/media-video/mpv/mpv-0.37.0.ebuild
+++ b/media-video/mpv/mpv-0.37.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ppc64 ~riscv x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: bd1802abf4a33dbf2df342b0801e75ea18389d0d Author: Ionen Wolkens gentoo org> AuthorDate: Tue Dec 19 11:46:51 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Tue Dec 19 11:48:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd1802ab media-video/mpv: remove local "egl" metadata.xml desc Does not add much over the new global desc (unlike the opengl one). Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml index 7ae1bd6e2875..e6f3a0a8f95c 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -10,7 +10,6 @@ Enable playback of Blu-ray filesystems Enable the command-line player Enable Kernel Mode Setting / Direct Rendering Manager based video outputs - Enable support for various EGL-based video outputs / backends Enable gamepad input support Enable the shared library and headers (used by frontends / plugins) Enable support for GPU accelerated video rendering with media-libs/libplacebo
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: 90b4f2e08581cfccf88f8f38ccf388002af5982a
Author: James Le Cuirot gentoo org>
AuthorDate: Sat Dec 16 21:16:59 2023 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sat Dec 16 21:17:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90b4f2e0
media-video/mpv: Apply upstream patch to fix USE="drm -wayland -X"
Signed-off-by: James Le Cuirot gentoo.org>
media-video/mpv/files/mpv-0.37.0-drm-fix.patch | 41 ++
media-video/mpv/mpv-0.37.0.ebuild | 4 +++
2 files changed, 45 insertions(+)
diff --git a/media-video/mpv/files/mpv-0.37.0-drm-fix.patch
b/media-video/mpv/files/mpv-0.37.0-drm-fix.patch
new file mode 100644
index ..7e10c07eebc1
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.37.0-drm-fix.patch
@@ -0,0 +1,41 @@
+From e575ec4fc3654387c7358bd3640877ef32628d2c Mon Sep 17 00:00:00 2001
+From: Jan Beich
+Date: Wed, 22 Nov 2023 19:44:13 +0100
+Subject: [PATCH] meson: also expose present_sync for VT-only after
+ a96d04f19d73
+
+$ meson setup --auto-features=disabled -Ddrm=enabled -Degl=enabled
-Dgbm=enabled -Degl-drm=enabled /tmp/mpv_build
+$ meson compile -C /tmp/mpv_build
+[...]
+ld: error: undefined symbol: mp_present_initialize
+>>> referenced by drm_common.c
+>>> libmpv.so.2.2.0.p/video_out_drm_common.c.o:(vo_drm_init)
+
+ld: error: undefined symbol: present_sync_update_values
+>>> referenced by drm_common.c
+>>> libmpv.so.2.2.0.p/video_out_drm_common.c.o:(drm_pflip_cb)
+
+ld: error: undefined symbol: present_sync_swap
+>>> referenced by drm_common.c
+>>> libmpv.so.2.2.0.p/video_out_drm_common.c.o:(drm_pflip_cb)
+
+ld: error: undefined symbol: present_sync_get_info
+>>> referenced by vo_drm.c
+>>> libmpv.so.2.2.0.p/video_out_vo_drm.c.o:(get_vsync)
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index a3c3430dd47b..6fd5afa5122a 100644
+--- a/meson.build
b/meson.build
+@@ -1049,7 +1049,7 @@ if features['xv']
+ sources += files('video/out/vo_xv.c')
+ endif
+
+-if features['wayland'] or features['x11']
++if features['wayland'] or features['x11'] or features['drm']
+ sources += ('video/out/present_sync.c')
+ endif
+
diff --git a/media-video/mpv/mpv-0.37.0.ebuild
b/media-video/mpv/mpv-0.37.0.ebuild
index 8e95724ccf24..36d77d771326 100644
--- a/media-video/mpv/mpv-0.37.0.ebuild
+++ b/media-video/mpv/mpv-0.37.0.ebuild
@@ -134,6 +134,10 @@ BDEPEND="
wayland? ( dev-util/wayland-scanner )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.37.0-drm-fix.patch
+)
+
pkg_setup() {
use lua && lua-single_pkg_setup
python-single-r1_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 4d1095681ad988b6ea3e50f3f5dd8a88794643e1
Author: Sam James gentoo org>
AuthorDate: Tue Dec 12 23:22:32 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 12 23:22:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d109568
media-video/mpv: Stabilize 0.37.0 ppc64, #919769
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.37.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.37.0.ebuild
b/media-video/mpv/mpv-0.37.0.ebuild
index 8f8c05e085d2..8e95724ccf24 100644
--- a/media-video/mpv/mpv-0.37.0.ebuild
+++ b/media-video/mpv/mpv-0.37.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: bd5dec9bd1f4e9867d8ee4761892aaed0dff295d
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Dec 12 17:51:18 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Dec 12 17:51:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd5dec9b
media-video/mpv: Stabilize 0.37.0 amd64, #919769
Signed-off-by: Arthur Zamarin gentoo.org>
media-video/mpv/mpv-0.37.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.37.0.ebuild
b/media-video/mpv/mpv-0.37.0.ebuild
index d295e431b8e1..8f8c05e085d2 100644
--- a/media-video/mpv/mpv-0.37.0.ebuild
+++ b/media-video/mpv/mpv-0.37.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: bfa775c8912e1962d7abaadc51670244093e6a33
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Dec 12 17:04:51 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Dec 12 17:04:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa775c8
media-video/mpv: Stabilize 0.37.0 x86, #919769
Signed-off-by: Arthur Zamarin gentoo.org>
media-video/mpv/mpv-0.37.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.37.0.ebuild
b/media-video/mpv/mpv-0.37.0.ebuild
index ad4ac4d2c08c..d295e431b8e1 100644
--- a/media-video/mpv/mpv-0.37.0.ebuild
+++ b/media-video/mpv/mpv-0.37.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+ KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: f913ee28010a0458bc2d0417a0e8a3e4cbdee440
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Dec 12 16:55:26 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Dec 12 16:55:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f913ee28
media-video/mpv: Stabilize 0.37.0 arm64, #919769
Signed-off-by: Arthur Zamarin gentoo.org>
media-video/mpv/mpv-0.37.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.37.0.ebuild
b/media-video/mpv/mpv-0.37.0.ebuild
index 0fc7a044aa14..ad4ac4d2c08c 100644
--- a/media-video/mpv/mpv-0.37.0.ebuild
+++ b/media-video/mpv/mpv-0.37.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+ KEYWORDS="~amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: ac8d4e3372a275dbb90f77d4a99da77f8d409a38
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Nov 29 06:29:48 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Nov 29 06:38:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac8d4e33
media-video/mpv: update live
meson.build was updated to only enable shaderc for windows builds
given anything else will use libplacebo, so let's just leave
the setting alone now.
shaderc can now technically be avoided entirely with
libplacebo[glslang,-shaderc], albeit shaderc is still what
upstream libplacebo prefers at the moment (aka in the event
both are available, it'll force shaderc).
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index c4c1dc58c5e7..3c28f760365f 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -103,10 +103,7 @@ COMMON_DEPEND="
sndio? ( media-sound/sndio:= )
vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] )
vdpau? ( x11-libs/libvdpau )
- vulkan? (
- media-libs/shaderc
- media-libs/vulkan-loader[X?,wayland?]
- )
+ vulkan? ( media-libs/vulkan-loader[X?,wayland?] )
wayland? (
dev-libs/wayland
dev-libs/wayland-protocols
@@ -222,7 +219,6 @@ src_configure() {
$(meson_feature raspberry-pi rpi)
$(meson_feature vulkan)
- $(meson_feature vulkan shaderc)
# hardware decoding
$(meson_feature nvenc cuda-hwaccel)
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 53c02c4e5016f69546b9a36c50d683528bd4f129
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Nov 21 18:52:04 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Nov 21 18:52:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c02c4e
media-video/mpv: add 0.37.0
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/Manifest | 1 +
media-video/mpv/mpv-0.37.0.ebuild | 282 ++
2 files changed, 283 insertions(+)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index f2d8620668dc..60b418e98698 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1 +1,2 @@
DIST mpv-0.36.0.tar.gz 3409178 BLAKE2B
7260c265f02918d4caf72d8d8ecc9d4ab9783d66d675bd683a2f9c228404ad978c6fe0aa50f486b5257740176bc26f8abde7eff20d89019d5f701ec78c7743e1
SHA512
51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f
+DIST mpv-0.37.0.tar.gz 3384190 BLAKE2B
31d8d47ed7ae94540189fe05b7ea63f5b0d5c987a22191f931e4bd90664d05dca4c7e0bd0e05fcdf48b977e38e5f8eec0d2572265f2cf4a969a8a9a9dbf83d68
SHA512
a2f7fb3837312ec59c50427af7be3b2b1b6175a53ccc7463e81503284fc4047dff32cb105d665d80be77ee1ae775d4512b71584f324d6d202c9a7fc1fab53257
diff --git a/media-video/mpv/mpv-0.37.0.ebuild
b/media-video/mpv/mpv-0.37.0.ebuild
new file mode 100644
index ..0fc7a044aa14
--- /dev/null
+++ b/media-video/mpv/mpv-0.37.0.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
+else
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="Media player for the command line"
+HOMEPAGE="https://mpv.io/;
+
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
+SLOT="0/2" # soname
+IUSE="
+ +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
+ dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
+ +lua mmal nvenc openal opengl pipewire pulseaudio raspberry-pi
+ rubberband sdl selinux sixel sndio test tools +uchardet vaapi
+ vdpau vulkan wayland xv zimg zlib
+"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ || ( cli libmpv )
+ egl? ( || ( X drm wayland ) )
+ lua? ( ${LUA_REQUIRED_USE} )
+ nvenc? ( || ( egl opengl vulkan ) )
+ opengl? ( || ( X aqua ) )
+ test? ( cli )
+ tools? ( cli )
+ uchardet? ( iconv )
+ vaapi? ( || ( X drm wayland ) )
+ vdpau? ( X )
+ vulkan? ( || ( X wayland ) )
+ xv? ( X )
+"
+RESTRICT="!test? ( test )"
+
+# raspberry-pi: default to -bin given non-bin is known broken (bug #893422)
+COMMON_DEPEND="
+ media-libs/libass:=[fontconfig]
+ >=media-libs/libplacebo-6.338:=[opengl?,vulkan?]
+ >=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?]
+ X? (
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXext
+ x11-libs/libXpresent
+ x11-libs/libXrandr
+ xv? ( x11-libs/libXv )
+ )
+ alsa? ( media-libs/alsa-lib )
+ archive? ( app-arch/libarchive:= )
+ bluray? ( media-libs/libbluray:= )
+ cdda? (
+ dev-libs/libcdio-paranoia:=
+ dev-libs/libcdio:=
+ )
+ drm? (
+ x11-libs/libdrm
+ egl? ( media-libs/mesa[gbm(+)] )
+ )
+ dvd? (
+ media-libs/libdvdnav
+ media-libs/libdvdread:=
+ )
+ egl? (
+ media-libs/libglvnd
+ media-libs/libplacebo[opengl]
+ )
+ gamepad? ( media-libs/libsdl2[joystick] )
+ iconv? (
+ virtual/libiconv
+ uchardet? ( app-i18n/uchardet )
+ )
+ jack? ( virtual/jack )
+ javascript? ( dev-lang/mujs:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ lcms? ( media-libs/lcms:2 )
+ libcaca? ( media-libs/libcaca )
+ lua? ( ${LUA_DEPS} )
+ openal? ( media-libs/openal )
+ opengl? ( media-libs/libglvnd[X?] )
+ pipewire? ( media-video/pipewire:= )
+ pulseaudio? ( media-libs/libpulse )
+ raspberry-pi? (
+ || (
+ media-libs/raspberrypi-userland-bin
+ media-libs/raspberrypi-userland
+ )
+ )
+ rubberband? ( media-libs/rubberband )
+ sdl? ( media-libs/libsdl2[sound,threads,video] )
+ sixel? ( media-libs/libsixel )
+ sndio? ( media-sound/sndio:= )
+
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 6ea99c355eb7a63c9abb03edc815cbfc26539c29
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Nov 19 01:52:21 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Nov 19 05:53:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ea99c35
media-video/mpv: update vulkan-interop comment
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.36.0-r1.ebuild | 2 +-
media-video/mpv/mpv-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mpv/mpv-0.36.0-r1.ebuild
b/media-video/mpv/mpv-0.36.0-r1.ebuild
index a1e1203ee5d1..d4c540278992 100644
--- a/media-video/mpv/mpv-0.36.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.36.0-r1.ebuild
@@ -247,7 +247,7 @@ src_configure() {
# notable options left to automagic
#dmabuf-wayland: USE="drm wayland" + plus memfd_create support
#libplacebo-next: USE="libplacebo" + >=libplacebo-5.264
- #vulkan-interop: USE="libplacebo vulkan" + ffmpeg- currently
+ #vulkan-interop: USE="libplacebo vulkan" + >=ffmpeg-6.1
# TODO?: perhaps few more similar compound options should be
left auto
)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 534bec70ead1..c4c1dc58c5e7 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -240,7 +240,7 @@ src_configure() {
# notable options left to automagic
#dmabuf-wayland: USE="drm wayland" + plus memfd_create support
- #vulkan-interop: USE="vulkan" + ffmpeg- currently
+ #vulkan-interop: USE="vulkan" + >=ffmpeg-6.1
# TODO?: perhaps few more similar compound options should be
left auto
)
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/, media-video/mpv/files/
commit: 156ba410354704aaec994b031eeaadec4acb13f3
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Nov 9 15:17:27 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Nov 9 15:17:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=156ba410
media-video/mpv: drop 0.35.1-r2
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/Manifest | 1 -
.../mpv/files/mpv-0.35.1-pipewire-0.3.75.patch | 86 --
.../files/mpv-0.35.1-yt-dlp-edl-fragments.patch| 55
media-video/mpv/mpv-0.35.1-r2.ebuild | 304 -
4 files changed, 446 deletions(-)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 2848b9c4a196..f2d8620668dc 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,2 +1 @@
-DIST mpv-0.35.1.tar.gz 3367913 BLAKE2B
706a2031a2ca973eb3a092ec7f62ba40ca4dfd78e3ffe5d6e432486b0018852b034152a21805be594054178ccb17856dafe2b860cddcc22d27df895d163871de
SHA512
42f3564a9ed4d972d14b2c697b0163f06a8bb68a0606a86c34935181247c783e3cb62286b44578def0919fb13fce8b8f6453f82652d5bfaea5929119127a
DIST mpv-0.36.0.tar.gz 3409178 BLAKE2B
7260c265f02918d4caf72d8d8ecc9d4ab9783d66d675bd683a2f9c228404ad978c6fe0aa50f486b5257740176bc26f8abde7eff20d89019d5f701ec78c7743e1
SHA512
51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f
diff --git a/media-video/mpv/files/mpv-0.35.1-pipewire-0.3.75.patch
b/media-video/mpv/files/mpv-0.35.1-pipewire-0.3.75.patch
deleted file mode 100644
index 41392ab0839c..
--- a/media-video/mpv/files/mpv-0.35.1-pipewire-0.3.75.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Issue point that pipewire itself may apply a workaround for mpv,
-so this may or may not be necessary for future pipewire versions.
-Albeit the actual issue seems to be in mpv, so let's backport the
-fix which appears to work properly for old 0.35.1 as well.
-
-Note that (unrelated to this issue), 0.35.1 is still a bit flaky
-with pipewire. If have other issues with ao=pipewire you may want
-to consider mpv- until next release, or use ao=pulse/alsa/jack
-to use through pipewire meanwhile.
-
-https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3374
-https://github.com/mpv-player/mpv/issues/11995
-
-https://github.com/mpv-player/mpv/pull/11996
-https://github.com/mpv-player/mpv/commit/007019a303a09b098a387f607ae149705b57dc1c
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?=
-Date: Sun, 23 Jul 2023 09:10:55 +0200
-Subject: [PATCH] ao_pipewire: for_each_sink: properly check termination
- condition
-
-Doing a pw_thread_loop_wait() without checking conditions is invalid.
-The thread loop could be signalled for other reasons and in this case
-the wait needs to continue.
-
-PipeWire added such additional signaling in
-commit 33be898130f0 ("thread-loop: signal when started").
-
-This meant that for_each_sink would return before the callbacks have
-fired and session_has_sink() would incorrectly return "false", failing
-the initialization of ao_pipewire.
-
-Fixes #11995
a/audio/out/ao_pipewire.c
-+++ b/audio/out/ao_pipewire.c
-@@ -337,6 +337,11 @@
- }
-
-
-+struct for_each_done_ctx {
-+struct pw_thread_loop *loop;
-+bool done;
-+};
-+
- static const struct pw_registry_events for_each_sink_registry_events = {
- .version = PW_VERSION_REGISTRY_EVENTS,
- .global = for_each_sink_registry_event_global,
-@@ -344,8 +349,9 @@
-
- static void for_each_sink_done(void *data, uint32_t it, int seq)
- {
--struct pw_thread_loop *loop = data;
--pw_thread_loop_signal(loop, false);
-+struct for_each_done_ctx *ctx = data;
-+ctx->done = true;
-+pw_thread_loop_signal(ctx->loop, false);
- }
-
- static const struct pw_core_events for_each_sink_core_events = {
-@@ -359,12 +365,16 @@
- struct priv *priv = ao->priv;
- struct pw_registry *registry;
- struct spa_hook core_listener;
-+struct for_each_done_ctx done_ctx = {
-+.loop = priv->loop,
-+.done = false,
-+};
- int ret = -1;
-
- pw_thread_loop_lock(priv->loop);
-
- spa_zero(core_listener);
--if (pw_core_add_listener(priv->core, _listener,
_each_sink_core_events, priv->loop) < 0)
-+if (pw_core_add_listener(priv->core, _listener,
_each_sink_core_events, _ctx) < 0)
- goto unlock_loop;
-
- registry = pw_core_get_registry(priv->core, PW_VERSION_REGISTRY, 0);
-@@ -383,7 +393,8 @@
- if (pw_registry_add_listener(registry, _listener,
_each_sink_registry_events, _ctx) < 0)
- goto destroy_registry;
-
--pw_thread_loop_wait(priv->loop);
-+while (!done_ctx.done)
-+pw_thread_loop_wait(priv->loop);
-
- spa_hook_remove(_listener);
-
diff --git a/media-video/mpv/files/mpv-0.35.1-yt-dlp-edl-fragments.patch
b/media-video/mpv/files/mpv-0.35.1-yt-dlp-edl-fragments.patch
deleted file mode 100644
index 058c608233d4..
---
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: c72af2bebda015f91da2b1cc524358e3d5b38905
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Oct 9 21:43:40 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Oct 23 18:15:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c72af2be
media-video/mpv: hard-require libplacebo in live
Option was removed upstream, now always used.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 22 ++
1 file changed, 10 insertions(+), 12 deletions(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 1175525fffac..534bec70ead1 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -23,15 +23,14 @@ SLOT="0/2" # soname
IUSE="
+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
- +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
- raspberry-pi rubberband sdl selinux sixel sndio test tools
- +uchardet vaapi vdpau vulkan wayland xv zimg zlib
+ +lua mmal nvenc openal opengl pipewire pulseaudio raspberry-pi
+ rubberband sdl selinux sixel sndio test tools +uchardet vaapi
+ vdpau vulkan wayland xv zimg zlib
"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
|| ( cli libmpv )
egl? ( || ( X drm wayland ) )
- libplacebo? ( || ( egl opengl vulkan ) )
lua? ( ${LUA_REQUIRED_USE} )
nvenc? ( || ( egl opengl vulkan ) )
opengl? ( || ( X aqua ) )
@@ -40,7 +39,7 @@ REQUIRED_USE="
uchardet? ( iconv )
vaapi? ( || ( X drm wayland ) )
vdpau? ( X )
- vulkan? ( || ( X wayland ) libplacebo )
+ vulkan? ( || ( X wayland ) )
xv? ( X )
"
RESTRICT="!test? ( test )"
@@ -48,6 +47,7 @@ RESTRICT="!test? ( test )"
# raspberry-pi: default to -bin given non-bin is known broken (bug #893422)
COMMON_DEPEND="
media-libs/libass:=[fontconfig]
+ >=media-libs/libplacebo-6.338:=[opengl?,vulkan?]
>=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?]
X? (
x11-libs/libX11
@@ -72,7 +72,10 @@ COMMON_DEPEND="
media-libs/libdvdnav
media-libs/libdvdread:=
)
- egl? ( media-libs/libglvnd )
+ egl? (
+ media-libs/libglvnd
+ media-libs/libplacebo[opengl]
+ )
gamepad? ( media-libs/libsdl2[joystick] )
iconv? (
virtual/libiconv
@@ -83,10 +86,6 @@ COMMON_DEPEND="
jpeg? ( media-libs/libjpeg-turbo:= )
lcms? ( media-libs/lcms:2 )
libcaca? ( media-libs/libcaca )
- libplacebo? (
- >=media-libs/libplacebo-6.292:=[opengl?,vulkan?]
- egl? ( media-libs/libplacebo[opengl] )
- )
lua? ( ${LUA_DEPS} )
openal? ( media-libs/openal )
opengl? ( media-libs/libglvnd[X?] )
@@ -204,7 +203,6 @@ src_configure() {
$(meson_feature drm)
$(meson_feature jpeg)
$(meson_feature libcaca caca)
- $(meson_feature libplacebo)
$(meson_feature mmal rpi-mmal)
$(meson_feature sdl sdl2-video)
$(meson_feature sixel)
@@ -242,7 +240,7 @@ src_configure() {
# notable options left to automagic
#dmabuf-wayland: USE="drm wayland" + plus memfd_create support
- #vulkan-interop: USE="libplacebo vulkan" + ffmpeg- currently
+ #vulkan-interop: USE="vulkan" + ffmpeg- currently
# TODO?: perhaps few more similar compound options should be
left auto
)
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: b52240c00c5702199e8340938662acd0ada7ba09 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Sep 19 12:20:01 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Tue Sep 19 12:21:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b52240c0 media-video/mpv: remove xinerama dependency in live Unused since a month ago. Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/mpv-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild index 840b8b317550..1175525fffac 100644 --- a/media-video/mpv/mpv-.ebuild +++ b/media-video/mpv/mpv-.ebuild @@ -53,7 +53,6 @@ COMMON_DEPEND=" x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXext - x11-libs/libXinerama x11-libs/libXpresent x11-libs/libXrandr xv? ( x11-libs/libXv )
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 53cd34ec1d5f3d9e285232cc18a3b2fee8c474a3
Author: Sam James gentoo org>
AuthorDate: Sun Aug 27 17:18:30 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 27 17:18:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53cd34ec
media-video/mpv: Stabilize 0.36.0-r1 amd64, #913092
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.36.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.36.0-r1.ebuild
b/media-video/mpv/mpv-0.36.0-r1.ebuild
index a4b8928d809d..a1e1203ee5d1 100644
--- a/media-video/mpv/mpv-0.36.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.36.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86
~amd64-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86
~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 13902edc5644fc101e80f0d2cadd2d939e636337
Author: Sam James gentoo org>
AuthorDate: Sun Aug 27 01:53:55 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 27 01:53:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13902edc
media-video/mpv: Stabilize 0.36.0-r1 x86, #913092
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.36.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.36.0-r1.ebuild
b/media-video/mpv/mpv-0.36.0-r1.ebuild
index f7a202b8bfe0..a4b8928d809d 100644
--- a/media-video/mpv/mpv-0.36.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.36.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86
~amd64-linux"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86
~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 761ed07723ca4219caa438df366f55af076992cb
Author: Sam James gentoo org>
AuthorDate: Sun Aug 27 01:34:15 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 27 01:34:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=761ed077
media-video/mpv: Stabilize 0.36.0-r1 ppc, #913092
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.36.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.36.0-r1.ebuild
b/media-video/mpv/mpv-0.36.0-r1.ebuild
index 9af42f73035f..f7a202b8bfe0 100644
--- a/media-video/mpv/mpv-0.36.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.36.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86
~amd64-linux"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86
~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 2939efad4fe68e89fe65dad32e86570e76be3f0a
Author: Sam James gentoo org>
AuthorDate: Sun Aug 27 01:26:31 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 27 01:26:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2939efad
media-video/mpv: Stabilize 0.36.0-r1 ppc64, #913092
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.36.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.36.0-r1.ebuild
b/media-video/mpv/mpv-0.36.0-r1.ebuild
index 5761951972fc..9af42f73035f 100644
--- a/media-video/mpv/mpv-0.36.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.36.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~x86
~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: b0292944ed6897cbe34e46ae03ae6ea19c3387e7
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Aug 18 14:52:28 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Aug 18 14:55:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0292944
media-video/mpv: update live
Newer libplacebo is now a hard requirement with
USE=libplacebo regardless of gpu-next.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 16fb6df1b0b3..840b8b317550 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -85,7 +85,7 @@ COMMON_DEPEND="
lcms? ( media-libs/lcms:2 )
libcaca? ( media-libs/libcaca )
libplacebo? (
- >=media-libs/libplacebo-4.157:=[opengl?,vulkan?]
+ >=media-libs/libplacebo-6.292:=[opengl?,vulkan?]
egl? ( media-libs/libplacebo[opengl] )
)
lua? ( ${LUA_DEPS} )
@@ -243,14 +243,10 @@ src_configure() {
# notable options left to automagic
#dmabuf-wayland: USE="drm wayland" + plus memfd_create support
- #libplacebo-next: USE="libplacebo" + >=libplacebo-5.266
#vulkan-interop: USE="libplacebo vulkan" + ffmpeg- currently
# TODO?: perhaps few more similar compound options should be
left auto
)
- has_version '>=media-libs/libplacebo-5.266' ||
- ewarn "${PN}'s gpu-next video output requires ${_} to be used"
-
meson_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: a04e1ccea8971e2856e432a97ec747014d51365e
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Aug 6 00:45:35 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Aug 6 04:27:43 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a04e1cce
media-video/mpv: drop 0.35.1-r1
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.35.1-r1.ebuild | 303 ---
1 file changed, 303 deletions(-)
diff --git a/media-video/mpv/mpv-0.35.1-r1.ebuild
b/media-video/mpv/mpv-0.35.1-r1.ebuild
deleted file mode 100644
index 45e8f6492569..
--- a/media-video/mpv/mpv-0.35.1-r1.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{10..12} )
-inherit edo flag-o-matic lua-single meson optfeature pax-utils
python-single-r1 xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
-else
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86
~amd64-linux"
-fi
-
-DESCRIPTION="Media player for the command line"
-HOMEPAGE="https://mpv.io/;
-
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
-SLOT="0/2" # soname
-IUSE="
- +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
- dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
- +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
- raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet
- vaapi vdpau vulkan wayland +xv zimg zlib"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( cli libmpv )
- egl? ( || ( X drm wayland ) )
- libplacebo? ( || ( egl opengl vulkan ) )
- lua? ( ${LUA_REQUIRED_USE} )
- nvenc? ( || ( egl opengl vulkan ) )
- opengl? ( || ( X aqua ) )
- test? ( cli )
- tools? ( cli )
- uchardet? ( iconv )
- vaapi? (
- || ( X egl libplacebo wayland )
- wayland? ( drm )
- )
- vdpau? ( X )
- vulkan? ( || ( X wayland ) libplacebo )
- xv? ( X )"
-RESTRICT="!test? ( test )"
-
-# raspberry-pi: default to -bin given non-bin is known broken (bug #893422)
-COMMON_DEPEND="
- media-libs/libass:=[fontconfig]
- media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?]
- X? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXext
- x11-libs/libXinerama
- x11-libs/libXpresent
- x11-libs/libXrandr
- xv? ( x11-libs/libXv )
- )
- alsa? ( media-libs/alsa-lib )
- archive? ( app-arch/libarchive:= )
- bluray? ( media-libs/libbluray:= )
- cdda? (
- dev-libs/libcdio-paranoia:=
- dev-libs/libcdio:=
- )
- drm? (
- media-libs/mesa[gbm(+)]
- x11-libs/libdrm
- )
- dvd? (
- media-libs/libdvdnav
- media-libs/libdvdread:=
- )
- egl? ( media-libs/libglvnd )
- gamepad? ( media-libs/libsdl2[joystick] )
- iconv? (
- virtual/libiconv
- uchardet? ( app-i18n/uchardet )
- )
- jack? ( virtual/jack )
- javascript? ( dev-lang/mujs:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- lcms? ( media-libs/lcms:2 )
- libcaca? ( media-libs/libcaca )
- libplacebo? (
- >=media-libs/libplacebo-4.202:=[opengl?,vulkan?]
- https://github.com/mpv-player/mpv/blob/master/DOCS/man/options.rst#debugging
- local tests=($("${BUILD_DIR}"/mpv --no-config --unittest=help | tail -n
+2; assert))
- (( ${#tests[@]} )) || die "failed to gather any tests"
-
- local skip=(
- all-simple
-
- # fails on non-issue minor inconsistencies (bug #888639)
- img_format
- repack_sws
- )
-
- local test
- for test in "${tests[@]}"; do
- [[ ${test} == @($(IFS='|'; echo "${skip[*]}")) ]] ||
- edo "${BUILD_DIR}"/mpv -v --no-config
--unittest="${test}"
- done
-}
-
-src_install() {
- meson_src_install
-
- if use lua; then
- insinto /usr/share/${PN}
- doins -r TOOLS/lua
-
- if use cli && use lua_single_target_luajit; then
- pax-mark -m "${ED}"/usr/bin/${PN}
- fi
- fi
-
- if use tools; then
- dobin TOOLS/{mpv_identify.sh,umpv}
- newbin TOOLS/idet.sh mpv_idet.sh
- python_fix_shebang "${ED}"/usr/bin/umpv
- fi
-
- if use cli; then
- dodir /usr/share/doc/${PF}/html
- mv
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/, media-video/mpv/files/
commit: 709e2ffb08e3c920ab8f3e01b750fa3d6c1ad736
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Aug 3 06:28:43 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Aug 3 06:43:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=709e2ffb
media-video/mpv: backport old sub select behavior in 0.36.0
Unsure if a 0.36.1 is coming, but if not it may be worth
it before consider stabling this one.
Signed-off-by: Ionen Wolkens gentoo.org>
.../mpv/files/mpv-0.36.0-sub-match-audio.patch | 35 ++
.../{mpv-0.36.0.ebuild => mpv-0.36.0-r1.ebuild}| 1 +
2 files changed, 36 insertions(+)
diff --git a/media-video/mpv/files/mpv-0.36.0-sub-match-audio.patch
b/media-video/mpv/files/mpv-0.36.0-sub-match-audio.patch
new file mode 100644
index ..d893b7b78c12
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.36.0-sub-match-audio.patch
@@ -0,0 +1,35 @@
+Backport to restore --subs-with-matching-audio back to "yes" by default
+like it was in <0.36 to spare users from confusion and/or needlessly
+adjusting their configs until next version.
+
+https://github.com/mpv-player/mpv/issues/11854
+https://github.com/mpv-player/mpv/pull/12015
+https://github.com/mpv-player/mpv/commit/a2dd78fbc0932a4f47edbe4c41fe268095075c88
+--- a/DOCS/man/options.rst
b/DOCS/man/options.rst
+@@ -140,11 +140,11 @@ Track Selection
+
+ ``--subs-with-matching-audio=``
+ When autoselecting a subtitle track, select a full/non-forced one even if
the selected
+-audio stream matches your preferred subtitle language (default: no).
++audio stream matches your preferred subtitle language (default: yes).
+
+ ``--subs-fallback=``
+ When autoselecting a subtitle track, if no tracks match your preferred
languages,
+-select a full track even if it doesn't match your preferred subtitle
language (default: no).
++select a full track even if it doesn't match your preferred subtitle
language (default: default).
+ Setting this to `default` means that only streams flagged as `default`
will be selected.
+
+ ``--subs-fallback-forced=``
+--- a/options/options.c
b/options/options.c
+@@ -1040,7 +1040,8 @@ static const struct MPOpts mp_default_opts = {
+ [STREAM_SUB] = (char *[]){ "auto", NULL },
+ },
+ .stream_auto_sel = true,
+-.subs_with_matching_audio = false,
++.subs_with_matching_audio = true,
++.subs_fallback = 1,
+ .subs_fallback_forced = true,
+ .audio_display = 1,
+ .audio_output_format = 0, // AF_FORMAT_UNKNOWN
diff --git a/media-video/mpv/mpv-0.36.0.ebuild
b/media-video/mpv/mpv-0.36.0-r1.ebuild
similarity index 99%
rename from media-video/mpv/mpv-0.36.0.ebuild
rename to media-video/mpv/mpv-0.36.0-r1.ebuild
index 1c181bdcbf33..5761951972fc 100644
--- a/media-video/mpv/mpv-0.36.0.ebuild
+++ b/media-video/mpv/mpv-0.36.0-r1.ebuild
@@ -135,6 +135,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-0.36.0-tests-odr.patch
+ "${FILESDIR}"/${PN}-0.36.0-sub-match-audio.patch
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 95d85a31ded17f92282e27e78f3f23165381dda8
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jul 26 01:52:01 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jul 26 01:53:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95d85a31
media-video/mpv: disable IUSE=xv by default
While fairly unexpensive to keep enabled, using xv is hardly
recommended nowadays (mpv will warn if used). Users are free
to re-enable if used, but being default for everyone makes
little sense.
Note that a -vo=x11 for basic testing is still available
either way with USE=X.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.36.0.ebuild | 2 +-
media-video/mpv/mpv-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mpv/mpv-0.36.0.ebuild
b/media-video/mpv/mpv-0.36.0.ebuild
index 6760747c08e2..1c181bdcbf33 100644
--- a/media-video/mpv/mpv-0.36.0.ebuild
+++ b/media-video/mpv/mpv-0.36.0.ebuild
@@ -25,7 +25,7 @@ IUSE="
dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
+libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet
- vaapi vdpau vulkan wayland +xv zimg zlib"
+ vaapi vdpau vulkan wayland xv zimg zlib"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
|| ( cli libmpv )
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 5984f7637494..16fb6df1b0b3 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -25,7 +25,7 @@ IUSE="
dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
+libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
raspberry-pi rubberband sdl selinux sixel sndio test tools
- +uchardet vaapi vdpau vulkan wayland +xv zimg zlib
+ +uchardet vaapi vdpau vulkan wayland xv zimg zlib
"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 6bbca209faf999825ceb616e6a9c861844aa724a
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Jul 25 17:41:03 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Jul 25 19:23:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bbca209
media-video/mpv: update live
vaapi-egl option just got removed. This along with previous updates
now make vaapi options a lot less confusing and can be used with less
USE being enabled.
`vaapi? ( wayland? ( drm ) )` should also no longer be relevant, it
was primarily added to avoid confusion from mpv-0.34->0.35 upgrade
given the change in behavior that made it non-obvious that USE=-drm
(perhaps disabled long ago) was breaking setups. But 0.34 been gone
for a while now. Not that this means that should disable USE=drm
unless really not being used.
Also adjust gbm handling, technically only uses libgbm with egl-drm.
Still does not feel worth having its own USE=gbm like before.
Plus some minor style adjustments, used it for a while but having
second thoughts about this quoting style.
(note that there is good odds there will be 0.36.1 soon)
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 30 --
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index c2718b1e8de1..5984f7637494 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -24,8 +24,9 @@ IUSE="
+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
+libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
- raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet
- vaapi vdpau vulkan wayland +xv zimg zlib"
+ raspberry-pi rubberband sdl selinux sixel sndio test tools
+ +uchardet vaapi vdpau vulkan wayland +xv zimg zlib
+"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
|| ( cli libmpv )
@@ -37,13 +38,11 @@ REQUIRED_USE="
test? ( cli )
tools? ( cli )
uchardet? ( iconv )
- vaapi? (
- || ( X egl libplacebo wayland )
- wayland? ( drm )
- )
+ vaapi? ( || ( X drm wayland ) )
vdpau? ( X )
vulkan? ( || ( X wayland ) libplacebo )
- xv? ( X )"
+ xv? ( X )
+"
RESTRICT="!test? ( test )"
# raspberry-pi: default to -bin given non-bin is known broken (bug #893422)
@@ -67,8 +66,8 @@ COMMON_DEPEND="
dev-libs/libcdio:=
)
drm? (
- media-libs/mesa[gbm(+)]
x11-libs/libdrm
+ egl? ( media-libs/mesa[gbm(+)] )
)
dvd? (
media-libs/libdvdnav
@@ -116,22 +115,26 @@ COMMON_DEPEND="
x11-libs/libxkbcommon
)
zimg? ( media-libs/zimg )
- zlib? ( sys-libs/zlib:= )"
+ zlib? ( sys-libs/zlib:= )
+"
RDEPEND="
${COMMON_DEPEND}
selinux? ( sec-policy/selinux-mplayer )
- tools? ( ${PYTHON_DEPS} )"
+ tools? ( ${PYTHON_DEPS} )
+"
DEPEND="
${COMMON_DEPEND}
X? ( x11-base/xorg-proto )
dvb? ( virtual/linuxtv-dvb-headers )
nvenc? ( media-libs/nv-codec-headers )
- wayland? ( dev-libs/wayland-protocols )"
+ wayland? ( dev-libs/wayland-protocols )
+"
BDEPEND="
${PYTHON_DEPS}
virtual/pkgconfig
cli? ( dev-python/docutils )
- wayland? ( dev-util/wayland-scanner )"
+ wayland? ( dev-util/wayland-scanner )
+"
pkg_setup() {
use lua && lua-single_pkg_setup
@@ -200,7 +203,6 @@ src_configure() {
$(meson_feature X x11)
$(meson_feature aqua cocoa)
$(meson_feature drm)
- $(meson_feature drm gbm)
$(meson_feature jpeg)
$(meson_feature libcaca caca)
$(meson_feature libplacebo)
@@ -214,6 +216,7 @@ src_configure() {
echo enabled || echo disabled)
$(meson_feature egl)
$(mpv_feature_multi egl X egl-x11)
+ $(mpv_feature_multi egl drm gbm) # gbm is only used by egl-drm
$(mpv_feature_multi egl drm egl-drm)
$(mpv_feature_multi egl wayland egl-wayland)
$(meson_feature libmpv plain-gl)
@@ -231,7 +234,6 @@ src_configure() {
$(meson_feature vaapi)
$(mpv_feature_multi vaapi X vaapi-x11)
$(mpv_feature_multi vaapi drm vaapi-drm)
- $(mpv_feature_multi vaapi egl vaapi-egl)
$(mpv_feature_multi vaapi wayland vaapi-wayland)
$(meson_feature vdpau)
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 960f4e178b328e52170c026f8f15b696735c2c95
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Jul 25 00:56:37 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Jul 25 00:56:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960f4e17
media-video/mpv: update live
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 49ab623bd326..c2718b1e8de1 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -230,9 +230,9 @@ src_configure() {
$(meson_feature vaapi)
$(mpv_feature_multi vaapi X vaapi-x11)
- $(mpv_feature_multi 'vaapi X' egl vaapi-x-egl)
- $(mpv_feature_multi 'vaapi egl' drm vaapi-drm)
- $(mpv_feature_multi 'vaapi egl' wayland vaapi-wayland)
+ $(mpv_feature_multi vaapi drm vaapi-drm)
+ $(mpv_feature_multi vaapi egl vaapi-egl)
+ $(mpv_feature_multi vaapi wayland vaapi-wayland)
$(meson_feature vdpau)
$(mpv_feature_multi vdpau opengl vdpau-gl-x11)
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 582bfaa5fa8bde6a24307f7f8096cd0cc2ba004a
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Jul 23 19:26:39 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Jul 23 19:28:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=582bfaa5
media-video/mpv: adjust libplacebo warning
Turns out mpv did a temporary revert to be able to use
older version for the release and missed that.
So comments about libplacebo version from previous commit
summary do not apply.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.36.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mpv/mpv-0.36.0.ebuild
b/media-video/mpv/mpv-0.36.0.ebuild
index 67d67e316531..6760747c08e2 100644
--- a/media-video/mpv/mpv-0.36.0.ebuild
+++ b/media-video/mpv/mpv-0.36.0.ebuild
@@ -245,12 +245,12 @@ src_configure() {
# notable options left to automagic
#dmabuf-wayland: USE="drm wayland" + plus memfd_create support
- #libplacebo-next: USE="libplacebo" + >=libplacebo-5.266
+ #libplacebo-next: USE="libplacebo" + >=libplacebo-5.264
#vulkan-interop: USE="libplacebo vulkan" + ffmpeg- currently
# TODO?: perhaps few more similar compound options should be
left auto
)
- has_version '>=media-libs/libplacebo-5.266' ||
+ has_version '>=media-libs/libplacebo-5.264' ||
ewarn "${PN}'s gpu-next video output requires ${_} to be used"
meson_src_configure
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 0b266fbf4b99a21d626058973b099a4c7396562e
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Jul 23 17:39:47 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Jul 23 19:08:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b266fbf
media-video/mpv: sync live keywords
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 3290819e1b60..49ab623bd326 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv
~x86 ~amd64-linux"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/, media-video/mpv/files/
commit: 40df9a529bbb5075b565b3b1e092348ac7802472
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Jul 23 18:22:43 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Jul 23 19:08:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40df9a52
media-video/mpv: add 0.36.0
Neither me nor pipewire upstream expected a release soon, but
turns out did not have to worry about that. Also includes more
pipewire fixes than just the emergency one so ao=pipewire users
should upgrade ahead of stable.
Note that this needs the latest version of libplacebo or else
gpu-next won't be enabled (that version is however incompatible
with gentoo.org>
media-video/mpv/Manifest | 1 +
media-video/mpv/files/mpv-0.36.0-tests-odr.patch | 30 +++
media-video/mpv/mpv-0.36.0.ebuild| 291 +++
3 files changed, 322 insertions(+)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 6ac1915445ce..2848b9c4a196 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1 +1,2 @@
DIST mpv-0.35.1.tar.gz 3367913 BLAKE2B
706a2031a2ca973eb3a092ec7f62ba40ca4dfd78e3ffe5d6e432486b0018852b034152a21805be594054178ccb17856dafe2b860cddcc22d27df895d163871de
SHA512
42f3564a9ed4d972d14b2c697b0163f06a8bb68a0606a86c34935181247c783e3cb62286b44578def0919fb13fce8b8f6453f82652d5bfaea5929119127a
+DIST mpv-0.36.0.tar.gz 3409178 BLAKE2B
7260c265f02918d4caf72d8d8ecc9d4ab9783d66d675bd683a2f9c228404ad978c6fe0aa50f486b5257740176bc26f8abde7eff20d89019d5f701ec78c7743e1
SHA512
51f455a425ea5aac47acb3582d0f958a34248a2290a8d6887d22bcb9385fe8d1ab5d7f09d5408cfecfb73c1ec85d1b8ec8958e45a4941d3f711a2e580187472f
diff --git a/media-video/mpv/files/mpv-0.36.0-tests-odr.patch
b/media-video/mpv/files/mpv-0.36.0-tests-odr.patch
new file mode 100644
index ..1c7c05c20f78
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.36.0-tests-odr.patch
@@ -0,0 +1,30 @@
+Quickfix for USE=test with -Werror=odr (stubs, so have no real consequences).
+
+timer.h gets indirectly included and can declare these differently, have not
+looked closer yet.
+--- a/test/test_utils.c
b/test/test_utils.c
+@@ -110,6 +110,6 @@
+ #ifndef WIN32_TESTS
+-void mp_add_timeout(void) {};
+-void mp_rel_time_to_timespec(void) {};
+-void mp_time_us(void) {};
+-void mp_time_us_to_timespec(void) {};
++void mp_add_timeout(int64_t time_us, double timeout_sec) {};
++struct timespec mp_rel_time_to_timespec(double timeout_sec) {return (struct
timespec){0};};
++int64_t mp_time_us(void) {return 0;};
++struct timespec mp_time_us_to_timespec(int64_t time_us) {return (struct
timespec){0};};
+ #endif
+--- a/test/test_utils.h
b/test/test_utils.h
+@@ -61,6 +61,6 @@
+ #ifndef WIN32_TESTS
+-void mp_add_timeout(void);
+-void mp_rel_time_to_timespec(void);
+-void mp_time_us(void);
+-void mp_time_us_to_timespec(void);
++void mp_add_timeout(int64_t time_us, double timeout_sec);
++struct timespec mp_rel_time_to_timespec(double timeout_sec);
++int64_t mp_time_us(void);
++struct timespec mp_time_us_to_timespec(int64_t time_us);
+ #endif
diff --git a/media-video/mpv/mpv-0.36.0.ebuild
b/media-video/mpv/mpv-0.36.0.ebuild
new file mode 100644
index ..67d67e316531
--- /dev/null
+++ b/media-video/mpv/mpv-0.36.0.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
+else
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
+fi
+
+DESCRIPTION="Media player for the command line"
+HOMEPAGE="https://mpv.io/;
+
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
+SLOT="0/2" # soname
+IUSE="
+ +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
+ dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
+ +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
+ raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet
+ vaapi vdpau vulkan wayland +xv zimg zlib"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ || ( cli libmpv )
+ egl? ( || ( X drm wayland ) )
+ libplacebo? ( || ( egl opengl vulkan ) )
+ lua? ( ${LUA_REQUIRED_USE} )
+ nvenc? ( || ( egl opengl vulkan ) )
+ opengl? ( || ( X aqua ) )
+ test? ( cli )
+ tools? ( cli )
+ uchardet? ( iconv )
+ vaapi? (
+ || ( X egl libplacebo wayland )
+ wayland? ( drm )
+ )
+ vdpau? ( X )
+ vulkan? ( || ( X wayland ) libplacebo )
+ xv? ( X )"
+RESTRICT="!test? ( test )"
+
+#
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/, media-video/mpv/files/
commit: cd1fd1800adb5b92006acc74cad8e3e4e782416b
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Jul 23 14:17:35 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Jul 23 15:22:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd1fd180
media-video/mpv: backport fix for use with pipewire-0.3.75
Albeit, regardless of this patch or stable pipewire, ao=pipewire on
0.35.1 seems to have several other issues (in my VM it results in
horribly crackling audio), and I personally recommend ao=pulse
(or jack/alsa) instead to use with pipewire. Pipewire does work
great in mpv-, so next release should be better.
Considered a ~arch revbump, but given this only touch pipewire
code and that ao=pipewire is already a bit bad on 0.35.1 I'm not
sure it's worth the stabilization trouble (aka current keywords
are intentional).
Tested with both 0.3.75 and stable 0.3.71, but will keep -r1 for
a bit in case of something I missed.
Signed-off-by: Ionen Wolkens gentoo.org>
.../mpv/files/mpv-0.35.1-pipewire-0.3.75.patch | 86 ++
media-video/mpv/mpv-0.35.1-r2.ebuild | 304 +
2 files changed, 390 insertions(+)
diff --git a/media-video/mpv/files/mpv-0.35.1-pipewire-0.3.75.patch
b/media-video/mpv/files/mpv-0.35.1-pipewire-0.3.75.patch
new file mode 100644
index ..41392ab0839c
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.35.1-pipewire-0.3.75.patch
@@ -0,0 +1,86 @@
+Issue point that pipewire itself may apply a workaround for mpv,
+so this may or may not be necessary for future pipewire versions.
+Albeit the actual issue seems to be in mpv, so let's backport the
+fix which appears to work properly for old 0.35.1 as well.
+
+Note that (unrelated to this issue), 0.35.1 is still a bit flaky
+with pipewire. If have other issues with ao=pipewire you may want
+to consider mpv- until next release, or use ao=pulse/alsa/jack
+to use through pipewire meanwhile.
+
+https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3374
+https://github.com/mpv-player/mpv/issues/11995
+
+https://github.com/mpv-player/mpv/pull/11996
+https://github.com/mpv-player/mpv/commit/007019a303a09b098a387f607ae149705b57dc1c
+From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?=
+Date: Sun, 23 Jul 2023 09:10:55 +0200
+Subject: [PATCH] ao_pipewire: for_each_sink: properly check termination
+ condition
+
+Doing a pw_thread_loop_wait() without checking conditions is invalid.
+The thread loop could be signalled for other reasons and in this case
+the wait needs to continue.
+
+PipeWire added such additional signaling in
+commit 33be898130f0 ("thread-loop: signal when started").
+
+This meant that for_each_sink would return before the callbacks have
+fired and session_has_sink() would incorrectly return "false", failing
+the initialization of ao_pipewire.
+
+Fixes #11995
+--- a/audio/out/ao_pipewire.c
b/audio/out/ao_pipewire.c
+@@ -337,6 +337,11 @@
+ }
+
+
++struct for_each_done_ctx {
++struct pw_thread_loop *loop;
++bool done;
++};
++
+ static const struct pw_registry_events for_each_sink_registry_events = {
+ .version = PW_VERSION_REGISTRY_EVENTS,
+ .global = for_each_sink_registry_event_global,
+@@ -344,8 +349,9 @@
+
+ static void for_each_sink_done(void *data, uint32_t it, int seq)
+ {
+-struct pw_thread_loop *loop = data;
+-pw_thread_loop_signal(loop, false);
++struct for_each_done_ctx *ctx = data;
++ctx->done = true;
++pw_thread_loop_signal(ctx->loop, false);
+ }
+
+ static const struct pw_core_events for_each_sink_core_events = {
+@@ -359,12 +365,16 @@
+ struct priv *priv = ao->priv;
+ struct pw_registry *registry;
+ struct spa_hook core_listener;
++struct for_each_done_ctx done_ctx = {
++.loop = priv->loop,
++.done = false,
++};
+ int ret = -1;
+
+ pw_thread_loop_lock(priv->loop);
+
+ spa_zero(core_listener);
+-if (pw_core_add_listener(priv->core, _listener,
_each_sink_core_events, priv->loop) < 0)
++if (pw_core_add_listener(priv->core, _listener,
_each_sink_core_events, _ctx) < 0)
+ goto unlock_loop;
+
+ registry = pw_core_get_registry(priv->core, PW_VERSION_REGISTRY, 0);
+@@ -383,7 +393,8 @@
+ if (pw_registry_add_listener(registry, _listener,
_each_sink_registry_events, _ctx) < 0)
+ goto destroy_registry;
+
+-pw_thread_loop_wait(priv->loop);
++while (!done_ctx.done)
++pw_thread_loop_wait(priv->loop);
+
+ spa_hook_remove(_listener);
+
diff --git a/media-video/mpv/mpv-0.35.1-r2.ebuild
b/media-video/mpv/mpv-0.35.1-r2.ebuild
new file mode 100644
index ..f41aea9d7e6f
--- /dev/null
+++ b/media-video/mpv/mpv-0.35.1-r2.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{10..12} )
+inherit edo flag-o-matic lua-single meson optfeature pax-utils
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 4d9d50d4346a0a584780a3da20e1366d49231051
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Jul 15 21:57:51 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jul 15 22:12:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d9d50d4
media-video/mpv: loosen libplacebo requirement in live
Using a older libplacebo is possible, but gpu-next support will
be missing. Lower bound felt harmless to ensure all features,
but other packages (e.g. ffmpeg) could potentially need to set
temporary upper bounds like mpv-0.35 did and this will create
conflicts.
Not that it matters that much while this is only in mpv-.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 946f87643e68..3290819e1b60 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -86,7 +86,7 @@ COMMON_DEPEND="
lcms? ( media-libs/lcms:2 )
libcaca? ( media-libs/libcaca )
libplacebo? (
- >=media-libs/libplacebo-5.266:=[opengl?,vulkan?]
+ >=media-libs/libplacebo-4.157:=[opengl?,vulkan?]
egl? ( media-libs/libplacebo[opengl] )
)
lua? ( ${LUA_DEPS} )
@@ -204,7 +204,6 @@ src_configure() {
$(meson_feature jpeg)
$(meson_feature libcaca caca)
$(meson_feature libplacebo)
- $(meson_feature libplacebo libplacebo-next)
$(meson_feature mmal rpi-mmal)
$(meson_feature sdl sdl2-video)
$(meson_feature sixel)
@@ -242,10 +241,14 @@ src_configure() {
# notable options left to automagic
#dmabuf-wayland: USE="drm wayland" + plus memfd_create support
+ #libplacebo-next: USE="libplacebo" + >=libplacebo-5.266
#vulkan-interop: USE="libplacebo vulkan" + ffmpeg- currently
# TODO?: perhaps few more similar compound options should be
left auto
)
+ has_version '>=media-libs/libplacebo-5.266' ||
+ ewarn "${PN}'s gpu-next video output requires ${_} to be used"
+
meson_src_configure
}
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 4d5dd1fdcc55082f19a7980c8c9147195641567e
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Jul 15 05:17:19 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jul 15 05:26:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d5dd1fd
media-video/mpv: note new options in live
Meant to handle them but upon closer look there's not
really anything that should be done -- but may be worth
noting.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 5 +
1 file changed, 5 insertions(+)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 52c41d825bf8..946f87643e68 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -239,6 +239,11 @@ src_configure() {
$(mpv_feature_multi vdpau opengl vdpau-gl-x11)
$(mpv_feature_multi aqua opengl videotoolbox-gl)
+
+ # notable options left to automagic
+ #dmabuf-wayland: USE="drm wayland" + plus memfd_create support
+ #vulkan-interop: USE="libplacebo vulkan" + ffmpeg- currently
+ # TODO?: perhaps few more similar compound options should be
left auto
)
meson_src_configure
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 54322c9339c07de1104d00f67b1e9d1b8e26b1da Author: Ionen Wolkens gentoo org> AuthorDate: Mon Jul 3 04:53:40 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Jul 3 04:56:41 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54322c93 media-video/mpv: style fix Not sure why I put parentheses there, maybe(?) it's clearer but eh.. they do nothing. Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/mpv-0.35.1-r1.ebuild | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/media-video/mpv/mpv-0.35.1-r1.ebuild b/media-video/mpv/mpv-0.35.1-r1.ebuild index 5dadc871fc7b..45e8f6492569 100644 --- a/media-video/mpv/mpv-0.35.1-r1.ebuild +++ b/media-video/mpv/mpv-0.35.1-r1.ebuild @@ -86,10 +86,8 @@ COMMON_DEPEND=" lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) libplacebo? ( - ( - >=media-libs/libplacebo-4.202:=[opengl?,vulkan?] - =media-libs/libplacebo-4.202:=[opengl?,vulkan?] +
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 14ec067fed7a73eb441527d57a9779d53716312b Author: Ionen Wolkens gentoo org> AuthorDate: Mon Jul 3 04:08:13 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Jul 3 04:47:37 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14ec067f media-video/mpv: update libplacebo bounds mpv- needs >=5.266 which is not released yet unless counting the release candidate (6.287.0_rc1). And then that version appears to break older mpv (can skip revbump thanks to the binding operator). If using the live ebuild, please keyword either gentoo.org> media-video/mpv/mpv-0.35.1-r1.ebuild | 5 - media-video/mpv/mpv-.ebuild | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/media-video/mpv/mpv-0.35.1-r1.ebuild b/media-video/mpv/mpv-0.35.1-r1.ebuild index db20dba448a3..5dadc871fc7b 100644 --- a/media-video/mpv/mpv-0.35.1-r1.ebuild +++ b/media-video/mpv/mpv-0.35.1-r1.ebuild @@ -86,7 +86,10 @@ COMMON_DEPEND=" lcms? ( media-libs/lcms:2 ) libcaca? ( media-libs/libcaca ) libplacebo? ( - >=media-libs/libplacebo-4.202:=[opengl?,vulkan?] + ( + >=media-libs/libplacebo-4.202:=[opengl?,vulkan?] +
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 304cf6bed8cde5a2a39e53f921563eb28c8f5fcf
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue May 23 16:58:17 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue May 23 17:14:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=304cf6be
media-video/mpv: enable py3.12
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.35.1-r1.ebuild | 2 +-
media-video/mpv/mpv-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mpv/mpv-0.35.1-r1.ebuild
b/media-video/mpv/mpv-0.35.1-r1.ebuild
index 4ee310fc3829..db20dba448a3 100644
--- a/media-video/mpv/mpv-0.35.1-r1.ebuild
+++ b/media-video/mpv/mpv-0.35.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=8
LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit edo flag-o-matic lua-single meson optfeature pax-utils
python-single-r1 xdg
if [[ ${PV} == ]]; then
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index bdc142fe6cd6..2fc084c964c4 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -4,7 +4,7 @@
EAPI=8
LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
if [[ ${PV} == ]]; then
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: cd366b8d35c2dcf9c880eeabde1f3c0a9c558b0d Author: Ionen Wolkens gentoo org> AuthorDate: Tue May 23 04:50:28 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Tue May 23 04:50:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd366b8d media-video/mpv: defer to new global USE=vulkan description Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml index f635e0d7c024..7ae1bd6e2875 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -27,7 +27,6 @@ Enable sound support via media-sound/sndio Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv Enable subtitles charset discovery via app-i18n/uchardet - Enable support for Vulkan-based video backends Enable libzimg support (for vf_fingerprint)
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: e53d4960d765795022cfc5861df7c87e1605b1d9
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Apr 5 12:34:58 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Apr 5 13:21:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e53d4960
media-video/mpv: drop 0.35.0-r1
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/Manifest | 1 -
media-video/mpv/mpv-0.35.0-r1.ebuild | 309 ---
2 files changed, 310 deletions(-)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index b935d2d6787d..6ac1915445ce 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,2 +1 @@
-DIST mpv-0.35.0.tar.gz 3365752 BLAKE2B
9b8dca943fc60a68f8474549d75c021dd9157195253c5ec09721969e500b2756c033e86975499f5632f0c943ac7bb54699f47340f0dee73d7284668d4419b17f
SHA512
d5c1f734057f6b6c27e7f59de43cf7c0e7f813d842b8c7fd2ae1073dbe649c8187b7686df4efe928db2952e9f1efc171245e6f8780c1d9f174f4d7abff1e073a
DIST mpv-0.35.1.tar.gz 3367913 BLAKE2B
706a2031a2ca973eb3a092ec7f62ba40ca4dfd78e3ffe5d6e432486b0018852b034152a21805be594054178ccb17856dafe2b860cddcc22d27df895d163871de
SHA512
42f3564a9ed4d972d14b2c697b0163f06a8bb68a0606a86c34935181247c783e3cb62286b44578def0919fb13fce8b8f6453f82652d5bfaea5929119127a
diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild
b/media-video/mpv/mpv-0.35.0-r1.ebuild
deleted file mode 100644
index 355a3f826dcd..
--- a/media-video/mpv/mpv-0.35.0-r1.ebuild
+++ /dev/null
@@ -1,309 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{9..11} )
-inherit edo flag-o-matic lua-single meson optfeature pax-utils
python-single-r1 xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
-else
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux"
-fi
-
-DESCRIPTION="Media player for the command line"
-HOMEPAGE="https://mpv.io/;
-
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
-SLOT="0/2" # soname
-IUSE="
- +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
- dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
- +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
- raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet
- vaapi vdpau vulkan wayland +xv zimg zlib"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( cli libmpv )
- egl? ( || ( X drm wayland ) )
- libplacebo? ( || ( egl opengl vulkan ) )
- lua? ( ${LUA_REQUIRED_USE} )
- nvenc? ( || ( egl opengl vulkan ) )
- opengl? ( || ( X aqua ) )
- test? ( cli )
- tools? ( cli )
- uchardet? ( iconv )
- vaapi? (
- || ( X egl libplacebo wayland )
- wayland? ( drm )
- )
- vdpau? ( X )
- vulkan? ( || ( X wayland ) libplacebo )
- xv? ( X )"
-RESTRICT="!test? ( test )"
-
-# raspberry-pi: default to -bin given non-bin is known broken (bug #893422)
-COMMON_DEPEND="
- media-libs/libass:=[fontconfig]
- media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?]
- X? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXext
- x11-libs/libXinerama
- x11-libs/libXpresent
- x11-libs/libXrandr
- xv? ( x11-libs/libXv )
- )
- alsa? ( media-libs/alsa-lib )
- archive? ( app-arch/libarchive:= )
- bluray? ( media-libs/libbluray:= )
- cdda? (
- dev-libs/libcdio-paranoia:=
- dev-libs/libcdio:=
- )
- drm? (
- media-libs/mesa[gbm(+)]
- x11-libs/libdrm
- )
- dvd? (
- media-libs/libdvdnav
- media-libs/libdvdread:=
- )
- egl? ( media-libs/libglvnd )
- gamepad? ( media-libs/libsdl2[joystick] )
- iconv? (
- virtual/libiconv
- uchardet? ( app-i18n/uchardet )
- )
- jack? ( virtual/jack )
- javascript? ( dev-lang/mujs:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- lcms? ( media-libs/lcms:2 )
- libcaca? ( media-libs/libcaca )
- libplacebo? (
- >=media-libs/libplacebo-4.202:=[opengl?,vulkan?]
- egl? ( media-libs/libplacebo[opengl] )
- )
- lua? ( ${LUA_DEPS} )
- openal? ( media-libs/openal )
- opengl? ( media-libs/libglvnd[X?] )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-libs/libpulse )
- raspberry-pi? (
- || (
- media-libs/raspberrypi-userland-bin
- media-libs/raspberrypi-userland
-
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 37f54b2c381bb5dc66942190bc98627d86c0ff2d
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Apr 1 16:32:08 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 1 16:32:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37f54b2c
media-video/mpv: Stabilize 0.35.1-r1 x86, #893480
Signed-off-by: Arthur Zamarin gentoo.org>
media-video/mpv/mpv-0.35.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.35.1-r1.ebuild
b/media-video/mpv/mpv-0.35.1-r1.ebuild
index 9d2d6ee62ae3..4ee310fc3829 100644
--- a/media-video/mpv/mpv-0.35.1-r1.ebuild
+++ b/media-video/mpv/mpv-0.35.1-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86
~amd64-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86
~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 37dab4f6416a7ab8674430ea41b44f30d2a4832a
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Mar 29 05:56:35 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Mar 29 06:00:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37dab4f6
media-video/mpv: update live
Probably no reason (for us) to make that a separate USE, it
just means need to depend on recent enough libplacebo which
we already do.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 8bd4afdb8685..bdc142fe6cd6 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -204,6 +204,7 @@ src_configure() {
$(meson_feature jpeg)
$(meson_feature libcaca caca)
$(meson_feature libplacebo)
+ $(meson_feature libplacebo libplacebo-next)
$(meson_feature mmal rpi-mmal)
$(meson_feature sdl sdl2-video)
$(meson_feature sixel)
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: f888178b37a4f337564d23a6c89d035aa4f04f86
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Mar 27 06:58:35 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Mar 28 02:25:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f888178b
media-video/mpv: require newer libplacebo in live
It can work with older, but this is the (new) minimum
version for gpu-next to be enabled.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 74cbb75b987a..8bd4afdb8685 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -86,7 +86,7 @@ COMMON_DEPEND="
lcms? ( media-libs/lcms:2 )
libcaca? ( media-libs/libcaca )
libplacebo? (
- >=media-libs/libplacebo-4.202:=[opengl?,vulkan?]
+ >=media-libs/libplacebo-5.264:=[opengl?,vulkan?]
egl? ( media-libs/libplacebo[opengl] )
)
lua? ( ${LUA_DEPS} )
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 6fe471d6de67f5d543183ef4b6533cca33a61548
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Mar 9 18:30:48 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Mar 9 20:12:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe471d6
media-video/mpv: drop 0.34.1-r1
Been a while and about time to clean this up + old libplacebo
despite bug #885397 that leaves mpv without alpha keywords anymore
(up to alpha@ whether want to leave that way or still rekeyword).
Bug: https://bugs.gentoo.org/885397
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/Manifest | 2 -
media-video/mpv/metadata.xml | 2 -
media-video/mpv/mpv-0.34.1-r1.ebuild | 359 ---
3 files changed, 363 deletions(-)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 17ec75c9053d..b935d2d6787d 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,2 @@
-DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B
c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab
SHA512
77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
DIST mpv-0.35.0.tar.gz 3365752 BLAKE2B
9b8dca943fc60a68f8474549d75c021dd9157195253c5ec09721969e500b2756c033e86975499f5632f0c943ac7bb54699f47340f0dee73d7284668d4419b17f
SHA512
d5c1f734057f6b6c27e7f59de43cf7c0e7f813d842b8c7fd2ae1073dbe649c8187b7686df4efe928db2952e9f1efc171245e6f8780c1d9f174f4d7abff1e073a
DIST mpv-0.35.1.tar.gz 3367913 BLAKE2B
706a2031a2ca973eb3a092ec7f62ba40ca4dfd78e3ffe5d6e432486b0018852b034152a21805be594054178ccb17856dafe2b860cddcc22d27df895d163871de
SHA512
42f3564a9ed4d972d14b2c697b0163f06a8bb68a0606a86c34935181247c783e3cb62286b44578def0919fb13fce8b8f6453f82652d5bfaea5929119127a
-DIST waf-2.0.22 104880 BLAKE2B
6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0
SHA512
4156cefa65b7e6349ddb1ca643bbdf3e449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 6813c210d437..f635e0d7c024 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -9,11 +9,9 @@
Enable support for various archive formats
via app-arch/libarchive
Enable playback of Blu-ray
filesystems
Enable the command-line player
- Enable C plugins support
Enable Kernel Mode Setting / Direct Rendering
Manager based video outputs
Enable support for various EGL-based video
outputs / backends
Enable gamepad input support
- Enable Graphics Buffer Manager based EGL video
backend
Enable the shared library and headers (used
by frontends / plugins)
Enable support for GPU accelerated
video rendering with media-libs/libplacebo
Enable Lua scripting, OSC (On Screen
Controller) GUI, and net-misc/yt-dlp support
diff --git a/media-video/mpv/mpv-0.34.1-r1.ebuild
b/media-video/mpv/mpv-0.34.1-r1.ebuild
deleted file mode 100644
index 529896f60781..
--- a/media-video/mpv/mpv-0.34.1-r1.ebuild
+++ /dev/null
@@ -1,359 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV=2.0.22
-
-inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils
python-r1 toolchain-funcs waf-utils xdg-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv;
-
-if [[ ${PV} != ** ]]; then
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86
~amd64-linux"
- DOCS=( RELEASE_NOTES )
-else
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
- inherit git-r3
- DOCS=(); SRC_URI=""
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV};
-DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
-
-# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
-SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
- dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv
+lua
- nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
- selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib
zimg"
-
-REQUIRED_USE="
- || ( cli libmpv )
- aqua? ( opengl )
- egl? ( || ( gbm X wayland ) )
- gamepad? ( sdl )
- gbm? ( drm egl opengl )
-
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: b88415abf5a1a3174a30fb6bdf4cdca8cb8a6ab7
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Mar 6 20:35:40 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Mar 6 20:39:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b88415ab
media-video/mpv: backport ytdl hook fix for dash videos
Feels safe enough for straight-to-stable given only touches
the lua script which is already semi-broken.
Closes: https://bugs.gentoo.org/899956
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/mpv-0.35.1-yt-dlp-edl-fragments.patch| 55 ++
.../{mpv-0.35.1.ebuild => mpv-0.35.1-r1.ebuild}| 4 ++
2 files changed, 59 insertions(+)
diff --git a/media-video/mpv/files/mpv-0.35.1-yt-dlp-edl-fragments.patch
b/media-video/mpv/files/mpv-0.35.1-yt-dlp-edl-fragments.patch
new file mode 100644
index ..058c608233d4
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.35.1-yt-dlp-edl-fragments.patch
@@ -0,0 +1,55 @@
+https://bugs.gentoo.org/899956
+https://github.com/mpv-player/mpv/pull/11398
+
+From 985655ebfd77ceddc44d76f8cc6dc446002f34ee Mon Sep 17 00:00:00 2001
+From: Christoph Heinrich
+Date: Fri, 3 Mar 2023 00:45:45 +0100
+Subject: [PATCH 1/2] ytdl_hook: init fragment requires other fragments
+
+With dash the first fragment was always considered an init fragment if
+there wasn't a duration. However that only makes sense when there are
+also other fragments, so check if there are other fragments in addition
+to the lack of a duration.
+--- a/player/lua/ytdl_hook.lua
b/player/lua/ytdl_hook.lua
+@@ -297,7 +297,7 @@ local function edl_track_joined(fragments, protocol,
is_live, base)
+ local args = ""
+
+ -- assume MP4 DASH initialization segment
+-if not fragments[1].duration then
++if not fragments[1].duration and #fragments > 1 then
+ msg.debug("Using init segment")
+ args = args .. ",init=" .. edl_escape(join_url(base,
fragments[1]))
+ offset = 2
+
+From a5961ad096b1361a12f836c8b170fc748f46962a Mon Sep 17 00:00:00 2001
+From: Christoph Heinrich
+Date: Fri, 3 Mar 2023 00:50:58 +0100
+Subject: [PATCH 2/2] ytdl_hook: only log error when no fallback url available
+
+An error indicates that something doesn't work, but as long as a
+safe url is available, playback is still expected to work.
+
+Thus reduce logging level of MP4 DASH without fragments message and
+add a new error message for when there is no safe url available either.
+
+Also adds a missing space.
+--- a/player/lua/ytdl_hook.lua
b/player/lua/ytdl_hook.lua
+@@ -309,7 +309,7 @@ local function edl_track_joined(fragments, protocol,
is_live, base)
+ -- if not available in all, give up.
+ for i = offset, #fragments do
+ if not fragments[i].duration then
+-msg.error("EDL doesn't support fragments" ..
++msg.verbose("EDL doesn't support fragments " ..
+ "without duration with MP4 DASH")
+ return nil
+ end
+@@ -423,6 +423,7 @@ local function formats_to_edl(json, formats,
use_all_formats)
+ track.protocol, json.is_live,
+ track.fragment_base_url)
+ if not edl_track and not url_is_safe(track.url) then
++msg.error("No safe URL or supported fragmented stream available")
+ return nil
+ end
+
diff --git a/media-video/mpv/mpv-0.35.1.ebuild
b/media-video/mpv/mpv-0.35.1-r1.ebuild
similarity index 99%
rename from media-video/mpv/mpv-0.35.1.ebuild
rename to media-video/mpv/mpv-0.35.1-r1.ebuild
index 5ea6dc240af6..9d2d6ee62ae3 100644
--- a/media-video/mpv/mpv-0.35.1.ebuild
+++ b/media-video/mpv/mpv-0.35.1-r1.ebuild
@@ -133,6 +133,10 @@ BDEPEND="
cli? ( dev-python/docutils )
wayland? ( dev-util/wayland-scanner )"
+PATCHES=(
+ "${FILESDIR}"/${P}-yt-dlp-edl-fragments.patch
+)
+
pkg_setup() {
use lua && lua-single_pkg_setup
python-single-r1_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 246b6b742559270b0e3dc0d470c698bd7e72445c
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Mar 3 05:18:26 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Mar 3 05:25:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=246b6b74
media-video/mpv: drop custom src_test in live
All tests are now handled by meson and --unittest no longer
exists. For now skip nothing but may need to revisit this.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 25 +
1 file changed, 1 insertion(+), 24 deletions(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 34293c859ac9..74cbb75b987a 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
LUA_COMPAT=( lua5-1 luajit )
PYTHON_COMPAT=( python3_{9..11} )
-inherit edo flag-o-matic lua-single meson optfeature pax-utils
python-single-r1 xdg
+inherit flag-o-matic lua-single meson optfeature pax-utils python-single-r1 xdg
if [[ ${PV} == ]]; then
inherit git-r3
@@ -243,29 +243,6 @@ src_configure() {
meson_src_configure
}
-src_test() {
- #
https://github.com/mpv-player/mpv/blob/master/DOCS/man/options.rst#debugging
- local tests=($("${BUILD_DIR}"/mpv --no-config --unittest=help | tail -n
+2; assert))
- (( ${#tests[@]} )) || die "failed to gather any tests"
-
- local skip=(
- all-simple
-
- # fails on non-issue minor inconsistencies (bug #888639)
- img_format
- repack_sws
- )
-
- local test
- for test in "${tests[@]}"; do
- [[ ${test} == @($(IFS='|'; echo "${skip[*]}")) ]] ||
- edo "${BUILD_DIR}"/mpv -v --no-config
--unittest="${test}"
- done
-
- # currently only does basic libmpv testing, do in addition to --unittest
- meson_src_test
-}
-
src_install() {
meson_src_install
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 96fb6735bb117aedd5fb3e9e5f80a9d4fbfd6fea
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Feb 28 12:55:02 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Feb 28 14:53:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96fb6735
media-video/mpv: don't unnecessarily pass -I/-L for raspberry-pi
If meson.build doesn't find the pkg-config file, it'll fail. So
there's no sense in adding this ourselves.
mpv already looks for the .pc file in /opt/vc for userland-bin, and
meson considers SYSROOT even with absolute paths (cross works).
Prefix is untested (would need more setting up to try this on arm),
may or may not need to use PKG_CONFIG_PATH so it can find brcmegl.pc
depending on how meson handles it -- but either way is unlikely to
work given userland-bin's .pc are not modified to include EPREFIX
(not going to worry unless someone actually uses this configuration).
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.35.1.ebuild | 5 -
media-video/mpv/mpv-.ebuild | 5 -
2 files changed, 10 deletions(-)
diff --git a/media-video/mpv/mpv-0.35.1.ebuild
b/media-video/mpv/mpv-0.35.1.ebuild
index bcd28382376d..5ea6dc240af6 100644
--- a/media-video/mpv/mpv-0.35.1.ebuild
+++ b/media-video/mpv/mpv-0.35.1.ebuild
@@ -147,11 +147,6 @@ src_configure() {
fi
fi
- if use raspberry-pi; then
- append-cflags -I"${ESYSROOT}"/opt/vc/include
- append-ldflags -L"${ESYSROOT}"/opt/vc/lib
- fi
-
mpv_feature_multi() {
local use set
for use in ${1} ${2}; do
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 11323310aeb0..34293c859ac9 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -147,11 +147,6 @@ src_configure() {
fi
fi
- if use raspberry-pi; then
- append-cflags -I"${ESYSROOT}"/opt/vc/include
- append-ldflags -L"${ESYSROOT}"/opt/vc/lib
- fi
-
mpv_feature_multi() {
local use set
for use in ${1} ${2}; do
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 95b4fbe26c40707175e18726024b12f9f88c5f4a
Author: Matoro Mahri users noreply github
com>
AuthorDate: Sun Feb 26 17:48:57 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sun Feb 26 18:15:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b4fbe2
media-video/mpv: Keyword 0.35.1 hppa, #885397
Signed-off-by: Matoro Mahri users.noreply.github.com>
Signed-off-by: Arthur Zamarin gentoo.org>
media-video/mpv/mpv-0.35.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.35.1.ebuild
b/media-video/mpv/mpv-0.35.1.ebuild
index 859d7bb46c7d..bcd28382376d 100644
--- a/media-video/mpv/mpv-0.35.1.ebuild
+++ b/media-video/mpv/mpv-0.35.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~x86
~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 9c3eb68f88f6bd34ef86687a60d67bee7762a8ad
Author: Sam James gentoo org>
AuthorDate: Tue Feb 7 16:54:16 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 7 16:54:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c3eb68f
media-video/mpv: Stabilize 0.35.1 ppc, #893480
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.35.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.35.1.ebuild
b/media-video/mpv/mpv-0.35.1.ebuild
index fcd833022e33..859d7bb46c7d 100644
--- a/media-video/mpv/mpv-0.35.1.ebuild
+++ b/media-video/mpv/mpv-0.35.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv ~x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: a8b9547851bbf150aa97018a7af1655b30d66931
Author: Sam James gentoo org>
AuthorDate: Tue Feb 7 16:54:13 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 7 16:54:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8b95478
media-video/mpv: Stabilize 0.35.1 ppc64, #893480
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.35.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.35.1.ebuild
b/media-video/mpv/mpv-0.35.1.ebuild
index 9a41edeb58eb..5b569efdabcd 100644
--- a/media-video/mpv/mpv-0.35.1.ebuild
+++ b/media-video/mpv/mpv-0.35.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 710fed0b00290ce61144d0ebfad0ed6f2973b30b
Author: Sam James gentoo org>
AuthorDate: Tue Feb 7 16:54:15 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 7 16:54:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=710fed0b
media-video/mpv: Stabilize 0.35.1 amd64, #893480
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.35.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.35.1.ebuild
b/media-video/mpv/mpv-0.35.1.ebuild
index 5b569efdabcd..fcd833022e33 100644
--- a/media-video/mpv/mpv-0.35.1.ebuild
+++ b/media-video/mpv/mpv-0.35.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ppc64 ~riscv ~x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 66abe318f165c27ecd761c0639f11de3b768ae86 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Feb 7 04:09:16 2023 + Commit: Ionen Wolkens gentoo org> CommitDate: Tue Feb 7 04:24:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66abe318 media-video/mpv: allow using raspberry-userland-bin Currently fails to build with non-bin wrt bug #893422, so let's at least allow this one. Runtime untested (have no raspberry-pi). (no revbump needed given it currently doesn't build with non-bin) Bug: https://bugs.gentoo.org/893422 Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/mpv-0.35.0-r1.ebuild | 8 +++- media-video/mpv/mpv-0.35.1.ebuild| 8 +++- media-video/mpv/mpv-.ebuild | 8 +++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild b/media-video/mpv/mpv-0.35.0-r1.ebuild index a67b869c76cc..355a3f826dcd 100644 --- a/media-video/mpv/mpv-0.35.0-r1.ebuild +++ b/media-video/mpv/mpv-0.35.0-r1.ebuild @@ -46,6 +46,7 @@ REQUIRED_USE=" xv? ( X )" RESTRICT="!test? ( test )" +# raspberry-pi: default to -bin given non-bin is known broken (bug #893422) COMMON_DEPEND=" media-libs/libass:=[fontconfig] media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?] @@ -93,7 +94,12 @@ COMMON_DEPEND=" opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) - raspberry-pi? ( media-libs/raspberrypi-userland ) + raspberry-pi? ( + || ( + media-libs/raspberrypi-userland-bin + media-libs/raspberrypi-userland + ) + ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) diff --git a/media-video/mpv/mpv-0.35.1.ebuild b/media-video/mpv/mpv-0.35.1.ebuild index b3fb03958f57..9a41edeb58eb 100644 --- a/media-video/mpv/mpv-0.35.1.ebuild +++ b/media-video/mpv/mpv-0.35.1.ebuild @@ -46,6 +46,7 @@ REQUIRED_USE=" xv? ( X )" RESTRICT="!test? ( test )" +# raspberry-pi: default to -bin given non-bin is known broken (bug #893422) COMMON_DEPEND=" media-libs/libass:=[fontconfig] media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?] @@ -93,7 +94,12 @@ COMMON_DEPEND=" opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) - raspberry-pi? ( media-libs/raspberrypi-userland ) + raspberry-pi? ( + || ( + media-libs/raspberrypi-userland-bin + media-libs/raspberrypi-userland + ) + ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild index 2c923f2ec44e..11323310aeb0 100644 --- a/media-video/mpv/mpv-.ebuild +++ b/media-video/mpv/mpv-.ebuild @@ -46,6 +46,7 @@ REQUIRED_USE=" xv? ( X )" RESTRICT="!test? ( test )" +# raspberry-pi: default to -bin given non-bin is known broken (bug #893422) COMMON_DEPEND=" media-libs/libass:=[fontconfig] >=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?] @@ -93,7 +94,12 @@ COMMON_DEPEND=" opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) - raspberry-pi? ( media-libs/raspberrypi-userland ) + raspberry-pi? ( + || ( + media-libs/raspberrypi-userland-bin + media-libs/raspberrypi-userland + ) + ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel )
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: ad85aede566131748cdc6fbfc7e2a97930b26f56
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Jan 28 17:29:09 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jan 28 18:27:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad85aede
media-video/mpv: add 0.35.1
bugfix-only release with cherry picks from master, so likely
won't wait very long to stable it
wrt bug #889178, upstream has added an automated mode used
by default so it doesn't enable DR when it's not benefical
meson_src_test addition didn't make in this version,
so keeping tests unchanged from 0.35.0
Closes: https://bugs.gentoo.org/889178
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/Manifest | 1 +
media-video/mpv/mpv-0.35.1.ebuild | 297 ++
2 files changed, 298 insertions(+)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index 15de9c1bc027..17ec75c9053d 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,3 +1,4 @@
DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B
c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab
SHA512
77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
DIST mpv-0.35.0.tar.gz 3365752 BLAKE2B
9b8dca943fc60a68f8474549d75c021dd9157195253c5ec09721969e500b2756c033e86975499f5632f0c943ac7bb54699f47340f0dee73d7284668d4419b17f
SHA512
d5c1f734057f6b6c27e7f59de43cf7c0e7f813d842b8c7fd2ae1073dbe649c8187b7686df4efe928db2952e9f1efc171245e6f8780c1d9f174f4d7abff1e073a
+DIST mpv-0.35.1.tar.gz 3367913 BLAKE2B
706a2031a2ca973eb3a092ec7f62ba40ca4dfd78e3ffe5d6e432486b0018852b034152a21805be594054178ccb17856dafe2b860cddcc22d27df895d163871de
SHA512
42f3564a9ed4d972d14b2c697b0163f06a8bb68a0606a86c34935181247c783e3cb62286b44578def0919fb13fce8b8f6453f82652d5bfaea5929119127a
DIST waf-2.0.22 104880 BLAKE2B
6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0
SHA512
4156cefa65b7e6349ddb1ca643bbdf3e449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
diff --git a/media-video/mpv/mpv-0.35.1.ebuild
b/media-video/mpv/mpv-0.35.1.ebuild
new file mode 100644
index ..b3fb03958f57
--- /dev/null
+++ b/media-video/mpv/mpv-0.35.1.ebuild
@@ -0,0 +1,297 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{9..11} )
+inherit edo flag-o-matic lua-single meson optfeature pax-utils
python-single-r1 xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
+else
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
+fi
+
+DESCRIPTION="Media player for the command line"
+HOMEPAGE="https://mpv.io/;
+
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
+SLOT="0/2" # soname
+IUSE="
+ +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
+ dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
+ +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
+ raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet
+ vaapi vdpau vulkan wayland +xv zimg zlib"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ || ( cli libmpv )
+ egl? ( || ( X drm wayland ) )
+ libplacebo? ( || ( egl opengl vulkan ) )
+ lua? ( ${LUA_REQUIRED_USE} )
+ nvenc? ( || ( egl opengl vulkan ) )
+ opengl? ( || ( X aqua ) )
+ test? ( cli )
+ tools? ( cli )
+ uchardet? ( iconv )
+ vaapi? (
+ || ( X egl libplacebo wayland )
+ wayland? ( drm )
+ )
+ vdpau? ( X )
+ vulkan? ( || ( X wayland ) libplacebo )
+ xv? ( X )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ media-libs/libass:=[fontconfig]
+ media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?]
+ X? (
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXpresent
+ x11-libs/libXrandr
+ xv? ( x11-libs/libXv )
+ )
+ alsa? ( media-libs/alsa-lib )
+ archive? ( app-arch/libarchive:= )
+ bluray? ( media-libs/libbluray:= )
+ cdda? (
+ dev-libs/libcdio-paranoia:=
+ dev-libs/libcdio:=
+ )
+ drm? (
+ media-libs/mesa[gbm(+)]
+ x11-libs/libdrm
+ )
+ dvd? (
+ media-libs/libdvdnav
+ media-libs/libdvdread:=
+ )
+ egl? ( media-libs/libglvnd )
+
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 740e8ad8153dbbefc1e9940dcd44998b69a39e07
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Jan 20 07:14:26 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Jan 20 07:28:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=740e8ad8
media-video/mpv: run meson_src_test in live
Only does a very basic libmpv test so far, but it is something
and upstream added it to their CI -- so let's run it too (no-op
if USE=-libmpv, but run unconditionally given more tests may be
added in the future).
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index ac0f9dd62ae7..2c923f2ec44e 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -260,6 +260,9 @@ src_test() {
[[ ${test} == @($(IFS='|'; echo "${skip[*]}")) ]] ||
edo "${BUILD_DIR}"/mpv -v --no-config
--unittest="${test}"
done
+
+ # currently only does basic libmpv testing, do in addition to --unittest
+ meson_src_test
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 0b7a23aa667094fa61699e435dad4a850b80f6ea
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Jan 14 14:26:31 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Jan 14 14:42:29 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b7a23aa
media-video/mpv: drop 0.35.0-r0
This is the only 0.35 with alpha/hppa KEYWORDS but these were
never really tested after the major changes and may as well
wait for bug #885397's rekeywording.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.35.0.ebuild | 287 --
1 file changed, 287 deletions(-)
diff --git a/media-video/mpv/mpv-0.35.0.ebuild
b/media-video/mpv/mpv-0.35.0.ebuild
deleted file mode 100644
index 7b484c0f34e9..
--- a/media-video/mpv/mpv-0.35.0.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{9..11} )
-inherit edo flag-o-matic lua-single meson optfeature pax-utils
python-single-r1 xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
-else
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv
~x86 ~amd64-linux"
-fi
-
-DESCRIPTION="Media player for the command line"
-HOMEPAGE="https://mpv.io/;
-
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
-SLOT="0/2" # soname
-IUSE="
- +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
- dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
- +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
- raspberry-pi rubberband sdl selinux sndio test tools +uchardet
- vaapi vdpau vulkan wayland +xv zimg zlib"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( cli libmpv )
- egl? ( || ( X drm wayland ) )
- libplacebo? ( || ( egl opengl vulkan ) )
- lua? ( ${LUA_REQUIRED_USE} )
- nvenc? ( || ( egl opengl vulkan ) )
- opengl? ( || ( X aqua ) )
- test? ( cli )
- tools? ( cli )
- uchardet? ( iconv )
- vaapi? (
- || ( X egl libplacebo wayland )
- wayland? ( drm )
- )
- vdpau? ( X )
- vulkan? ( || ( X wayland ) libplacebo )
- xv? ( X )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- media-libs/libass:=[fontconfig]
- media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?]
- X? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- x11-libs/libXext
- x11-libs/libXinerama
- x11-libs/libXpresent
- x11-libs/libXrandr
- xv? ( x11-libs/libXv )
- )
- alsa? ( media-libs/alsa-lib )
- archive? ( app-arch/libarchive:= )
- bluray? ( media-libs/libbluray:= )
- cdda? (
- dev-libs/libcdio-paranoia:=
- dev-libs/libcdio:=
- )
- drm? (
- media-libs/mesa[gbm(+)]
- x11-libs/libdrm
- )
- dvd? (
- media-libs/libdvdnav
- media-libs/libdvdread:=
- )
- egl? ( media-libs/libglvnd )
- gamepad? ( media-libs/libsdl2[joystick] )
- iconv? (
- virtual/libiconv
- uchardet? ( app-i18n/uchardet )
- )
- jack? ( virtual/jack )
- javascript? ( dev-lang/mujs:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- lcms? ( media-libs/lcms:2 )
- libcaca? ( media-libs/libcaca )
- libplacebo? (
- >=media-libs/libplacebo-4.202:=[opengl?,vulkan?]
- egl? ( media-libs/libplacebo[opengl] )
- )
- lua? ( ${LUA_DEPS} )
- openal? ( media-libs/openal )
- opengl? ( media-libs/libglvnd[X?] )
- pipewire? ( media-video/pipewire:= )
- pulseaudio? ( media-libs/libpulse )
- raspberry-pi? ( media-libs/raspberrypi-userland )
- rubberband? ( media-libs/rubberband )
- sdl? ( media-libs/libsdl2[sound,threads,video] )
- sndio? ( media-sound/sndio:= )
- vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] )
- vdpau? ( x11-libs/libvdpau )
- vulkan? (
- media-libs/shaderc
- media-libs/vulkan-loader[X?,wayland?]
- )
- wayland? (
- dev-libs/wayland
- dev-libs/wayland-protocols
- x11-libs/libxkbcommon
- )
- zimg? ( media-libs/zimg )
- zlib? ( sys-libs/zlib:= )"
-RDEPEND="
- ${COMMON_DEPEND}
- selinux? ( sec-policy/selinux-mplayer )
- tools? ( ${PYTHON_DEPS} )"
-DEPEND="
- ${COMMON_DEPEND}
- X? ( x11-base/xorg-proto )
- dvb? ( virtual/linuxtv-dvb-headers )
- nvenc? ( media-libs/nv-codec-headers )
- wayland? (
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 8151f3c6f1c398530eabf4931ca7873763013707
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Jan 13 16:47:27 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Jan 13 16:49:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8151f3c6
media-video/mpv: drop obsolete rst2html workaround in live
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 0f9e5d85df07..b973d14bb739 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.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
@@ -132,12 +132,6 @@ pkg_setup() {
python-single-r1_pkg_setup
}
-src_prepare() {
- default
-
- sed -i "s/'rst2html/&.py/" meson.build || die
-}
-
src_configure() {
if use !debug; then
if use test; then
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: f69bb1871757572f885dcb1db8c9ba04a924fa03
Author: Sam James gentoo org>
AuthorDate: Fri Jan 13 04:40:45 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 13 04:40:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f69bb187
media-video/mpv: Stabilize 0.35.0-r1 ppc64, #889006
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.35.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild
b/media-video/mpv/mpv-0.35.0-r1.ebuild
index 6fa992dfd848..c83c4bf9a053 100644
--- a/media-video/mpv/mpv-0.35.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.35.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ppc64 ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: abe350993b1d677de56888d0b1971517a5c3cc56
Author: Sam James gentoo org>
AuthorDate: Fri Jan 13 03:49:56 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 13 03:49:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe35099
media-video/mpv: Stabilize 0.35.0-r1 ppc, #889006
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.35.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild
b/media-video/mpv/mpv-0.35.0-r1.ebuild
index 7882a7e133ca..6fa992dfd848 100644
--- a/media-video/mpv/mpv-0.35.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.35.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 568df056ed8715dc664272c202d1ea6fe162e244
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Jan 12 21:58:49 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Jan 12 21:59:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568df056
media-video/mpv: Keyword 0.35.0-r1 ppc64, #885397
Tested-by: ernsteiswuerfel mailbox.org>
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.35.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild
b/media-video/mpv/mpv-0.35.0-r1.ebuild
index e6eaa3e15dc6..7882a7e133ca 100644
--- a/media-video/mpv/mpv-0.35.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.35.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~riscv x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: b2ba6407b57745ee09c09c98027d2d3efd829411
Author: Ionen Wolkens gentoo org>
AuthorDate: Wed Jan 11 11:39:57 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Jan 11 11:40:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2ba6407
media-video/mpv: Keyword 0.35.0-r1 ppc, #885397
Tested-by: ernsteiswuerfel mailbox.org>
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.35.0-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild
b/media-video/mpv/mpv-0.35.0-r1.ebuild
index d979c38b602c..e6eaa3e15dc6 100644
--- a/media-video/mpv/mpv-0.35.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.35.0-r1.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
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 3750544f26a7427b92b102c1cd2253b2c66cee81
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Dec 30 15:46:06 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Dec 30 16:25:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3750544f
media-video/mpv: skip img_format and repack_sws test
This seems to be mostly inconsistencies than actual issues.
Thanks to ernsteiswuerfel for verifying runtime is fine on
real hardware.
Tried with ppc64 qemu and the other tests don't fail.
Closes: https://bugs.gentoo.org/888639
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.35.0-r1.ebuild | 17 -
media-video/mpv/mpv-.ebuild | 17 -
2 files changed, 32 insertions(+), 2 deletions(-)
diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild
b/media-video/mpv/mpv-0.35.0-r1.ebuild
index 2fb3855a1bfd..d979c38b602c 100644
--- a/media-video/mpv/mpv-0.35.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.35.0-r1.ebuild
@@ -250,7 +250,22 @@ src_configure() {
src_test() {
#
https://github.com/mpv-player/mpv/blob/master/DOCS/man/options.rst#debugging
- edo "${BUILD_DIR}"/mpv --no-config -v --unittest=all-simple
+ local tests=($("${BUILD_DIR}"/mpv --no-config --unittest=help | tail -n
+2; assert))
+ (( ${#tests[@]} )) || die "failed to gather any tests"
+
+ local skip=(
+ all-simple
+
+ # fails on non-issue minor inconsistencies (bug #888639)
+ img_format
+ repack_sws
+ )
+
+ local test
+ for test in "${tests[@]}"; do
+ [[ ${test} == @($(IFS='|'; echo "${skip[*]}")) ]] ||
+ edo "${BUILD_DIR}"/mpv -v --no-config
--unittest="${test}"
+ done
}
src_install() {
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index a7b00cd2fc59..0f9e5d85df07 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -250,7 +250,22 @@ src_configure() {
src_test() {
#
https://github.com/mpv-player/mpv/blob/master/DOCS/man/options.rst#debugging
- edo "${BUILD_DIR}"/mpv --no-config -v --unittest=all-simple
+ local tests=($("${BUILD_DIR}"/mpv --no-config --unittest=help | tail -n
+2; assert))
+ (( ${#tests[@]} )) || die "failed to gather any tests"
+
+ local skip=(
+ all-simple
+
+ # fails on non-issue minor inconsistencies (bug #888639)
+ img_format
+ repack_sws
+ )
+
+ local test
+ for test in "${tests[@]}"; do
+ [[ ${test} == @($(IFS='|'; echo "${skip[*]}")) ]] ||
+ edo "${BUILD_DIR}"/mpv -v --no-config
--unittest="${test}"
+ done
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 0ce022a760a561586f701828572ed645859aaa41
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Dec 29 16:06:24 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Dec 29 20:28:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ce022a7
media-video/mpv: stabilize 0.35.0-r1 for amd64, x86
Been a while and no known major issues, albeit 0.34 will be kept
for some time still given this is a year worth of changes plus
ppc/ppc64 stable is held up for now wrt bug #888639.
Closes: https://bugs.gentoo.org/884519
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.35.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild
b/media-video/mpv/mpv-0.35.0-r1.ebuild
index 5919ad1bb124..2fb3855a1bfd 100644
--- a/media-video/mpv/mpv-0.35.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.35.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux"
+ KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: a5b7ae13e99c01ea84a808cbc61afd99cba05f4f Author: Ionen Wolkens gentoo org> AuthorDate: Mon Dec 26 11:47:17 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Dec 26 13:33:00 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5b7ae13 media-video/mpv: require drm with wayland+vaapi Builds fine without and not entirely sure which configurations truly need USE=drm (nvidia-only so I don't test vaapi), but reports show that it's unlikely to work with (at least) wayland in 0.35. Already enabled by default and realistically everyone with USE=wayland and vaapi will have the deps so there's little reason to disable it. Skipping revbump as it's not overly a problem, mostly in preparation for stabilization in case anyone did global USE=-drm or so. Alternatively it may make sense to drop the USE and enable by default if a non-headless/library build, but leaving that alone for now. Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/mpv-0.35.0-r1.ebuild | 5 - media-video/mpv/mpv-0.35.0.ebuild| 5 - media-video/mpv/mpv-.ebuild | 5 - 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild b/media-video/mpv/mpv-0.35.0-r1.ebuild index befbfdd2ade0..5919ad1bb124 100644 --- a/media-video/mpv/mpv-0.35.0-r1.ebuild +++ b/media-video/mpv/mpv-0.35.0-r1.ebuild @@ -37,7 +37,10 @@ REQUIRED_USE=" test? ( cli ) tools? ( cli ) uchardet? ( iconv ) - vaapi? ( || ( X egl libplacebo wayland ) ) + vaapi? ( + || ( X egl libplacebo wayland ) + wayland? ( drm ) + ) vdpau? ( X ) vulkan? ( || ( X wayland ) libplacebo ) xv? ( X )" diff --git a/media-video/mpv/mpv-0.35.0.ebuild b/media-video/mpv/mpv-0.35.0.ebuild index 6551a1953b76..1b855c04fbb5 100644 --- a/media-video/mpv/mpv-0.35.0.ebuild +++ b/media-video/mpv/mpv-0.35.0.ebuild @@ -37,7 +37,10 @@ REQUIRED_USE=" test? ( cli ) tools? ( cli ) uchardet? ( iconv ) - vaapi? ( || ( X egl libplacebo wayland ) ) + vaapi? ( + || ( X egl libplacebo wayland ) + wayland? ( drm ) + ) vdpau? ( X ) vulkan? ( || ( X wayland ) libplacebo ) xv? ( X )" diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild index 3138e56d9b66..a7b00cd2fc59 100644 --- a/media-video/mpv/mpv-.ebuild +++ b/media-video/mpv/mpv-.ebuild @@ -37,7 +37,10 @@ REQUIRED_USE=" test? ( cli ) tools? ( cli ) uchardet? ( iconv ) - vaapi? ( || ( X egl libplacebo wayland ) ) + vaapi? ( + || ( X egl libplacebo wayland ) + wayland? ( drm ) + ) vdpau? ( X ) vulkan? ( || ( X wayland ) libplacebo ) xv? ( X )"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 8502c925e6dfbefc9b8af0468df6b40dbbbdd062
Author: Jakov Smolić gentoo org>
AuthorDate: Sun Dec 11 11:35:42 2022 +
Commit: Jakov Smolić gentoo org>
CommitDate: Sun Dec 11 11:35:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8502c925
media-video/mpv: Keyword 0.35.0-r1 riscv, #885397
Signed-off-by: Jakov Smolić gentoo.org>
media-video/mpv/mpv-0.35.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild
b/media-video/mpv/mpv-0.35.0-r1.ebuild
index 114139e4b2c9..befbfdd2ade0 100644
--- a/media-video/mpv/mpv-0.35.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.35.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86 ~amd64-linux"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 714267b5011c081d8f93de3de87402362275d437
Author: Sam James gentoo org>
AuthorDate: Sun Dec 11 02:43:54 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 11 02:43:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=714267b5
media-video/mpv: Keyword 0.35.0-r1 arm64, #885397
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.35.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild
b/media-video/mpv/mpv-0.35.0-r1.ebuild
index 750a9f0be9c9..114139e4b2c9 100644
--- a/media-video/mpv/mpv-0.35.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.35.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~loong ~x86 ~amd64-linux"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: de2bbb7f597258b3a0f5a1064d18ef4a8908a229
Author: Sam James gentoo org>
AuthorDate: Sun Dec 11 02:36:38 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 11 02:36:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de2bbb7f
media-video/mpv: Keyword 0.35.0-r1 arm, #885397
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.35.0-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild
b/media-video/mpv/mpv-0.35.0-r1.ebuild
index 70fc31844c15..750a9f0be9c9 100644
--- a/media-video/mpv/mpv-0.35.0-r1.ebuild
+++ b/media-video/mpv/mpv-0.35.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~loong ~x86 ~amd64-linux"
+ KEYWORDS="~amd64 ~arm ~loong ~x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: ba4ff88a968cbdd9ff0dae67cd28b914a303c6a5
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Dec 11 00:13:41 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Dec 11 00:16:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4ff88a
media-video/mpv: add USE=sixel support
Revbump to handle restoring dropped keywords rather than .mask.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/metadata.xml | 1 +
media-video/mpv/{mpv-.ebuild => mpv-0.35.0-r1.ebuild} | 9 +
media-video/mpv/mpv-.ebuild | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 0f527c3340f7..49c4dfe18641 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -29,6 +29,7 @@
Enable high quality pitch correction
via media-libs/rubberband
Enable media-libs/libsdl2 based
video and audio outputs
(Note: these outputs exist for compatibility reasons
only, avoid if possible)
+ Enable support for the sixel video backend
using media-libs/libsixel
Enable sound support via
media-sound/sndio
Install extra tools: mpv_identify.sh,
mpv_idet.sh, and umpv
Enable subtitles charset discovery via
app-i18n/uchardet
diff --git a/media-video/mpv/mpv-.ebuild
b/media-video/mpv/mpv-0.35.0-r1.ebuild
similarity index 96%
copy from media-video/mpv/mpv-.ebuild
copy to media-video/mpv/mpv-0.35.0-r1.ebuild
index 0624e8ac6f99..70fc31844c15 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-0.35.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == ]]; then
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv
~x86 ~amd64-linux"
+ KEYWORDS="~amd64 ~loong ~x86 ~amd64-linux"
fi
DESCRIPTION="Media player for the command line"
@@ -24,7 +24,7 @@ IUSE="
+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
+libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
- raspberry-pi rubberband sdl selinux sndio test tools +uchardet
+ raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet
vaapi vdpau vulkan wayland +xv zimg zlib"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -45,7 +45,7 @@ RESTRICT="!test? ( test )"
COMMON_DEPEND="
media-libs/libass:=[fontconfig]
- >=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?]
+ media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?]
X? (
x11-libs/libX11
x11-libs/libXScrnSaver
@@ -93,6 +93,7 @@ COMMON_DEPEND="
raspberry-pi? ( media-libs/raspberrypi-userland )
rubberband? ( media-libs/rubberband )
sdl? ( media-libs/libsdl2[sound,threads,video] )
+ sixel? ( media-libs/libsixel )
sndio? ( media-sound/sndio:= )
vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] )
vdpau? ( x11-libs/libvdpau )
@@ -207,7 +208,7 @@ src_configure() {
$(meson_feature libplacebo)
$(meson_feature mmal rpi-mmal)
$(meson_feature sdl sdl2-video)
- -Dsixel=disabled # TODO? needs keywording/testing
+ $(meson_feature sixel)
$(meson_feature wayland)
$(meson_feature xv)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 0624e8ac6f99..3138e56d9b66 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -24,7 +24,7 @@ IUSE="
+X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb
dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv
+libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
- raspberry-pi rubberband sdl selinux sndio test tools +uchardet
+ raspberry-pi rubberband sdl selinux sixel sndio test tools +uchardet
vaapi vdpau vulkan wayland +xv zimg zlib"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
@@ -93,6 +93,7 @@ COMMON_DEPEND="
raspberry-pi? ( media-libs/raspberrypi-userland )
rubberband? ( media-libs/rubberband )
sdl? ( media-libs/libsdl2[sound,threads,video] )
+ sixel? ( media-libs/libsixel )
sndio? ( media-sound/sndio:= )
vaapi? ( media-libs/libva:=[X?,drm(+)?,wayland?] )
vdpau? ( x11-libs/libvdpau )
@@ -207,7 +208,7 @@ src_configure() {
$(meson_feature libplacebo)
$(meson_feature mmal rpi-mmal)
$(meson_feature sdl sdl2-video)
- -Dsixel=disabled # TODO? needs keywording/testing
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 4de28696b25783fb2e1f71e45c744e56eec105d8
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Dec 6 04:12:31 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Dec 6 04:50:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4de28696
media-video/mpv: note that yt-dlp support needs USE=lua
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-0.35.0.ebuild | 2 +-
media-video/mpv/mpv-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mpv/mpv-0.35.0.ebuild
b/media-video/mpv/mpv-0.35.0.ebuild
index 39a550fa8790..6551a1953b76 100644
--- a/media-video/mpv/mpv-0.35.0.ebuild
+++ b/media-video/mpv/mpv-0.35.0.ebuild
@@ -280,5 +280,5 @@ src_install() {
pkg_postinst() {
xdg_pkg_postinst
- optfeature "URL support" net-misc/yt-dlp
+ optfeature "URL support with USE=lua" net-misc/yt-dlp
}
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index bb47b11a853a..0624e8ac6f99 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -280,5 +280,5 @@ src_install() {
pkg_postinst() {
xdg_pkg_postinst
- optfeature "URL support" net-misc/yt-dlp
+ optfeature "URL support with USE=lua" net-misc/yt-dlp
}
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 942ebdc1f2938d38889bcdfdff111d58d1d47c82 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Dec 6 04:15:03 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Tue Dec 6 04:50:46 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=942ebdc1 media-video/mpv: adjust/update USE descriptions Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/metadata.xml | 19 +-- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml index 94c02f8c4ff7..0f527c3340f7 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -12,28 +12,27 @@ Enable support for various archive formats via app-arch/libarchive Enable playback of Blu-ray filesystems - Build mpv CLI player + Enable the command-line player Enable C plugins support - Enable Kernel Mode Setting / Direct Rendering Manager based video output + Enable Kernel Mode Setting / Direct Rendering Manager based video outputs Enable support for various EGL-based video outputs / backends Enable gamepad input support Enable Graphics Buffer Manager based EGL video backend - Enable support for saving screenshots in JPEG format - Build mpv shared library + Enable the shared library and headers (used by frontends / plugins) Enable support for GPU accelerated video rendering with media-libs/libplacebo - Enable Lua scripting, OSC (On Screen Controller) GUI and net-misc/youtube-dl hook-script - Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi. - Enable the recommended 'opengl' video output - Enable support for various OpenGL-based video backends - Enable support for the Raspberry Pi + Enable Lua scripting, OSC (On Screen Controller) GUI, and net-misc/yt-dlp support + Enable Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi + Enable support for OpenGL-based video backends + (Note: deprecated for X11, USE=egl provides the newer support for -gpu-api=opengl) Enable sound support via native PipeWire backend + Enable support for the Raspberry Pi Enable high quality pitch correction via media-libs/rubberband Enable media-libs/libsdl2 based video and audio outputs (Note: these outputs exist for compatibility reasons only, avoid if possible) Enable sound support via media-sound/sndio Install extra tools: mpv_identify.sh, mpv_idet.sh, and umpv Enable subtitles charset discovery via app-i18n/uchardet - Enable support for various Vulkan-based video backends + Enable support for Vulkan-based video backends Enable libzimg support (for vf_fingerprint)
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 18d4e7afad72d6c663276a694eed9c9721fcd939 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Dec 5 03:35:52 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Dec 5 03:37:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18d4e7af media-video/mpv: bump ffmpeg min req to >=4.4 in live Not super important but we still have ffmpeg-4.2 in tree. Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/mpv-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild index 39a550fa8790..bb47b11a853a 100644 --- a/media-video/mpv/mpv-.ebuild +++ b/media-video/mpv/mpv-.ebuild @@ -45,7 +45,7 @@ RESTRICT="!test? ( test )" COMMON_DEPEND=" media-libs/libass:=[fontconfig] - media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?] + >=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?] X? ( x11-libs/libX11 x11-libs/libXScrnSaver
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 3e04cd1d625dfb089cc4b349463243996c9a8ce8 Author: Ionen Wolkens gentoo org> AuthorDate: Sat Nov 19 10:19:14 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Sat Nov 19 13:27:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e04cd1d media-video/mpv: enable drm and libmpv by default Low footprint options, realistically everyone has libdrm unless this is an headless machine or put mesa in package.provided and going nvidia+libglvnd-only. Being disabled can also give unexpected results with e.g. vaapi. And libmpv is just an annoyance to enable for any users of frontends. Could even consider removing the option (forced on), which would also simplify the -Dgl logic, but I'll leave that alone at least for now. Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/mpv-0.35.0.ebuild | 4 ++-- media-video/mpv/mpv-.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-video/mpv/mpv-0.35.0.ebuild b/media-video/mpv/mpv-0.35.0.ebuild index 80c072d09d63..39a550fa8790 100644 --- a/media-video/mpv/mpv-0.35.0.ebuild +++ b/media-video/mpv/mpv-0.35.0.ebuild @@ -21,8 +21,8 @@ HOMEPAGE="https://mpv.io/; LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946 SLOT="0/2" # soname IUSE=" - +X +alsa aqua archive bluray cdda +cli coreaudio debug drm dvb - dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca libmpv + +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb + dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio raspberry-pi rubberband sdl selinux sndio test tools +uchardet vaapi vdpau vulkan wayland +xv zimg zlib" diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild index 80c072d09d63..39a550fa8790 100644 --- a/media-video/mpv/mpv-.ebuild +++ b/media-video/mpv/mpv-.ebuild @@ -21,8 +21,8 @@ HOMEPAGE="https://mpv.io/; LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946 SLOT="0/2" # soname IUSE=" - +X +alsa aqua archive bluray cdda +cli coreaudio debug drm dvb - dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca libmpv + +X +alsa aqua archive bluray cdda +cli coreaudio debug +drm dvb + dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca +libmpv +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio raspberry-pi rubberband sdl selinux sndio test tools +uchardet vaapi vdpau vulkan wayland +xv zimg zlib"
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 65c21785665a206dd30428fd899a4f70eeb01d68
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Nov 12 14:09:56 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Nov 12 14:17:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65c21785
media-video/mpv: add 0.35.0
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/Manifest | 1 +
media-video/mpv/mpv-0.35.0.ebuild | 284 ++
2 files changed, 285 insertions(+)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index fbe295dcbc3d..d8d53a88258f 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,3 +1,4 @@
DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B
c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab
SHA512
77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
DIST mpv-0.34.1_p20221105.tar.gz 3366581 BLAKE2B
52bf8f339e6535c17430d4a8f865a4559681200bfff379e98104ad1365addade3899a3339ae480c23f7e8470623374395aa2e948ee3d616fa8ce152821340fd0
SHA512
a246087a5af191459af71c729e5da5f09a7466792774e1114b8775294ed1de6a9d882e0d2076e35f7d09cd2a57780f504fedbbfc572fb533dc1d72f87e59dabc
+DIST mpv-0.35.0.tar.gz 3365752 BLAKE2B
9b8dca943fc60a68f8474549d75c021dd9157195253c5ec09721969e500b2756c033e86975499f5632f0c943ac7bb54699f47340f0dee73d7284668d4419b17f
SHA512
d5c1f734057f6b6c27e7f59de43cf7c0e7f813d842b8c7fd2ae1073dbe649c8187b7686df4efe928db2952e9f1efc171245e6f8780c1d9f174f4d7abff1e073a
DIST waf-2.0.22 104880 BLAKE2B
6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0
SHA512
4156cefa65b7e6349ddb1ca643bbdf3e449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
diff --git a/media-video/mpv/mpv-0.35.0.ebuild
b/media-video/mpv/mpv-0.35.0.ebuild
new file mode 100644
index ..80c072d09d63
--- /dev/null
+++ b/media-video/mpv/mpv-0.35.0.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-1 luajit )
+PYTHON_COMPAT=( python3_{8..11} )
+inherit edo flag-o-matic lua-single meson optfeature pax-utils
python-single-r1 xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
+else
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv
~x86 ~amd64-linux"
+fi
+
+DESCRIPTION="Media player for the command line"
+HOMEPAGE="https://mpv.io/;
+
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
+SLOT="0/2" # soname
+IUSE="
+ +X +alsa aqua archive bluray cdda +cli coreaudio debug drm dvb
+ dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca libmpv
+ +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
+ raspberry-pi rubberband sdl selinux sndio test tools +uchardet
+ vaapi vdpau vulkan wayland +xv zimg zlib"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ || ( cli libmpv )
+ egl? ( || ( X drm wayland ) )
+ libplacebo? ( || ( egl opengl vulkan ) )
+ lua? ( ${LUA_REQUIRED_USE} )
+ nvenc? ( || ( egl opengl vulkan ) )
+ opengl? ( || ( X aqua ) )
+ test? ( cli )
+ tools? ( cli )
+ uchardet? ( iconv )
+ vaapi? ( || ( X egl libplacebo wayland ) )
+ vdpau? ( X )
+ vulkan? ( || ( X wayland ) libplacebo )
+ xv? ( X )"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ media-libs/libass:=[fontconfig]
+ media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?]
+ X? (
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXpresent
+ x11-libs/libXrandr
+ xv? ( x11-libs/libXv )
+ )
+ alsa? ( media-libs/alsa-lib )
+ archive? ( app-arch/libarchive:= )
+ bluray? ( media-libs/libbluray:= )
+ cdda? (
+ dev-libs/libcdio-paranoia:=
+ dev-libs/libcdio:=
+ )
+ drm? (
+ media-libs/mesa[gbm(+)]
+ x11-libs/libdrm
+ )
+ dvd? (
+ media-libs/libdvdnav
+ media-libs/libdvdread:=
+ )
+ egl? ( media-libs/libglvnd )
+ gamepad? ( media-libs/libsdl2[joystick] )
+ iconv? (
+ virtual/libiconv
+ uchardet? ( app-i18n/uchardet )
+ )
+ jack? ( virtual/jack )
+ javascript? ( dev-lang/mujs:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ lcms? ( media-libs/lcms:2 )
+ libcaca? ( media-libs/libcaca )
+ libplacebo? (
+
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: 9183fe56197f7df943933c096e17ee1bfc8559ee
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Nov 12 14:15:16 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Nov 12 14:17:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9183fe56
media-video/mpv: drop 0.34.1_p20221105
Almost identical to 0.35.0 beside fixing some loose ends,
so just drop this short lived snapshot.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/Manifest | 1 -
.../mpv-0.34.1_p20221105-macos-touchbar.patch | 8 -
media-video/mpv/metadata.xml | 1 -
media-video/mpv/mpv-0.34.1_p20221105.ebuild| 293 -
4 files changed, 303 deletions(-)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index d8d53a88258f..15de9c1bc027 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,3 @@
DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B
c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab
SHA512
77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
-DIST mpv-0.34.1_p20221105.tar.gz 3366581 BLAKE2B
52bf8f339e6535c17430d4a8f865a4559681200bfff379e98104ad1365addade3899a3339ae480c23f7e8470623374395aa2e948ee3d616fa8ce152821340fd0
SHA512
a246087a5af191459af71c729e5da5f09a7466792774e1114b8775294ed1de6a9d882e0d2076e35f7d09cd2a57780f504fedbbfc572fb533dc1d72f87e59dabc
DIST mpv-0.35.0.tar.gz 3365752 BLAKE2B
9b8dca943fc60a68f8474549d75c021dd9157195253c5ec09721969e500b2756c033e86975499f5632f0c943ac7bb54699f47340f0dee73d7284668d4419b17f
SHA512
d5c1f734057f6b6c27e7f59de43cf7c0e7f813d842b8c7fd2ae1073dbe649c8187b7686df4efe928db2952e9f1efc171245e6f8780c1d9f174f4d7abff1e073a
DIST waf-2.0.22 104880 BLAKE2B
6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0
SHA512
4156cefa65b7e6349ddb1ca643bbdf3e449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
diff --git a/media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch
b/media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch
deleted file mode 100644
index bbf931167b2b..
--- a/media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-https://bugs.gentoo.org/880737
a/meson.build
-+++ b/meson.build
-@@ -1538,3 +1538,3 @@
- }
--features += {'macos-touchbar': cc.compiles(macos_touchbar['fragment'], name:
'macos-touchbar check')}
-+features += {'macos-touchbar': macos_touchbar['deps'].found() and
cc.compiles(macos_touchbar['fragment'], name: 'macos-touchbar check')}
- if features['macos-touchbar']
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 76c201612ef0..94c02f8c4ff7 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -33,7 +33,6 @@
Enable sound support via
media-sound/sndio
Install extra tools: mpv_identify.sh,
mpv_idet.sh, and umpv
Enable subtitles charset discovery via
app-i18n/uchardet
- Use function implementations more amenable
to vectorization (gives speedup). Made optional in case of bugs.
Enable support for various Vulkan-based
video backends
Enable libzimg support (for
vf_fingerprint)
diff --git a/media-video/mpv/mpv-0.34.1_p20221105.ebuild
b/media-video/mpv/mpv-0.34.1_p20221105.ebuild
deleted file mode 100644
index a7f3bb4b505f..
--- a/media-video/mpv/mpv-0.34.1_p20221105.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{8..11} )
-inherit edo flag-o-matic lua-single meson optfeature pax-utils
python-single-r1 xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
-else
- HASH_MPV=c416a38ef227067ef7b81b9650a13157300cdfbe
- SRC_URI="https://github.com/mpv-player/mpv/archive/${HASH_MPV}.tar.gz
-> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${HASH_MPV}"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv
~x86 ~amd64-linux"
-fi
-
-DESCRIPTION="Media player for the command line"
-HOMEPAGE="https://mpv.io/;
-
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
-SLOT="0/2" # soname
-IUSE="
- +X +alsa aqua archive bluray cdda +cli coreaudio debug drm dvb
- dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca libmpv
- +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
- raspberry-pi rubberband sdl selinux sndio test tools +uchardet
- vaapi vdpau +vector vulkan wayland +xv zimg zlib"
-REQUIRED_USE="
-
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 6ff9cf14438fa3e03c464674dafcea366d215df2
Author: Ionen Wolkens gentoo org>
AuthorDate: Sat Nov 12 14:10:52 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sat Nov 12 14:17:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff9cf14
media-video/mpv: sync live
Leave IUSE=vector to automagic if chosen compiler supports it,
not readily seeing a motivation to be either forced on or off.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 44b6c139ad77..80c072d09d63 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -11,9 +11,7 @@ if [[ ${PV} == ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
- HASH_MPV=c416a38ef227067ef7b81b9650a13157300cdfbe
- SRC_URI="https://github.com/mpv-player/mpv/archive/${HASH_MPV}.tar.gz
-> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${HASH_MPV}"
+ SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv
~x86 ~amd64-linux"
fi
@@ -27,7 +25,7 @@ IUSE="
dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca libmpv
+libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
raspberry-pi rubberband sdl selinux sndio test tools +uchardet
- vaapi vdpau +vector vulkan wayland +xv zimg zlib"
+ vaapi vdpau vulkan wayland +xv zimg zlib"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
|| ( cli libmpv )
@@ -133,8 +131,6 @@ pkg_setup() {
src_prepare() {
default
- [[ ${PV} == ]] || sed -i "s/UNKNOWN/${HASH_MPV::11}/" VERSION ||
die
-
sed -i "s/'rst2html/&.py/" meson.build || die
}
@@ -188,7 +184,6 @@ src_configure() {
-Dsdl2=$(use gamepad || use sdl && echo enabled || echo
disabled) #857156
$(meson_feature uchardet)
-Dvapoursynth=disabled # only available in overlays
- $(meson_feature vector)
$(meson_feature zimg)
$(meson_feature zlib)
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: d40b7712ec25ea8437c1f9479354ada67c72ce71
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Nov 11 17:32:13 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Nov 11 17:35:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d40b7712
media-video/mpv: drop touchbar patch from live
Should be unneeded soon, just an edge case so no harm in
dropping rather than wait for it to fail to apply.
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 4
1 file changed, 4 deletions(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 210b3b42bc51..44b6c139ad77 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -125,10 +125,6 @@ BDEPEND="
cli? ( dev-python/docutils )
wayland? ( dev-util/wayland-scanner )"
-PATCHES=(
- "${FILESDIR}"/${PN}-0.34.1_p20221105-macos-touchbar.patch
-)
-
pkg_setup() {
use lua && lua-single_pkg_setup
python-single-r1_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/, media-video/mpv/files/
commit: 7fb1614a93bdb50808a6de8cec2da308184bb85c
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Nov 11 00:36:01 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Nov 11 00:45:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb1614a
media-video/mpv: fix build when gnustep-gui is installed
quick fix by ensuring macos_touchbar['deps'].found()
('and' check is fine there, right? .. well it works)
Closes: https://bugs.gentoo.org/880737
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch | 8
media-video/mpv/mpv-0.34.1_p20221105.ebuild | 4
media-video/mpv/mpv-.ebuild | 4
3 files changed, 16 insertions(+)
diff --git a/media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch
b/media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch
new file mode 100644
index ..bbf931167b2b
--- /dev/null
+++ b/media-video/mpv/files/mpv-0.34.1_p20221105-macos-touchbar.patch
@@ -0,0 +1,8 @@
+https://bugs.gentoo.org/880737
+--- a/meson.build
b/meson.build
+@@ -1538,3 +1538,3 @@
+ }
+-features += {'macos-touchbar': cc.compiles(macos_touchbar['fragment'], name:
'macos-touchbar check')}
++features += {'macos-touchbar': macos_touchbar['deps'].found() and
cc.compiles(macos_touchbar['fragment'], name: 'macos-touchbar check')}
+ if features['macos-touchbar']
diff --git a/media-video/mpv/mpv-0.34.1_p20221105.ebuild
b/media-video/mpv/mpv-0.34.1_p20221105.ebuild
index 44b6c139ad77..a7f3bb4b505f 100644
--- a/media-video/mpv/mpv-0.34.1_p20221105.ebuild
+++ b/media-video/mpv/mpv-0.34.1_p20221105.ebuild
@@ -125,6 +125,10 @@ BDEPEND="
cli? ( dev-python/docutils )
wayland? ( dev-util/wayland-scanner )"
+PATCHES=(
+ "${FILESDIR}"/${P}-macos-touchbar.patch
+)
+
pkg_setup() {
use lua && lua-single_pkg_setup
python-single-r1_pkg_setup
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 44b6c139ad77..210b3b42bc51 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -125,6 +125,10 @@ BDEPEND="
cli? ( dev-python/docutils )
wayland? ( dev-util/wayland-scanner )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.34.1_p20221105-macos-touchbar.patch
+)
+
pkg_setup() {
use lua && lua-single_pkg_setup
python-single-r1_pkg_setup
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/
commit: 31a76f76ed2b9d91860aca63d7b99e8a23fe14df
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Tue Nov 8 06:22:23 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Tue Nov 8 06:53:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a76f76
media-video/mpv: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28188
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/files/mpv--docdir.patch | 11 ---
1 file changed, 11 deletions(-)
diff --git a/media-video/mpv/files/mpv--docdir.patch
b/media-video/mpv/files/mpv--docdir.patch
deleted file mode 100644
index 62a57415163b..
--- a/media-video/mpv/files/mpv--docdir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/meson.build
-+++ b/meson.build
-@@ -1856,7 +1856,7 @@ if get_option('cplayer')
-
- conf_files = ['etc/mpv.conf', 'etc/input.conf',
- 'etc/mplayer-input.conf', 'etc/restore-old-bindings.conf']
--install_data(conf_files, install_dir: join_paths(datadir, 'doc', 'mpv'))
-+install_data(conf_files, install_dir: join_paths(datadir, 'mpv'))
-
- bash_install_dir = join_paths(datadir, 'bash-completion', 'completions')
- install_data('etc/mpv.bash-completion', install_dir: bash_install_dir,
rename: 'mpv')
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: edcc8441e05b21564cce241408e648570ed7065a
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Nov 6 23:28:43 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Nov 7 19:28:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edcc8441
media-video/mpv: sync live
Closes: https://github.com/gentoo/gentoo/pull/28162
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/mpv-.ebuild | 418 +---
1 file changed, 177 insertions(+), 241 deletions(-)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 566af4acb50c..44b6c139ad77 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -3,285 +3,254 @@
EAPI=8
-LUA_COMPAT=( lua5-{1..2} luajit )
+LUA_COMPAT=( lua5-1 luajit )
PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE='threads(+)'
+inherit edo flag-o-matic lua-single meson optfeature pax-utils
python-single-r1 xdg
-inherit edo flag-o-matic lua-single optfeature meson pax-utils
python-single-r1 toolchain-funcs xdg
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv;
-
-if [[ ${PV} == ** ]]; then
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
+if [[ ${PV} == ]]; then
inherit git-r3
-
- DOCS=()
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
else
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
-
- DOCS=( RELEASE_NOTES )
+ HASH_MPV=c416a38ef227067ef7b81b9650a13157300cdfbe
+ SRC_URI="https://github.com/mpv-player/mpv/archive/${HASH_MPV}.tar.gz
-> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${HASH_MPV}"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv
~x86 ~amd64-linux"
fi
-DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
-
-# See Copyright in sources and Gentoo bug #506946. libmpv is ISC.
-# See
https://github.com/mpv-player/mpv/blob/6265724f3331e3dee8d9ec2b6639def5004a5fa2/Copyright
which
-# says other files may be BSD/MIT/ISC.
-LICENSE="LGPL-2.1+ GPL-2+ BSD MIT ISC"
-SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
- dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv
+lua
- mmal nvenc openal +opengl pipewire pulseaudio raspberry-pi rubberband
sdl
- selinux sndio test tools +uchardet vaapi vdpau +vector vulkan wayland
+X +xv zlib zimg"
-
+DESCRIPTION="Media player for the command line"
+HOMEPAGE="https://mpv.io/;
+
+LICENSE="LGPL-2.1+ GPL-2+ BSD ISC MIT" #506946
+SLOT="0/2" # soname
+IUSE="
+ +X +alsa aqua archive bluray cdda +cli coreaudio debug drm dvb
+ dvd +egl gamepad +iconv jack javascript jpeg lcms libcaca libmpv
+ +libplacebo +lua mmal nvenc openal opengl pipewire pulseaudio
+ raspberry-pi rubberband sdl selinux sndio test tools +uchardet
+ vaapi vdpau +vector vulkan wayland +xv zimg zlib"
REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
|| ( cli libmpv )
- aqua? ( opengl )
- egl? ( || ( gbm X wayland ) )
- gamepad? ( sdl )
- gbm? ( drm egl opengl )
- lcms? ( opengl )
+ egl? ( || ( X drm wayland ) )
+ libplacebo? ( || ( egl opengl vulkan ) )
lua? ( ${LUA_REQUIRED_USE} )
- nvenc? ( opengl )
- opengl? ( || ( aqua egl X raspberry-pi !cli ) )
- raspberry-pi? ( opengl )
- test? ( opengl )
+ nvenc? ( || ( egl opengl vulkan ) )
+ opengl? ( || ( X aqua ) )
+ test? ( cli )
tools? ( cli )
uchardet? ( iconv )
- vaapi? ( || ( gbm X wayland ) )
+ vaapi? ( || ( X egl libplacebo wayland ) )
vdpau? ( X )
- vulkan? ( || ( X wayland ) )
- wayland? ( egl )
- X? ( egl? ( opengl ) )
- xv? ( X )
- ${PYTHON_REQUIRED_USE}
-"
-
+ vulkan? ( || ( X wayland ) libplacebo )
+ xv? ( X )"
RESTRICT="!test? ( test )"
COMMON_DEPEND="
- >=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
- alsa? ( >=media-libs/alsa-lib-1.0.18 )
- archive? ( >=app-arch/libarchive-3.4.0:= )
- bluray? ( >=media-libs/libbluray-0.3.0:= )
- cdda? ( dev-libs/libcdio-paranoia
- dev-libs/libcdio:= )
- drm? ( x11-libs/libdrm )
+ media-libs/libass:=[fontconfig]
+ media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?]
+ X? (
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXext
+ x11-libs/libXinerama
+ x11-libs/libXpresent
+ x11-libs/libXrandr
+ xv? ( x11-libs/libXv )
+ )
+ alsa? ( media-libs/alsa-lib )
+ archive? ( app-arch/libarchive:= )
+ bluray? ( media-libs/libbluray:= )
+ cdda? (
+
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 6d12bd1af38d8887a89d21a7c7b1807e0eafd029 Author: Ionen Wolkens gentoo org> AuthorDate: Sun Nov 6 14:29:22 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Mon Nov 7 19:28:00 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d12bd1a media-video/mpv: add 0.34.1_p20221105 mpv releases are rare and it can be difficult to backport fixes (e.g. old libplacebo is broken with newer glslang, but new libplacebo breaks current mpv, not that can't disable glslang or vulkan on mpv if need be). So will release snapshots if felt necessary, please report if feel a newer snapshot would be useful. One quirk is that a whole year ago it switched to API 2.0 and not all revdeps are ready for this (mostly a few trivial deprecations). Personally see this as a good time to get this sorted out. Note this also include meson migration, which may still have oversights. MacOS / rpi builds are also untested, feel free to make any changes to improve these two if you use/know them. rough list of non-style changes from - (non-exhaustive): * update DESCRIPTION, upstream been dissociating itself with the original MPlayer * drop pkg_postinst versions messages (0.18-0.25 is rather ancient) * drop docdir patch as it installed examples .conf to /usr/share/mpv, instead just move these to docdir/examples * drop IUSE=cplugins and enable by default, upstream default and not seeing a motivation to be optional * drop IUSE=gbm, rather redundant with IUSE=drm and is default on mesa * limit USE=opengl to controlling gl-x11/gl-cocoa backends rather than the general `gl` option, avoids e.g. `egl? ( opengl )` req use * make IUSE=opengl non-default given gl-x11 is deprecated, albeit still let it be enabled by desktop profiles * add IUSE=+libplacebo split off from IUSE=vulkan and depend on newer version, if recent enough this enables `-vo gpu-next` which is not limited to vulkan (default given libplacebo main author is same as mpv's and this is the obvious focus) * invert IUSE=debug logic, was passing N(no)DEBUG with debug * swap mesa with libglvnd for IUSE=egl, low level driver packages handling is not for us (and mesa is meaningless with nvidia with the exception of getting libgbm) * ^ likewise, drop nvidia-drivers (ffmpeg/obs/etc.. also don't check drivers for nvenc) * only depend on docutils + build man/html with USE=cli, and drop IUSE=doc (mpv.html has same dependency as the man page) * fix python-exec[-native-symlinks] when USE=-tools, calls 'python3' at build time too * depend on vulkan-loader[X?,wayland?] wrt bug #753434 and #74 * various deps and tentative REQUIRED_USE adjustments Closes: https://bugs.gentoo.org/753434 Closes: https://bugs.gentoo.org/74 Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/Manifest| 1 + media-video/mpv/metadata.xml| 1 + media-video/mpv/mpv-0.34.1_p20221105.ebuild | 289 3 files changed, 291 insertions(+) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 4e3bbca9d645..fbe295dcbc3d 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,2 +1,3 @@ DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab SHA512 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e +DIST mpv-0.34.1_p20221105.tar.gz 3366581 BLAKE2B 52bf8f339e6535c17430d4a8f865a4559681200bfff379e98104ad1365addade3899a3339ae480c23f7e8470623374395aa2e948ee3d616fa8ce152821340fd0 SHA512 a246087a5af191459af71c729e5da5f09a7466792774e1114b8775294ed1de6a9d882e0d2076e35f7d09cd2a57780f504fedbbfc572fb533dc1d72f87e59dabc DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292 diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml index 60caeb2ccc60..76c201612ef0 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -20,6 +20,7 @@ Enable Graphics Buffer Manager based EGL video backend Enable support for saving screenshots in JPEG format Build mpv shared library + Enable support for GPU accelerated video rendering with media-libs/libplacebo Enable Lua scripting, OSC (On Screen Controller) GUI and net-misc/youtube-dl hook-script Enables Multi-Media Abstraction Layer (MMAL) decoding support: Available e.g. on the Raspberry Pi. Enable the recommended 'opengl' video output diff --git a/media-video/mpv/mpv-0.34.1_p20221105.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 160b346f233df31470d45af79637a14c83b3359a
Author: Ionen Wolkens gentoo org>
AuthorDate: Sun Nov 6 00:20:22 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Sun Nov 6 09:09:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=160b346f
media-video/mpv: drop 0.33.1-r3
Closes: https://bugs.gentoo.org/879609
Signed-off-by: Ionen Wolkens gentoo.org>
media-video/mpv/Manifest | 2 -
media-video/mpv/mpv-0.33.1-r3.ebuild | 358 ---
2 files changed, 360 deletions(-)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index bae6bf74a76e..4e3bbca9d645 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,4 +1,2 @@
-DIST mpv-0.33.1.tar.gz 3259882 BLAKE2B
97ab101c2013ffb219d36a788020fb9fc4382d09971ac0beee42701a54667a6c766521be7b052193de4505b2117c2d47b3682ebafab46632fc40b637e0d19c04
SHA512
99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae236062053c163bc3c55b254df021e005b350ebc3df7e952b
DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B
c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab
SHA512
77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
DIST waf-2.0.22 104880 BLAKE2B
6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0
SHA512
4156cefa65b7e6349ddb1ca643bbdf3e449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
-DIST waf-2.0.9 103104 BLAKE2B
c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546
SHA512
0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
diff --git a/media-video/mpv/mpv-0.33.1-r3.ebuild
b/media-video/mpv/mpv-0.33.1-r3.ebuild
deleted file mode 100644
index ddbaf34ddd05..
--- a/media-video/mpv/mpv-0.33.1-r3.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV=2.0.9
-
-inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils
python-r1 toolchain-funcs waf-utils xdg-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv;
-
-if [[ ${PV} != ** ]]; then
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86
~amd64-linux"
- DOCS=( RELEASE_NOTES )
-else
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
- inherit git-r3
- DOCS=(); SRC_URI=""
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV};
-DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
-
-# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
-SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
- dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv
+lua
- nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
- selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib
zimg"
-
-REQUIRED_USE="
- || ( cli libmpv )
- aqua? ( opengl )
- egl? ( || ( gbm X wayland ) )
- gamepad? ( sdl )
- gbm? ( drm egl opengl )
- lcms? ( opengl )
- lua? ( ${LUA_REQUIRED_USE} )
- nvenc? ( opengl )
- opengl? ( || ( aqua egl X raspberry-pi !cli ) )
- raspberry-pi? ( opengl )
- test? ( opengl )
- tools? ( cli )
- uchardet? ( iconv )
- vaapi? ( || ( gbm X wayland ) )
- vdpau? ( X )
- vulkan? ( || ( X wayland ) )
- wayland? ( egl )
- X? ( egl? ( opengl ) )
- xv? ( X )
- ${PYTHON_REQUIRED_USE}
-"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- >=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
- alsa? ( >=media-libs/alsa-lib-1.0.18 )
- archive? ( >=app-arch/libarchive-3.4.0:= )
- bluray? ( >=media-libs/libbluray-0.3.0:= )
- cdda? ( dev-libs/libcdio-paranoia
- dev-libs/libcdio:= )
- drm? ( x11-libs/libdrm )
- dvd? (
- >=media-libs/libdvdnav-4.2.0:=
- >=media-libs/libdvdread-4.1.0:=
- )
- egl? ( media-libs/mesa[egl(+),gbm(+)?,wayland(-)?] )
- gamepad? ( media-libs/libsdl2 )
- iconv? (
- virtual/libiconv
- uchardet? ( app-i18n/uchardet )
- )
- jack? ( virtual/jack )
- javascript? ( >=dev-lang/mujs-1.0.0 )
-
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 1a805b62789c72ffd5df85eca159b4d2ea1c10c0 Author: Ionen Wolkens gentoo org> AuthorDate: Sun Nov 6 00:26:26 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Sun Nov 6 09:09:38 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a805b62 media-video/mpv: set upper bound for libplacebo in 0.34.1 Known broken with libplacebo-5. No need for a revbump thanks to the binding operator. Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/mpv-0.34.1-r1.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/media-video/mpv/mpv-0.34.1-r1.ebuild b/media-video/mpv/mpv-0.34.1-r1.ebuild index 7818f17ff2a7..07dad44585b1 100644 --- a/media-video/mpv/mpv-0.34.1-r1.ebuild +++ b/media-video/mpv/mpv-0.34.1-r1.ebuild @@ -94,6 +94,7 @@ COMMON_DEPEND=" vdpau? ( x11-libs/libvdpau ) vulkan? ( >=media-libs/libplacebo-3.104.0:=[vulkan] +
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: bda68f774ec81274d1e0b4280a84a795ed27889a Author: Ionen Wolkens gentoo org> AuthorDate: Sun Nov 6 00:29:10 2022 + Commit: Ionen Wolkens gentoo org> CommitDate: Sun Nov 6 09:09:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bda68f77 media-video/mpv: add myself as a maintainer Current maintainer is mostly unavailable and there's a limit to handling this package with drive-by commits. Signed-off-by: Ionen Wolkens gentoo.org> media-video/mpv/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml index 656c28187c05..60caeb2ccc60 100644 --- a/media-video/mpv/metadata.xml +++ b/media-video/mpv/metadata.xml @@ -1,6 +1,10 @@ https://www.gentoo.org/dtd/metadata.dtd;> + + io...@gentoo.org + Ionen Wolkens + zlog...@gentoo.org Mikle Kolyada
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 219572fed0af2c1502bca811346c9adb38c90443
Author: Sam James gentoo org>
AuthorDate: Tue Sep 27 21:21:27 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Sep 27 21:21:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=219572fe
media-video/mpv: drop 0.34.0-r1
Signed-off-by: Sam James gentoo.org>
media-video/mpv/Manifest | 1 -
media-video/mpv/mpv-0.34.0-r1.ebuild | 358 ---
2 files changed, 359 deletions(-)
diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest
index d82046a8b542..bae6bf74a76e 100644
--- a/media-video/mpv/Manifest
+++ b/media-video/mpv/Manifest
@@ -1,5 +1,4 @@
DIST mpv-0.33.1.tar.gz 3259882 BLAKE2B
97ab101c2013ffb219d36a788020fb9fc4382d09971ac0beee42701a54667a6c766521be7b052193de4505b2117c2d47b3682ebafab46632fc40b637e0d19c04
SHA512
99d6c40d18c5cf83814b44ec6d8eade229800c5b51a734c9bbe831c3aeb95f8931124c94f6ae236062053c163bc3c55b254df021e005b350ebc3df7e952b
-DIST mpv-0.34.0.tar.gz 3287976 BLAKE2B
9fc412544d81b249c71eed0d6669121a1942771ecb48d50d3fda16b8f967c8a777529e28a234d7169617981cd909ff03aed0deaf15db900d605b8d8849939218
SHA512
9935a20730dbb8fbf4cd11fe2fc38b1981882fc85c93046837a9b99cae089b3f710e6af7d7ea977c177de5479aa24e413f76cab9b995e8b7e66d6b77c524fdf0
DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B
c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab
SHA512
77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
DIST waf-2.0.22 104880 BLAKE2B
6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0
SHA512
4156cefa65b7e6349ddb1ca643bbdf3e449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292
DIST waf-2.0.9 103104 BLAKE2B
c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546
SHA512
0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d
diff --git a/media-video/mpv/mpv-0.34.0-r1.ebuild
b/media-video/mpv/mpv-0.34.0-r1.ebuild
deleted file mode 100644
index c6bf9d1ac4aa..
--- a/media-video/mpv/mpv-0.34.0-r1.ebuild
+++ /dev/null
@@ -1,358 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} luajit )
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='threads(+)'
-
-WAF_PV=2.0.22
-
-inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils
python-r1 toolchain-funcs waf-utils xdg-utils
-
-DESCRIPTION="Media player based on MPlayer and mplayer2"
-HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv;
-
-if [[ ${PV} != ** ]]; then
- SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
- DOCS=( RELEASE_NOTES )
-else
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
- inherit git-r3
- DOCS=(); SRC_URI=""
-fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV};
-DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
-
-# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
-SLOT="0"
-IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
- dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv
+lua
- nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
- selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib
zimg"
-
-REQUIRED_USE="
- || ( cli libmpv )
- aqua? ( opengl )
- egl? ( || ( gbm X wayland ) )
- gamepad? ( sdl )
- gbm? ( drm egl opengl )
- lcms? ( opengl )
- lua? ( ${LUA_REQUIRED_USE} )
- nvenc? ( opengl )
- opengl? ( || ( aqua egl X raspberry-pi !cli ) )
- raspberry-pi? ( opengl )
- test? ( opengl )
- tools? ( cli )
- uchardet? ( iconv )
- vaapi? ( || ( gbm X wayland ) )
- vdpau? ( X )
- vulkan? ( || ( X wayland ) )
- wayland? ( egl )
- X? ( egl? ( opengl ) )
- xv? ( X )
- ${PYTHON_REQUIRED_USE}
-"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- >=media-video/ffmpeg-4.0:0=[encode,threads,vaapi?,vdpau?]
- alsa? ( >=media-libs/alsa-lib-1.0.18 )
- archive? ( >=app-arch/libarchive-3.4.0:= )
- bluray? ( >=media-libs/libbluray-0.3.0:= )
- cdda? ( dev-libs/libcdio-paranoia
- dev-libs/libcdio:= )
- drm? ( x11-libs/libdrm )
- dvd? (
- >=media-libs/libdvdnav-4.2.0:=
- >=media-libs/libdvdread-4.1.0:=
- )
- egl? (
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: e7a72c8743645d5672973cdd42ba018fc6486c02
Author: WANG Xuerui gentoo org>
AuthorDate: Sun Aug 28 03:53:30 2022 +
Commit: WANG Xuerui gentoo org>
CommitDate: Sun Aug 28 05:05:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7a72c87
media-video/mpv: keyword 0.34.1-r1 for ~loong
Signed-off-by: WANG Xuerui gentoo.org>
media-video/mpv/mpv-0.34.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.34.1-r1.ebuild
b/media-video/mpv/mpv-0.34.1-r1.ebuild
index 54b74ef27af7..499693d829f8 100644
--- a/media-video/mpv/mpv-0.34.1-r1.ebuild
+++ b/media-video/mpv/mpv-0.34.1-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv;
if [[ ${PV} != ** ]]; then
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86
~amd64-linux"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv x86
~amd64-linux"
DOCS=( RELEASE_NOTES )
else
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 5bdb94b8d37bba617eed48dd58b1191499d3f756
Author: Sam James gentoo org>
AuthorDate: Thu Jul 28 08:29:54 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Jul 28 08:29:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdb94b8
media-video/mpv: add Python 3.11
Closes: https://bugs.gentoo.org/861662
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-0.34.1-r1.ebuild | 2 +-
media-video/mpv/mpv-.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-video/mpv/mpv-0.34.1-r1.ebuild
b/media-video/mpv/mpv-0.34.1-r1.ebuild
index 74d217d95401..54b74ef27af7 100644
--- a/media-video/mpv/mpv-0.34.1-r1.ebuild
+++ b/media-video/mpv/mpv-0.34.1-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
LUA_COMPAT=( lua5-{1..2} luajit )
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE='threads(+)'
WAF_PV=2.0.22
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 6b7b10dfecd8..437d26a77ed4 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -4,7 +4,7 @@
EAPI=8
LUA_COMPAT=( lua5-{1..2} luajit )
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
PYTHON_REQ_USE='threads(+)'
inherit edo flag-o-matic lua-single optfeature meson pax-utils
python-single-r1 toolchain-funcs xdg
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 62addd648bb30fe31d65ec87d7874216361d0f4a
Author: Sam James gentoo org>
AuthorDate: Mon Jul 11 03:27:14 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Jul 11 03:27:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62addd64
media-video/mpv: fix sdl2
Closes: https://bugs.gentoo.org/857156
Signed-off-by: Sam James gentoo.org>
media-video/mpv/mpv-.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 0958d7c9fee9..6b7b10dfecd8 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -187,6 +187,10 @@ src_configure() {
-Dlibavdevice=enabled
+ # Needed for either of the more specific audio or video options
+ # bug #857156
+ $(meson_feature sdl sdl2)
+
# Audio outputs:
$(meson_feature sdl sdl2-audio)
$(meson_feature pulseaudio pulse)
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/, media-video/mpv/files/
commit: 15ec35a786aaa2db6b77ff3af468353441b7dffd
Author: Sam James gentoo org>
AuthorDate: Sat Jul 9 02:31:23 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Jul 9 02:39:15 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ec35a7
media-video/mpv: port live ebuild to meson
Closes: https://bugs.gentoo.org/856943
Signed-off-by: Sam James gentoo.org>
media-video/mpv/files/mpv--docdir.patch | 11 ++
media-video/mpv/metadata.xml| 3 +
media-video/mpv/mpv-.ebuild | 273 +---
3 files changed, 145 insertions(+), 142 deletions(-)
diff --git a/media-video/mpv/files/mpv--docdir.patch
b/media-video/mpv/files/mpv--docdir.patch
new file mode 100644
index ..62a57415163b
--- /dev/null
+++ b/media-video/mpv/files/mpv--docdir.patch
@@ -0,0 +1,11 @@
+--- a/meson.build
b/meson.build
+@@ -1856,7 +1856,7 @@ if get_option('cplayer')
+
+ conf_files = ['etc/mpv.conf', 'etc/input.conf',
+ 'etc/mplayer-input.conf', 'etc/restore-old-bindings.conf']
+-install_data(conf_files, install_dir: join_paths(datadir, 'doc', 'mpv'))
++install_data(conf_files, install_dir: join_paths(datadir, 'mpv'))
+
+ bash_install_dir = join_paths(datadir, 'bash-completion', 'completions')
+ install_data('etc/mpv.bash-completion', install_dir: bash_install_dir,
rename: 'mpv')
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index 8f8efa409921..46da6fbe4743 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -20,11 +20,14 @@
Enable the recommended 'opengl' video
output
Enable support for various OpenGL-based
video backends
Enable support for the Raspberry
Pi
+ Enable sound support via native PipeWire
backend
Enable high quality pitch correction
via media-libs/rubberband
Enable media-libs/libsdl2 based
video and audio outputs
(Note: these outputs exist for compatibility reasons
only, avoid if possible)
+ Enable sound support via
media-sound/sndio
Install extra tools: mpv_identify.sh,
mpv_idet.sh, and umpv
Enable subtitles charset discovery via
app-i18n/uchardet
+ Use function implementations more amenable
to vectorization (gives speedup). Made optional in case of bugs.
Enable support for various Vulkan-based
video backends
Enable libzimg support (for
vf_fingerprint)
diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild
index 647b7976525a..be6ab3bcae5b 100644
--- a/media-video/mpv/mpv-.ebuild
+++ b/media-video/mpv/mpv-.ebuild
@@ -1,38 +1,40 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
LUA_COMPAT=( lua5-{1..2} luajit )
PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE='threads(+)'
-WAF_PV=2.0.22
-
-inherit bash-completion-r1 flag-o-matic lua-single optfeature pax-utils
python-r1 toolchain-funcs waf-utils xdg-utils
+inherit edo flag-o-matic lua-single optfeature meson pax-utils
python-single-r1 toolchain-funcs xdg
DESCRIPTION="Media player based on MPlayer and mplayer2"
HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv;
-if [[ ${PV} != ** ]]; then
+if [[ ${PV} == ** ]]; then
+ EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
+ inherit git-r3
+
+ DOCS=()
+else
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
~amd64-linux"
+
DOCS=( RELEASE_NOTES )
-else
- EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
- inherit git-r3
- DOCS=(); SRC_URI=""
fi
-SRC_URI+=" https://waf.io/waf-${WAF_PV};
+
DOCS+=( README.md DOCS/{client-api,interface}-changes.rst )
-# See Copyright in sources and Gentoo bug 506946. Waf is BSD, libmpv is ISC.
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
+# See Copyright in sources and Gentoo bug #506946. libmpv is ISC.
+# See
https://github.com/mpv-player/mpv/blob/6265724f3331e3dee8d9ec2b6639def5004a5fa2/Copyright
which
+# says other files may be BSD/MIT/ISC.
+LICENSE="LGPL-2.1+ GPL-2+ BSD MIT ISC"
SLOT="0"
IUSE="+alsa aqua archive bluray cdda +cli coreaudio cplugins debug doc drm dvb
dvd +egl gamepad gbm +iconv jack javascript jpeg lcms libcaca libmpv
+lua
- nvenc openal +opengl pulseaudio raspberry-pi rubberband sdl
- selinux test tools +uchardet vaapi vdpau vulkan wayland +X +xv zlib
zimg"
+ nvenc openal +opengl pipewire pulseaudio raspberry-pi rubberband sdl
+ selinux sndio test tools +uchardet vaapi vdpau +vector vulkan wayland
+X +xv zlib zimg"
REQUIRED_USE="
|| ( cli libmpv )
@@ -79,17 +81,19 @@ COMMON_DEPEND="
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 9f6e0a95a5a95d941f7e16796b39b7ce93c9af38 Author: orbea riseup net> AuthorDate: Tue Jun 21 17:52:45 2022 + Commit: Sam James gentoo org> CommitDate: Wed Jun 22 04:09:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f6e0a95 media-video/mpv: Add libXpresent as a dependency Fixes a waf configure error where it fails to find xpresent.pc. Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/gentoo/pull/26022 Signed-off-by: Sam James gentoo.org> media-video/mpv/mpv-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild index c44511ff2016..647b7976525a 100644 --- a/media-video/mpv/mpv-.ebuild +++ b/media-video/mpv/mpv-.ebuild @@ -106,6 +106,7 @@ COMMON_DEPEND=" x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama + x11-libs/libXpresent x11-libs/libXrandr opengl? ( x11-libs/libXdamage
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/
commit: 072e54b4bc9f9872654e3911a68ee126e08b2c49
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue May 17 12:39:19 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue May 17 12:39:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072e54b4
media-video/mpv: x86 stable wrt bug #843758
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
media-video/mpv/mpv-0.34.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-video/mpv/mpv-0.34.1-r1.ebuild
b/media-video/mpv/mpv-0.34.1-r1.ebuild
index 9d0df7ae6809..74d217d95401 100644
--- a/media-video/mpv/mpv-0.34.1-r1.ebuild
+++ b/media-video/mpv/mpv-0.34.1-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv;
if [[ ${PV} != ** ]]; then
SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv ~x86
~amd64-linux"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86
~amd64-linux"
DOCS=( RELEASE_NOTES )
else
EGIT_REPO_URI="https://github.com/mpv-player/mpv.git;
