+++ /dev/null
-From 54fd93856a3b34c92d0dd9e8cc972b57a92d1a5e Mon Sep 17 00:00:00 2001
-From: wm4 <wm4@nowhere>
-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=<yes|no|auto>``
- (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;
- }
-
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
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
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
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
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.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
%waf configure \
--enable-libguess \
--enable-libmpv-shared \
--enable-libpostproc \
- --enable-libquvi4 \
--enable-libsmbclient \
--enable-libv4l2 \
--enable-lirc \
--enable-pvr \
--enable-sdl1 \
--enable-shm \
- --enable-terminfo \
--enable-tv \
--enable-tv-v4l2 \
--enable-vaapi \
--enable-xss \
--enable-xv \
--enable-zsh-comp \
- --lua=51pld
+ --lua=51pld \
+ --zshdir=%{zshdir}
%waf build -v
%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}
projects / packages / mpv.git / commitdiff