diff --git a/libvlc_remove_xid.patch b/libvlc_remove_xid.patch deleted file mode 100644 index afe01b6..0000000 --- a/libvlc_remove_xid.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0014603e717efc39242acc5c3dafc9390304415b Mon Sep 17 00:00:00 2001 -From: Thomas Guillem -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 e71444f..d882724 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcea04f4a76dcc36c9ed2450b72d87b1 vlc-3.0.0-20171009-0241-git.tar.xz +90ae508248c66715ccd7c167e341feed vlc-3.0.0-20171103-0240-git.tar.xz diff --git a/vlc.spec b/vlc.spec index 0192196..24ee9ee 100644 --- a/vlc.spec +++ b/vlc.spec @@ -1,5 +1,5 @@ -%global vlc_date 20171009 -%global vlc_rc -%{?vlc_date}-0241-git +%global vlc_date 20171103 +%global vlc_rc -%{?vlc_date}-0240-git %if 0%{?vlc_rc:1} %global vlc_url https://nightlies.videolan.org/build/source/ %else @@ -39,14 +39,13 @@ Summary: The cross-platform open-source multimedia framework, player and server Name: vlc Version: 3.0.0 -Release: 0.38%{?vlc_date:.git%{vlc_date}}%{?dist} +Release: 0.39%{?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 @@ -146,9 +145,10 @@ BuildRequires: pkgconfig(libarchive) >= 3.1.0 BuildRequires: pkgconfig(libpulse) >= 0.9.8 BuildRequires: pkgconfig(libsecret-1) >= 0.18 BuildRequires: pkgconfig(protobuf-lite) >= 2.5 -BuildRequires: pkgconfig(Qt5Core) >= 5.2 -BuildRequires: pkgconfig(Qt5X11Extras) >= 5.2 +BuildRequires: pkgconfig(Qt5Core) >= 5.5 BuildRequires: pkgconfig(Qt5Gui) >= 5.5 +BuildRequires: pkgconfig(Qt5Svg) >= 5.5 +BuildRequires: pkgconfig(Qt5X11Extras) >= 5.5 BuildRequires: pkgconfig(speexdsp) >= 1.0.5 %{?_with_wayland: BuildRequires: pkgconfig(wayland-client) >= 1.5.91 @@ -254,7 +254,6 @@ 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 @@ -552,6 +551,9 @@ fi || : %changelog +* Fri Nov 03 2017 Nicolas Chauvet - 3.0.0-0.39.git20171103 +- Update to 20171103 snapshoot + * Mon Oct 16 2017 Leigh Scott - 3.0.0-0.38.git20171009 - Rebuild for ffmpeg update