[zoneminder] 1.34.23 Release create ssl cert in all cases, not just nginx
by Andrew Bauer
commit 5d1140e41526860424d79174c50bf6705e5c24bc
Author: Andrew Bauer <zonexpertconsulting(a)outlook.com>
Date: Sun Jan 31 16:23:25 2021 -0600
1.34.23 Release
create ssl cert in all cases, not just nginx
.gitignore | 1 +
sources | 2 +-
zoneminder.spec | 60 ++++++++++++++++++++++++++++++---------------------------
3 files changed, 34 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7582f6..99ab99d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
/zoneminder-1.34.20.tar.gz
/zoneminder-1.34.21.tar.gz
/zoneminder-1.34.22.tar.gz
+/zoneminder-1.34.23.tar.gz
diff --git a/sources b/sources
index 0460e0c..b244df6 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.22.tar.gz) = 70d4dfc3a9c2d709a452b81cadaf93851f4f93e643cde8812e0d262672507a443f2faa53f6075a188fb9898166bce581f4b41f419b180a28579c9f3104d0137d
+SHA512 (zoneminder-1.34.23.tar.gz) = 23921fe3459a8edb8e565305d632c545da0de32fa4b67855719308ee5619262bdbee51187dbae3377aeb12128ac06f0bbbb16f218447d17881aea152787ff7e0
diff --git a/zoneminder.spec b/zoneminder.spec
index 8271cad..58a5989 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -28,8 +28,8 @@
%global _hardened_build 1
Name: zoneminder
-Version: 1.34.22
-Release: 3%{?dist}
+Version: 1.34.23
+Release: 1%{?dist}
Summary: A camera monitoring and analysis tool
Group: System Environment/Daemons
# Mootools is under the MIT license: http://mootools.net/
@@ -264,6 +264,32 @@ fi
echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, you must read the README file\nto finish the installation or upgrade!"
echo -e "\nThe README file is located here: %{_pkgdocdir}-common/README\n"
+# Neither the Apache nor Nginx packages create an SSL certificate anymore, so lets do that here
+if [ -f %{sslkey} -o -f %{sslcert} ]; then
+ exit 0
+fi
+
+umask 077
+%{_bindir}/openssl genrsa -rand /proc/cpuinfo:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/uptime 2048 > %{sslkey} 2> /dev/null
+
+FQDN=`hostname`
+# A >59 char FQDN means "root@FQDN" exceeds 64-char max length for emailAddress
+if [ "x${FQDN}" = "x" -o ${#FQDN} -gt 59 ]; then
+ FQDN=localhost.localdomain
+fi
+
+cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \
+ -x509 -sha256 -days 365 -set_serial $RANDOM -extensions v3_req \
+ -out %{sslcert} 2>/dev/null
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+${FQDN}
+root@${FQDN}
+EOF
+
%post httpd
# For the case of changing from nginx <-> httpd, files in these folders must change ownership if they exist
%{_bindir}/chown -R %{zmuid_final}:%{zmgid_final} %{_sharedstatedir}/php/session/* >/dev/null 2>&1 || :
@@ -295,32 +321,6 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
%{_bindir}/gpasswd -a nginx video >/dev/null 2>&1 || :
%{_bindir}/gpasswd -a nginx dialout >/dev/null 2>&1 || :
-# Nginx does not create an SSL certificate like the apache package does so lets do that here
-if [ -f %{sslkey} -o -f %{sslcert} ]; then
- exit 0
-fi
-
-umask 077
-%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 2048 > %{sslkey} 2> /dev/null
-
-FQDN=`hostname`
-# A >59 char FQDN means "root@FQDN" exceeds 64-char max length for emailAddress
-if [ "x${FQDN}" = "x" -o ${#FQDN} -gt 59 ]; then
- FQDN=localhost.localdomain
-fi
-
-cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \
- -x509 -sha256 -days 365 -set_serial $RANDOM -extensions v3_req \
- -out %{sslcert} 2>/dev/null
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-${FQDN}
-root@${FQDN}
-EOF
-
%preun
%systemd_preun %{name}.service
@@ -425,6 +425,10 @@ EOF
%dir %attr(755,nginx,nginx) %{_localstatedir}/spool/zoneminder-upload
%changelog
+* Sun Jan 31 2020 Andrew Bauer <zonexpertconsulting(a)outlook.com> - 1.34.23-1
+- 1.34.23 Release
+- create ssl cert in all cases, not just nginx
+
* Fri Jan 1 2021 Leigh Scott <leigh123linux(a)gmail.com> - 1.34.22-3
- Rebuilt for new ffmpeg snapshot
3 years, 9 months
[plex-media-player/f32] (10 commits) ...Patch for new mpv
by Leigh Scott
Summary of changes:
c6cb795... Improve compatibility with new CMake macro (*)
9a3a2a3... fix (*)
5342533... Revert "fix" (*)
021ce6f... Revert "Improve compatibility with new CMake macro" (*)
0487761... Use old cmake macro (*)
10f500f... bump release (*)
0d634eb... - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass (*)
0354a28... Rebuild for libcec (*)
5e19abf... Rebuild for new mpv (*)
8e96e02... Patch for new mpv (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 9 months
[plex-media-player] Patch for new mpv
by Leigh Scott
commit 8e96e02000ce0a7f8a4b3852c7a2d2f610f12015
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jan 31 13:00:42 2021 +0000
Patch for new mpv
5430cd807250a8f7329baad76b15a363f35b53fa.patch | 178 +++++++++++++++++++++++++
plex-media-player.spec | 9 +-
2 files changed, 185 insertions(+), 2 deletions(-)
---
diff --git a/5430cd807250a8f7329baad76b15a363f35b53fa.patch b/5430cd807250a8f7329baad76b15a363f35b53fa.patch
new file mode 100644
index 0000000..b7be786
--- /dev/null
+++ b/5430cd807250a8f7329baad76b15a363f35b53fa.patch
@@ -0,0 +1,178 @@
+From 5430cd807250a8f7329baad76b15a363f35b53fa Mon Sep 17 00:00:00 2001
+From: Matthew Hitchens <matt(a)hitchens.net>
+Date: Sat, 28 Nov 2020 12:46:01 -0600
+Subject: [PATCH] player: replaces opengl-cb with the libmpv Render API
+
+Plex-CLA-1.0-signed-off-by: Matthew Hitchens matt(a)hitchens.net
+---
+ src/player/PlayerComponent.cpp | 4 +--
+ src/player/PlayerQuickItem.cpp | 50 +++++++++++++++++++++++++---------
+ src/player/PlayerQuickItem.h | 6 ++--
+ 3 files changed, 42 insertions(+), 18 deletions(-)
+
+diff --git a/src/player/PlayerComponent.cpp b/src/player/PlayerComponent.cpp
+index 4dc5e7ba..65fbfa06 100644
+--- a/src/player/PlayerComponent.cpp
++++ b/src/player/PlayerComponent.cpp
+@@ -259,7 +259,7 @@ void PlayerComponent::setQtQuickWindow(QQuickWindow* window)
+ ///////////////////////////////////////////////////////////////////////////////////////////////////
+ void PlayerComponent::setWindow(QQuickWindow* window)
+ {
+- QString vo = "opengl-cb";
++ QString vo = "libmpv";
+
+ #ifdef TARGET_RPI
+ window->setFlags(Qt::FramelessWindowHint);
+@@ -276,7 +276,7 @@ void PlayerComponent::setWindow(QQuickWindow* window)
+
+ mpv::qt::set_property(m_mpv, "vo", vo);
+
+- if (vo == "opengl-cb")
++ if (vo == "libmpv")
+ setQtQuickWindow(window);
+ }
+
+diff --git a/src/player/PlayerQuickItem.cpp b/src/player/PlayerQuickItem.cpp
+index 6f5a46bb..7628c5c6 100644
+--- a/src/player/PlayerQuickItem.cpp
++++ b/src/player/PlayerQuickItem.cpp
+@@ -11,6 +11,8 @@
+ #include <QtQuick/QQuickWindow>
+ #include <QOpenGLFunctions>
+
++#include <mpv/render_gl.h>
++
+ #include "QsLog.h"
+ #include "utils/Utils.h"
+
+@@ -93,7 +95,6 @@ class RequestRepaintJob : public QRunnable
+ PlayerRenderer::PlayerRenderer(mpv::qt::Handle mpv, QQuickWindow* window)
+ : m_mpv(mpv), m_mpvGL(nullptr), m_window(window), m_size(), m_hAvrtHandle(nullptr), m_videoRectangle(-1, -1, -1, -1), m_fbo(0)
+ {
+- m_mpvGL = (mpv_opengl_cb_context *)mpv_get_sub_api(m_mpv, MPV_SUB_API_OPENGL_CB);
+ }
+
+ ///////////////////////////////////////////////////////////////////////////////////////////////////
+@@ -104,11 +105,27 @@ bool PlayerRenderer::init()
+ DwmEnableMMCSS(TRUE);
+ #endif
+
+- mpv_opengl_cb_set_update_callback(m_mpvGL, on_update, (void *)this);
+
+ // Signals presence of MPGetNativeDisplay().
+ const char *extensions = "GL_MP_MPGetNativeDisplay";
+- return mpv_opengl_cb_init_gl(m_mpvGL, extensions, get_proc_address, nullptr) >= 0;
++
++ mpv_opengl_init_params opengl_params = {
++ .get_proc_address = get_proc_address,
++ .get_proc_address_ctx = NULL,
++ .extra_exts = extensions,
++ };
++ mpv_render_param params[] = {
++ {MPV_RENDER_PARAM_API_TYPE, (void*)MPV_RENDER_API_TYPE_OPENGL},
++ {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &opengl_params},
++ {MPV_RENDER_PARAM_INVALID},
++ };
++ int err = mpv_render_context_create(&m_mpvGL, m_mpv, params);
++
++ if (err >= 0) {
++ mpv_render_context_set_update_callback(m_mpvGL, on_update, (void *)this);
++ return true;
++ }
++ return false;
+ }
+
+ ///////////////////////////////////////////////////////////////////////////////////////////////////
+@@ -116,7 +133,8 @@ PlayerRenderer::~PlayerRenderer()
+ {
+ // Keep in mind that the m_mpv handle must be held until this is done.
+ if (m_mpvGL)
+- mpv_opengl_cb_uninit_gl(m_mpvGL);
++ mpv_render_context_free(m_mpvGL);
++ m_mpvGL = nullptr;
+ delete m_fbo;
+ }
+
+@@ -158,9 +176,18 @@ void PlayerRenderer::render()
+ }
+ }
+
+- // The negative height signals to mpv that the video should be flipped
+- // (according to the flipped OpenGL coordinate system).
+- mpv_opengl_cb_draw(m_mpvGL, fbo, fboSize.width(), (flip ? -1 : 1) * fboSize.height());
++ mpv_opengl_fbo mpv_fbo = {
++ .fbo = fbo,
++ .w = fboSize.width(),
++ .h = fboSize.height(),
++ };
++ int mpv_flip = flip ? -1 : 0;
++ mpv_render_param params[] = {
++ {MPV_RENDER_PARAM_OPENGL_FBO, &mpv_fbo},
++ {MPV_RENDER_PARAM_FLIP_Y, &mpv_flip},
++ {MPV_RENDER_PARAM_INVALID}
++ };
++ mpv_render_context_render(m_mpvGL, params);
+
+ m_window->resetOpenGLState();
+
+@@ -177,7 +204,8 @@ void PlayerRenderer::render()
+ ///////////////////////////////////////////////////////////////////////////////////////////////////
+ void PlayerRenderer::swap()
+ {
+- mpv_opengl_cb_report_flip(m_mpvGL, 0);
++ if (m_mpvGL)
++ mpv_render_context_report_swap(m_mpvGL);
+ }
+
+ ///////////////////////////////////////////////////////////////////////////////////////////////////
+@@ -224,7 +252,7 @@ PlayerQuickItem::PlayerQuickItem(QQuickItem* parent)
+ PlayerQuickItem::~PlayerQuickItem()
+ {
+ if (m_mpvGL)
+- mpv_opengl_cb_set_update_callback(m_mpvGL, nullptr, nullptr);
++ mpv_render_context_set_update_callback(m_mpvGL, nullptr, nullptr);
+ }
+
+ ///////////////////////////////////////////////////////////////////////////////////////////////////
+@@ -298,10 +326,6 @@ void PlayerQuickItem::initMpv(PlayerComponent* player)
+ {
+ m_mpv = player->getMpvHandle();
+
+- m_mpvGL = (mpv_opengl_cb_context *)mpv_get_sub_api(m_mpv, MPV_SUB_API_OPENGL_CB);
+- if (!m_mpvGL)
+- throw FatalException(tr("OpenGL not enabled in libmpv."));
+-
+ connect(player, &PlayerComponent::windowVisible, this, &QQuickItem::setVisible);
+ window()->update();
+ }
+diff --git a/src/player/PlayerQuickItem.h b/src/player/PlayerQuickItem.h
+index b706b892..644a62e0 100644
+--- a/src/player/PlayerQuickItem.h
++++ b/src/player/PlayerQuickItem.h
+@@ -6,7 +6,7 @@
+ #include <QOpenGLFramebufferObject>
+
+ #include <mpv/client.h>
+-#include <mpv/opengl_cb.h>
++#include <mpv/render.h>
+
+ #ifdef Q_OS_WIN32
+ #include <windows.h>
+@@ -34,7 +34,7 @@ public slots:
+ private:
+ static void on_update(void *ctx);
+ mpv::qt::Handle m_mpv;
+- mpv_opengl_cb_context* m_mpvGL;
++ mpv_render_context* m_mpvGL;
+ QQuickWindow* m_window;
+ QSize m_size;
+ HANDLE m_hAvrtHandle;
+@@ -64,7 +64,7 @@ private slots:
+
+ private:
+ mpv::qt::Handle m_mpv;
+- mpv_opengl_cb_context* m_mpvGL;
++ mpv_render_context* m_mpvGL;
+ PlayerRenderer* m_renderer;
+ QString m_debugInfo;
+ };
diff --git a/plex-media-player.spec b/plex-media-player.spec
index 184452e..30cd188 100644
--- a/plex-media-player.spec
+++ b/plex-media-player.spec
@@ -6,15 +6,16 @@
%global web_client_desktop 4.29.2-e50e175
%global web_client_tv 4.29.6-045db5b
%global arti_url https://artifacts.plex.tv/web-client-pmp
+%global git_url https://github.com/plexinc/plex-media-player
Name: plex-media-player
Version: 2.58.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Plex Media Player
License: GPLv2+
URL: https://plex.tv/
-Source0: https://github.com/plexinc/plex-media-player/archive/v%{plex_hash}/%{name...
+Source0: %{git_url}/archive/v%{plex_hash}/%{name}-%{plex_hash}.tar.gz
Source1: plexmediaplayer.desktop
Source2: plexmediaplayer.appdata.xml
Source3: plexmediaplayer.service
@@ -32,6 +33,7 @@ Source93: %{arti_url}/%{clients_hash}/web-client-tv-%{web_client_tv}.tar.x
Source94: %{arti_url}/%{clients_hash}/web-client-tv-%{web_client_tv}.tar.xz.sha1
Patch0: buildfix_qt514.patch
+Patch1: %{git_url}/commit/5430cd807250a8f7329baad76b15a363f35b53fa.patch
# qtwebengine is not available there
ExcludeArch: ppc64le
@@ -209,6 +211,9 @@ exit 0
%{_unitdir}/%{name}.target
%changelog
+* Sun Jan 31 2021 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-7
+- Patch for new mpv
+
* Mon Nov 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 2.58.0-6
- Rebuild for new mpv
3 years, 9 months
[vdr-mpv/f32] Update to 0.5.0
by Martin Gansser
Summary of changes:
b6a183d... Update to 0.5.0 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 9 months
[vdr-mpv/f33] Update to 0.5.0
by Martin Gansser
Summary of changes:
b6a183d... Update to 0.5.0 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 9 months
[vdr-mpv] Update to 0.5.0
by Martin Gansser
commit b6a183dfec52457d9d452f3a70519b57d6c82380
Author: Martin Gansser <mgansser(a)online.de>
Date: Sun Jan 31 13:24:50 2021 +0100
Update to 0.5.0
.gitignore | 1 +
sources | 2 +-
vdr-mpv.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 467ecea..fc8a68f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/vdr-mpv-0.3.0.tar.gz
/vdr-mpv-0.3.1.tar.gz
/vdr-mpv-0.4.0.tar.gz
+/vdr-mpv-0.5.0.tar.gz
diff --git a/sources b/sources
index 5336946..ea9e15a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vdr-mpv-0.4.0.tar.gz) = a857ea8ec6c4d794f02c27faee2daf6a9bd8d87566f4d150750cac01e233e0677f82f6673996678f4f3d83ea1b3b41d0c3f089ad403482f5014de5b47f945f99
+SHA512 (vdr-mpv-0.5.0.tar.gz) = c6b24e5f4ee2b7a45e69806e849ddc519d10056c88150fe5a2e34df83fc370e7cd8b8a05cec39ff2bda80ae9efa4da8bfa8f4da4118b3d7fe3adff72bcc85b5c
diff --git a/vdr-mpv.spec b/vdr-mpv.spec
index 78bc7a8..46f6484 100644
--- a/vdr-mpv.spec
+++ b/vdr-mpv.spec
@@ -1,7 +1,7 @@
%global pname mpv
Name: vdr-%{pname}
-Version: 0.4.0
+Version: 0.5.0
Release: 1%{?dist}
Summary: A mpv player plugin for VDR
License: AGPLv3+
@@ -41,6 +41,9 @@ make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
%{vdr_plugindir}/libvdr-*.so.%{vdr_apiversion}
%changelog
+* Sun Jan 31 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 0.5.0-1
+- Update to 0.5.0
+
* Thu Jan 28 2021 Martin Gansser <martinkg(a)fedoraproject.org> - 0.4.0-1
- Update to 0.4.0
3 years, 9 months
[shotcut/f32] (2 commits) ...Update to 21.01.29
by Martin Gansser
Summary of changes:
0ac130a... Add shotcut-numeric_limits.patch (*)
b4636c7... Update to 21.01.29 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 9 months
[shotcut/f33] (2 commits) ...Update to 21.01.29
by Martin Gansser
Summary of changes:
0ac130a... Add shotcut-numeric_limits.patch (*)
b4636c7... Update to 21.01.29 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 9 months