[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/

[gentoo-commits] repo/gentoo:master commit in: media-video/mpv/files/

[Ian Delaney]

commit:     4e74fdbda975745927525d5b64c215cc83791746
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Tue Dec 22 21:40:17 2015 +0000
Commit:     Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Dec 28 12:47:31 2015 +0000
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..0000000
--- 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 <libavcodec/avcodec.h>
-+#include <libavutil/mem.h>
- 
- // 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/

[David Seifert]

commit:     cdd878ca5c47cafbb29bfe9cbb9e9ee64ec70fc9
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Sun Feb 12 21:15:50 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 21:41:03 2017 +0000
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/

[Ionen Wolkens]

commit:     31a76f76ed2b9d91860aca63d7b99e8a23fe14df
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Nov  8 06:22:23 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Nov  8 06:53:25 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a76f76

media-video/mpv: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28188
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-video/mpv/files/mpv-9999-docdir.patch | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/media-video/mpv/files/mpv-9999-docdir.patch b/media-video/mpv/files/mpv-9999-docdir.patch
deleted file mode 100644
index 62a57415163b..000000000000
--- a/media-video/mpv/files/mpv-9999-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')