[zoneminder/el7: 3/3] Merge branch 'master' into el7
by Andrew Bauer
commit 0ada8dfe5f1312c37509b57c5bca83ea91c3d677
Merge: a10c038 297603a
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Fri Jun 5 17:32:13 2020 -0500
Merge branch 'master' into el7
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
3 years, 10 months
[zoneminder] 1.34.16 Release
by Andrew Bauer
commit 297603a2c8c173cb491cc3110623cb18197f03cc
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Fri Jun 5 17:31:01 2020 -0500
1.34.16 Release
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f0e6c2..d7807b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
/zoneminder-1.34.12.tar.gz
/zoneminder-1.34.13.tar.gz
/zoneminder-1.34.14.tar.gz
+/zoneminder-1.34.16.tar.gz
diff --git a/sources b/sources
index 24e8eb3..989223b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
SHA512 (cakephp-enum-behavior-1.0-zm.tar.gz) = 26b4fa4e4b53b6add69df506d68cee06c7c153ddb6facb76ff1156c5f558b9a7704e99b54361771195092ae7ab4f493c24135fa5a3f59fae84b6dc33ff3e0bd1
SHA512 (crud-3.1.0-zm.tar.gz) = 03b641454ad070a729e45f592c6c01bf2c80c53f00e085eb48380ba96e88d8c1410b2a0c58607f85d6536375d789b022b9e6b7de5bda8886ec17c3bdb07a68fc
-SHA512 (zoneminder-1.34.14.tar.gz) = 105207f1908674e1acdaaf1562768e0fab809640cb834d909c45e1fbdfc24704411eb7eeaa105a4d049cb4eea10abcfc287c32ac49b30f736797d019aae65921
+SHA512 (zoneminder-1.34.16.tar.gz) = 84b7e3a6037011206a18cd551a980fec6cf4c9fa6b5695e32dd5353dd9de270d0e56063b1c17a7233a01eb1df327d1014d721ea5d065f931b5d0a43855e5b37e
diff --git a/zoneminder.spec b/zoneminder.spec
index dbccd94..745530c 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -28,7 +28,7 @@
%global _hardened_build 1
Name: zoneminder
-Version: 1.34.14
+Version: 1.34.16
Release: 1%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
@@ -416,6 +416,9 @@ EOF
%dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload
%changelog
+* Fri Jun 05 2020 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.34.16-1
+- 1.34.16 Release
+
* Fri May 15 2020 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.34.14-1
- 1.34.14 Release
3 years, 10 months
[lives] Fix release number
by sagitter
commit 2030990312e02c8b07a03c53d91fb456633280d0
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Jun 5 23:40:39 2020 +0200
Fix release number
lives.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/lives.spec b/lives.spec
index c5655c5..fe1c254 100644
--- a/lives.spec
+++ b/lives.spec
@@ -27,7 +27,7 @@
Name: lives
Version: 3.0.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
3 years, 10 months
[lives] Rebuild for Python 3.9| Set opencv cflags
by sagitter
commit dfd172f72b4235df79360c266473be263c443c11
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Jun 5 23:35:22 2020 +0200
Rebuild for Python 3.9| Set opencv cflags
...Y.patch => lives-Switch-to-opencv2-COLOR_RGB2GRAY.patch | 0
lives.spec | 14 ++++++++++----
sources | 2 +-
3 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/Switch-to-opencv2-COLOR_RGB2GRAY.patch b/lives-Switch-to-opencv2-COLOR_RGB2GRAY.patch
similarity index 100%
rename from Switch-to-opencv2-COLOR_RGB2GRAY.patch
rename to lives-Switch-to-opencv2-COLOR_RGB2GRAY.patch
diff --git a/lives.spec b/lives.spec
index b03c5c3..c5655c5 100644
--- a/lives.spec
+++ b/lives.spec
@@ -33,7 +33,7 @@ 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
+Patch0: lives-Switch-to-opencv2-COLOR_RGB2GRAY.patch
# Appdata file
Source1: LiVES.appdata.xml
@@ -131,7 +131,7 @@ find . -type f -name "*.c" -exec chmod 0644 '{}' \;
--disable-sdl2 --disable-projectM
%endif
-%make_build CPPFLAGS=`pkg-config --cflags libtirpc`
+%make_build CPPFLAGS="`pkg-config --cflags libtirpc` `pkg-config --cflags opencv4`"
%install
%make_install
@@ -165,8 +165,8 @@ find %{buildroot} -name 'multi_encoder' -exec rm -f {} ';'
find %{buildroot}%{_bindir} -name '*_encoder' -exec rm -f {} ';'
# Fix unversioned Python interpreter
-find %{buildroot} -name '*multi_encoder3' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python3}|'
-find %{buildroot}%{_bindir} -name '*_encoder3' | xargs sed -i '1s|^#!/usr/bin/env python|#!%{__python3}|'
+find %{buildroot} -name '*multi_encoder3' | xargs pathfix.py -pn -i "%{__python3}"
+find %{buildroot}%{_bindir} -name '*_encoder3' | xargs pathfix.py -pn -i "%{__python3}"
rm -f %{buildroot}%{_bindir}/%{name}
cat > %{buildroot}%{_bindir}/%{name} <<EOF
@@ -212,6 +212,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%{_metainfodir}/LiVES.appdata.xml
%changelog
+* Fri Jun 05 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 3.0.2-6
+- Patch renamed
+- Use pathfix.py commands
+- Rebuild for Python 3.9
+- Set opencv cflags
+
* Wed Apr 01 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.2-5
- Rebuilt for libfreenect
diff --git a/sources b/sources
index 8e5c789..d1ebbf9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2574a16cc1f5c8d0ff16791b290e8d07 LiVES-3.0.2.tar.gz
+SHA512 (LiVES-3.0.2.tar.gz) = 4f81102569bdc35a52872f1be96e9111a41f9d119778f13784f95016099f7de8c6a73a0a327834b47211dd4c09373eb07c66c25b600f50221ded7c55af70b2e1
3 years, 10 months
[xpra-codecs-freeworld] Release 4.0.2
by sagitter
commit 712bc38216cc52ccdcdf56c2441a7304e995b9ce
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Jun 5 22:46:02 2020 +0200
Release 4.0.2
.gitignore | 1 +
sources | 2 +-
xpra-codecs-freeworld.spec | 7 +++++--
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4eab9e2..73b2906 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@ xpra-0.16.3.tar.xz
/xpra-3.0.9.tar.xz
/xpra-4.0.tar.xz
/xpra-4.0.1.tar.xz
+/xpra-4.0.2.tar.xz
diff --git a/sources b/sources
index cf4a35a..6061d82 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (xpra-4.0.1.tar.xz) = 4981f04bbb1418b8dc0dd0f0a7c3d02e7588a7987f1a624d35891f93cad290651f90de505d01247fac8653891c37c241c65f4bc9d88d36a37e3543e4590c81e9
+SHA512 (xpra-4.0.2.tar.xz) = 462ff9c6efd865ed3acf967c04c677119bb4c7aa75b057c5e7e4ab05e4c7718ece1c3db34cacf0c608bb38604342479265e4f0f9ea8d2cbf2119b1b4a3fe1ec0
diff --git a/xpra-codecs-freeworld.spec b/xpra-codecs-freeworld.spec
index 268e8de..2dcc0da 100644
--- a/xpra-codecs-freeworld.spec
+++ b/xpra-codecs-freeworld.spec
@@ -25,8 +25,8 @@
%endif
Name: xpra-codecs-freeworld
-Version: 4.0.1
-Release: 3%{?dist}
+Version: 4.0.2
+Release: 1%{?dist}
Summary: Additional codecs for xpra using x264 and ffmpeg
License: GPLv2+
URL: http://www.xpra.org/
@@ -121,6 +121,9 @@ find %{buildroot}%{python3_sitearch}/xpra -name '*.so' \
%license COPYING
%changelog
+* Fri Jun 05 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 4.0.2-1
+- Release 4.0.2
+
* Sun May 31 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.0.1-3
- Rebuild for new x265 version
3 years, 10 months