From: Jan Palus Date: Wed, 26 Nov 2014 12:07:17 +0000 (+0100) Subject: - up to 0.7.0 X-Git-Tag: auto/th/mpv-0.7.0-1~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=e386ece9c9f6ecafdf6d9e08917b4718412afcab;p=packages%2Fmpv.git - up to 0.7.0 - zsh/xmonad patches no longer required - quvi support dropped in favour of youtube-dl (suggested now) - adapterized --- diff --git a/mpv-xmonad_fullscreen.patch b/mpv-xmonad_fullscreen.patch deleted file mode 100755 index 3c2154e..0000000 --- a/mpv-xmonad_fullscreen.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 54fd93856a3b34c92d0dd9e8cc972b57a92d1a5e Mon Sep 17 00:00:00 2001 -From: wm4 -Date: Sat, 4 Oct 2014 15:03:02 +0200 -Subject: [PATCH] x11: stupid workaround for XMonad - ---x11-netwm=yes now forces NetWM fullscreen, while --x11-netwm=auto -(detect whether NetWM fullsctreen support is available) is the old -behavior and still the default. - -See #888. ---- - DOCS/man/options.rst | 18 ++++++++++++++---- - options/options.c | 4 ++-- - video/out/x11_common.c | 6 +++++- - 3 files changed, 21 insertions(+), 7 deletions(-) - -diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst -index b187259..69525ae 100644 ---- a/DOCS/man/options.rst -+++ b/DOCS/man/options.rst -@@ -1708,16 +1708,26 @@ Window - ``--x11-name`` - Set the window class name for X11-based video output methods. - --``--x11-netwm=no`` -+``--x11-netwm=`` - (X11 only) -- Disable use of the NetWM protocol when switching to or from fullscreen. -+ Control the use of NetWM protocol features. -+ - This may or may not help with broken window managers. This provides some - functionality that was implemented by the now removed ``--fstype`` option. - Actually, it is not known to the developers to which degree this option - was needed, so feedback is welcome. - -- By default, NetWM support is autodetected, and using this option forces -- autodetection to fail. -+ Specifically, ``yes`` will force use of NetWM fullscreen support, even if -+ not advertised by the WM. This can be useful for WMs that are broken on -+ purpose, like XMonad. (XMonad supposedly doesn't advertise fullscreen -+ support, because Flash uses it. Apparently, applications which want to -+ use fullscreen anyway are supposed to either ignore the NetWM support hints, -+ or provide a workaround. Shame on XMonad for deliberately breaking X -+ protocols (as if X isn't bad enough already). -+ -+ By default, NetWM support is autodetected (``auto``). -+ -+ This option might be removed in the future. - - - Disc Devices -diff --git a/options/options.c b/options/options.c -index bc016df..1639719 100644 ---- a/options/options.c -+++ b/options/options.c -@@ -431,7 +431,8 @@ const m_option_t mp_opts[] = { - - OPT_INT64("wid", vo.WinID, CONF_GLOBAL), - #if HAVE_X11 -- OPT_FLAG("x11-netwm", vo.x11_netwm, 0), -+ OPT_CHOICE("x11-netwm", vo.x11_netwm, 0, -+ ({"auto", 0}, {"no", -1}, {"yes", 1})), - #endif - OPT_STRING("heartbeat-cmd", heartbeat_cmd, 0), - OPT_FLOAT("heartbeat-interval", heartbeat_interval, CONF_MIN, 0), -@@ -573,7 +574,6 @@ const struct MPOpts mp_default_opts = { - .keepaspect = 1, - .border = 1, - .WinID = -1, -- .x11_netwm = 1, - }, - .allow_win_drag = 1, - .wintitle = "mpv - ${media-title}", -diff --git a/video/out/x11_common.c b/video/out/x11_common.c -index 140069e..aed54f9 100644 ---- a/video/out/x11_common.c -+++ b/video/out/x11_common.c -@@ -308,7 +308,7 @@ static int vo_wm_detect(struct vo *vo) - &nitems); - if (args) { - MP_VERBOSE(x11, "Detected wm supports NetWM.\n"); -- if (vo->opts->x11_netwm) { -+ if (vo->opts->x11_netwm >= 0) { - for (i = 0; i < nitems; i++) - wm |= net_wm_support_state_test(vo->x11, args[i]); - } else { -@@ -319,6 +319,10 @@ static int vo_wm_detect(struct vo *vo) - - if (wm == 0) - MP_VERBOSE(x11, "Unknown wm type...\n"); -+ if (vo->opts->x11_netwm > 0 && !(wm & vo_wm_FULLSCREEN)) { -+ MP_WARN(x11, "Forcing NetWM FULLSCREEN support.\n"); -+ wm |= vo_wm_FULLSCREEN; -+ } - return wm; - } - diff --git a/mpv-zshcompdir.patch b/mpv-zshcompdir.patch deleted file mode 100644 index 8d039bd..0000000 --- a/mpv-zshcompdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN mpv-0.4.0.orig/wscript_build.py mpv-0.4.0/wscript_build.py ---- mpv-0.4.0.orig/wscript_build.py 2014-06-28 12:59:05.435131074 +0200 -+++ mpv-0.4.0/wscript_build.py 2014-06-28 12:59:38.128463410 +0200 -@@ -539,7 +539,7 @@ - if ctx.dependency_satisfied('zsh-comp'): - ctx.zshcomp(target = "etc/_mpv") - ctx.install_files( -- ctx.env.DATADIR + '/zsh/vendor-completions', -+ ctx.env.DATADIR + '/zsh/site-functions', - ['etc/_mpv']) - - ctx.install_files( diff --git a/mpv.spec b/mpv.spec index 7a828d5..24199d1 100644 --- a/mpv.spec +++ b/mpv.spec @@ -1,15 +1,13 @@ Summary: Movie player based on MPlayer and mplayer2 Name: mpv -Version: 0.6.2 +Version: 0.7.0 Release: 1 License: GPL v2+ Group: Applications/Multimedia Source0: http://github.com/mpv-player/mpv/archive/v%{version}.tar.gz?/%{name}-%{version}.tar.gz -# Source0-md5: d0e25a26b6143b5e7d4ba354dd52f1b3 +# Source0-md5: ddb900d0f4e086734ccf2a775a15c859 Source1: %{name}.conf -Patch0: %{name}-zshcompdir.patch -Patch1: %{name}-lua.patch -Patch2: %{name}-xmonad_fullscreen.patch +Patch0: %{name}-lua.patch URL: http://mpv.io/ BuildRequires: Mesa-libwayland-egl-devel >= 9.0.0 BuildRequires: OpenAL-devel >= 1.13 @@ -34,7 +32,6 @@ BuildRequires: libdvdread-devel >= 4.1.0 BuildRequires: libguess-devel BuildRequires: libjpeg-devel BuildRequires: libmpg123-devel >= 1.14.0 -BuildRequires: libquvi-devel < 0.9.0 BuildRequires: libsmbclient-devel BuildRequires: libv4l-devel BuildRequires: libva-devel >= 1.2.0 @@ -42,7 +39,6 @@ BuildRequires: libva-glx-devel >= 1.2.0 BuildRequires: libvdpau-devel >= 0.2 BuildRequires: lirc-devel BuildRequires: lua51-devel -BuildRequires: ncurses-devel BuildRequires: pkgconfig BuildRequires: portaudio-devel >= 19 BuildRequires: pulseaudio-devel >= 0.9 @@ -60,6 +56,7 @@ BuildRequires: xorg-lib-libXxf86vm-devel BuildRequires: xorg-lib-libxkbcommon-devel >= 0.3.0 BuildRequires: xorg-proto-xproto-devel Requires: OpenGL +Suggests: youtube-dl >= 2:20141109 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %define _noautoreqdep libGL.so.1 libGLU.so.1 @@ -70,24 +67,24 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Movie player based on MPlayer and mplayer2. %package client-libs -Summary: Client library for controlling mpv -Group: Development/Libraries +Summary: Client library for controlling mpv +Group: Development/Libraries %description client-libs Client library for controlling mpv. %package client-devel -Summary: Development files for mpv client library -Group: Development/Libraries -Requires: %{name}-client-libs = %{version}-%{release} +Summary: Development files for mpv client library +Group: Development/Libraries +Requires: %{name}-client-libs = %{version}-%{release} %description client-devel Development files for mpv client library. %package -n zsh-completion-mpv -Summary: zsh-completion for mpv -Group: Applications/Shells -Requires: %{name} = %{version}-%{release} +Summary: zsh-completion for mpv +Group: Applications/Shells +Requires: %{name} = %{version}-%{release} %description -n zsh-completion-mpv zsh-completion for mpv. @@ -95,8 +92,6 @@ zsh-completion for mpv. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %waf configure \ @@ -135,7 +130,6 @@ zsh-completion for mpv. --enable-libguess \ --enable-libmpv-shared \ --enable-libpostproc \ - --enable-libquvi4 \ --enable-libsmbclient \ --enable-libv4l2 \ --enable-lirc \ @@ -147,7 +141,6 @@ zsh-completion for mpv. --enable-pvr \ --enable-sdl1 \ --enable-shm \ - --enable-terminfo \ --enable-tv \ --enable-tv-v4l2 \ --enable-vaapi \ @@ -164,7 +157,8 @@ zsh-completion for mpv. --enable-xss \ --enable-xv \ --enable-zsh-comp \ - --lua=51pld + --lua=51pld \ + --zshdir=%{zshdir} %waf build -v @@ -174,7 +168,7 @@ rm -rf $RPM_BUILD_ROOT %waf install --destdir=$RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_sysconfdir}/mpv -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mpv +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mpv %{__rm} -r $RPM_BUILD_ROOT%{_docdir}