1:34 p.m.
commit eabba11346d2c9567f372630908f75fdfa91afb4
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Oct 10 14:34:27 2017 +0100
Fix libvlc vdpau issue (rfbz #4678)
libvlc_remove_xid.patch | 29 +++++++++++++++++++++++++++++
sources | 2 +-
vlc.spec | 16 +++++++++++-----
3 files changed, 41 insertions(+), 6 deletions(-)
---
diff --git a/libvlc_remove_xid.patch b/libvlc_remove_xid.patch
new file mode 100644
index 0000000..afe01b6
--- /dev/null
+++ b/libvlc_remove_xid.patch
@@ -0,0 +1,29 @@
+From 0014603e717efc39242acc5c3dafc9390304415b Mon Sep 17 00:00:00 2001
+From: Thomas Guillem <thomas(a)gllm.fr>
+Date: Tue, 10 Oct 2017 15:01:26 +0200
+Subject: [PATCH] libvlc: don't force the xid "vout display"
+
+libvlc_media_player_set_xwindow() should only force the embed-xid "vout
window"
+plugin but not the xid "vout display" plugin.
+
+This allows to use the GL "vout display" via EGL/GLX (with full hardware
+acceleration) with an embedded X window.
+
+Fixes #18907
+---
+ lib/media_player.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/media_player.c b/lib/media_player.c
+index 7247cdea857..ef34125aa5a 100644
+--- a/lib/media_player.c
++++ b/lib/media_player.c
+@@ -1175,7 +1175,7 @@ void libvlc_media_player_set_xwindow( libvlc_media_player_t *p_mi,
+ assert (p_mi != NULL);
+
+ var_SetString (p_mi, "avcodec-hw", "");
+- var_SetString (p_mi, "vout", drawable ? "xid" : "");
++ var_SetString (p_mi, "vout", "");
+ var_SetString (p_mi, "window", drawable ? "embed-xid,any" :
"");
+ var_SetInteger (p_mi, "drawable-xid", drawable);
+ }
diff --git a/sources b/sources
index 5293529..e71444f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9947671bbf29c2ab46c919d8e7a853e4 vlc-3.0.0-20170922-0239-git.tar.xz
+fcea04f4a76dcc36c9ed2450b72d87b1 vlc-3.0.0-20171009-0241-git.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 2fe0d48..542a5df 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,5 +1,5 @@
-%global vlc_date 20170922
-%global vlc_rc -%{?vlc_date}-0239-git
+%global vlc_date 20171009
+%global vlc_rc -%{?vlc_date}-0241-git
%if 0%{?vlc_rc:1}
%global vlc_url https://nightlies.videolan.org/build/source/
%else
@@ -39,13 +39,14 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.0
-Release: 0.36%{?vlc_date:.git%{vlc_date}}%{?dist}
+Release: 0.37%{?vlc_date:.git%{vlc_date}}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_rc}.tar.xz
#https://trac.videolan.org/vlc/ticket/18383
Patch0: 0001-qt-Prefer-XCB-over-Wayland.patch
+Patch1: libvlc_remove_xid.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
@@ -253,6 +254,7 @@ VLC media player extras modules.
%prep
%setup -q -n %{name}-%{version}%{?vlc_rc:-git}
%patch0 -p1 -b .wl
+%patch1 -p1 -b .xid
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
@@ -356,7 +358,7 @@ touch %{buildroot}%{_libdir}/vlc/plugins/plugins.dat
#Appdata
appstream-util validate-relax --nonet \
- %{buildroot}/%{_datadir}/appdata/*.appdata.xml || :
+ %{buildroot}/%{_datadir}/metainfo/*.appdata.xml || :
#Fixup
rm -rf %{buildroot}/%{_datadir}/macosx
@@ -407,7 +409,7 @@ fi || :
%files
%doc AUTHORS ChangeLog NEWS README THANKS
%license COPYING
-%{_datadir}/appdata/vlc.appdata.xml
+%{_datadir}/metainfo/vlc.appdata.xml
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/kde4/apps/solid/actions/vlc-*.desktop
%{_datadir}/icons/hicolor/*/apps/vlc*.png
@@ -550,6 +552,10 @@ fi || :
%changelog
+* Mon Oct 09 2017 Leigh Scott <leigh123linux(a)googlemail.com> -
3.0.0-0.37.git20171009
+- Update snapshot
+- Fix libvlc vdpau issue (rfbz #4678)
+
* Mon Sep 25 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.36.git20170922
- Rebuilt for live555