[lives] Fix build with OpenCV
by Nicolas Chauvet
commit 03ca19b7463a19c3565935f3a3b550e8df0a702c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Mar 10 12:21:56 2020 +0100
Fix build with OpenCV
Switch-to-opencv2-COLOR_RGB2GRAY.patch | 49 ++++++++++++++++++++++++++++++++++
lives.spec | 9 +++++--
2 files changed, 56 insertions(+), 2 deletions(-)
---
diff --git a/Switch-to-opencv2-COLOR_RGB2GRAY.patch b/Switch-to-opencv2-COLOR_RGB2GRAY.patch
new file mode 100644
index 0000000..ee5ea14
--- /dev/null
+++ b/Switch-to-opencv2-COLOR_RGB2GRAY.patch
@@ -0,0 +1,49 @@
+From bb7e9d2fe3f16db93b8ab005f6a4f0f19269800e Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart(a)gmail.com>
+Date: Tue, 10 Mar 2020 11:11:21 +0100
+Subject: [PATCH] Switch to opencv2+ COLOR_RGB2GRAY and related
+
+Signed-off-by: Nicolas Chauvet <kwizart(a)gmail.com>
+---
+ lives-plugins/weed-plugins/farneback_analyser.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/lives-plugins/weed-plugins/farneback_analyser.cpp b/lives-plugins/weed-plugins/farneback_analyser.cpp
+index c67c1417..5b8cd384 100644
+--- a/lives-plugins/weed-plugins/farneback_analyser.cpp
++++ b/lives-plugins/weed-plugins/farneback_analyser.cpp
+@@ -157,26 +157,26 @@ static weed_error_t farneback_process(weed_plant_t *inst, weed_timecode_t tc) {
+ switch (palette) {
+ case WEED_PALETTE_RGB24:
+ srcMat = Mat(height, width, CV_8UC3, src, irow);
+- cvtColor(srcMat, *cvgrey, CV_RGB2GRAY); // may segfault here, not sure what causes it. Bug in opencv 2.4 ?
++ cvtColor(srcMat, *cvgrey, COLOR_RGB2GRAY); // may segfault here, not sure what causes it. Bug in opencv 2.4 ?
+ break;
+ case WEED_PALETTE_BGR24:
+ srcMat = Mat(height, width, CV_8UC3, src, irow);
+- cvtColor(srcMat, *cvgrey, CV_BGR2GRAY);
++ cvtColor(srcMat, *cvgrey, COLOR_BGR2GRAY);
+ break;
+ case WEED_PALETTE_RGBA32:
+ srcMat = Mat(height, width, CV_8UC4, src, irow);
+- cvtColor(srcMat, *cvgrey, CV_RGB2GRAY);
++ cvtColor(srcMat, *cvgrey, COLOR_RGB2GRAY);
+ break;
+ case WEED_PALETTE_BGRA32:
+ srcMat = Mat(height, width, CV_8UC4, src, irow);
+- cvtColor(srcMat, *cvgrey, CV_BGR2GRAY);
++ cvtColor(srcMat, *cvgrey, COLOR_BGR2GRAY);
+ break;
+ case WEED_PALETTE_ARGB32: {
+ int from_to[] = {0, 3, 1, 0, 2, 1, 3, 2}; // convert argb to rgba
+ srcMat = Mat(height, width, CV_8UC4, src, irow);
+ mixMat = Mat(height, width, CV_8UC4);
+ mixChannels(&srcMat, 1, &mixMat, 1, from_to, 4);
+- cvtColor(mixMat, *cvgrey, CV_RGB2GRAY);
++ cvtColor(mixMat, *cvgrey, COLOR_RGB2GRAY);
+ }
+ break;
+ case WEED_PALETTE_YUVA4444P:
+--
+2.24.1
+
diff --git a/lives.spec b/lives.spec
index 8f743a6..693c4e3 100644
--- a/lives.spec
+++ b/lives.spec
@@ -27,11 +27,13 @@
Name: lives
Version: 3.0.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
Source0: http://lives-video.com/releases/LiVES-%{version}.tar.gz
+# https://github.com/salsaman/LiVES/pull/7
+Patch0: Switch-to-opencv2-COLOR_RGB2GRAY.patch
# Appdata file
Source1: LiVES.appdata.xml
@@ -113,7 +115,7 @@ designed to be simple to use, yet powerful.
It is small in size, yet it has many advanced features.
%prep
-%autosetup -n LiVES-%{version}
+%autosetup -p1 -n LiVES-%{version}
# Remove spurious executable permissions
find . -type f -name "*.h" -exec chmod 0644 '{}' \;
@@ -210,6 +212,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%{_metainfodir}/LiVES.appdata.xml
%changelog
+* Tue Mar 10 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.2-4
+- Fix build for OpenCV
+
* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 3.0.2-3
- Rebuild for ffmpeg-4.3 git
4 years, 8 months
[tvheadend/f32] Disable -fno-common flag to allow building with GCC 10
by Mohamed ElMorabity
commit 18b98ad17739746f1751ef798b00e40d1592d597
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Tue Mar 10 12:09:51 2020 +0100
Disable -fno-common flag to allow building with GCC 10
tvheadend.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/tvheadend.spec b/tvheadend.spec
index ab9d7ab..256494e 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -138,7 +138,8 @@ done
%build
# https://github.com/FFmpeg/FFmpeg/commit/4361293
-export CFLAGS="$RPM_OPT_FLAGS -Wno-attributes"
+# Force -fcommon until code fully supports GCC 10
+export CFLAGS="$RPM_OPT_FLAGS -Wno-attributes -fcommon"
echo "%{version}-%{release}" >rpm/version
# Note: --disable-lib* correspond to options to build bundled FFmpeg
%configure \
@@ -236,6 +237,7 @@ exit 0
%changelog
* Tue Mar 10 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.8-7
- Fix build with hdhomerun >= 20190621
+- Disable -fno-common flag to allow building with GCC 10
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 4.2.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 8 months
[tvheadend/f32] Fix build with hdhomerun >= 20190621
by Mohamed ElMorabity
commit 6a7d771132adb07afc67e52433a7f8ca9df27413
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Tue Mar 10 10:27:23 2020 +0100
Fix build with hdhomerun >= 20190621
sources | 2 +-
tvheadend-4.2.8-hdhomerun20190621.patch | 12 ++++++++++++
tvheadend.spec | 7 ++++++-
3 files changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index 071dc3a..8bca8cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b9571efa46dd489f9fe87acdb391d591 tvheadend-4.2.8.tar.gz
+SHA512 (tvheadend-4.2.8.tar.gz) = e629ffe1802e76b5121d5c22d11be86640f17816a5e902ed4842b2fd21df506d00d9caebafd931d71995e9d9049cb675c032478c9bed4f1ce82fc3f255f6166f
diff --git a/tvheadend-4.2.8-hdhomerun20190621.patch b/tvheadend-4.2.8-hdhomerun20190621.patch
new file mode 100644
index 0000000..f23efd3
--- /dev/null
+++ b/tvheadend-4.2.8-hdhomerun20190621.patch
@@ -0,0 +1,12 @@
+diff -up ./src/input/mpegts/tvhdhomerun/tvhdhomerun.c.orig ./src/input/mpegts/tvhdhomerun/tvhdhomerun.c
+--- ./src/input/mpegts/tvhdhomerun/tvhdhomerun.c.orig 2019-01-12 09:58:47.000000000 +0100
++++ ./src/input/mpegts/tvhdhomerun/tvhdhomerun.c 2020-03-10 10:10:22.429845330 +0100
+@@ -28,7 +28,7 @@
+ #include <arpa/inet.h>
+ #include <openssl/sha.h>
+
+-#ifdef HDHOMERUN_TAG_DEVICE_AUTH_BIN
++#if defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN) || defined(HDHOMERUN_TAG_DEVICE_AUTH_BIN_DEPRECATED)
+ #define hdhomerun_discover_find_devices_custom \
+ hdhomerun_discover_find_devices_custom_v2
+ #endif
diff --git a/tvheadend.spec b/tvheadend.spec
index e2c9301..ab9d7ab 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -20,7 +20,7 @@
Name: tvheadend
Version: 4.2.8
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: TV streaming server and digital video recorder
License: GPLv3+
@@ -43,6 +43,8 @@ Patch4: %{name}-4.2.1-crypto_policies.patch
Patch5: %{name}-4.2.7-python3.patch
# Fix build with GCC 9
Patch6: %{name}-4.2.8-gcc9.patch
+# Fix build with hdhomerun >= 20190621
+Patch7: %{name}-4.2.8-hdhomerun20190621.patch
BuildRequires: bzip2
BuildRequires: gcc
@@ -232,6 +234,9 @@ exit 0
%changelog
+* Tue Mar 10 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.8-7
+- Fix build with hdhomerun >= 20190621
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 4.2.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 8 months
[tvheadend] Disable -fno-common flag to allow building with GCC 10
by Mohamed ElMorabity
commit 91c64825dff321446ff6b1e3acc39e31fdca2c3b
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Tue Mar 10 12:09:51 2020 +0100
Disable -fno-common flag to allow building with GCC 10
tvheadend.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/tvheadend.spec b/tvheadend.spec
index bef92c4..a832a46 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -138,7 +138,8 @@ done
%build
# https://github.com/FFmpeg/FFmpeg/commit/4361293
-export CFLAGS="$RPM_OPT_FLAGS -Wno-attributes"
+# Force -fcommon until code fully supports GCC 10
+export CFLAGS="$RPM_OPT_FLAGS -Wno-attributes -fcommon"
echo "%{version}-%{release}" >rpm/version
# Note: --disable-lib* correspond to options to build bundled FFmpeg
%configure \
@@ -236,6 +237,7 @@ exit 0
%changelog
* Tue Mar 10 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.8-8
- Fix build with hdhomerun >= 20190621
+- Disable -fno-common flag to allow building with GCC 10
* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 4.2.8-7
- Rebuild for ffmpeg-4.3 git
4 years, 8 months
[qmmp-plugins-freeworld] version bump to 1.3.6
by Leigh Scott
commit b7e7d004ba28f1ede855dc8e425c09ef30b38891
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Mar 10 10:04:23 2020 +0000
version bump to 1.3.6
.gitignore | 1 +
qmmp-plugins-freeworld.spec | 19 ++++++-------------
sources | 2 +-
3 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e39099..eb25369 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ qmmp-0.9.6.tar.bz2
/qmmp-1.2.4.tar.bz2
/qmmp-1.3.3.tar.bz2
/qmmp-1.3.5.tar.bz2
+/qmmp-1.3.6.tar.bz2
diff --git a/qmmp-plugins-freeworld.spec b/qmmp-plugins-freeworld.spec
index e59d082..d65c51f 100644
--- a/qmmp-plugins-freeworld.spec
+++ b/qmmp-plugins-freeworld.spec
@@ -1,6 +1,6 @@
Name: qmmp-plugins-freeworld
-Version: 1.3.5
-Release: 3%{?dist}
+Version: 1.3.6
+Release: 1%{?dist}
Summary: Plugins for qmmp (Qt-based multimedia player)
Group: Applications/Multimedia
@@ -160,23 +160,16 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}-ffmpeg-enque
%post
/sbin/ldconfig
-%{_bindir}/update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
%postun
/sbin/ldconfig
-/sbin/ldconfig
-%{_bindir}/update-desktop-database &> /dev/null || :
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
%changelog
+* Tue Mar 10 2020 leigh123linux <leigh123linux(a)googlemail.com> - 1.3.6-1
+- version bump to 1.3.6
+- Remove obsolete scriptlets
+
* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.3.5-3
- Rebuild for ffmpeg-4.3 git
diff --git a/sources b/sources
index 32b4a63..0ca5c8e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qmmp-1.3.5.tar.bz2) = fbf4173e6dcd78e02ee52e53d80f4477bd840047f96ef8c0bd23f56eec5efa11ac52cc458cfeae65b46cda357b986ba30e1ec4e06d35f4f96cab9a915095d735
+SHA512 (qmmp-1.3.6.tar.bz2) = 83600b3116a62200d6751b4c6a526cd0af842b943d8d2979e16803ad788ee826a52a25ac0736f337a8fa739affcba361e6cfd1947c5135aef963d128dcb7e3b9
4 years, 8 months
[vdr-plex] Rebuild for new poco version
by Leigh Scott
commit 76427564e04b42b1c8553b3e414520c7ba221496
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Mar 10 09:57:50 2020 +0000
Rebuild for new poco version
vdr-plex.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/vdr-plex.spec b/vdr-plex.spec
index 22cf3f1..b08078d 100644
--- a/vdr-plex.spec
+++ b/vdr-plex.spec
@@ -1,10 +1,10 @@
Name: vdr-plex
Version: 0.4.0
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: A Plex Client for the VDR
License: GPLv2
URL: http://projects.vdr-developer.org/projects/plg-plex
-SOURCE: https://projects.vdr-developer.org/git/vdr-plugin-plex.git/snapshot/vdr-p...
+Source: https://projects.vdr-developer.org/git/vdr-plugin-plex.git/snapshot/vdr-p...
Patch0: %{name}-namespace.patch
BuildRequires: gcc-c++
@@ -28,7 +28,7 @@ Cast Vimeo, Youtube, Apple-Trailers, and many other Plexchannels to your VDR.
%autosetup -p1 -n vdr-plugin-plex-%{version}
%build
-make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
+%make_build CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" all
%install
%make_install
@@ -41,6 +41,9 @@ make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
%changelog
+* Tue Mar 10 2020 leigh123linux <leigh123linux(a)googlemail.com> - 0.4.0-15
+- Rebuild for new poco version
+
* Wed Feb 05 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.4.0-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
4 years, 8 months