[kodi-pvr-mythtv] Update cppmyth patch and add version to cppmyth buildrequires
by Leigh Scott
commit 29ee384cb94d062dac687d010aa9eb324550dc83
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sat Jul 27 13:41:56 2019 +0100
Update cppmyth patch and add version to cppmyth buildrequires
kodi-pvr-mythtv-5.7.0-use_external_cppmyth.patch | 8 ++++----
kodi-pvr-mythtv.spec | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/kodi-pvr-mythtv-5.7.0-use_external_cppmyth.patch b/kodi-pvr-mythtv-5.7.0-use_external_cppmyth.patch
index d041afa..8002845 100644
--- a/kodi-pvr-mythtv-5.7.0-use_external_cppmyth.patch
+++ b/kodi-pvr-mythtv-5.7.0-use_external_cppmyth.patch
@@ -97,18 +97,18 @@ diff -up ./src/cppmyth/MythScheduleManager.h.orig ./src/cppmyth/MythScheduleMana
#include "MythRecordingRule.h"
#include "MythProgramInfo.h"
#include "MythEPGInfo.h"
-diff -up ./src/fileOps.h.orig ./src/fileOps.h
---- ./src/fileOps.h.orig 2018-02-25 20:43:55.000000000 +0100
-+++ ./src/fileOps.h 2018-03-15 15:26:52.369583754 +0100
+diff -up ./src/artworksmanager.h.orig ./src/artworksmanager.h
+--- ./src/artworksmanager.h.orig 2019-07-27 13:13:17.724168594 +0100
++++ ./src/artworksmanager.h 2019-04-08 16:01:39.000000000 +0100
@@ -24,7 +24,7 @@
#include "cppmyth/MythChannel.h"
#include "cppmyth/MythProgramInfo.h"
-#include <mythwsapi.h>
+#include <cppmyth/mythwsapi.h>
- #include <p8-platform/threads/threads.h>
#include <string>
+
diff -up ./src/filestreaming.h.orig ./src/filestreaming.h
--- ./src/filestreaming.h.orig 2018-02-25 20:43:55.000000000 +0100
+++ ./src/filestreaming.h 2018-03-15 15:27:08.972125702 +0100
diff --git a/kodi-pvr-mythtv.spec b/kodi-pvr-mythtv.spec
index ebe696d..77317b1 100644
--- a/kodi-pvr-mythtv.spec
+++ b/kodi-pvr-mythtv.spec
@@ -28,7 +28,7 @@ BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
BuildRequires: kodi-platform-devel >= %{kodi_version}
-BuildRequires: pkgconfig(cppmyth)
+BuildRequires: pkgconfig(cppmyth) >= 2.12.1
BuildRequires: platform-devel
BuildRequires: zlib-devel
Requires: kodi >= %{kodi_version}
4 years, 9 months
[ffmpeg] Drop subversion
by Nicolas Chauvet
commit a5ff9385e0c452949c167638495d87e202dc9e53
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Jul 27 14:39:01 2019 +0200
Drop subversion
ffmpeg.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 033c27e..cdd499f 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -171,7 +171,6 @@ BuildRequires: perl(Pod::Man)
%{?_with_snappy:BuildRequires: snappy-devel}
BuildRequires: soxr-devel
BuildRequires: speex-devel
-BuildRequires: subversion
%{?_with_tesseract:BuildRequires: tesseract-devel}
#BuildRequires: texi2html
BuildRequires: texinfo
4 years, 9 months
[ffmpeg] Revert to the patch for 4.1x/4.0x
by Nicolas Chauvet
commit 9737b159b4d98ab5ad8445fbf371c603b0f199aa
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Jul 27 14:38:47 2019 +0200
Revert to the patch for 4.1x/4.0x
Use-gnutls_set_default_priority.patch | 21 +++++++--------------
1 file changed, 7 insertions(+), 14 deletions(-)
---
diff --git a/Use-gnutls_set_default_priority.patch b/Use-gnutls_set_default_priority.patch
index dffe2a8..cd89588 100644
--- a/Use-gnutls_set_default_priority.patch
+++ b/Use-gnutls_set_default_priority.patch
@@ -1,16 +1,9 @@
-From 58eb69d5f471a7d6c13d54e235164595a0968049 Mon Sep 17 00:00:00 2001
+From 73499eb72f268a0178d88c2144d9961a503f11fc Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart(a)gmail.com>
-Date: Sat, 15 Jun 2019 16:18:42 +0200
-Subject: [PATCH] Use gnutls_set_default_priority
+Date: Mon, 24 Sep 2018 18:12:27 +0200
+Subject: [PATCH] gnutls Switch to default (system) priority
-This will use the default priority for gnutls.
-
-When supported, the priority will be set to @SYSTEM which allows to
-adapt the ciphers list at runtime according to the policy set.
-
-See also:
https://fedoraproject.org/wiki/Packaging:CryptoPolicies
-https://wiki.debian.org/CryptoPolicy
Signed-off-by: Nicolas Chauvet <kwizart(a)gmail.com>
---
@@ -18,7 +11,7 @@ Signed-off-by: Nicolas Chauvet <kwizart(a)gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c
-index f32bc2821b..b30e8ea007 100644
+index e3c43683be..673a18ac6a 100644
--- a/libavformat/tls_gnutls.c
+++ b/libavformat/tls_gnutls.c
@@ -181,7 +181,7 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
@@ -27,9 +20,9 @@ index f32bc2821b..b30e8ea007 100644
gnutls_transport_set_ptr(p->session, c->tcp);
- gnutls_priority_set_direct(p->session, "NORMAL", NULL);
+ gnutls_set_default_priority (p->session);
- do {
- ret = gnutls_handshake(p->session);
- if (gnutls_error_is_fatal(ret)) {
+ ret = gnutls_handshake(p->session);
+ if (ret) {
+ ret = print_tls_error(h, ret);
--
2.17.2
4 years, 9 months
[ffmpeg] Update changelog
by Nicolas Chauvet
commit af227139fe5f8164f0d2bdc9246834fbc8b962f9
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Jul 27 14:19:44 2019 +0200
Update changelog
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index ca6d8c4..033c27e 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -87,7 +87,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.1.4
-Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -431,6 +431,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sat Jul 27 2019 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.4-2
+- Add patch for set_default_priority
+
* Tue Jul 09 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 4.1.4-1
- Update to 4.1.4 release
4 years, 9 months
[ffmpeg] Add patch for gnutls set_default_priority
by Nicolas Chauvet
commit 604596387379849e9ca1152177e3cd2ad7fc924c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Sat Jul 27 14:19:19 2019 +0200
Add patch for gnutls set_default_priority
Use-gnutls_set_default_priority.patch | 35 +++++++++++++++++++++++++++++++++++
ffmpeg.spec | 2 ++
2 files changed, 37 insertions(+)
---
diff --git a/Use-gnutls_set_default_priority.patch b/Use-gnutls_set_default_priority.patch
new file mode 100644
index 0000000..dffe2a8
--- /dev/null
+++ b/Use-gnutls_set_default_priority.patch
@@ -0,0 +1,35 @@
+From 58eb69d5f471a7d6c13d54e235164595a0968049 Mon Sep 17 00:00:00 2001
+From: Nicolas Chauvet <kwizart(a)gmail.com>
+Date: Sat, 15 Jun 2019 16:18:42 +0200
+Subject: [PATCH] Use gnutls_set_default_priority
+
+This will use the default priority for gnutls.
+
+When supported, the priority will be set to @SYSTEM which allows to
+adapt the ciphers list at runtime according to the policy set.
+
+See also:
+https://fedoraproject.org/wiki/Packaging:CryptoPolicies
+https://wiki.debian.org/CryptoPolicy
+
+Signed-off-by: Nicolas Chauvet <kwizart(a)gmail.com>
+---
+ libavformat/tls_gnutls.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c
+index f32bc2821b..b30e8ea007 100644
+--- a/libavformat/tls_gnutls.c
++++ b/libavformat/tls_gnutls.c
+@@ -181,7 +181,7 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
+ gnutls_transport_set_pull_function(p->session, gnutls_url_pull);
+ gnutls_transport_set_push_function(p->session, gnutls_url_push);
+ gnutls_transport_set_ptr(p->session, c->tcp);
+- gnutls_priority_set_direct(p->session, "NORMAL", NULL);
++ gnutls_set_default_priority (p->session);
+ do {
+ ret = gnutls_handshake(p->session);
+ if (gnutls_error_is_fatal(ret)) {
+--
+2.17.2
+
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 423c75a..ca6d8c4 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -98,6 +98,8 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
#Backport avutil/mem: Fix invalid use of av_alloc_size
#See rfbz#5221
Patch0: 4361293fcf59edb56879c36edcd25f0a91e0edf8.patch
+#http://lists.ffmpeg.org/pipermail/ffmpeg-devel/2019-July/246927.html
+Patch1: Use-gnutls_set_default_priority.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
%{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})}
4 years, 9 months
[kodi-pvr-mythtv/f29: 7/8] Update to 5.10.7 (rfbz #5304)
by Leigh Scott
commit 7c9709a682b6a457f2a6e7ee3775d04c6b0d1ced
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sat Jul 27 12:56:10 2019 +0100
Update to 5.10.7 (rfbz #5304)
.gitignore | 1 +
kodi-pvr-mythtv.spec | 17 ++++++++++-------
sources | 2 +-
3 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 39f1c11..0b03414 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/kodi-pvr-mythtv-a41fed4.tar.gz
/pvr.mythtv-59ff911.tar.gz
/pvr.mythtv-573f7b2.tar.gz
+/pvr.mythtv-179b6ea.tar.gz
diff --git a/kodi-pvr-mythtv.spec b/kodi-pvr-mythtv.spec
index 18f097b..ebe696d 100644
--- a/kodi-pvr-mythtv.spec
+++ b/kodi-pvr-mythtv.spec
@@ -1,6 +1,6 @@
-%global commit 573f7b29e9086464ce58dc1a1c908141d2681aa8
+%global commit 179b6ea5ad6a394a7e59be25ae72bc5033c9cb35
%global shortcommit %(c=%{commit}; echo ${c:0:7})
-%global commitdate 20180901
+%global commitdate 20190408
%global kodi_addon pvr.mythtv
%global kodi_version 18.0
@@ -9,8 +9,8 @@ Name: kodi-%(tr "." "-" <<<%{kodi_addon})
# Use Epoch to manage upgrades from older upstream
# (https://github.com/opdenkamp/xbmc-pvr-addons/)
Epoch: 1
-Version: 5.10.2
-Release: 2%{?dist}
+Version: 5.10.7
+Release: 1%{?dist}
Summary: MythTV PVR for Kodi
# Some cppmyth private headers are LGPLv2+
@@ -20,11 +20,11 @@ License: GPLv2+ and LGPLv2+
# URL: https://github.com/kodi-pvr/%%{kodi_addon}/
# Source0: https://github.com/kodi-pvr/%%{kodi_addon}/archive/%%{shortcommit}/%%{kod...
URL: https://github.com/janbar/%{kodi_addon}/
-Source0: https://github.com/janbar/%{kodi_addon}/archive/%{shortcommit}/%{kodi_add...
+Source0: %{url}/archive/%{shortcommit}/%{kodi_addon}-%{shortcommit}.tar.gz
# Use external cppmyth library
Patch0: %{name}-5.7.0-use_external_cppmyth.patch
-BuildRequires: cmake
+BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: kodi-devel >= %{kodi_version}
BuildRequires: kodi-platform-devel >= %{kodi_version}
@@ -46,7 +46,7 @@ find lib/cppmyth/ -type f -not -path "lib/cppmyth/src/private/*" -delete
%build
-%cmake .
+%cmake3 .
%make_build
@@ -61,6 +61,9 @@ find lib/cppmyth/ -type f -not -path "lib/cppmyth/src/private/*" -delete
%changelog
+* Sat Jul 27 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1:5.10.7-1
+- Update to 5.10.7 (rfbz #5304)
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:5.10.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index 8463a23..d84d889 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f9a373674a0a71e2afe73c850a838bd8 pvr.mythtv-573f7b2.tar.gz
+09b4c939ce61eb7c8e86cdb3f35caaa8 pvr.mythtv-179b6ea.tar.gz
4 years, 9 months