[vlc/f27: 12/22] Fix build against Qt 5.11
by Leigh Scott
commit b46eb65ee255a5903ea7297cf93642b94fc0be69
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Jun 2 14:18:16 2018 +0100
Fix build against Qt 5.11
buildfix_qt511.patch | 28 ++++++++++++++++++++++++++++
vlc.spec | 11 +++++++----
2 files changed, 35 insertions(+), 4 deletions(-)
---
diff --git a/buildfix_qt511.patch b/buildfix_qt511.patch
new file mode 100644
index 0000000..ee84452
--- /dev/null
+++ b/buildfix_qt511.patch
@@ -0,0 +1,28 @@
+From 39b0590165501cdeb85595a19bf076d06bcc594c Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar(a)opensuse.org>
+Date: Thu, 17 May 2018 17:40:37 +0200
+Subject: [PATCH] qt: fix build against Qt 5.11
+
+Qt 5.11 is in RC phase now, and some headers need to be explicitly
+included in order to build successfully.
+
+Signed-off-by: Jean-Baptiste Kempf <jb(a)videolan.org>
+---
+ modules/gui/qt/components/simple_preferences.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/modules/gui/qt/components/simple_preferences.cpp b/modules/gui/qt/components/simple_preferences.cpp
+index b48ea7b67f..7a9c2dbf28 100644
+--- a/modules/gui/qt/components/simple_preferences.cpp
++++ b/modules/gui/qt/components/simple_preferences.cpp
+@@ -36,6 +36,7 @@
+ #include <QString>
+ #include <QFont>
+ #include <QToolButton>
++#include <QButtonGroup>
+ #include <QSignalMapper>
+ #include <QVBoxLayout>
+ #include <QScrollArea>
+--
+2.11.0
+
diff --git a/vlc.spec b/vlc.spec
index f11bdc8..a6ae4d7 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -42,13 +42,14 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.3
-Release: 2%{?dist}
+Release: 3%{?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
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: fontpackages-devel
@@ -270,8 +271,7 @@ VLC media player extras modules.
%prep
-%setup -q -n %{name}-%{version}%{?vlc_rc:-%{vlc_rc}}
-%patch0 -p1
+%autosetup -p1 -n %{name}-%{version}%{?vlc_rc:-%{vlc_rc}}
%if 0%{?rhel} == 7
. /opt/rh/devtoolset-7/enable
@@ -565,6 +565,9 @@ fi || :
%changelog
+* Sat Jun 02 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-3
+- Fix build against Qt 5.11
+
* Fri Jun 01 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.3-2
- Add missing libjpeg
5 years, 7 months
[vlc/f27] (22 commits) ...Merge branch 'master' into f27
by Leigh Scott
Summary of changes:
2abed9d... Add missing libjpeg (*)
177501b... Fix build against Qt 5.11 (*)
d323b5e... Rebuild for new libass version (*)
6d9dbda... Make libplacebo x86 only due to vulkan changes (*)
bc3b86d... Revert last commit (*)
17385d7... Remove Group (*)
309f21e... Rebuilt (*)
125f9ec... Add patch from vlc mailing list to fix wayland freeze (rfbz (*)
eb71c5a... Add gcc-c++ (*)
e8e5e3d... use upstream commit (*)
0e7c088... Update to 3.0.4 (*)
b46eb65... Fix build against Qt 5.11
72be7da... Rebuild for new libass version
b89fd7e... Make libplacebo x86 only due to vulkan changes
ec92073... Revert last commit
fd2ab55... Remove Group
0003905... Rebuilt
a3ace90... Add patch from vlc mailing list to fix wayland freeze (rfbz
a0aead4... Add gcc-c++
ced940a... use upstream commit
6c5a93c... Update to 3.0.4
df97162... Merge branch 'master' into f27
(*) This commit already existed in another branch; no separate mail sent
5 years, 7 months
[vlc/f28: 22/22] Merge branch 'master' into f28
by Leigh Scott
commit d3e443ee48b500489fe67319218543a914bc609e
Merge: f6af375 0e7c088
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri Aug 31 21:11:25 2018 +0100
Merge branch 'master' into f28
---
5 years, 7 months
[vlc/f28: 21/22] Update to 3.0.4
by Leigh Scott
commit f6af375d00a2d04c3b1323e68122d2ec8b74e871
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)
5 years, 7 months
[vlc/f28: 20/22] use upstream commit
by Leigh Scott
commit 7b5f93ea53c68ce99e3dc08251fd506dfbcf4d66
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
+
+
5 years, 7 months
[vlc/f28: 19/22] Add gcc-c++
by Leigh Scott
commit ee24183a8995874924c0548a527dfdb3f215bf06
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}
5 years, 7 months
[vlc/f28: 18/22] Add patch from vlc mailing list to fix wayland freeze (rfbz#4596)
by Leigh Scott
commit c0e5ada81eff85dadadc07a2bae0996dc53201d5
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
5 years, 7 months
[vlc/f28: 17/22] Rebuilt
by Leigh Scott
commit df0786cb2c27d908274334cdec548878aa20e52d
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
5 years, 7 months
[vlc/f28: 16/22] Remove Group
by Leigh Scott
commit cc269dfde77b2b219f24b65994458bf9e526a7bb
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}
5 years, 7 months
[vlc/f28: 15/22] Revert last commit
by Leigh Scott
commit bcdc86a2bb822c02db1630dee25008c6d0da9de0
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
5 years, 7 months