- rediff qt patch

- fix opencv4 detection and disable excaple plugin (does not build)

diff --git a/opencv4.patch b/opencv4.patch
new file mode 100644 (file)
index 0000000..aa7050e
--- /dev/null
+++ b/opencv4.patch
@@ -0,0 +1,24 @@
+--- vlc-3.0.12/configure.ac~   2021-03-07 19:28:23.000000000 +0100
++++ vlc-3.0.12/configure.ac    2021-03-07 19:31:18.620014658 +0100
+@@ -1899,7 +1899,7 @@
+ dnl
+ dnl  OpenCV wrapper and example filters
+ dnl
+-PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0], (OpenCV (computer vision) filter), [auto])
++PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv4 > 4.0], (OpenCV (computer vision) filter), [auto])
+ 
+ 
+ dnl
+--- vlc-3.0.12/modules/video_filter/Makefile.am~       2017-11-24 16:29:18.000000000 +0100
++++ vlc-3.0.12/modules/video_filter/Makefile.am        2021-03-07 19:48:08.007515036 +0100
+@@ -164,10 +164,3 @@
+ # misc
+ libblend_plugin_la_SOURCES = video_filter/blend.cpp
+ video_filter_LTLIBRARIES += libblend_plugin.la
+-
+-libopencv_example_plugin_la_SOURCES = video_filter/opencv_example.cpp video_filter/filter_event_info.h
+-libopencv_example_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENCV_CFLAGS)
+-libopencv_example_plugin_la_LIBADD = $(OPENCV_LIBS)
+-libopencv_example_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(video_filterdir)'
+-video_filter_LTLIBRARIES += $(LTLIBopencv_example)
+-EXTRA_LTLIBRARIES += libopencv_example_plugin.la

diff --git a/qt-5.15.patch b/qt-5.15.patch
index 940823af56e19a13ee2360339c3b3ce592ad85b5..dc24e17fe8f95d1049494365b014e76d5637eea6 100644 (file)
--- a/qt-5.15.patch
+++ b/qt-5.15.patch
@@ -1,15 +1,6 @@
---- vlc-3.0.10/modules/gui/qt/dialogs/plugins.hpp~     2017-11-24 16:29:17.000000000 +0100
-+++ vlc-3.0.10/modules/gui/qt/dialogs/plugins.hpp      2020-06-02 09:11:52.586760706 +0200
-@@ -32,6 +32,7 @@
- 
- #include <QStringList>
- #include <QTreeWidgetItem>
-+#include <QPainterPath>
- #include <QPushButton>
- #include <QAbstractListModel>
- #include <QSortFilterProxyModel>
---- vlc-3.0.10/modules/gui/qt/components/playlist/views.hpp~   2017-11-24 16:29:17.000000000 +0100
-+++ vlc-3.0.10/modules/gui/qt/components/playlist/views.hpp    2020-06-02 09:13:07.692655049 +0200
+diff -urNp -x '*.orig' vlc-3.0.12.org/modules/gui/qt/components/playlist/views.hpp vlc-3.0.12/modules/gui/qt/components/playlist/views.hpp
+--- vlc-3.0.12.org/modules/gui/qt/components/playlist/views.hpp        2017-11-24 16:29:17.000000000 +0100
++++ vlc-3.0.12/modules/gui/qt/components/playlist/views.hpp    2021-03-07 19:23:36.322183404 +0100

 @@ -26,6 +26,7 @@
  
  #include <QStyledItemDelegate>
 @@ -26,6 +26,7 @@
  
  #include <QStyledItemDelegate>


@@ -18,13 +9,25 @@
  #include <QTreeView>
  #include <QAbstractItemView>
  #include "util/pictureflow.hpp"
  #include <QTreeView>
  #include <QAbstractItemView>
  #include "util/pictureflow.hpp"

---- vlc-3.0.10/modules/gui/qt/util/timetooltip.hpp~    2018-05-03 14:03:21.000000000 +0200
-+++ vlc-3.0.10/modules/gui/qt/util/timetooltip.hpp     2020-06-02 09:14:04.892066840 +0200
+diff -urNp -x '*.orig' vlc-3.0.12.org/modules/gui/qt/dialogs/plugins.hpp vlc-3.0.12/modules/gui/qt/dialogs/plugins.hpp
+--- vlc-3.0.12.org/modules/gui/qt/dialogs/plugins.hpp  2017-11-24 16:29:17.000000000 +0100
++++ vlc-3.0.12/modules/gui/qt/dialogs/plugins.hpp      2021-03-07 19:23:36.322183404 +0100
+@@ -32,6 +32,7 @@
+ 
+ #include <QStringList>
+ #include <QTreeWidgetItem>
++#include <QPainterPath>
+ #include <QPushButton>
+ #include <QAbstractListModel>
+ #include <QSortFilterProxyModel>
+diff -urNp -x '*.orig' vlc-3.0.12.org/modules/gui/qt/util/timetooltip.hpp vlc-3.0.12/modules/gui/qt/util/timetooltip.hpp
+--- vlc-3.0.12.org/modules/gui/qt/util/timetooltip.hpp 2020-10-24 20:21:13.000000000 +0200
++++ vlc-3.0.12/modules/gui/qt/util/timetooltip.hpp     2021-03-07 19:23:36.322183404 +0100

 @@ -24,6 +24,7 @@
  
  #include "qt.hpp"
  
 +#include <QPainterPath>
  #include <QWidget>
 @@ -24,6 +24,7 @@
  
  #include "qt.hpp"
  
 +#include <QPainterPath>
  #include <QWidget>

+ #include <QPainterPath>

  
  

- class TimeTooltip : public QWidget

diff --git a/vlc.spec b/vlc.spec
index 4aa0ebfc2a0f428165828719be1ec5fb1eb7475e..286829b45df819bd65f1266d0ada2b2e1a8cb755 100644 (file)
--- a/vlc.spec
+++ b/vlc.spec
@@ -87,6 +87,7 @@ Patch7:               %{name}-vsxu.patch
 Patch8:                qt-5.15.patch
 Patch9:                %{name}-live.patch
 Patch10:       %{name}-srt.patch
 Patch8:                qt-5.15.patch
 Patch9:                %{name}-live.patch
 Patch10:       %{name}-srt.patch

+Patch11:       opencv4.patch

 URL:           http://www.videolan.org/vlc/
 %{?with_decklink:BuildRequires:        Blackmagic_DeckLink_SDK}
 # 1.0 for X11 or GLESv1, 1.1 for GLESv2
 URL:           http://www.videolan.org/vlc/
 %{?with_decklink:BuildRequires:        Blackmagic_DeckLink_SDK}
 # 1.0 for X11 or GLESv1, 1.1 for GLESv2


@@ -431,6 +432,7 @@ Akcje klienta VLC dla Solid.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1

+%patch11 -p1

 
 %build
 %{__libtoolize}
 
 %build
 %{__libtoolize}


@@ -1162,7 +1164,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/liboldmovie_plugin.so
 %if %{with opencv}
 # R: opencv
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/liboldmovie_plugin.so
 %if %{with opencv}
 # R: opencv

-%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
+#%attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so

 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
 %endif
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
 %endif
 %attr(755,root,root) %{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so