[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/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/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/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/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/files/, media-video/mpv/
commit: 872914dde9a6d8e5ecb4d488278e47d4cb804ca0 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Jan 5 18:54:40 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sun Jan 5 18:54:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872914dd media-video/mpv: Drop old Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Mikle Kolyada gentoo.org> media-video/mpv/Manifest | 1 - 29.0-make-ffmpeg-version-check-non-fatal.patch | 28 -- media-video/mpv/files/mpv-0.29.1-egl-bound.patch | 27 -- media-video/mpv/mpv-0.29.1-r1.ebuild | 367 - 4 files changed, 423 deletions(-) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index c3040fc218d..0d6ec7a8cb6 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,4 +1,3 @@ -DIST mpv-0.29.1.tar.gz 3059503 BLAKE2B 231e7c184d441c126c6b6b7199810552981816e5afd59bce4b423c7b4f3739b540f26a4de947cb3cf87a31a7d3ce03a11a6d1247158250afde596f490321a537 SHA512 ec57c9ceaaf2915ee237dd5a1c5ea5d22725d8611e28a9b998e5bb0d8ab5bdf3631d0267fc7b54da31cb1eaa145ef35841e68846bd41c3b9e1024902e92fd086 DIST mpv-0.30.0.tar.gz 3085141 BLAKE2B 314f6830f91e7dc11d3627688415c7535ef0ae462378d2c29cf036d5b851c55025ea5e9d5b0aa3f07ac6ec8c87350be65c882932bd908eab7c4f40b3840bf1a3 SHA512 2b3cc626575b5e56308f5f9ecf926957a36c861c85f700a4a3ede72cf7f7ea08729d20f810693117e21aeeff649f08718e73ead7d117521bf88d746708a72c66 DIST mpv-0.31.0.tar.gz 3142672 BLAKE2B 62a24a2bde2929047e061522147a6e823dfea9b5e7f1f739ad65bc0c82742e98743fb9ff7f0c3f74218cf50a32d0dc37c5e786fdcc951d649499f74efc3a641c SHA512 5199183d35bc2d7fffde1af250edf829fe768cedd7aa00f424d2a11a11d82cdb451c62886159ba3e1efc407b242c25e2485f4ebffd13b1da9c70defbd1f4c309 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d diff --git a/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch deleted file mode 100644 index 1a4975a4e30..000 --- a/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch +++ /dev/null @@ -1,28 +0,0 @@ -player: make ffmpeg/libav version check non-fatal - -We already enforce mpv rebuilds when ffmpeg/libav SONAME changes. - -diff --git a/player/main.c b/player/main.c -index f56191a297..4e51aebd66 100644 a/player/main.c -+++ b/player/main.c -@@ -387,13 +387,12 @@ int mp_initialize(struct MPContext *mpctx, char **options) - // Distro maintainers who patch this out should be aware that mpv - // intentionally ignores ABI in some places where it's not possible to - // get by without violating it. --print_libav_versions(mpctx->log, MSGL_FATAL); --MP_FATAL(mpctx, "\nmpv was compiled against a different version of " -- "FFmpeg/Libav than the shared\nlibrary it is linked against. " -- "This is most likely a broken build and could\nresult in " -- "misbehavior and crashes.\n\nmpv does not support this " -- "configuration and will not run - rebuild mpv instead.\n"); --return -1; -+print_libav_versions(mpctx->log, MSGL_WARN); -+MP_WARN(mpctx, "\nmpv was compiled against a different version of " -+"FFmpeg/Libav than the shared\nlibrary it is linked against. " -+"This could result in misbehavior and crashes.\n\n" -+"Upstream does not support this configuration.\n" -+"Please rebuild mpv in case of any problems.\n"); - } - - if (!mpctx->playlist->first && !opts->player_idle_mode) { diff --git a/media-video/mpv/files/mpv-0.29.1-egl-bound.patch b/media-video/mpv/files/mpv-0.29.1-egl-bound.patch deleted file mode 100644 index 5a9be073fbf..000 --- a/media-video/mpv/files/mpv-0.29.1-egl-bound.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f726b368da87024a0cfe82627e0730ffe4578716 Mon Sep 17 00:00:00 2001 -From: Marvin Schmidt -Date: Wed, 18 Sep 2019 17:07:29 +0200 -Subject: [PATCH] build: lower version requirement for EGL - -`egl.pc` can be provided either by mesa or libglvnd. The latter doesn't -follow the same version scheme as mesa but instead uses the API version -that the library exposes, which is 1.5 for EGL[1] - -[1] https://github.com/NVIDIA/libglvnd/commit/0dfaea2bcb7cdcc785f95e244223bd004a2d7fba#diff-b58a140c00ea99fb9a708e15afaade62R8 - wscript | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index 3569dbf060..97a4d9196b 100644 a/wscript -+++ b/wscript -@@ -636,7 +636,7 @@ video_output_features = [ - 'deps': 'wayland', - 'groups': [ 'gl'
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: e31d80a419120a0af70f62b1ee7cbf6b75a38213 Author: Ilya Tumaykin gmail com> AuthorDate: Mon Jul 23 15:46:05 2018 + Commit: Michał Górny gentoo org> CommitDate: Sat Jul 28 08:53:30 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31d80a4 media-video/mpv: rebase latest ffmpeg patch on top of 0.29.0 Package-Manager: Portage-2.3.43, Repoman-2.3.10 ...l.patch => mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch} | 6 +++--- media-video/mpv/mpv-.ebuild | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/media-video/mpv/files/mpv--make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch similarity index 88% rename from media-video/mpv/files/mpv--make-ffmpeg-version-check-non-fatal.patch rename to media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch index 1594617fba9..1a4975a4e30 100644 --- a/media-video/mpv/files/mpv--make-ffmpeg-version-check-non-fatal.patch +++ b/media-video/mpv/files/mpv-0.29.0-make-ffmpeg-version-check-non-fatal.patch @@ -3,10 +3,10 @@ player: make ffmpeg/libav version check non-fatal We already enforce mpv rebuilds when ffmpeg/libav SONAME changes. diff --git a/player/main.c b/player/main.c -index 5a3fe4c1b7..8cfbb09c56 100644 +index f56191a297..4e51aebd66 100644 --- a/player/main.c +++ b/player/main.c -@@ -429,13 +429,12 @@ int mp_initialize(struct MPContext *mpctx, char **options) +@@ -387,13 +387,12 @@ int mp_initialize(struct MPContext *mpctx, char **options) // Distro maintainers who patch this out should be aware that mpv // intentionally ignores ABI in some places where it's not possible to // get by without violating it. @@ -25,4 +25,4 @@ index 5a3fe4c1b7..8cfbb09c56 100644 +"Please rebuild mpv in case of any problems.\n"); } - if (!mpctx->playlist->first && !opts->player_idle_mode) + if (!mpctx->playlist->first && !opts->player_idle_mode) { diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild index eae5391d95d..ba554e7956f 100644 --- a/media-video/mpv/mpv-.ebuild +++ b/media-video/mpv/mpv-.ebuild @@ -137,7 +137,7 @@ RDEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}/${P}-make-ffmpeg-version-check-non-fatal.patch" + "${FILESDIR}/${PN}-0.29.0-make-ffmpeg-version-check-non-fatal.patch" ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: 49e832ffa5becb353cbdc3f34c2e34fd40e0147a Author: Ilya Tumaykin gmail com> AuthorDate: Sun Mar 11 12:51:27 2018 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Mar 11 13:07:41 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49e832ff media-video/mpv: update ffmpeg patch for Closes: https://bugs.gentoo.org/649908 Closes: https://github.com/gentoo/gentoo/pull/7421 Package-Manager: Portage-2.3.24, Repoman-2.3.6 ...--make-ffmpeg-version-check-non-fatal.patch | 28 ++ media-video/mpv/mpv-.ebuild| 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/media-video/mpv/files/mpv--make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv--make-ffmpeg-version-check-non-fatal.patch new file mode 100644 index 000..1594617fba9 --- /dev/null +++ b/media-video/mpv/files/mpv--make-ffmpeg-version-check-non-fatal.patch @@ -0,0 +1,28 @@ +player: make ffmpeg/libav version check non-fatal + +We already enforce mpv rebuilds when ffmpeg/libav SONAME changes. + +diff --git a/player/main.c b/player/main.c +index 5a3fe4c1b7..8cfbb09c56 100644 +--- a/player/main.c b/player/main.c +@@ -429,13 +429,12 @@ int mp_initialize(struct MPContext *mpctx, char **options) + // Distro maintainers who patch this out should be aware that mpv + // intentionally ignores ABI in some places where it's not possible to + // get by without violating it. +-print_libav_versions(mpctx->log, MSGL_FATAL); +-MP_FATAL(mpctx, "\nmpv was compiled against a different version of " +- "FFmpeg/Libav than the shared\nlibrary it is linked against. " +- "This is most likely a broken build and could\nresult in " +- "misbehavior and crashes.\n\nmpv does not support this " +- "configuration and will not run - rebuild mpv instead.\n"); +-return -1; ++print_libav_versions(mpctx->log, MSGL_WARN); ++MP_WARN(mpctx, "\nmpv was compiled against a different version of " ++"FFmpeg/Libav than the shared\nlibrary it is linked against. " ++"This could result in misbehavior and crashes.\n\n" ++"Upstream does not support this configuration.\n" ++"Please rebuild mpv in case of any problems.\n"); + } + + if (!mpctx->playlist->first && !opts->player_idle_mode) diff --git a/media-video/mpv/mpv-.ebuild b/media-video/mpv/mpv-.ebuild index e273db3d080..302641687d6 100644 --- a/media-video/mpv/mpv-.ebuild +++ b/media-video/mpv/mpv-.ebuild @@ -132,7 +132,7 @@ RDEPEND="${COMMON_DEPEND} " PATCHES=( - "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" + "${FILESDIR}/${P}-make-ffmpeg-version-check-non-fatal.patch" ) src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: e834ef497c80f7b45a8b16d49df4c3649f61506c Author: Ilya Tumaykin gmail com> AuthorDate: Tue Feb 13 20:43:05 2018 + Commit: Michał Górny gentoo org> CommitDate: Wed Feb 14 19:55:01 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e834ef49 media-video/mpv: verbump to 0.27.1 and 0.28.1 with fix for CVE-2018-6360 Bug: https://bugs.gentoo.org/646886 Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-video/mpv/Manifest | 3 + ...mpv-0.27.0-add-missing-link-flags-for-rpi.patch | 25 ++ media-video/mpv/mpv-0.27.1.ebuild | 374 + media-video/mpv/mpv-0.28.1.ebuild | 361 4 files changed, 763 insertions(+) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index f68d7e9520b..7d531db6ac5 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -2,5 +2,8 @@ DIST mpv-0.25.0-patches-r2.tar.xz 11036 BLAKE2B 09fdd566c5fcca290829c536c9e41b65 DIST mpv-0.25.0.tar.gz 2874584 BLAKE2B c64321b50fd635f82bbcbce5cdefee1d0da011558cebdacd3339aaa14162f659c955bea75341ed21096eea5b689e4c1ca4d2d97feff1f4026044ddd61bdd9944 SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf DIST mpv-0.26.0.tar.gz 2916212 BLAKE2B b6402868face65c1179351697eff02116765eecdd105eef621faa73dc77f376aa060476bc80b92eba4839c46836c13bce0e56c6dccf0fe1aa49b1cfa463ec43e SHA512 fd772b4765317eb1ea3b54f12b86e0ac6c4d5e9d16895eb5bebe2e074a01f6b790981b9b34a87d9b23e4291149d3a7154b09fba4a259cec1949a6aa88d6ddec7 DIST mpv-0.27.0.tar.gz 2956816 BLAKE2B 2af0fc7edbecb552fd7df93dcd9124fd4e30a2c29aa53d2139f2817356a6c4eb82eed74a8fdf0493ebb0315cb2806d76a8b2d8c24706975acf4d4704fd291dac SHA512 22738f907d84d362095773972f685e3b03ab4c8172a22ddede290fc221a83ab9135b96f8b18191dabe842b2963f68983929cf065097287fc1a054a7d5f1d0ae4 +DIST mpv-0.27.1-patches-r0.tar.xz 6580 BLAKE2B fdf5f580fbda9ec6856354d43fd80a177464af27ea6f65ab31c610996fced64670f178956b4030c9c34d0707f8fa4544c829e4401679d2e2d6e730b19ebfe6d8 SHA512 8f25c51f0a3c6b5304090144b8343afba4d872216f8fa13890240a51ac464bd2c486b017390d4d3398d7082ffdf3e617659861f15505bd2db72b6f5ab4500bcb +DIST mpv-0.27.1.tar.gz 2957202 BLAKE2B 79dd06ba9399368f24c2c0a065218432110829af08d97cfdf753966ec7ca75e5af8f04da381f83251cb57bdce9b30c0d2d8c6fc772f73b5a0ed43139ce66a316 SHA512 3b8e12edb20b6ffdbbb02aba9cc64ad25e4fb583efc72248549641a46cc840827c1b6b017e7efc323d8a8299b7b094a676525bd978b8c3c9ea32fe39149a DIST mpv-0.28.0.tar.gz 2982165 BLAKE2B 50f095d499df9685dec958287c159fc88be3b5db1465264404ba7c74184569ba47c147cb6491342ba8762199290f408737d03403e454a180bd0ed8b7191d14cc SHA512 33e889f9ca2dd16ad055ccd9fc5549fcead3fd15dcbc52c6b5f3ef608cf87b3d9952e9236e3dec8e7f32240b68d0b0cff1499f511d39c8f3a0501334f5c57a70 +DIST mpv-0.28.1.tar.gz 2982546 BLAKE2B ae078e3393b1113a8211699da1fea867324c50d3696ab82446996f04b2571b29791811b3d3dc082761ca36d63c9b1aa844d7cd56b740e73821b3e7ca35d39512 SHA512 7593e5dbb5963bf39f57f8a08f1b5142474897172a2c6cafcbfd3a83a2f0cfb9a3e5d62eea6625f01aae8ccc236b738511846cd5a5016b93d2510f12f0be7624 DIST waf-1.9.8 100685 BLAKE2B b335115b7ba5af4f8f49fc4da7967fa20e0633bfc7de7ad28fdb58dfcf7ae9c7833d053d298280e26e94b18af70a66fc13d08adf1fc7f9ad9b81e70d95cc74fc SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2 diff --git a/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch b/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch new file mode 100644 index 000..411573a6625 --- /dev/null +++ b/media-video/mpv/files/mpv-0.27.0-add-missing-link-flags-for-rpi.patch @@ -0,0 +1,25 @@ +commit 48143b0cf52de37f93ae53a95261988d9b5ebff2 +Author: Ilya Tumaykin+Date: Thu Jan 26 23:51:29 2017 +0300 + +build: rpi: add missing linker flags to fix build + +See https://www.raspberrypi.org/forums/viewtopic.php?f=67=20005=194090 +and https://github.com/raspberrypi/firmware/issues/110 + +Raspberry-pi upstream also adds '-lGLESv2' when EGL is used: +https://github.com/raspberrypi/userland/blob/master/pkgconfig/egl.pc.in + +diff --git a/wscript b/wscript +index 1880f631e5..741fe1e5a4 100644 +--- a/wscript b/wscript +@@ -772,7 +772,7 @@ video_output_features = [ + lib=['mmal_core', 'mmal_util', 'mmal_vc_client', 'bcm_host']), + # We still need all OpenGL symbols, because the vo_opengl code is + # generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core. +-check_cc(lib="EGL"), ++check_cc(lib="EGL", linkflags="-lGLESv2"), + check_cc(lib="GLESv2"), + ), + } , { diff --git a/media-video/mpv/mpv-0.27.1.ebuild b/media-video/mpv/mpv-0.27.1.ebuild new file mode 100644 index 000..dec8d69628f --- /dev/null +++
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/, media-video/mpv/files/0.27.0/
commit: 78dad5cda155e9eba3589142062e9518d4d1f00c Author: Ilya Tumaykin gmail com> AuthorDate: Sun Dec 17 21:57:40 2017 + Commit: Patrice Clement gentoo org> CommitDate: Thu Dec 21 20:19:50 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78dad5cd media-video/mpv: add SLOT operator on libva rdep. Also clean up after Polynomial-C's messy fix. Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../mpv-0.27.0-support-libva2.patch} | 24 ++ .../{mpv-0.27.0.ebuild => mpv-0.27.0-r1.ebuild}| 5 ++--- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/media-video/mpv/files/mpv-libva2.patch b/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch similarity index 89% rename from media-video/mpv/files/mpv-libva2.patch rename to media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch index 843e8449454..8ae7f537682 100644 --- a/media-video/mpv/files/mpv-libva2.patch +++ b/media-video/mpv/files/0.27.0/mpv-0.27.0-support-libva2.patch @@ -1,12 +1,10 @@ -From 2ecf240b1cd20875991a5b18efafbe799864ff7f Mon Sep 17 00:00:00 2001 -From: Mark Thompson-Date: Mon, 9 Oct 2017 20:10:26 +0100 -Subject: [PATCH] vaapi: Use libva2 message callbacks +commit 2ecf240b1cd20875991a5b18efafbe799864ff7f +Author: Mark Thompson +Date: Mon Oct 9 20:10:26 2017 +0100 + +vaapi: Use libva2 message callbacks They are no longer global, so they work vaguely sensibly. - video/vaapi.c | 32 +--- - 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/video/vaapi.c b/video/vaapi.c index 6bedbbaa18..3b1cb9cc41 100644 @@ -15,7 +13,7 @@ index 6bedbbaa18..3b1cb9cc41 100644 @@ -40,9 +40,27 @@ int va_get_colorspace_flag(enum mp_csp csp) return 0; } - + -// VA message callbacks are global and do not have a context parameter, so it's -// impossible to know from which VADisplay they originate. Try to route them -// to existing mpv/libmpv instances within this process. @@ -48,13 +46,13 @@ index 6bedbbaa18..3b1cb9cc41 100644 va_message_callback(msg, MSGL_V); } +#endif - + static void open_lavu_vaapi_device(struct mp_vaapi_ctx *ctx) { @@ -108,6 +127,10 @@ struct mp_vaapi_ctx *va_initialize(VADisplay *display, struct mp_log *plog, }, }; - + +#if VA_CHECK_VERSION(1, 0, 0) +vaSetErrorCallback(display, va_error_callback, res); +vaSetInfoCallback(display, va_info_callback, res); @@ -68,12 +66,12 @@ index 6bedbbaa18..3b1cb9cc41 100644 vaSetInfoCallback(va_info_callback); +#endif #endif - + int major, minor; @@ -154,6 +178,7 @@ void va_destroy(struct mp_vaapi_ctx *ctx) if (ctx->destroy_native_ctx) ctx->destroy_native_ctx(ctx->native_ctx); - + +#if !VA_CHECK_VERSION(1, 0, 0) pthread_mutex_lock(_log_mutex); for (int n = 0; n < num_va_mpv_clients; n++) { @@ -83,6 +81,6 @@ index 6bedbbaa18..3b1cb9cc41 100644 TA_FREEP(_mpv_clients); // avoid triggering leak detectors pthread_mutex_unlock(_log_mutex); +#endif - + talloc_free(ctx); } diff --git a/media-video/mpv/mpv-0.27.0.ebuild b/media-video/mpv/mpv-0.27.0-r1.ebuild similarity index 99% rename from media-video/mpv/mpv-0.27.0.ebuild rename to media-video/mpv/mpv-0.27.0-r1.ebuild index 0edb3df22f3..fd90c09f204 100644 --- a/media-video/mpv/mpv-0.27.0.ebuild +++ b/media-video/mpv/mpv-0.27.0-r1.ebuild @@ -97,7 +97,7 @@ COMMON_DEPEND=" vaapi? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) libav? ( >=media-video/libav-13:0 ) - x11-libs/libva[drm?,X?,wayland?] + x11-libs/libva:=[drm?,X?,wayland?] ) vdpau? ( !libav? ( >=media-video/ffmpeg-3.3:0 ) @@ -141,7 +141,6 @@ RDEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}/${PN}-0.19.0-make-ffmpeg-version-check-non-fatal.patch" "${FILESDIR}/${PN}-0.23.0-make-libavdevice-check-accept-libav.patch" - "${FILESDIR}/${PN}-libva2.patch" #641384 ) pkg_setup() { @@ -152,7 +151,7 @@ src_prepare() { cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die chmod +x "${S}"/waf || die eapply "${FILESDIR}/${PV}" - default + default_src_prepare } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/0.25.0/, media-video/mpv/
commit: 6d4a8121bbb370d913d7bc7e74e0f563d9cf34da Author: Ilya Tumaykin gmail com> AuthorDate: Sun Jun 11 15:19:49 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 11 16:55:46 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4a8121 media-video/mpv: backport few patches for the next stable candidate Also backport recent (mostly cosmetic) changes from the live ebuild. Package-Manager: Portage-2.3.6, Repoman-2.3.2 media-video/mpv/Manifest | 1 + .../0.25.0/mpv-use-internal-GL-definitions.patch | 100 - .../{mpv-0.25.0.ebuild => mpv-0.25.0-r1.ebuild}| 28 +++--- 3 files changed, 18 insertions(+), 111 deletions(-) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 828195108a3..320adf8a4b5 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,4 +1,5 @@ DIST mpv-0.18.0.tar.gz 2758960 SHA256 b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 WHIRLPOOL c491e61cb2d7f453cfc23605120048e81c2b7621b8d9591cad6415d3b550f55db6a6c8c6f90d27c7ce214ff89f92a9861d202b457c2de25c5b7de11d8d1d40af +DIST mpv-0.25.0-patches-r1.tar.xz 8408 SHA256 aa027a4df1e8e5d6612102ab3afdfb93019de5ed868f65d38e967bca76ab41ae SHA512 e9344546283c88a489b517d408cbaf49c3aabc380372e28871b63c91d0b99a3946b2c5511d247e48916671081c8f85dd27e38a552b3f96cc6122c179ab10e928 WHIRLPOOL b4a5871478b284052f66d4fb6229e8b2a0453cbbb92e03c6b39cb821be0def58d7047594e7782972cb50d4089adaf6175b5f1f77329aba3c2c36c8167e33d03d DIST mpv-0.25.0.tar.gz 2874584 SHA256 07423ffad6921ec4da32f703cd7fbfb27012301dcb736ac8542ac8e6083b0bce SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf WHIRLPOOL 4c5225040ed8793de5daa00a4bb5cf2754fb877c73055dbe4bed92d9fa1bb3f5e67d341c698658e9f10e183084bbe691c8bbb90960e16358b9ffdaa58b11bf2b DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b DIST waf-1.9.8 100685 SHA256 167dc42bab6d5bd823b798af195420319cb5c9b571e00db7d83df2a0fe1f4dbf SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2 WHIRLPOOL 447b6936b8bd5904d85001a96bdcfd0d517f92ff0a859f8a63efd032a418c1b335578266d0f7ce0c5f71ffc7b81643d18e21c14981502153e2d586a9ce152c3a diff --git a/media-video/mpv/files/0.25.0/mpv-use-internal-GL-definitions.patch b/media-video/mpv/files/0.25.0/mpv-use-internal-GL-definitions.patch deleted file mode 100644 index afb0a541647..000 --- a/media-video/mpv/files/0.25.0/mpv-use-internal-GL-definitions.patch +++ /dev/null @@ -1,100 +0,0 @@ -commit 9d80c08441edf3e8da5180fb42eda71878e9c411 -Author: Ilya Tumaykin-Date: Wed Apr 26 17:43:51 2017 +0300 - -build: rely on internal GL headers for rpi check - -Since mpv ships all the required OpenGL defines now, -rpi check doesn't need to check system GL headers. - -diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py -index 8ed06e5b2..36b6822be 100644 a/waftools/checks/custom.py -+++ b/waftools/checks/custom.py -@@ -146,10 +146,6 @@ def check_rpi(ctx, dependency_identifier): - check_pkg_config('egl'), - check_pkg_config('glesv2'), - check_cc(lib=['mmal_core', 'mmal_util', 'mmal_vc_client'], use=['bcm_host']), --# We still need all OpenGL symbols, because the vo_opengl code is --# generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core. --check_statement('GL/gl.h', '(void)GL_RGB32F'), # arbitrary OpenGL 3.0 symbol --check_statement('GL/gl.h', '(void)GL_LUMINANCE16') # arbitrary OpenGL legacy-only symbol - ] - - ret = all((fn(ctx, dependency_identifier) for fn in checks)) - -commit cb25bb5776b30e34ff7aa32c5e0a4f8862774e74 -Author: wm4 -Date: Wed Apr 26 17:09:16 2017 +0200 - -build: remove checks for libGL - -We don't need to link against libGL directly, nor do we need OpenGL -headers. The only thing we need is the windowing interop stuff, such as -libEGL. - -diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py -index 36b6822be..a2b4971cd 100644 a/waftools/checks/custom.py -+++ b/waftools/checks/custom.py -@@ -144,7 +144,6 @@ def check_rpi(ctx, dependency_identifier): - checks = [ - check_pkg_config('bcm_host', uselib_store='bcm_host'), - check_pkg_config('egl'), --check_pkg_config('glesv2'), - check_cc(lib=['mmal_core',
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/0.25.0/, media-video/mpv/
commit: 8cd64057c30c0a6b62f84e32d8b34ba994e16200 Author: Ilya Tumaykin gmail com> AuthorDate: Thu Apr 27 20:30:03 2017 + Commit: David Seifert gentoo org> CommitDate: Thu May 4 16:28:07 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cd64057 media-video/mpv: verbump to 0.25.0 Gentoo-Bug: 616838 Package-Manager: Portage-2.3.5, Repoman-2.3.2 media-video/mpv/Manifest | 1 + .../0.25.0/mpv-use-internal-GL-definitions.patch | 100 ++ media-video/mpv/mpv-0.25.0.ebuild | 376 + 3 files changed, 477 insertions(+) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 4aeeafdc247..d36d37ce4ba 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,5 +1,6 @@ DIST mpv-0.18.0.tar.gz 2758960 SHA256 b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 WHIRLPOOL c491e61cb2d7f453cfc23605120048e81c2b7621b8d9591cad6415d3b550f55db6a6c8c6f90d27c7ce214ff89f92a9861d202b457c2de25c5b7de11d8d1d40af DIST mpv-0.22.0.tar.gz 2822645 SHA256 c0f9ac8f0e37a391d19007b333ef8787c2f45d75a0d4401c0098cde52c5082f6 SHA512 6c021bfb79cbedee842bf122ebb29df56e8b1cbfcb038bd54bf6e2f2db2a6550b71fd9fe8998dbd79b4ceeab3fbcab65ec60695f255c5cb36fb1feae17b797c0 WHIRLPOOL 3458dfe646bab65408a7fe45f98ae168f439b4939064b009ba87d0ae08c1f2067bd252558a92f9fdb0822bf5a35b2377bce7f46aeb190d60a4e115394f0506c9 DIST mpv-0.24.0.tar.gz 2835920 SHA256 a41854fa0ac35b9c309ad692aaee67c8d4495c3546f11cb4cdd0a124195d3f15 SHA512 c1d988ccf9e22765822b9ce75c04f155df4fc4bd4c2aa164903eee8947c36f659116c2ab96668a4af31c4f5aeecbf20ce21191c48456d74e138db617a1e34d96 WHIRLPOOL e3a10fc26df124127b819754aedd8bd4ccaa1b9b3764f0deac20eaa8e338e49f09aea25d2b508b8599ce75b0a72fdd3ebcbb9487851cf823c803024e1effc950 +DIST mpv-0.25.0.tar.gz 2874584 SHA256 07423ffad6921ec4da32f703cd7fbfb27012301dcb736ac8542ac8e6083b0bce SHA512 eefc574e2995ddf6bd15c9b62986a5ca277c30949b036d57a11bbfb796c11c1e6dd7c313abd91a909dd98ca0f2b0be29ec6b980d0287a5891b42b0ffba926cbf WHIRLPOOL 4c5225040ed8793de5daa00a4bb5cf2754fb877c73055dbe4bed92d9fa1bb3f5e67d341c698658e9f10e183084bbe691c8bbb90960e16358b9ffdaa58b11bf2b DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b DIST waf-1.9.8 100685 SHA256 167dc42bab6d5bd823b798af195420319cb5c9b571e00db7d83df2a0fe1f4dbf SHA512 e7493767f65deeb38aa162adef22adf60ebbd038410e9cdf4fe6f0de8c43395dbbba14962aa2c3855e1277136085fc22ad12ebfb8ac4e76f16358296039b8ea2 WHIRLPOOL 447b6936b8bd5904d85001a96bdcfd0d517f92ff0a859f8a63efd032a418c1b335578266d0f7ce0c5f71ffc7b81643d18e21c14981502153e2d586a9ce152c3a diff --git a/media-video/mpv/files/0.25.0/mpv-use-internal-GL-definitions.patch b/media-video/mpv/files/0.25.0/mpv-use-internal-GL-definitions.patch new file mode 100644 index 000..afb0a541647 --- /dev/null +++ b/media-video/mpv/files/0.25.0/mpv-use-internal-GL-definitions.patch @@ -0,0 +1,100 @@ +commit 9d80c08441edf3e8da5180fb42eda71878e9c411 +Author: Ilya Tumaykin+Date: Wed Apr 26 17:43:51 2017 +0300 + +build: rely on internal GL headers for rpi check + +Since mpv ships all the required OpenGL defines now, +rpi check doesn't need to check system GL headers. + +diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py +index 8ed06e5b2..36b6822be 100644 +--- a/waftools/checks/custom.py b/waftools/checks/custom.py +@@ -146,10 +146,6 @@ def check_rpi(ctx, dependency_identifier): + check_pkg_config('egl'), + check_pkg_config('glesv2'), + check_cc(lib=['mmal_core', 'mmal_util', 'mmal_vc_client'], use=['bcm_host']), +-# We still need all OpenGL symbols, because the vo_opengl code is +-# generic and supports anything from GLES2/OpenGL 2.1 to OpenGL 4 core. +-check_statement('GL/gl.h', '(void)GL_RGB32F'), # arbitrary OpenGL 3.0 symbol +-check_statement('GL/gl.h', '(void)GL_LUMINANCE16') # arbitrary OpenGL legacy-only symbol + ] + + ret = all((fn(ctx, dependency_identifier) for fn in checks)) + +commit cb25bb5776b30e34ff7aa32c5e0a4f8862774e74 +Author: wm4 +Date: Wed Apr 26 17:09:16 2017 +0200 + +build: remove checks for libGL + +We don't need to link against libGL directly, nor do we need OpenGL +headers. The only thing we need is the windowing interop stuff, such as +libEGL. + +diff --git a/waftools/checks/custom.py b/waftools/checks/custom.py +index 36b6822be..a2b4971cd 100644 +--- a/waftools/checks/custom.py
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/
commit: cdd878ca5c47cafbb29bfe9cbb9e9ee64ec70fc9 Author: Ilya Tumaykin gmail com> AuthorDate: Sun Feb 12 21:15:50 2017 + Commit: David Seifert gentoo org> CommitDate: Tue Feb 14 21:41:03 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd878ca media-video/mpv: make message less scary in ffmpeg patch "Most likely a broken build" isn't the best thing to tell our users especially because in most cases it isn't a broken build. Package-Manager: Portage-2.3.3, Repoman-2.3.1 .../files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch| 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch index 96a1f566a6..7c8d5b44c8 100644 --- a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch +++ b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch @@ -3,7 +3,7 @@ player: make ffmpeg/libav version check non-fatal We already enforce mpv rebuilds when ffmpeg/libav SONAME changes. diff --git a/player/main.c b/player/main.c -index 67dde34..ee133a9 100644 +index 67dde3449..696d2e716 100644 --- a/player/main.c +++ b/player/main.c @@ -419,13 +419,12 @@ int mp_initialize(struct MPContext *mpctx, char **options) @@ -20,9 +20,9 @@ index 67dde34..ee133a9 100644 +print_libav_versions(mpctx->log, MSGL_WARN); +MP_WARN(mpctx, "\nmpv was compiled against a different version of " +"FFmpeg/Libav than the shared\nlibrary it is linked against. " -+"This is most likely a broken build and could\nresult in " -+"misbehavior and crashes.\n\nUpstream does not support this " -+"configuration.\nPlease rebuild mpv in case of any problems.\n"); ++"This could result in misbehavior and crashes.\n\n" ++"Upstream does not support this configuration.\n" ++"Please rebuild mpv in case of any problems.\n"); } if (opts->dump_stats && opts->dump_stats[0]) {
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: a48d19fdbe33b2ce09da35a1e065517d18d308d7 Author: Ilya Tumaykin gmail com> AuthorDate: Mon Aug 15 15:33:08 2016 + Commit: Patrice Clement gentoo org> CommitDate: Mon Aug 15 20:54:27 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a48d19fd media-video/mpv: verbump to 0.19.0 Also update ffmpeg patch to apply cleanly. Package-Manager: portage-2.3.0 Signed-off-by: Patrice Clement gentoo.org> media-video/mpv/Manifest | 1 + 19.0-make-ffmpeg-version-check-non-fatal.patch | 28 ++ media-video/mpv/mpv-0.19.0.ebuild | 321 + 3 files changed, 350 insertions(+) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 7ce6708..341ba86 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -2,6 +2,7 @@ DIST mpv-0.17.0-patches-06.tar.gz 14418 SHA256 a0fcf861ed50686f35556a9334581e1d7 DIST mpv-0.17.0.tar.gz 2882629 SHA256 602cd2b0f5fc7e43473234fbb96e3f7bbb6418f15eb8fa720d9433cce31eba6e SHA512 fb79738a16dbc12b60199a68836aca121a800958af4eaf6c2bdf1114bde36c156bafc232e814045a16fd738d2de1e2d8392bc98507961e5a73fa692e270dc7a2 WHIRLPOOL 704133b4033a5a2be8db92a4f1e52397d5b261a99a035d38e33b91d2c478e0e9bfcb2ba0e24ee03d37fffe693b275f50f7f1e453263a5afe61e8944f51eefa61 DIST mpv-0.18.0.tar.gz 2758960 SHA256 b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 WHIRLPOOL c491e61cb2d7f453cfc23605120048e81c2b7621b8d9591cad6415d3b550f55db6a6c8c6f90d27c7ce214ff89f92a9861d202b457c2de25c5b7de11d8d1d40af DIST mpv-0.18.1.tar.gz 2763392 SHA256 e413d57fec4ad43b9f9b848f38d13fb921313fc9a4a64bf1e906c8d0f7a46329 SHA512 4ed94a5365d432d1fb07c11a8e40ed7564925eacec8b61576690b8f3d8ff82d4e0b2841cc941fb711c659c77ff67bfea86b66bd5f570d3ae953bce715981cd2a WHIRLPOOL 6c46555f31fdc240065e5500b055aa6845e0103b1e48a55a912b3fa3de777f10859d517c00f5f2651ef84b1da98457439335b8dad43b0a142a6b3b678c542b5f +DIST mpv-0.19.0.tar.gz 2770618 SHA256 3df5811942cd1d71f48eb4720092fdafec11885bf6dd6d1d3e6413f32e5d67e2 SHA512 11a1318e0bcf937635e8f83bba615998c7a89ceb0fb0829cef9f510c215d142b205b5c26c617e95d95dfcfc3fbd212cee58cab2dae0b8b8250a44e998d18380f WHIRLPOOL bb1c016a51bae0a512f3383f252cf661414d6375e31d8a08a3885f2450cd772e38d102f26ffecfc6fec1b469f64b33f027dcc5c0e7ca22f171c074e628310bd3 DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e diff --git a/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch new file mode 100644 index 000..96a1f56 --- /dev/null +++ b/media-video/mpv/files/mpv-0.19.0-make-ffmpeg-version-check-non-fatal.patch @@ -0,0 +1,28 @@ +player: make ffmpeg/libav version check non-fatal + +We already enforce mpv rebuilds when ffmpeg/libav SONAME changes. + +diff --git a/player/main.c b/player/main.c +index 67dde34..ee133a9 100644 +--- a/player/main.c b/player/main.c +@@ -419,13 +419,12 @@ int mp_initialize(struct MPContext *mpctx, char **options) + if (!print_libav_versions(mp_null_log, 0)) { + // Using mismatched libraries can be legitimate, but even then it's + // a bad idea. We don't acknowledge its usefulness and stability. +-print_libav_versions(mpctx->log, MSGL_FATAL); +-MP_FATAL(mpctx, "\nmpv was compiled against a different version of " +- "FFmpeg/Libav than the shared\nlibrary it is linked against. " +- "This is most likely a broken build and could\nresult in " +- "misbehavior and crashes.\n\nmpv does not support this " +- "configuration and will not run - rebuild mpv instead.\n"); +-return -1; ++print_libav_versions(mpctx->log, MSGL_WARN); ++
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/0.18.0/, media-video/mpv/
commit: 3919e1b5f826612ff664ca29aab01e937047864f Author: Ilya Tumaykin gmail com> AuthorDate: Sun Jul 17 22:13:16 2016 + Commit: Patrice Clement gentoo org> CommitDate: Mon Jul 25 13:03:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3919e1b5 media-video/mpv: backport build, memleak, AV sync fixes for 0.18.0 We'll keep 0.18.0 longer than usual as 0.18.1 changed how volume levels work in a partially incompatible way. This causes problems at least in smplayer, see Gentoo bug 588584. Package-Manager: portage-2.3.0 Signed-off-by: Patrice Clement gentoo.org> .../files/0.18.0/mpv-0.18.0-fix-doc-build.patch| 23 ++ .../0.18.0/mpv-0.18.0-fix-fbo-resize-memleak.patch | 27 ++ .../mpv-0.18.0-fix-height-alignment-on-xv.patch| 1 - .../0.18.0/mpv-0.18.0-fix-initial-av-sync.patch| 42 +++ media-video/mpv/mpv-0.18.0-r1.ebuild | 305 + 5 files changed, 397 insertions(+), 1 deletion(-) diff --git a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-doc-build.patch b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-doc-build.patch new file mode 100644 index 000..26c8f72 --- /dev/null +++ b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-doc-build.patch @@ -0,0 +1,23 @@ +commit 4a4a9f330281ad11eb39a013bf7308063767bab8 +Author: Martin Herkt+Date: Fri Jul 15 12:57:12 2016 +0200 + +man: fix PDF build error + +ReportLab really doesn’t like breaking inline literals, so insert an +explicit line break. + +Fixes #3338 + +diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst +index 9a251ae..74d17a6 100644 +--- a/DOCS/man/options.rst b/DOCS/man/options.rst +@@ -588,6 +588,7 @@ Video + :videotoolbox: requires ``--vo=opengl`` (OS X 10.8 and up only) + :videotoolbox-copy: copies video back into system RAM (OS X 10.8 and up only) + :dxva2: requires ``--vo=opengl:backend=angle`` or ++ + ``--vo=opengl:backend=dxinterop`` (Windows only) + :dxva2-copy: copies video back to system RAM (Windows only) + :d3d11va: requires ``--vo=opengl:backend=angle`` (Windows only) diff --git a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-fbo-resize-memleak.patch b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-fbo-resize-memleak.patch new file mode 100644 index 000..9407f15 --- /dev/null +++ b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-fbo-resize-memleak.patch @@ -0,0 +1,27 @@ +commit 3abf9c9204e2fcbc1910deb102efab4ab9d8c149 +Author: Niklas Haas +Date: Wed Jun 8 17:32:40 2016 +0200 + +vo_opengl: don't constantly resize the output FBO + +Commit 883d3114 seems to have (accidentally?) dropped the FBOTEX_FUZZY +from the output_fbo resize, which means that current master will keep +resizing and resizing the FBO as you change the window size, introducing +severe memory leaking after a while. (Not sure why that would cause +memory leaks, but I blame nvidia) + +Either way, it's bad for performance too, so it's worth fixing. + +diff --git a/video/out/opengl/video.c b/video/out/opengl/video.c +index bd1eb89..6c7646b 100644 +--- a/video/out/opengl/video.c b/video/out/opengl/video.c +@@ -2791,7 +2791,7 @@ void gl_video_render_frame(struct gl_video *p, struct vo_frame *frame, int fbo) + { + fbotex_change(>output_fbo, p->gl, p->log, + p->vp_w, abs(p->vp_h), +- p->opts.fbo_format, 0); ++ p->opts.fbo_format, FBOTEX_FUZZY); + dest_fbo = p->output_fbo.fbo; + p->output_fbo_valid = true; + } diff --git a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-height-alignment-on-xv.patch b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-height-alignment-on-xv.patch index 550b493..5033157 100644 --- a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-height-alignment-on-xv.patch +++ b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-height-alignment-on-xv.patch @@ -11,7 +11,6 @@ makes sense, so it can't certainly be considered server misbehavior. Do 2 things against this: allow if the server returns a larger image (we just crop it then), and also allocate a properly aligned image in the first place. diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c index 1e7ae7c..a5a4728 100644 diff --git a/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-initial-av-sync.patch b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-initial-av-sync.patch new file mode 100644 index 000..c2cacc3 --- /dev/null +++ b/media-video/mpv/files/0.18.0/mpv-0.18.0-fix-initial-av-sync.patch @@ -0,0 +1,42 @@ +commit 614efea3e67a435f3330820c3dc8b402535641e8 +Author: wm4 +Date: Fri Jul 1 15:51:34 2016 +0200 + +ad_lavc: work around braindead ffmpeg behavior + +The libavcodec wmapro decoder will skip some bytes at the start of the +first packet and return each time. It will not return any audio data in +this state. + +Our own code as well
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/0.18.1/, media-video/mpv/
commit: 8acfe6db0f4025b2661cf4cc0f97d56f61089a06 Author: Ilya Tumaykin gmail com> AuthorDate: Sun Jul 17 22:01:00 2016 + Commit: Patrice Clement gentoo org> CommitDate: Mon Jul 25 13:03:08 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8acfe6db media-video/mpv: verbump to 0.18.1 Gentoo-Bug: 588492 Package-Manager: portage-2.3.0 Signed-off-by: Patrice Clement gentoo.org> media-video/mpv/Manifest | 1 + .../0.18.1/mpv-0.18.1-fix-audio-uninit-crash.patch | 39 +++ .../files/0.18.1/mpv-0.18.1-fix-doc-build.patch| 23 ++ .../mpv-0.18.1-fix-high-CPU-on-wayland.patch | 34 +++ ...mpv-0.18.1-fix-stuck-volume-on-pulseaudio.patch | 32 ++ .../mpv-0.18.1-handle-ffmpeg-ABI-changes.patch | 69 + .../mpv-0.18.1-respect-deinterlace-auto.patch | 38 +++ .../mpv-0.18.1-show-osd-with-ao-volume.patch | 46 +++ media-video/mpv/mpv-0.18.1.ebuild | 329 + 9 files changed, 611 insertions(+) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 4ed6ad1..7ce6708 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,6 +1,7 @@ DIST mpv-0.17.0-patches-06.tar.gz 14418 SHA256 a0fcf861ed50686f35556a9334581e1d735f2910f834d1885b9940bd90d7525c SHA512 0bbd040df7d59e30e5c0b37b6966e5f24bd9041b3916a68b68f97a1f2aa3c2447a2dc873742d779f8ebfe599aeef6474c542f8acc7cd2fdf871d89b6b458452b WHIRLPOOL 38ab169a92b0d2c8266e459037c152ca841440231ba5dda2c2153dbee2f5a6e2193351d8f7e01e9eb6110fd21687deb1f39ea765e35dc8c69db358c45ff3c25e DIST mpv-0.17.0.tar.gz 2882629 SHA256 602cd2b0f5fc7e43473234fbb96e3f7bbb6418f15eb8fa720d9433cce31eba6e SHA512 fb79738a16dbc12b60199a68836aca121a800958af4eaf6c2bdf1114bde36c156bafc232e814045a16fd738d2de1e2d8392bc98507961e5a73fa692e270dc7a2 WHIRLPOOL 704133b4033a5a2be8db92a4f1e52397d5b261a99a035d38e33b91d2c478e0e9bfcb2ba0e24ee03d37fffe693b275f50f7f1e453263a5afe61e8944f51eefa61 DIST mpv-0.18.0.tar.gz 2758960 SHA256 b656638d4f6bce2621baaacb60d8be384aa492fcd86dfd43996aaa2c16fee02b SHA512 5a899ea680b4da6d668a6e77a254e623bafef16f376ee46639e40f151da5a000de84b382f2b07f3a1e87b60fc8e524132767fdf243e36474966af11a88277437 WHIRLPOOL c491e61cb2d7f453cfc23605120048e81c2b7621b8d9591cad6415d3b550f55db6a6c8c6f90d27c7ce214ff89f92a9861d202b457c2de25c5b7de11d8d1d40af +DIST mpv-0.18.1.tar.gz 2763392 SHA256 e413d57fec4ad43b9f9b848f38d13fb921313fc9a4a64bf1e906c8d0f7a46329 SHA512 4ed94a5365d432d1fb07c11a8e40ed7564925eacec8b61576690b8f3d8ff82d4e0b2841cc941fb711c659c77ff67bfea86b66bd5f570d3ae953bce715981cd2a WHIRLPOOL 6c46555f31fdc240065e5500b055aa6845e0103b1e48a55a912b3fa3de777f10859d517c00f5f2651ef84b1da98457439335b8dad43b0a142a6b3b678c542b5f DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e diff --git a/media-video/mpv/files/0.18.1/mpv-0.18.1-fix-audio-uninit-crash.patch b/media-video/mpv/files/0.18.1/mpv-0.18.1-fix-audio-uninit-crash.patch new file mode 100644 index 000..8300d4b --- /dev/null +++ b/media-video/mpv/files/0.18.1/mpv-0.18.1-fix-audio-uninit-crash.patch @@ -0,0 +1,39 @@ +commit 79974e7ad94e7658c780e3b446a7822a533675e4 +Author: wm4+Date: Fri Jul 15 23:11:25 2016 +0200 + +audio: fix crashes due to broken uninit check + +Since mixer->ao is always NULL now (it was really just forgotten to be +removed), the uninit call never actually cleared the af field, leaving +a dangling pointer that could be accessed by volume control. + +diff --git a/audio/mixer.c b/audio/mixer.c +index a58a814..795edfa 100644 +--- a/audio/mixer.c b/audio/mixer.c +@@ -23,7 +23,6 @@ + #include + + #include "config.h" +-#include "audio/out/ao.h" + #include "audio/filter/af.h" + #include "common/global.h" + #include "common/msg.h" +@@ -33,7 +32,6 @@ + struct mixer { + struct mp_log *log; + struct MPOpts *opts; +-struct ao *ao; + struct af_stream *af; + //
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/0.17.0/, media-video/mpv/
commit: a922a262381b0f28746512408c5def10a6df67a4 Author: Ilya Tumaykin gmail com> AuthorDate: Tue May 31 04:49:34 2016 + Commit: Sam Jorna gentoo org> CommitDate: Tue May 31 08:49:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a922a262 media-video/mpv: remove old Closes: https://github.com/gentoo/gentoo/pull/1569 Package-Manager: portage-2.3.0_rc1 media-video/mpv/Manifest | 1 - .../mpv-0.17.0-add-missing-math-include.patch | 21 -- ...7.0-fix-seeking-without-first-index-entry.patch | 42 --- media-video/mpv/mpv-0.17.0-r4.ebuild | 300 - media-video/mpv/mpv-0.17.0.ebuild | 288 5 files changed, 652 deletions(-) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 171e223..39ac01f 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,4 +1,3 @@ -DIST mpv-0.17.0-patches-04.tar.gz 7862 SHA256 a6b259cfe3ed605ca5530981670051e38c712c906bbdd0ea7958932660cc6556 SHA512 74dc84ab5baadb950658d55ba5d89300fc169c67cf854ca33ea812e246a1fbbbe9f84d0f07ca6cc3ca5fb97710209974105785a8a3e593166a4aaa696266b1ea WHIRLPOOL 743c9c7443213499d2ec692955c447f29ec10c3305fa13c2e06ae52b10408473b35037772b4b3c4a2f69ff9318fe1a6dd8a7d5c4307928424b0a081447b9018e DIST mpv-0.17.0-patches-05.tar.gz 12830 SHA256 cc63d7fe5754ceb62bc8c33d50a02376ee0d5d4c3ff0763fc85787624e32b1e1 SHA512 680b5f50e5a4749ffd63712bf6160b64b37bd14bfc9f9b3912afb1a576a1ab754cdaeb20ee206e3484e037126bec395431002590ff3417ea247d2be340b4fd09 WHIRLPOOL 01e76442ed360ca0f29404038d5b082fb87d40dcf7a868377735ac63cd2df51385dd5987fe57ed6c5928ca1aca3fa8938d7fe878360025d6ea8706b7948c8531 DIST mpv-0.17.0.tar.gz 2882629 SHA256 602cd2b0f5fc7e43473234fbb96e3f7bbb6418f15eb8fa720d9433cce31eba6e SHA512 fb79738a16dbc12b60199a68836aca121a800958af4eaf6c2bdf1114bde36c156bafc232e814045a16fd738d2de1e2d8392bc98507961e5a73fa692e270dc7a2 WHIRLPOOL 704133b4033a5a2be8db92a4f1e52397d5b261a99a035d38e33b91d2c478e0e9bfcb2ba0e24ee03d37fffe693b275f50f7f1e453263a5afe61e8944f51eefa61 DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-add-missing-math-include.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-add-missing-math-include.patch deleted file mode 100644 index 9f04fbe..000 --- a/media-video/mpv/files/0.17.0/mpv-0.17.0-add-missing-math-include.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit b735c0e2077cb37df6764350472cbc68a9142d91 -Author: wm4-Date: Fri Apr 15 13:58:41 2016 +0200 - -lcms: include math.h - -Fixes #3053. - -diff --git a/video/out/opengl/lcms.c b/video/out/opengl/lcms.c -index 7db8da6..a2030d3 100644 a/video/out/opengl/lcms.c -+++ b/video/out/opengl/lcms.c -@@ -16,6 +16,7 @@ - */ - - #include -+#include - - #include "mpv_talloc.h" - diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-seeking-without-first-index-entry.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-seeking-without-first-index-entry.patch deleted file mode 100644 index 82c6d37..000 --- a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-seeking-without-first-index-entry.patch +++ /dev/null @@ -1,42 +0,0 @@ -commit f4142ab9ad1d929b60ff134754f482754b63043a -Author: wm4 -Date: Tue Apr 12 15:41:44 2016 +0200 - -demux_mkv: fix seeking with files that miss the first index entry - -Now it will always be able to seek back to the start, even if the index -is sparse or misses the first entry. - -This can be achieved by reusing the logic for incremental index -generation (for files with no index), and start time probing (for making -sure the first block is always indexed). - -diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c -index b0a910b..210f4d6 100644 a/demux/demux_mkv.c -+++ b/demux/demux_mkv.c -@@ -773,8 +773,9 @@ static int demux_mkv_read_cues(demuxer_t *demuxer) - if (cues.n_cue_point <= 3) // probably too sparse and will just break seeking - goto done; - --// Discard incremental index. --mkv_d->num_indexes = 0; -+// Discard incremental index. (Keep the first entry, which must be the -+// start of the file - helps with files that miss the first index entry.) -+mkv_d->num_indexes = MPMIN(1, mkv_d->num_indexes); - mkv_d->index_has_durations = false; - - for (int i = 0; i < cues.n_cue_point; i++) { -@@ -2963,8 +2964,10 @@ static void probe_first_timestamp(struct demuxer *demuxer) - return; - - struct block_info block; --if (read_next_block(demuxer, ) > 0) -+if (read_next_block(demuxer, ) > 0) { -+
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/0.17.0/, media-video/mpv/
commit: ede52a841ed540c4572873834e05f88e5adf73b5 Author: Ilya Tumaykin gmail com> AuthorDate: Tue May 10 11:20:39 2016 + Commit: Ian Delaney gentoo org> CommitDate: Wed May 11 05:51:51 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ede52a84 media-video/mpv: revbump to 0.17.0-r4 wrt bug 582384 Also the usual dose of memleak/crash/corruption fixes is included. Move our already huge patchset to devspace kindly provided by wraeth. Closes: https://github.com/gentoo/gentoo/pull/1446 Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=582384 Package-Manager: portage-2.2.28 Signed-off-by: Ian Delaney gentoo.org> media-video/mpv/Manifest | 1 + .../mpv-0.17.0-avoid-deprecated-API-usage.patch| 28 - .../0.17.0/mpv-0.17.0-fix-early-audio-start.patch | 48 .../0.17.0/mpv-0.17.0-fix-hwdec-fallback.patch | 63 ...x-parsing-multiple-input-command-prefixes.patch | 19 -- ...0.17.0-fix-relative-seeking-with-coverart.patch | 59 --- .../0.17.0/mpv-0.17.0-fix-timestamp-resets.patch | 27 - .../mpv-0.17.0-fix-unselecting-video-track.patch | 23 .../0.17.0/mpv-0.17.0-fix-use-after-free.patch | 25 .../mpv-0.17.0-fix-video-frame-info-memleak.patch | 19 -- .../mpv-0.17.0-remove-unneeded-X11-include.patch | 21 --- .../{mpv-0.17.0-r3.ebuild => mpv-0.17.0-r4.ebuild} | 67 +- 12 files changed, 29 insertions(+), 371 deletions(-) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index a3873c8..d5fb1d0 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,3 +1,4 @@ +DIST mpv-0.17.0-patches-04.tar.gz 7862 SHA256 a6b259cfe3ed605ca5530981670051e38c712c906bbdd0ea7958932660cc6556 SHA512 74dc84ab5baadb950658d55ba5d89300fc169c67cf854ca33ea812e246a1fbbbe9f84d0f07ca6cc3ca5fb97710209974105785a8a3e593166a4aaa696266b1ea WHIRLPOOL 743c9c7443213499d2ec692955c447f29ec10c3305fa13c2e06ae52b10408473b35037772b4b3c4a2f69ff9318fe1a6dd8a7d5c4307928424b0a081447b9018e DIST mpv-0.17.0.tar.gz 2882629 SHA256 602cd2b0f5fc7e43473234fbb96e3f7bbb6418f15eb8fa720d9433cce31eba6e SHA512 fb79738a16dbc12b60199a68836aca121a800958af4eaf6c2bdf1114bde36c156bafc232e814045a16fd738d2de1e2d8392bc98507961e5a73fa692e270dc7a2 WHIRLPOOL 704133b4033a5a2be8db92a4f1e52397d5b261a99a035d38e33b91d2c478e0e9bfcb2ba0e24ee03d37fffe693b275f50f7f1e453263a5afe61e8944f51eefa61 DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-avoid-deprecated-API-usage.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-avoid-deprecated-API-usage.patch deleted file mode 100644 index 16a2845..000 --- a/media-video/mpv/files/0.17.0/mpv-0.17.0-avoid-deprecated-API-usage.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 78346e9c9a8a70fa581989b2cc8b4e0933765330 -Author: wm4-Date: Wed Apr 20 19:37:45 2016 +0200 - -ad_spdif: take care of deprecated libavcodec API usage - -diff --git a/audio/decode/ad_spdif.c b/audio/decode/ad_spdif.c -index eb2e2bb..56e4a81 100644 a/audio/decode/ad_spdif.c -+++ b/audio/decode/ad_spdif.c -@@ -116,9 +116,16 @@ static int determine_codec_profile(struct dec_audio *da, AVPacket *pkt) - goto done; - } - -+#if HAVE_AVCODEC_NEW_CODEC_API -+if (avcodec_send_packet(ctx, pkt) < 0) -+goto done; -+if (avcodec_receive_frame(ctx, frame) < 0) -+goto done; -+#else - int got_frame = 0; - if (avcodec_decode_audio4(ctx, frame, _frame, pkt) < 1 || !got_frame) - goto done; -+#endif - - profile = ctx->profile; - diff --git a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-early-audio-start.patch b/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-early-audio-start.patch deleted file mode 100644 index f7685d8..000 --- a/media-video/mpv/files/0.17.0/mpv-0.17.0-fix-early-audio-start.patch +++ /dev/null @@ -1,48 +0,0 @@ -commit cd9ee1a8533a3d5fb4c163802347e83c7db91923 -Author: wm4 -Date: Wed Apr 20 13:05:29 2016 +0200 - -player: really start audio only once video is ready - -The check whether video is ready yet was done only in STATUS_FILLING. -But it also switched to STATUS_READY, which means the next time
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: e71956edb8c90d8896ac1b77e977d95ed70dea01 Author: Sergei Trofimovich gentoo org> AuthorDate: Fri Apr 15 08:49:39 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Apr 15 08:49:39 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e71956ed media-video/mpv: fix build failure against glibc-2.23 Added missing header for pow() function. Package-Manager: portage-2.2.28 media-video/mpv/files/mpv-0.17.0-glibc-2.23.patch | 14 ++ media-video/mpv/mpv-0.17.0.ebuild | 3 ++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/media-video/mpv/files/mpv-0.17.0-glibc-2.23.patch b/media-video/mpv/files/mpv-0.17.0-glibc-2.23.patch new file mode 100644 index 000..ecd02aa --- /dev/null +++ b/media-video/mpv/files/mpv-0.17.0-glibc-2.23.patch @@ -0,0 +1,14 @@ +Fixes build failure on glibc-2.23 + +../video/out/opengl/lcms.c: In function 'get_vid_profile': +../video/out/opengl/lcms.c:235:27: error: implicit declaration of function 'pow' [-Werror=implicit-function-declaration] + double binv = pow(src_black[i], 1.0/gamma); + ^ +diff --git a/video/out/opengl/lcms.c b/video/out/opengl/lcms.c +index 7db8da6..3eb3d53 100644 +--- a/video/out/opengl/lcms.c b/video/out/opengl/lcms.c +@@ -17,2 +17,3 @@ + ++#include /* pow() */ + #include diff --git a/media-video/mpv/mpv-0.17.0.ebuild b/media-video/mpv/mpv-0.17.0.ebuild index 4b22f41..7562eb5 100644 --- a/media-video/mpv/mpv-0.17.0.ebuild +++ b/media-video/mpv/mpv-0.17.0.ebuild @@ -126,7 +126,8 @@ RDEPEND="${COMMON_DEPEND} selinux? ( sec-policy/selinux-mplayer ) " -PATCHES=( "${FILESDIR}/${P}-fix-seeking-without-first-index-entry.patch" ) +PATCHES=( "${FILESDIR}/${P}-fix-seeking-without-first-index-entry.patch" + "${FILESDIR}/${P}-glibc-2.23.patch") pkg_pretend() { if [[ ${MERGE_TYPE} != "binary" ]] && ! tc-has-tls && use vaapi && use egl; then
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: d942872359ff883adac37a80b1d5c8ad8f53347a Author: Ilya Tumaykin gmail com> AuthorDate: Tue Apr 12 10:10:05 2016 + Commit: Patrice Clement gentoo org> CommitDate: Tue Apr 12 18:33:38 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9428723 media-video/mpv: remove old Closes: https://github.com/gentoo/gentoo/pull/1249 Package-Manager: portage-2.2.28 Signed-off-by: Patrice Clement gentoo.org> media-video/mpv/Manifest | 1 - ...-0.16.0-add-missing-audio-reconfig-events.patch | 33 --- ...-0.16.0-avoid-NULL-dereference-on-wayland.patch | 23 -- .../files/mpv-0.16.0-fix-bitrate-calculation.patch | 31 --- .../files/mpv-0.16.0-fix-coverart-decoding.patch | 39 --- .../mpv-0.16.0-fix-srt-subtitles-on-libav.patch| 29 --- .../mpv-0.16.0-set-correct-seekable-flags.patch| 36 --- media-video/mpv/mpv-0.16.0-r2.ebuild | 282 - 8 files changed, 474 deletions(-) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 2ad0738..a3873c8 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,4 +1,3 @@ -DIST mpv-0.16.0.tar.gz 2877026 SHA256 fc3619de0ede16fbb023ac72589090e8e77fd9d9e03a81adc728105d50ef38ba SHA512 d328dba2cc68bd3ae2e14bfcf2b4f69f076691bb40db77036e716f783d7683fde668b652829106661dfeea46d66b4a7ad61b58610411b69bd5265adea4f20bd6 WHIRLPOOL 09af632453788c9251a595f7ea18a15876c2bab2e393d32e8cc9eebf7e2ecc459873022234a98f97840223c7cb613e05039dbc987f13839d3210f284300ce312 DIST mpv-0.17.0.tar.gz 2882629 SHA256 602cd2b0f5fc7e43473234fbb96e3f7bbb6418f15eb8fa720d9433cce31eba6e SHA512 fb79738a16dbc12b60199a68836aca121a800958af4eaf6c2bdf1114bde36c156bafc232e814045a16fd738d2de1e2d8392bc98507961e5a73fa692e270dc7a2 WHIRLPOOL 704133b4033a5a2be8db92a4f1e52397d5b261a99a035d38e33b91d2c478e0e9bfcb2ba0e24ee03d37fffe693b275f50f7f1e453263a5afe61e8944f51eefa61 DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b diff --git a/media-video/mpv/files/mpv-0.16.0-add-missing-audio-reconfig-events.patch b/media-video/mpv/files/mpv-0.16.0-add-missing-audio-reconfig-events.patch deleted file mode 100644 index b01e126..000 --- a/media-video/mpv/files/mpv-0.16.0-add-missing-audio-reconfig-events.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit c13c9945bf84817ee1dd2d65e58660fb38e23a7f -Author: wm4-Date: Sun Mar 13 15:52:17 2016 +0100 - -player: add missing audio reconfig events - -This also takes care of sending the required property change -notifications. - -Fixes #2929 and maybe fixes #2920. - -diff --git a/player/audio.c b/player/audio.c -index f17587a..3a2c60b 100644 a/player/audio.c -+++ b/player/audio.c -@@ -134,6 +134,8 @@ static int recreate_audio_filters(struct MPContext *mpctx) - - mixer_reinit_audio(mpctx->mixer, mpctx->ao, afs); - -+mp_notify(mpctx, MPV_EVENT_AUDIO_RECONFIG, NULL); -+ - return 0; - - fail: -@@ -368,6 +370,8 @@ static void reinit_audio_filters_and_output(struct MPContext *mpctx) - - update_playback_speed(mpctx); - -+mp_notify(mpctx, MPV_EVENT_AUDIO_RECONFIG, NULL); -+ - return; - - init_error: diff --git a/media-video/mpv/files/mpv-0.16.0-avoid-NULL-dereference-on-wayland.patch b/media-video/mpv/files/mpv-0.16.0-avoid-NULL-dereference-on-wayland.patch deleted file mode 100644 index 9af5e24..000 --- a/media-video/mpv/files/mpv-0.16.0-avoid-NULL-dereference-on-wayland.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 5c2026336419805202fbf7a817b2960b0584ce5d -Author: wm4 -Date: Thu Mar 3 15:30:28 2016 +0100 - -vo_opengl: wayland: don't destroy NULL wl_egl_window - -The wayland client API crashes intentionally when trying to free NULL -objects. (Thanks.) - -diff --git a/video/out/opengl/context_wayland.c b/video/out/opengl/context_wayland.c -index 63a1453..a100073 100644 a/video/out/opengl/context_wayland.c -+++ b/video/out/opengl/context_wayland.c -@@ -183,7 +183,8 @@ static void waylandgl_uninit(MPGLContext *ctx) - - if (wl->egl_context.egl.ctx) { - eglReleaseThread(); --wl_egl_window_destroy(wl->egl_context.egl_window); -+if (wl->egl_context.egl_window) -+wl_egl_window_destroy(wl->egl_context.egl_window);
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: c0ecbdc63848f418471175376d55ee041894a019 Author: Ilya Tumaykin gmail com> AuthorDate: Mon Mar 14 16:26:13 2016 + Commit: Ian Delaney gentoo org> CommitDate: Mon Mar 14 18:20:05 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ecbdc6 media-video/mpv: revbump to 0.16.0-r2 to backport another regression fix Backport one more fix [1] for two regressions reported upstream [2,3]. Hopefully it's the final revbump unless something critical pops up. [1]: https://github.com/mpv-player/mpv/commit/c13c9945 [2]: https://github.com/mpv-player/mpv/issues/2920 [3]: https://github.com/mpv-player/mpv/issues/2929 Closes: https://github.com/gentoo/gentoo/pull/1046 Package-Manager: portage-2.2.28 ...-0.16.0-add-missing-audio-reconfig-events.patch | 33 ++ .../{mpv-0.16.0-r1.ebuild => mpv-0.16.0-r2.ebuild} | 1 + 2 files changed, 34 insertions(+) diff --git a/media-video/mpv/files/mpv-0.16.0-add-missing-audio-reconfig-events.patch b/media-video/mpv/files/mpv-0.16.0-add-missing-audio-reconfig-events.patch new file mode 100644 index 000..b01e126 --- /dev/null +++ b/media-video/mpv/files/mpv-0.16.0-add-missing-audio-reconfig-events.patch @@ -0,0 +1,33 @@ +commit c13c9945bf84817ee1dd2d65e58660fb38e23a7f +Author: wm4+Date: Sun Mar 13 15:52:17 2016 +0100 + +player: add missing audio reconfig events + +This also takes care of sending the required property change +notifications. + +Fixes #2929 and maybe fixes #2920. + +diff --git a/player/audio.c b/player/audio.c +index f17587a..3a2c60b 100644 +--- a/player/audio.c b/player/audio.c +@@ -134,6 +134,8 @@ static int recreate_audio_filters(struct MPContext *mpctx) + + mixer_reinit_audio(mpctx->mixer, mpctx->ao, afs); + ++mp_notify(mpctx, MPV_EVENT_AUDIO_RECONFIG, NULL); ++ + return 0; + + fail: +@@ -368,6 +370,8 @@ static void reinit_audio_filters_and_output(struct MPContext *mpctx) + + update_playback_speed(mpctx); + ++mp_notify(mpctx, MPV_EVENT_AUDIO_RECONFIG, NULL); ++ + return; + + init_error: diff --git a/media-video/mpv/mpv-0.16.0-r1.ebuild b/media-video/mpv/mpv-0.16.0-r2.ebuild similarity index 99% rename from media-video/mpv/mpv-0.16.0-r1.ebuild rename to media-video/mpv/mpv-0.16.0-r2.ebuild index ca8e4a1..9afd780 100644 --- a/media-video/mpv/mpv-0.16.0-r1.ebuild +++ b/media-video/mpv/mpv-0.16.0-r2.ebuild @@ -127,6 +127,7 @@ PATCHES=( "${FILESDIR}/${P}-set-correct-seekable-flags.patch" "${FILESDIR}/${P}-fix-bitrate-calculation.patch" "${FILESDIR}/${P}-fix-coverart-decoding.patch" + "${FILESDIR}/${P}-add-missing-audio-reconfig-events.patch" ) pkg_pretend() {
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: 34da076f6b14edbef02c8fe91e9e19deefb49269 Author: Ilya Tumaykin gmail com> AuthorDate: Thu Mar 10 17:51:05 2016 + Commit: Patrice Clement gentoo org> CommitDate: Thu Mar 10 21:35:18 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34da076f media-video/mpv: remove old Gentoo-Bug: https://bugs.gentoo.org/576748 Closes: https://github.com/gentoo/gentoo/pull/1026 Signed-off-by: Patrice Clement gentoo.org> Package-Manager: portage-2.2.27 media-video/mpv/Manifest | 1 - .../mpv-0.15.0-fix-null-pointer-dereference.patch | 21 -- ...pv-0.15.0-fix-vaapi-build-on-older-ffmpeg.patch | 23 -- media-video/mpv/mpv-0.15.0-r1.ebuild | 304 - media-video/mpv/mpv-0.16.0.ebuild | 302 5 files changed, 651 deletions(-) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index e8307fd..57e84db 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,4 +1,3 @@ -DIST mpv-0.15.0.tar.gz 2849513 SHA256 7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc SHA512 6f12487ff9bedd6872993189e3359c04ab0de559fd42bfcc5accdbfbd02e0d863cf3d7cfa5cceaedd174a4c16c831914945cf9cf6c918732f72fa44467127332 WHIRLPOOL 92b5a8ff864089bdddffa5941b8afca1433e5732ebe1ba71e326fbeb93475471e25038e73f807b3be01381a2b11ba2bc586cdccdc40bd99509a6fe234d780d9d DIST mpv-0.16.0.tar.gz 2877026 SHA256 fc3619de0ede16fbb023ac72589090e8e77fd9d9e03a81adc728105d50ef38ba SHA512 d328dba2cc68bd3ae2e14bfcf2b4f69f076691bb40db77036e716f783d7683fde668b652829106661dfeea46d66b4a7ad61b58610411b69bd5265adea4f20bd6 WHIRLPOOL 09af632453788c9251a595f7ea18a15876c2bab2e393d32e8cc9eebf7e2ecc459873022234a98f97840223c7cb613e05039dbc987f13839d3210f284300ce312 DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b diff --git a/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch b/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch deleted file mode 100644 index 4cc4c87..000 --- a/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 5053f4cc3f48538c3d9a3ba13dc98442f3302052 -Author: wm4-Date: Mon Jan 18 20:10:28 2016 +0100 - -command: fix NULL pointer deref in "video-codec" property - -Fixes #2729. - -diff --git a/player/command.c b/player/command.c -index 3c7cfb2..413349d 100644 a/player/command.c -+++ b/player/command.c -@@ -2438,7 +2438,7 @@ static int mp_property_video_codec(void *ctx, struct m_property *prop, - { - MPContext *mpctx = ctx; - struct track *track = mpctx->current_track[0][STREAM_VIDEO]; --const char *c = track->d_video ? track->d_video->decoder_desc : NULL; -+const char *c = track && track->d_video ? track->d_video->decoder_desc : NULL; - return m_property_strdup_ro(action, arg, c); - } - diff --git a/media-video/mpv/files/mpv-0.15.0-fix-vaapi-build-on-older-ffmpeg.patch b/media-video/mpv/files/mpv-0.15.0-fix-vaapi-build-on-older-ffmpeg.patch deleted file mode 100644 index dc55c98..000 --- a/media-video/mpv/files/mpv-0.15.0-fix-vaapi-build-on-older-ffmpeg.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit a8abb53a5d00d023aa6cb753ccaa6810e1640338 -Author: wm4 -Date: Wed Jan 20 15:35:15 2016 +0100 - -vaapi: fix compilation on older FFmpeg/Libav - -They don't define FF_PROFILE_VP9_0. - -Fixes #2737. - -diff --git a/video/decode/vaapi.c b/video/decode/vaapi.c -index edc95f5..313a901 100644 a/video/decode/vaapi.c -+++ b/video/decode/vaapi.c -@@ -109,7 +109,7 @@ static const struct va_native_display disp_x11 = { - #endif - - #define HAS_HEVC VA_CHECK_VERSION(0, 38, 0) --#define HAS_VP9 VA_CHECK_VERSION(0, 38, 1) -+#define HAS_VP9 (VA_CHECK_VERSION(0, 38, 1) && defined(FF_PROFILE_VP9_0)) - - #define PE(av_codec_id, ff_profile, vdp_profile)\ - {AV_CODEC_ID_ ## av_codec_id, FF_PROFILE_ ## ff_profile,\ diff --git a/media-video/mpv/mpv-0.15.0-r1.ebuild b/media-video/mpv/mpv-0.15.0-r1.ebuild deleted file mode 100644 index d30f5e7..000 --- a/media-video/mpv/mpv-0.15.0-r1.ebuild +++ /dev/null @@ -1,304 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: b0ec4ce8cebbb5373b02c7ef2d45953596767667 Author: Ilya Tumaykin gmail com> AuthorDate: Mon Feb 29 14:29:43 2016 + Commit: Ian Delaney gentoo org> CommitDate: Mon Feb 29 19:28:40 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ec4ce8 media-video/mpv: verbump to 0.16.0 Gentoo-Bug: 575976 Package-Manager: portage-2.2.27 media-video/mpv/Manifest | 1 + .../mpv-0.16.0-fix-srt-subtitles-on-libav.patch| 29 ++ media-video/mpv/mpv-0.16.0.ebuild | 302 + 3 files changed, 332 insertions(+) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 58e4f66..a60de5b 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,5 +1,6 @@ DIST mpv-0.14.0.tar.gz 2872619 SHA256 042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233 SHA512 523bffe87d6743ac67cab090bb5f43363352491f663debf150e204b942d85176f228011e306d58fa4a05ee962d4bc56b6f77ea943e3efe757417ad52b952 WHIRLPOOL b27f8acb21870c4d98e2a39ce78cf0e8923bdac5056adafedd242b687c0532cc51e338b9d5c2046155972adb99fd8f12f7d9ec2e78bdf4ed8ae1a295faedc0e9 DIST mpv-0.15.0.tar.gz 2849513 SHA256 7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc SHA512 6f12487ff9bedd6872993189e3359c04ab0de559fd42bfcc5accdbfbd02e0d863cf3d7cfa5cceaedd174a4c16c831914945cf9cf6c918732f72fa44467127332 WHIRLPOOL 92b5a8ff864089bdddffa5941b8afca1433e5732ebe1ba71e326fbeb93475471e25038e73f807b3be01381a2b11ba2bc586cdccdc40bd99509a6fe234d780d9d +DIST mpv-0.16.0.tar.gz 2877026 SHA256 fc3619de0ede16fbb023ac72589090e8e77fd9d9e03a81adc728105d50ef38ba SHA512 d328dba2cc68bd3ae2e14bfcf2b4f69f076691bb40db77036e716f783d7683fde668b652829106661dfeea46d66b4a7ad61b58610411b69bd5265adea4f20bd6 WHIRLPOOL 09af632453788c9251a595f7ea18a15876c2bab2e393d32e8cc9eebf7e2ecc459873022234a98f97840223c7cb613e05039dbc987f13839d3210f284300ce312 DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b DIST waf-1.8.4 96179 SHA256 f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8 SHA512 3a132d8b1cba0af0e3df046c0204c5df706fae4e0fac41cf74b53f6cdea6210ed798671c7a3cb3fee70573aacab16d4c0cc699cc4b7aa74c8a416346c5513f4c WHIRLPOOL fe8d7f42e5118a1f9490a0c9add1355c969185376b57d0bab024068dd6e7364632d862bf9432e1209165c5313ae843479ef334f4bd6285db05dfebff9a1b640e diff --git a/media-video/mpv/files/mpv-0.16.0-fix-srt-subtitles-on-libav.patch b/media-video/mpv/files/mpv-0.16.0-fix-srt-subtitles-on-libav.patch new file mode 100644 index 000..4344e78 --- /dev/null +++ b/media-video/mpv/files/mpv-0.16.0-fix-srt-subtitles-on-libav.patch @@ -0,0 +1,29 @@ +commit 041c9f1782cbed4abf7793f4e72b8b29b2fd9b1b +Author: wm4+Date: Mon Feb 29 18:20:27 2016 +0100 + +lavc_conv: fix Libav srt subtitles + +Use the mp_lavc_set_extradata() function instead of setting up the +extradata manually. This takes care of the corner case when +extradata_len is 0. + +This apparently fixes #2888. + +diff --git a/sub/lavc_conv.c b/sub/lavc_conv.c +index 3dd6097..7303020 100644 +--- a/sub/lavc_conv.c b/sub/lavc_conv.c +@@ -79,11 +79,8 @@ struct lavc_conv *lavc_conv_create(struct mp_log *log, const char *codec_name, + avctx = avcodec_alloc_context3(codec); + if (!avctx) + goto error; +-avctx->extradata_size = extradata_len; +-avctx->extradata = av_malloc(extradata_len); +-if (!avctx->extradata) ++if (mp_lavc_set_extradata(avctx, extradata, extradata_len) < 0) + goto error; +-memcpy(avctx->extradata, extradata, extradata_len); + if (strcmp(codec_name, "eia_608") == 0) + av_dict_set(, "real_time", "1", 0); + if (avcodec_open2(avctx, codec, ) < 0) diff --git a/media-video/mpv/mpv-0.16.0.ebuild b/media-video/mpv/mpv-0.16.0.ebuild new file mode 100644 index 000..1d18f73 --- /dev/null +++ b/media-video/mpv/mpv-0.16.0.ebuild @@ -0,0 +1,302 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) +PYTHON_REQ_USE='threads(+)' + +WAF_PV='1.8.12' + +inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils + +DESCRIPTION="Media player
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: d5c7520d1570c6495046164ed1246c8d56daf789 Author: Ilya Tumaykin gmail com> AuthorDate: Mon Feb 29 14:32:17 2016 + Commit: Ian Delaney gentoo org> CommitDate: Mon Feb 29 19:28:44 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5c7520d media-video/mpv: remove old Package-Manager: portage-2.2.27 media-video/mpv/Manifest | 1 - .../files/mpv-0.14.0-support-GNU-__thread.patch| 37 --- .../mpv/files/mpv-fix-include-in-tests.patch | 17 -- media-video/mpv/mpv-0.14.0-r1.ebuild | 304 - 4 files changed, 359 deletions(-) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index a60de5b..e8307fd 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,4 +1,3 @@ -DIST mpv-0.14.0.tar.gz 2872619 SHA256 042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233 SHA512 523bffe87d6743ac67cab090bb5f43363352491f663debf150e204b942d85176f228011e306d58fa4a05ee962d4bc56b6f77ea943e3efe757417ad52b952 WHIRLPOOL b27f8acb21870c4d98e2a39ce78cf0e8923bdac5056adafedd242b687c0532cc51e338b9d5c2046155972adb99fd8f12f7d9ec2e78bdf4ed8ae1a295faedc0e9 DIST mpv-0.15.0.tar.gz 2849513 SHA256 7d31217ba8572f364fcea2955733f821374ae6d8c6d8f22f8bc63c44c0400bdc SHA512 6f12487ff9bedd6872993189e3359c04ab0de559fd42bfcc5accdbfbd02e0d863cf3d7cfa5cceaedd174a4c16c831914945cf9cf6c918732f72fa44467127332 WHIRLPOOL 92b5a8ff864089bdddffa5941b8afca1433e5732ebe1ba71e326fbeb93475471e25038e73f807b3be01381a2b11ba2bc586cdccdc40bd99509a6fe234d780d9d DIST mpv-0.16.0.tar.gz 2877026 SHA256 fc3619de0ede16fbb023ac72589090e8e77fd9d9e03a81adc728105d50ef38ba SHA512 d328dba2cc68bd3ae2e14bfcf2b4f69f076691bb40db77036e716f783d7683fde668b652829106661dfeea46d66b4a7ad61b58610411b69bd5265adea4f20bd6 WHIRLPOOL 09af632453788c9251a595f7ea18a15876c2bab2e393d32e8cc9eebf7e2ecc459873022234a98f97840223c7cb613e05039dbc987f13839d3210f284300ce312 DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe diff --git a/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch b/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch deleted file mode 100644 index 6e17314..000 --- a/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch +++ /dev/null @@ -1,37 +0,0 @@ -For a lengthy discussion see https://github.com/mpv-player/mpv/issues/2631 - -Upstream commits: -https://github.com/mpv-player/mpv/commit/1a6f3c56ea6e7bf9928fc99469f8f5da4578f035 -https://github.com/mpv-player/mpv/commit/946bd52a1d1eb561ff8bb516ef6efcd02ca3ea1e - -diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c -index 00cd535..f607c23 100644 a/video/out/opengl/common.c -+++ b/video/out/opengl/common.c -@@ -606,7 +606,13 @@ int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt, - } - - #if HAVE_C11_TLS --static _Thread_local MPGLContext *current_context; -+#define MP_TLS _Thread_local -+#elif defined(__GNU__) -+#define MP_TLS __thread -+#endif -+ -+#ifdef MP_TLS -+static MP_TLS MPGLContext *current_context; - - static void * GLAPIENTRY get_native_display(const char *name) - { -diff --git a/wscript b/wscript -index a5e6914..969d9cc 100644 a/wscript -+++ b/wscript -@@ -718,7 +718,6 @@ video_output_features = [ - }, { - 'name': 'vaapi-egl', - 'desc': 'VAAPI EGL', --'deps': [ 'c11-tls' ], # indirectly - 'deps_any': [ 'vaapi-x-egl', 'vaapi-wayland' ], - 'func': check_true, - }, { diff --git a/media-video/mpv/files/mpv-fix-include-in-tests.patch b/media-video/mpv/files/mpv-fix-include-in-tests.patch deleted file mode 100644 index b020119..000 --- a/media-video/mpv/files/mpv-fix-include-in-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ -commit 867334395765ae7d2765e0834f9fd3dd5de53cab -Author: Ilya Tumaykin-Date: Tue Dec 22 17:10:12 2015 +0300 - -tests: fix #include - -diff --git a/test/gl_video.c b/test/gl_video.c -index 253ab35..97fee94 100644 a/test/gl_video.c -+++ b/test/gl_video.c -@@ -1,5 +1,5 @@ - #include "test_helpers.h" --#include "video/out/gl_video.h" -+#include "video/out/opengl/video.h" - - static void test_scale_ambient_lux_limits(void **state) { - float x; diff --git a/media-video/mpv/mpv-0.14.0-r1.ebuild b/media-video/mpv/mpv-0.14.0-r1.ebuild deleted file mode 100644 index 40ccf88..000 --- a/media-video/mpv/mpv-0.14.0-r1.ebuild +++ /dev/null @@ -1,304 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) -PYTHON_REQ_USE='threads(+)' -
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: fd9b596cf9e8a8efb5dbb0041496b45fbe8249fd Author: Ilya Tumaykin gmail com> AuthorDate: Mon Jan 18 19:45:47 2016 + Commit: Patrice Clement gentoo org> CommitDate: Mon Jan 18 20:48:12 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9b596c media-video/mpv: revbump to 0.15.0-r1 to fix null pointer dereference Upstream issue: https://github.com/mpv-player/mpv/issues/2729 Package-Manager: portage-2.2.26 .../mpv-0.15.0-fix-null-pointer-dereference.patch | 21 + .../mpv/{mpv-0.15.0.ebuild => mpv-0.15.0-r1.ebuild} | 2 ++ 2 files changed, 23 insertions(+) diff --git a/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch b/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch new file mode 100644 index 000..4cc4c87 --- /dev/null +++ b/media-video/mpv/files/mpv-0.15.0-fix-null-pointer-dereference.patch @@ -0,0 +1,21 @@ +commit 5053f4cc3f48538c3d9a3ba13dc98442f3302052 +Author: wm4+Date: Mon Jan 18 20:10:28 2016 +0100 + +command: fix NULL pointer deref in "video-codec" property + +Fixes #2729. + +diff --git a/player/command.c b/player/command.c +index 3c7cfb2..413349d 100644 +--- a/player/command.c b/player/command.c +@@ -2438,7 +2438,7 @@ static int mp_property_video_codec(void *ctx, struct m_property *prop, + { + MPContext *mpctx = ctx; + struct track *track = mpctx->current_track[0][STREAM_VIDEO]; +-const char *c = track->d_video ? track->d_video->decoder_desc : NULL; ++const char *c = track && track->d_video ? track->d_video->decoder_desc : NULL; + return m_property_strdup_ro(action, arg, c); + } + diff --git a/media-video/mpv/mpv-0.15.0.ebuild b/media-video/mpv/mpv-0.15.0-r1.ebuild similarity index 99% rename from media-video/mpv/mpv-0.15.0.ebuild rename to media-video/mpv/mpv-0.15.0-r1.ebuild index b6a0297..ca974a9 100644 --- a/media-video/mpv/mpv-0.15.0.ebuild +++ b/media-video/mpv/mpv-0.15.0-r1.ebuild @@ -161,6 +161,8 @@ pkg_pretend() { src_prepare() { cp "${DISTDIR}/waf-${WAF_PV}" "${S}"/waf || die chmod +x "${S}"/waf || die + + epatch "${FILESDIR}/${P}-fix-null-pointer-dereference.patch" epatch_user }
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/
commit: 4e74fdbda975745927525d5b64c215cc83791746 Author: Ilya Tumaykin gmail com> AuthorDate: Tue Dec 22 21:40:17 2015 + Commit: Ian Delaney gentoo org> CommitDate: Mon Dec 28 12:47:31 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e74fdbd media-video/mpv: remove obsolete patch This was originally submitted by Vindex17 in PR #318. Package-Manager: portage-2.2.24 media-video/mpv/files/mpv-0.3.11-libav-9.patch | 12 1 file changed, 12 deletions(-) diff --git a/media-video/mpv/files/mpv-0.3.11-libav-9.patch b/media-video/mpv/files/mpv-0.3.11-libav-9.patch deleted file mode 100644 index 7ab6516..000 --- a/media-video/mpv/files/mpv-0.3.11-libav-9.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/demux/demux.c b/demux/demux.c -index 0649175..bd16a7a 100644 a/demux/demux.c -+++ b/demux/demux.c -@@ -43,6 +43,7 @@ - #include "audio/format.h" - - #include -+#include - - // Demuxer list - extern const struct demuxer_desc demuxer_desc_edl; \ No newline at end of file
[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/, media-video/mpv/
commit: cf902d203d54e298849bcac1b92aafee9b15f658 Author: Ilya Tumaykin gmail com> AuthorDate: Tue Dec 22 20:40:25 2015 + Commit: Ian Delaney gentoo org> CommitDate: Mon Dec 28 12:47:30 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf902d20 media-video/mpv: version bump to 0.14.0 wrt bug 564656 Gentoo-Bug: 564656 Package-Manager: portage-2.2.24 media-video/mpv/Manifest | 1 + .../files/mpv-0.14.0-support-GNU-__thread.patch| 37 +++ media-video/mpv/mpv-0.14.0.ebuild | 299 + 3 files changed, 337 insertions(+) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 89e69f2..8e886d7 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -1,4 +1,5 @@ DIST mpv-0.11.0.tar.gz 2689655 SHA256 a2157174e46db46dad5deb1fde94283e72ebe922fd15447cb16a2a243fae5bda SHA512 f85da000770dbca09be2a59c4eda7e6d7142ca17328844d2b08a173f64554159f50ba9b32661ba67924b789e886940cda1add993862f02f295e7753f50388bdb WHIRLPOOL 1184f09435d6f30119143ab98ddd4767e53c701bdc5b850eb62c19607652a7103699a6b54a0d165acb548f4cced4179af6f7decbf64c8289ff56736e26ed7924 +DIST mpv-0.14.0.tar.gz 2872619 SHA256 042937f483603f0c3d1dec11e8f0045e8c27f19eee46ea64d81a3cdf01e51233 SHA512 523bffe87d6743ac67cab090bb5f43363352491f663debf150e204b942d85176f228011e306d58fa4a05ee962d4bc56b6f77ea943e3efe757417ad52b952 WHIRLPOOL b27f8acb21870c4d98e2a39ce78cf0e8923bdac5056adafedd242b687c0532cc51e338b9d5c2046155972adb99fd8f12f7d9ec2e78bdf4ed8ae1a295faedc0e9 DIST mpv-0.9.2.tar.gz 2701306 SHA256 c0148f55dbd17705f49bb496d0ce374419de62e1b17195d91409d7727cbd4751 SHA512 4f652a8e78d65b0ef44a06287b05250dfdfbce4cf5a6e21d3b446eedec268d83cf98afcc687272e2da2cfac9e9f69a303847dffdfd45cecdd4273b943ce50967 WHIRLPOOL 1512bacc2ce50e875770c76106a1bb2bc1d0cc5f6e2bdce91ff8c5cfc8bf13ffb48519858a5fa2a7d57880820dc12e5eb20f34ab71eca5d76ec303618da8f3fe DIST mpv-0.9.2_p20150824.tar.xz 1867384 SHA256 67fa5ce11740b83ceef8bc435d5ef17803f1ec328dd2fee93b67e46ccc195209 SHA512 1ae0fd4faa180472c023c0ba77a28f2d1319f597763d5249259d55a04387b5f6384e2c5a8ff78bb514dfda86c30ceb474c35e54468a29ad3fc6327c4baaf75cc WHIRLPOOL cb61758234f9186880def4dcb7cb7e54d03abd6734484b5691926e2514cae1bebef6f9a53465e2aa2710e4ad5dbe1875369d483489a5cb853c3fa756ff7e968a DIST waf-1.8.12 97567 SHA256 01bf2beab2106d1558800c8709bc2c8e496d3da4a2ca343fe091f22fca60c98b SHA512 8e47112abb134f965f15a27a600b4453cad3075afb5dadc17f2f6dac33d80ec68b679ac0ebc5f8a0245cbd07ae9fc7b899e69afc1bd021cce74e7af2ab457939 WHIRLPOOL c36d37c2d8c08e4048b4800f511611af5cf534304fcb58388ca491ff308bfcbcdd959d153edfd6ff8c118404e7293d8b786e43b07486139bf915a82aa75d792b diff --git a/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch b/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch new file mode 100644 index 000..6e17314 --- /dev/null +++ b/media-video/mpv/files/mpv-0.14.0-support-GNU-__thread.patch @@ -0,0 +1,37 @@ +For a lengthy discussion see https://github.com/mpv-player/mpv/issues/2631 + +Upstream commits: +https://github.com/mpv-player/mpv/commit/1a6f3c56ea6e7bf9928fc99469f8f5da4578f035 +https://github.com/mpv-player/mpv/commit/946bd52a1d1eb561ff8bb516ef6efcd02ca3ea1e + +diff --git a/video/out/opengl/common.c b/video/out/opengl/common.c +index 00cd535..f607c23 100644 +--- a/video/out/opengl/common.c b/video/out/opengl/common.c +@@ -606,7 +606,13 @@ int mpgl_validate_backend_opt(struct mp_log *log, const struct m_option *opt, + } + + #if HAVE_C11_TLS +-static _Thread_local MPGLContext *current_context; ++#define MP_TLS _Thread_local ++#elif defined(__GNU__) ++#define MP_TLS __thread ++#endif ++ ++#ifdef MP_TLS ++static MP_TLS MPGLContext *current_context; + + static void * GLAPIENTRY get_native_display(const char *name) + { +diff --git a/wscript b/wscript +index a5e6914..969d9cc 100644 +--- a/wscript b/wscript +@@ -718,7 +718,6 @@ video_output_features = [ + }, { + 'name': 'vaapi-egl', + 'desc': 'VAAPI EGL', +-'deps': [ 'c11-tls' ], # indirectly + 'deps_any': [ 'vaapi-x-egl', 'vaapi-wayland' ], + 'func': check_true, + }, { diff --git a/media-video/mpv/mpv-0.14.0.ebuild b/media-video/mpv/mpv-0.14.0.ebuild new file mode 100644 index 000..f6a0485 --- /dev/null +++ b/media-video/mpv/mpv-0.14.0.ebuild @@ -0,0 +1,299 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +PYTHON_REQ_USE='threads(+)' + +WAF_PV='1.8.12' + +inherit eutils fdo-mime gnome2-utils pax-utils python-any-r1 toolchain-funcs waf-utils + +DESCRIPTION="Media player based on MPlayer and mplayer2" +HOMEPAGE="https://mpv.io/; + +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 ~sparc ~x86