From eabe993ae4a0ce9814b1a066b6053b7efca9a2424f7d4640c429402a5493735c Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 11 Feb 2016 11:37:38 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/vlc revision 51.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=138ee569fe914e8416c16c4789d9d265 --- vlc-CVE-2015-5949.patch | 30 ------------------------------ vlc-support-qt5.5.patch | 33 +++++++++++++++++++++++++++++++++ vlc.changes | 3 +++ vlc.spec | 10 +++++++--- 4 files changed, 43 insertions(+), 33 deletions(-) delete mode 100644 vlc-CVE-2015-5949.patch create mode 100644 vlc-support-qt5.5.patch diff --git a/vlc-CVE-2015-5949.patch b/vlc-CVE-2015-5949.patch deleted file mode 100644 index 1040bd1..0000000 --- a/vlc-CVE-2015-5949.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ce91452460a75d7424b165c4dc8db98114c3cbd9 Mon Sep 17 00:00:00 2001 -From: Francois Cartegnie -Date: Mon, 3 Aug 2015 15:17:32 +0200 -Subject: [PATCH 1/1] demux: mp4: correctly match release function - -Signed-off-by: Jean-Baptiste Kempf ---- - modules/demux/mp4/libmp4.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c -index 331262b..f220e51 100644 ---- a/modules/demux/mp4/libmp4.c -+++ b/modules/demux/mp4/libmp4.c -@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box ) - { - for( i_index = 0; ; i_index++ ) - { -+ if ( MP4_Box_Function[i_index].i_parent && -+ p_box->p_father && -+ p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent ) -+ continue; -+ - if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )|| - ( MP4_Box_Function[i_index].i_type == 0 ) ) - { --- -1.7.10.4 - - diff --git a/vlc-support-qt5.5.patch b/vlc-support-qt5.5.patch new file mode 100644 index 0000000..6efddf6 --- /dev/null +++ b/vlc-support-qt5.5.patch @@ -0,0 +1,33 @@ +From 64dccb0fdd71075e37e03c4b52a0c9f5bb749d3f Mon Sep 17 00:00:00 2001 +From: Jean-Baptiste Kempf +Date: Mon, 16 Nov 2015 14:54:35 +0100 +Subject: [PATCH 1/1] Configure: Refuse Qt 5.5.0 and 5.5.1 + +If you are a packager, I'm sorry for you, but you MUST patch Qt5.5 with +https://codereview.qt-project.org/#/c/139066/1 +and then revert this commit. +You can also lobby for a Qt5.5.2 +--- + configure.ac | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 63a0577..d90097c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3735,6 +3735,11 @@ AS_IF([test "${enable_qt}" != "no"], [ + ],[ + AC_MSG_WARN([Not building Qt Interface with X11 helpers.]) + ]) ++ ++ PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [ ++ AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"]) ++ ]) ++ + QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)" + QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)" + AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) +-- +1.7.10.4 + + diff --git a/vlc.changes b/vlc.changes index 644d6e1..e2a0069 100644 --- a/vlc.changes +++ b/vlc.changes @@ -81,6 +81,9 @@ Fri Feb 5 21:28:01 UTC 2016 - dimstar@opensuse.org + Updated translations. - Drop vlc-CVE-2015-5949.patch and vlc-qt5.5-mousepointer.patch: fixed upstream. +- Add vlc-support-qt5.5.patch (reverse applied): The Qt 5.5 package + in Leap and Tumbleweed have been patched to have the fix upstream + wanted to make us aware of with this commit. ------------------------------------------------------------------- Fri Feb 5 09:07:03 UTC 2016 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index b709540..9d49a3c 100644 --- a/vlc.spec +++ b/vlc.spec @@ -45,8 +45,8 @@ Source2: %{name}-rpmlintrc Patch1: vlc-2.1.5-fix-skins2-default-skin-creation.patch Patch3: 0001-no-return-in-non-void.patch Patch4: vlc-2.2.0-fix_deinterlace_mmx.patch -# PATCH-FIX-UPSTREAM vlc-CVE-2015-5949.patch boo#965227 CVE-2015-5949 dimstar@opensuse.org -- demux: mp4: correctly match release function -Patch5: vlc-CVE-2015-5949.patch +# PATCH-FIX-UPSTREAM vlc-support-qt5.5.patch dimstar@opensuse.org -- The Qt 5.5 packages in Leap and Tumbleweed are patched. Other dists don't have Qt 5.5 yet. Patch from upstream, reverse applied +Patch5: vlc-support-qt5.5.patch BuildRequires: Mesa-devel BuildRequires: SDL-devel >= 1.2.10 BuildRequires: aalib-devel @@ -312,7 +312,11 @@ date %patch4 %endif %endif -%patch5 -p1 +%if 0%{?suse_version} > 1310 +# openSUSE Leap and Tumbleweed have Qt 5.5.x, but with the required patch applied +# openSUSE 13.2 (also > 1310) comes with Qt 5.3, so is not affected, but the patch does not harm +%patch5 -p1 -R +%endif ### Fix up sources for LUA 5.3 if pkg-config --atleast-version 5.3 lua; then