Hello community,
here is the log from the commit of package vlc for openSUSE:Factory checked in
at 2017-08-24 18:26:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vlc (Old)
and /work/SRC/openSUSE:Factory/.vlc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vlc"
Thu Aug 24 18:26:26 2017 rev:71 rq:516973 version:2.2.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/vlc/vlc.changes 2017-08-02 11:27:29.163963852
+0200
+++ /work/SRC/openSUSE:Factory/.vlc.new/vlc.changes 2017-08-24
18:26:26.524793405 +0200
@@ -1,0 +2,5 @@
+Fri Aug 11 14:20:29 UTC 2017 - aloi...@gmx.com
+
+- Added vlc-projectM-qt5.patch and applied it for Factory
+
+-------------------------------------------------------------------
New:
----
vlc-projectM-qt5.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vlc.spec ++++++
--- /var/tmp/diff_new_pack.MnKn8s/_old 2017-08-24 18:26:27.832609149 +0200
+++ /var/tmp/diff_new_pack.MnKn8s/_new 2017-08-24 18:26:27.836608585 +0200
@@ -58,6 +58,8 @@
# PATCH-FIX-UPSTREAM vlc-gcc6-buildfixes.patch dims...@opensuse.org -- A
collection of upstream commits to fix build with gcc6
Patch6: vlc-gcc6-buildfixes.patch
Patch7: vlc.a52.patch
+# PATCH-FIX-OPENSUSE vlc-projectM-qt5.patch -- link to libprojectM-qt5
+Patch8: vlc-projectM-qt5.patch
BuildRequires: Mesa-devel
BuildRequires: SDL-devel >= 1.2.10
BuildRequires: aalib-devel
@@ -155,7 +157,11 @@
%if 0%{?suse_version} > 1110
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
BuildRequires: pkgconfig(SDL_image) >= 1.2.10
+%if 0%{?suse_version} > 1320
+BuildRequires: pkgconfig(libprojectM-qt5) >= 2.0.0
+%else
BuildRequires: pkgconfig(libprojectM) >= 2.0.0
+%endif
BuildRequires: pkgconfig(libupnp)
BuildRequires: pkgconfig(opencv) > 2.0
%endif
@@ -360,6 +366,9 @@
%patch6 -p1
fi
%patch7 -p1
+%if 0%{?suse_version} > 1320
+%patch8 -p1
+%endif
### Fix up sources for LUA 5.3
if pkg-config --atleast-version 5.3 lua; then
++++++ vlc-projectM-qt5.patch ++++++
Index: vlc-2.2.6/configure.ac
===================================================================
--- vlc-2.2.6.orig/configure.ac
+++ vlc-2.2.6/configure.ac
@@ -3965,12 +3965,12 @@ AC_ARG_ENABLE(projectm,
[ --enable-projectm projectM visualization plugin (default enabled)])
AS_IF([test "${enable_projectm}" != "no"],
[
- PKG_CHECK_MODULES(PROJECTM, libprojectM,
+ PKG_CHECK_MODULES(PROJECTM, libprojectM-qt5,
[
VLC_ADD_PLUGIN([projectm])
- PKG_CHECK_EXISTS([libprojectM >= 2.0.0],
- [ AC_DEFINE([HAVE_PROJECTM2], 1, [Define to 1 if using libprojectM
2.x]) ],
- [ AC_MSG_WARN( [Using libprojectM version 1] )
+ PKG_CHECK_EXISTS([libprojectM-qt5 >= 2.0.0],
+ [ AC_DEFINE([HAVE_PROJECTM2], 1, [Define to 1 if using libprojectM-qt5
2.x]) ],
+ [ AC_MSG_WARN( [Using libprojectM-qt5 version 1] )
])
],[
AC_MSG_WARN([${PROJECTM_PKG_ERRORS}.])
Index: vlc-2.2.6/modules/visualization/projectm.cpp
===================================================================
--- vlc-2.2.6.orig/modules/visualization/projectm.cpp
+++ vlc-2.2.6/modules/visualization/projectm.cpp
@@ -44,7 +44,7 @@
#include <vlc_filter.h>
#include <vlc_rand.h>
-#include <libprojectM/projectM.hpp>
+#include <libprojectM-qt5/projectM.hpp>
/*****************************************************************************
* Module descriptor
