diff --git a/vlc-projectM-qt5.patch b/vlc-projectM-qt5.patch new file mode 100644 index 0000000..f97295f --- /dev/null +++ b/vlc-projectM-qt5.patch @@ -0,0 +1,34 @@ +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 + #include + +-#include ++#include + + /***************************************************************************** + * Module descriptor diff --git a/vlc.changes b/vlc.changes index 74d3f68..ab3756d 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 11 14:20:29 UTC 2017 - aloisio@gmx.com + +- Added vlc-projectM-qt5.patch and applied it for Factory + ------------------------------------------------------------------- Mon Jul 24 06:37:10 UTC 2017 - olaf@aepfle.de diff --git a/vlc.spec b/vlc.spec index 1e0c68c..0016b8c 100644 --- a/vlc.spec +++ b/vlc.spec @@ -58,6 +58,8 @@ Patch5: vlc-support-qt5.5.patch # PATCH-FIX-UPSTREAM vlc-gcc6-buildfixes.patch dimstar@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 @@ BuildRequires: pkgconfig(libswscale) %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 @@ if [ $(gcc -dumpversion) -ge 6 ]; then %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