[vlc/f27: 22/22] Merge branch 'master' into f27
by Leigh Scott
commit df97162386c7b3ce8a9856f3069d395ab73549f2
Merge: 6c5a93c 0e7c088
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Aug 31 21:29:30 2018 +0100
Merge branch 'master' into f27
---
6 years, 2 months
[vlc/f27: 21/22] Update to 3.0.4
by Leigh Scott
commit 6c5a93cad9236e72656e3bd5499c45b2e56c19bc
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Aug 31 21:04:08 2018 +0100
Update to 3.0.4
buildfix_qt511.patch | 28 ---------
fix_wayland_freeze.patch | 62 -------------------
modules_text_renderer_freetype_text_layout.c.patch | 69 ----------------------
sources | 2 +-
vlc.spec | 16 ++---
5 files changed, 7 insertions(+), 170 deletions(-)
---
diff --git a/sources b/sources
index d391171..bf8b694 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf01d4755c719fe1c8605ceb40d8f1d2 vlc-3.0.3.tar.xz
+f5e49a0fb9594ab8debf934a710e92f1 vlc-3.0.4.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 2458198..1c03ae5 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -41,18 +41,11 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 3.0.3
-Release: 7%{?dist}
+Version: 3.0.4
+Release: 1%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
-# https://git.videolan.org/?p=vlc.git;a=commit;h=26e2d3906658c30f2f88f4b1bc...
-Patch0: modules_text_renderer_freetype_text_layout.c.patch
-# https://git.videolan.org/?p=vlc.git;a=commit;h=39b0590165501cdeb85595a19b...
-Patch1: buildfix_qt511.patch
-# https://mailman.videolan.org/pipermail/vlc-devel/2018-July/120638.html
-# https://bugzilla.rpmfusion.org/show_bug.cgi?id=4596
-Patch2: fix_wayland_freeze.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: fontpackages-devel
@@ -325,7 +318,7 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
--enable-theora \
--enable-libass \
--enable-shout \
-%{!?_with_wayland: --disable-wayland} \
+%{?_with_wayland: --enable-wayland} \
%{!?_without_xcb:--enable-xcb --enable-xvideo} \
%{?_without_xcb:--disable-xcb --disable-xvideo} \
--enable-svg \
@@ -566,6 +559,9 @@ fi || :
%changelog
+* Fri Aug 31 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.4-1
+- Update to 3.0.4
+
* Sat Aug 04 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-7
- Add patch from vlc mailing list to fix wayland freeze (rfbz#4596)
6 years, 2 months
[vlc/f27: 20/22] use upstream commit
by Leigh Scott
commit ced940a6a9774f8c21a8f6e9e0b6d18ce2148f9b
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Aug 9 12:26:14 2018 +0100
use upstream commit
fix_wayland_freeze.patch | 45 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 43 insertions(+), 2 deletions(-)
---
diff --git a/fix_wayland_freeze.patch b/fix_wayland_freeze.patch
index 7addcf8..aff8207 100644
--- a/fix_wayland_freeze.patch
+++ b/fix_wayland_freeze.patch
@@ -1,5 +1,44 @@
+From 33849a7fc3a948da2ddd6a96533e057583ef8e54 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan(a)redhat.com>
+Date: Tue, 31 Jul 2018 10:55:45 +0200
+Subject: [PATCH] Qt: Fix tooltip position
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+commit 5815534 ("qt: make the time tooltip a tooltip") reintroduced the
+bug fixed by previous commit ea99237 ("remove X11BypassWindowManagerHint
+from time tooltip") meant to fix #17829.
+
+The tooltip window is a shaped, override-redirect window which shows
+when the pointer enters the slider and disappears when it leaves the
+slider.
+
+By placing the tooltip window too low, above the slider, vlc causes a
+constant map/unmap of that window which will flood Xwayland and the
+Wayland compositori.window manager and can up with a deadlock situation.
+
+When the tooltip window is showing, the pointer will enter the tooltip
+window and thus leave the slider, which will cause the tooltip to be
+unmapped, which in turn causes the pointer to re-enter the slider area,
+which will cause the tooltip to show again, so on and so forth.
+
+On Wayland/Xwayland where the Wayland compositor (i.e. the display
+server) is also the window manager, that can lead to a deadlock
+situation because some X11 requests are blocking on rountrips to the
+Xserver, which in the case of Xwayland is also a Wayland client, waiting
+on the Wayland compositor for some operations, the Wayland compositor
+being also a Window manager and an X11 client at the same time...
+
+Avoid the issue by placing the tooltip so that it does not show up at
+the same location where the slider is, without overlap, to avoid that
+map/unmap requests storm.
+
Closes: https://gitlab.gnome.org/GNOME/mutter/issues/244
-Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
+Signed-off-by: Olivier Fourdan <ofourdan(a)redhat.com>
+Signed-off-by: Hugo Beauzée-Luyssen <hugo(a)beauzee.fr>
+(cherry picked from commit 6579a36c56ed30b72de584bf0e8cf21af1a90cf7)
+Signed-off-by: Hugo Beauzée-Luyssen <hugo(a)beauzee.fr>
---
modules/gui/qt/util/timetooltip.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -18,4 +57,6 @@ index 1314b520ea..7a63a9d7d9 100644
// Keep the tooltip on the same screen if possible
--
-2.17.1
+2.11.0
+
+
6 years, 2 months
[vlc/f27: 19/22] Add gcc-c++
by Leigh Scott
commit a0aead42b641373d704b02d9468deaa017648d65
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Aug 9 08:16:48 2018 +0200
Add gcc-c++
vlc.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/vlc.spec b/vlc.spec
index 4053548..2458198 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -62,6 +62,7 @@ BuildRequires: bison
BuildRequires: flex
BuildRequires: gettext-devel
BuildRequires: libtool
+BuildRequires: gcc-c++
}
%{?_with_a52dec:BuildRequires: a52dec-devel}
6 years, 2 months
[vlc/f27: 18/22] Add patch from vlc mailing list to fix wayland freeze (rfbz#4596)
by Leigh Scott
commit a3ace90d021446f34f788c552d04dc797176a5af
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Aug 4 14:14:49 2018 +0100
Add patch from vlc mailing list to fix wayland freeze (rfbz#4596)
fix_wayland_freeze.patch | 21 +++++++++++++++++++++
vlc.spec | 8 +++++++-
2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/fix_wayland_freeze.patch b/fix_wayland_freeze.patch
new file mode 100644
index 0000000..7addcf8
--- /dev/null
+++ b/fix_wayland_freeze.patch
@@ -0,0 +1,21 @@
+Closes: https://gitlab.gnome.org/GNOME/mutter/issues/244
+Signed-off-by: Olivier Fourdan <ofourdan at redhat.com>
+---
+ modules/gui/qt/util/timetooltip.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/gui/qt/util/timetooltip.cpp b/modules/gui/qt/util/timetooltip.cpp
+index 1314b520ea..7a63a9d7d9 100644
+--- a/modules/gui/qt/util/timetooltip.cpp
++++ b/modules/gui/qt/util/timetooltip.cpp
+@@ -73,7 +73,7 @@ void TimeTooltip::adjustPosition()
+ #if defined( Q_OS_WIN )
+ mTarget.y() - 2 * size.height() - TIP_HEIGHT / 2 );
+ #else
+- mTarget.y() - size.height() + TIP_HEIGHT / 2 );
++ mTarget.y() - size.height() - TIP_HEIGHT / 2 );
+ #endif
+
+ // Keep the tooltip on the same screen if possible
+--
+2.17.1
diff --git a/vlc.spec b/vlc.spec
index 0989bff..4053548 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -42,7 +42,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.3
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -50,6 +50,9 @@ Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
Patch0: modules_text_renderer_freetype_text_layout.c.patch
# https://git.videolan.org/?p=vlc.git;a=commit;h=39b0590165501cdeb85595a19b...
Patch1: buildfix_qt511.patch
+# https://mailman.videolan.org/pipermail/vlc-devel/2018-July/120638.html
+# https://bugzilla.rpmfusion.org/show_bug.cgi?id=4596
+Patch2: fix_wayland_freeze.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: fontpackages-devel
@@ -562,6 +565,9 @@ fi || :
%changelog
+* Sat Aug 04 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-7
+- Add patch from vlc mailing list to fix wayland freeze (rfbz#4596)
+
* Tue Jul 24 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.3-6
- Rebuilt for libplacebo
6 years, 2 months
[vlc/f27: 17/22] Rebuilt
by Leigh Scott
commit 0003905966c585a8a15ae3126b73c9c51e886cf6
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jul 24 09:32:31 2018 +0200
Rebuilt
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 472a335..0989bff 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -42,7 +42,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.3
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -562,6 +562,9 @@ fi || :
%changelog
+* Tue Jul 24 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.3-6
+- Rebuilt for libplacebo
+
* Wed Jun 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-5
- Revert last commit
6 years, 2 months
[vlc/f27: 16/22] Remove Group
by Leigh Scott
commit fd2ab55b588007d68ae04c82866a7ec36ed2b8ad
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Jul 24 09:32:14 2018 +0200
Remove Group
vlc.spec | 3 ---
1 file changed, 3 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 9ee0e69..472a335 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -241,7 +241,6 @@ multi-cast in IPv4 or IPv6 on networks.
%package devel
Summary: Development files for %{name}
-Group: Development/Libraries
Requires: %{name}-core%{_isa} = %{version}-%{release}
%description devel
@@ -251,7 +250,6 @@ developing applications that use %{name}.
%package core
Summary: VLC media player core
-Group: Applications/Multimedia
Provides: vlc-nox = %{version}-%{release}
Obsoletes: vlc-nox < 1.1.5-2
%{?live555_version:Requires: live555%{?_isa} = %{live555_version}}
@@ -262,7 +260,6 @@ VLC media player core components
%package extras
Summary: VLC media player with extras modules
-Group: Applications/Multimedia
Requires: vlc-core%{_isa} = %{version}-%{release}
6 years, 2 months
[vlc/f27: 15/22] Revert last commit
by Leigh Scott
commit ec920734ad2972bbc0ef7eba344fd0da579f1e46
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jun 27 13:32:36 2018 +0100
Revert last commit
vlc.spec | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 8b9cf78..9ee0e69 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -42,7 +42,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -123,9 +123,7 @@ BuildRequires: libtheora-devel
BuildRequires: libtiger-devel
BuildRequires: libtiff-devel
BuildRequires: pkgconfig(libjpeg)
-%ifarch x86_64 i686
BuildRequires: pkgconfig(libplacebo)
-%endif
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libvncclient)
BuildRequires: libupnp-devel
@@ -567,6 +565,9 @@ fi || :
%changelog
+* Wed Jun 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-5
+- Revert last commit
+
* Sat Jun 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-4
- Rebuild for new libass version
- Make libplacebo x86 only due to vulkan changes
6 years, 2 months
[vlc/f27: 14/22] Make libplacebo x86 only due to vulkan changes
by Leigh Scott
commit b89fd7e8a71854aa4db0ce7ff9dd3cf99f1a5fac
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jun 16 16:09:31 2018 +0100
Make libplacebo x86 only due to vulkan changes
vlc.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/vlc.spec b/vlc.spec
index 2dc63ed..8b9cf78 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -123,7 +123,9 @@ BuildRequires: libtheora-devel
BuildRequires: libtiger-devel
BuildRequires: libtiff-devel
BuildRequires: pkgconfig(libjpeg)
+%ifarch x86_64 i686
BuildRequires: pkgconfig(libplacebo)
+%endif
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libvncclient)
BuildRequires: libupnp-devel
@@ -567,6 +569,7 @@ fi || :
%changelog
* Sat Jun 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-4
- Rebuild for new libass version
+- Make libplacebo x86 only due to vulkan changes
* Sat Jun 02 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-3
- Fix build against Qt 5.11
6 years, 2 months
[vlc/f27: 13/22] Rebuild for new libass version
by Leigh Scott
commit 72be7dac3badfbcdf2c40252b1cb151a42e09315
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jun 16 14:13:36 2018 +0100
Rebuild for new libass version
vlc.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index a6ae4d7..2dc63ed 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -42,7 +42,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.3
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -565,6 +565,9 @@ fi || :
%changelog
+* Sat Jun 16 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-4
+- Rebuild for new libass version
+
* Sat Jun 02 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-3
- Fix build against Qt 5.11
6 years, 2 months