[xorg-x11-drv-nvidia/f26] Update to 375.66 release
by Leigh Scott
Summary of changes:
2a6cb11... Update to 375.66 release (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 11 months
- 1
- 0
[xorg-x11-drv-nvidia] Update to 375.66 release
by Leigh Scott
commit 2a6cb1190fa9c58b5bfc96505ab114d546491cb2
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Fri May 5 23:54:04 2017 +0100
Update to 375.66 release
.gitignore | 3 +++
sources | 6 +++---
xorg-x11-drv-nvidia.spec | 9 ++++++---
3 files changed, 12 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6d86284..d78c0fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,6 @@ NVIDIA-Linux-x86_64-358.16.run
/NVIDIA-Linux-x86-381.09.run
/NVIDIA-Linux-x86_64-381.09.run
/NVIDIA-Linux-armv7l-gnueabihf-381.09.run
+/NVIDIA-Linux-armv7l-gnueabihf-375.66.run
+/NVIDIA-Linux-x86-375.66.run
+/NVIDIA-Linux-x86_64-375.66.run
diff --git a/sources b/sources
index 17deac2..d20c4a9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-aa16257e2ab1c28724479165afc187cc NVIDIA-Linux-x86-381.09.run
-0a306b62fbf080943fd0559e12a7ddeb NVIDIA-Linux-x86_64-381.09.run
-01a30db744e0792ba8dd28202b37820e NVIDIA-Linux-armv7l-gnueabihf-381.09.run
+d8f8bee37b237f76c533eb0c4dae9bbc NVIDIA-Linux-armv7l-gnueabihf-375.66.run
+47dddb796fe39497cf6ae374591f6eb9 NVIDIA-Linux-x86-375.66.run
+9cf2c0a342a088211f25c5d8137097e6 NVIDIA-Linux-x86_64-375.66.run
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 2315350..cfcf984 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -29,9 +29,9 @@
Name: xorg-x11-drv-nvidia
-Epoch: 1
-Version: 381.09
-Release: 5%{?dist}
+Epoch: 2
+Version: 375.66
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -570,6 +570,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Fri May 05 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-1
+- Update to 375.66 release
+
* Wed Apr 26 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 1:381.09-5
- Use modprobe.blacklist cmdline instead of blacklist file on fedora.
- Use triggerin to install the new cmdline
6 years, 11 months
- 1
- 0
[game-data-packager] new upstream release
by Alexandre Detiste
commit 6691bdf97eb1070370403436f9c408bc6f1bc2b3
Author: Alexandre Detiste <alexandre.detiste(a)gmail.com>
Date: Fri May 5 21:54:36 2017 +0200
new upstream release
.gitignore | 1 +
game-data-packager.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 35476ff..80c7eee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/game-data-packager_46.tar.xz
/game-data-packager_47.tar.xz
/game-data-packager_48.tar.xz
+/game-data-packager_50.tar.xz
diff --git a/game-data-packager.spec b/game-data-packager.spec
index e4c399b..55047de 100644
--- a/game-data-packager.spec
+++ b/game-data-packager.spec
@@ -18,8 +18,8 @@
%endif
Name: game-data-packager
-Version: 48
-Release: 2%{?gver}%{?dist}
+Version: 50
+Release: 1%{?gver}%{?dist}
Summary: Installer for game data files
License: GPLv2 and GPLv2+
Url: https://wiki.debian.org/Games/GameDataPackager
@@ -128,6 +128,9 @@ rm -v $RPM_BUILD_ROOT/usr/share/man/man6/quake*.6
%license COPYING
%changelog
+* Thu May 04 2017 Alexandre Detiste <alexandre.detiste(a)gmail.com> - 50-1
+- new upstream release
+
* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org>
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/sources b/sources
index 6f61075..9d08ed0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-510c9b0169377862df65caa3a8579458 game-data-packager_48.tar.xz
+d2c4790069cd0e34b36061e92c33500c game-data-packager_50.tar.xz
6 years, 11 months
- 1
- 0
[freetype-freeworld/f24] Add CVE-2017-8105 and CVE-2017-8287 fixes from Fedora freetype
by Kevin Kofler
commit 08cf7d5a82fa01f5e3aa114a808aa10c40196f25
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Fri May 5 01:20:25 2017 +0200
Add CVE-2017-8105 and CVE-2017-8287 fixes from Fedora freetype
* Thu May 04 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.6.3-3
- Add freetype-2.6.3-protect-flex-handling.patch from Fedora freetype:
Better protect `flex' handling (CVE-2017-8105, rh#1446501)
- Add freetype-2.6.3-safety-guard.patch from Fedora freetype:
Add safety guard (CVE-2017-8287, rh#1446074)
freetype-2.6.3-protect-flex-handling.patch | 47 ++++++++++++++++++++++++++++++
freetype-2.6.3-safety-guard.patch | 36 +++++++++++++++++++++++
freetype-freeworld.spec | 18 +++++++++++-
3 files changed, 100 insertions(+), 1 deletion(-)
---
diff --git a/freetype-2.6.3-protect-flex-handling.patch b/freetype-2.6.3-protect-flex-handling.patch
new file mode 100644
index 0000000..01ff261
--- /dev/null
+++ b/freetype-2.6.3-protect-flex-handling.patch
@@ -0,0 +1,47 @@
+From f958c48ee431bef8d4d466b40c9cb2d4dbcb7791 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Fri, 24 Mar 2017 09:15:10 +0100
+Subject: [PATCH] [psaux] Better protect `flex' handling.
+
+Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=935
+
+* src/psaux/t1decode.c (t1_decoder_parse_charstrings)
+<callothersubr>: Since there is not a single flex operator but a
+series of subroutine calls, malformed fonts can call arbitrary other
+operators after the start of a flex, possibly adding points. For
+this reason we have to check the available number of points before
+inserting a point.
+---
+ ChangeLog | 15 +++++++++++++++
+ src/psaux/t1decode.c | 9 +++++++++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
+index af7b465e..7dd45135 100644
+--- a/src/psaux/t1decode.c
++++ b/src/psaux/t1decode.c
+@@ -780,10 +780,19 @@
+ /* point without adding any point to the outline */
+ idx = decoder->num_flex_vectors++;
+ if ( idx > 0 && idx < 7 )
++ {
++ /* in malformed fonts it is possible to have other */
++ /* opcodes in the middle of a flex (which don't */
++ /* increase `num_flex_vectors'); we thus have to */
++ /* check whether we can add a point */
++ if ( FT_SET_ERROR( t1_builder_check_points( builder, 1 ) ) )
++ goto Syntax_Error;
++
+ t1_builder_add_point( builder,
+ x,
+ y,
+ (FT_Byte)( idx == 3 || idx == 6 ) );
++ }
+ }
+ break;
+
+--
+2.12.2
+
diff --git a/freetype-2.6.3-safety-guard.patch b/freetype-2.6.3-safety-guard.patch
new file mode 100644
index 0000000..65ee149
--- /dev/null
+++ b/freetype-2.6.3-safety-guard.patch
@@ -0,0 +1,36 @@
+From 3774fc08b502c3e685afca098b6e8a195aded6a0 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Sun, 26 Mar 2017 08:32:09 +0200
+Subject: [PATCH] * src/psaux/psobjs.c (t1_builder_close_contour): Add safety
+ guard.
+
+Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941
+---
+ ChangeLog | 8 ++++++++
+ src/psaux/psobjs.c | 8 ++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
+index d18e821a..0baf8368 100644
+--- a/src/psaux/psobjs.c
++++ b/src/psaux/psobjs.c
+@@ -1718,6 +1718,14 @@
+ first = outline->n_contours <= 1
+ ? 0 : outline->contours[outline->n_contours - 2] + 1;
+
++ /* in malformed fonts it can happen that a contour was started */
++ /* but no points were added */
++ if ( outline->n_contours && first == outline->n_points )
++ {
++ outline->n_contours--;
++ return;
++ }
++
+ /* We must not include the last point in the path if it */
+ /* is located on the first point. */
+ if ( outline->n_points > 1 )
+--
+2.12.2
+
diff --git a/freetype-freeworld.spec b/freetype-freeworld.spec
index 363c073..71dfbbd 100644
--- a/freetype-freeworld.spec
+++ b/freetype-freeworld.spec
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.6.3
-Release: 2%{?dist}
+Release: 3%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
@@ -15,6 +15,12 @@ Patch46: freetype-2.2.1-enable-valid.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1429965
Patch93: freetype-2.6.3-heap-buffer-overflow.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1446500
+Patch94: freetype-2.6.3-protect-flex-handling.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1446073
+Patch95: freetype-2.6.3-safety-guard.patch
+
Provides: freetype-bytecode
Provides: freetype-subpixel
@@ -45,6 +51,10 @@ It transparently overrides the system library using ld.so.conf.d.
%patch93 -p1 -b .heap-buffer-overflow
+%patch94 -p1 -b .protect-flex-handling
+
+%patch95 -p1 -b .safety-guard
+
%build
%configure --disable-static \
@@ -88,6 +98,12 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Thu May 04 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.6.3-3
+- Add freetype-2.6.3-protect-flex-handling.patch from Fedora freetype:
+ Better protect `flex' handling (CVE-2017-8105, rh#1446501)
+- Add freetype-2.6.3-safety-guard.patch from Fedora freetype:
+ Add safety guard (CVE-2017-8287, rh#1446074)
+
* Sat Mar 11 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.6.3-2
- Add CVE-2016-10244 (heap buffer overflow, rh#1429965) fix from Fedora freetype
6 years, 11 months
- 1
- 0
[freetype-freeworld/f25] Add CVE-2017-8105 and CVE-2017-8287 fixes from Fedora freetype
by Kevin Kofler
commit 8fc15bde1cf1d21c301ed83068c772ebb632ba80
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Fri May 5 01:06:19 2017 +0200
Add CVE-2017-8105 and CVE-2017-8287 fixes from Fedora freetype
* Thu May 04 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.6.5-5
- Add freetype-2.6.5-protect-flex-handling.patch from Fedora freetype:
Better protect `flex' handling (CVE-2017-8105, rh#1446501)
- Add freetype-2.6.5-safety-guard.patch from Fedora freetype:
Add safety guard (CVE-2017-8287, rh#1446074)
freetype-2.6.5-protect-flex-handling.patch | 47 ++++++++++++++++++++++++++++++
freetype-2.6.5-safety-guard.patch | 36 +++++++++++++++++++++++
freetype-freeworld.spec | 16 +++++++++-
3 files changed, 98 insertions(+), 1 deletion(-)
---
diff --git a/freetype-2.6.5-protect-flex-handling.patch b/freetype-2.6.5-protect-flex-handling.patch
new file mode 100644
index 0000000..01ff261
--- /dev/null
+++ b/freetype-2.6.5-protect-flex-handling.patch
@@ -0,0 +1,47 @@
+From f958c48ee431bef8d4d466b40c9cb2d4dbcb7791 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Fri, 24 Mar 2017 09:15:10 +0100
+Subject: [PATCH] [psaux] Better protect `flex' handling.
+
+Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=935
+
+* src/psaux/t1decode.c (t1_decoder_parse_charstrings)
+<callothersubr>: Since there is not a single flex operator but a
+series of subroutine calls, malformed fonts can call arbitrary other
+operators after the start of a flex, possibly adding points. For
+this reason we have to check the available number of points before
+inserting a point.
+---
+ ChangeLog | 15 +++++++++++++++
+ src/psaux/t1decode.c | 9 +++++++++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
+index af7b465e..7dd45135 100644
+--- a/src/psaux/t1decode.c
++++ b/src/psaux/t1decode.c
+@@ -780,10 +780,19 @@
+ /* point without adding any point to the outline */
+ idx = decoder->num_flex_vectors++;
+ if ( idx > 0 && idx < 7 )
++ {
++ /* in malformed fonts it is possible to have other */
++ /* opcodes in the middle of a flex (which don't */
++ /* increase `num_flex_vectors'); we thus have to */
++ /* check whether we can add a point */
++ if ( FT_SET_ERROR( t1_builder_check_points( builder, 1 ) ) )
++ goto Syntax_Error;
++
+ t1_builder_add_point( builder,
+ x,
+ y,
+ (FT_Byte)( idx == 3 || idx == 6 ) );
++ }
+ }
+ break;
+
+--
+2.12.2
+
diff --git a/freetype-2.6.5-safety-guard.patch b/freetype-2.6.5-safety-guard.patch
new file mode 100644
index 0000000..65ee149
--- /dev/null
+++ b/freetype-2.6.5-safety-guard.patch
@@ -0,0 +1,36 @@
+From 3774fc08b502c3e685afca098b6e8a195aded6a0 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Sun, 26 Mar 2017 08:32:09 +0200
+Subject: [PATCH] * src/psaux/psobjs.c (t1_builder_close_contour): Add safety
+ guard.
+
+Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941
+---
+ ChangeLog | 8 ++++++++
+ src/psaux/psobjs.c | 8 ++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
+index d18e821a..0baf8368 100644
+--- a/src/psaux/psobjs.c
++++ b/src/psaux/psobjs.c
+@@ -1718,6 +1718,14 @@
+ first = outline->n_contours <= 1
+ ? 0 : outline->contours[outline->n_contours - 2] + 1;
+
++ /* in malformed fonts it can happen that a contour was started */
++ /* but no points were added */
++ if ( outline->n_contours && first == outline->n_points )
++ {
++ outline->n_contours--;
++ return;
++ }
++
+ /* We must not include the last point in the path if it */
+ /* is located on the first point. */
+ if ( outline->n_points > 1 )
+--
+2.12.2
+
diff --git a/freetype-freeworld.spec b/freetype-freeworld.spec
index ca26165..30d29d3 100644
--- a/freetype-freeworld.spec
+++ b/freetype-freeworld.spec
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.6.5
-Release: 4%{?dist}
+Release: 5%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
@@ -15,6 +15,12 @@ Patch46: freetype-2.2.1-enable-valid.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1429965
Patch94: freetype-2.6.5-heap-buffer-overflow.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1446500
+Patch95: freetype-2.6.5-protect-flex-handling.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1446073
+Patch96: freetype-2.6.5-safety-guard.patch
+
Provides: freetype-bytecode
Provides: freetype-subpixel
@@ -44,6 +50,8 @@ It transparently overrides the system library using ld.so.conf.d.
%patch46 -p1 -b .enable-valid
%patch94 -p1 -b .heap-buffer-overflow
+%patch95 -p1 -b .protect-flex-handling
+%patch96 -p1 -b .safety-guard
%build
@@ -88,6 +96,12 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Thu May 04 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.6.5-5
+- Add freetype-2.6.5-protect-flex-handling.patch from Fedora freetype:
+ Better protect `flex' handling (CVE-2017-8105, rh#1446501)
+- Add freetype-2.6.5-safety-guard.patch from Fedora freetype:
+ Add safety guard (CVE-2017-8287, rh#1446074)
+
* Mon Apr 10 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.6.5-4
- Drop freetype-2.6.5-linear-scaling.patch again as per rh#1437999 discussion
6 years, 11 months
- 1
- 0
[freetype-freeworld/f26] Add CVE-2017-8105 and CVE-2017-8287 fixes from Fedora freetype
by Kevin Kofler
Summary of changes:
32427de... Add CVE-2017-8105 and CVE-2017-8287 fixes from Fedora freet (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 11 months
- 1
- 0
[freetype-freeworld] Add CVE-2017-8105 and CVE-2017-8287 fixes from Fedora freetype
by Kevin Kofler
commit 32427de03ea2a9baf70d4fb24fc0c8e96f0a4bc4
Author: Kevin Kofler <kevin.kofler(a)chello.at>
Date: Fri May 5 00:39:14 2017 +0200
Add CVE-2017-8105 and CVE-2017-8287 fixes from Fedora freetype
* Thu May 04 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.7.1-5
- Add freetype-2.7.1-protect-flex-handling.patch from Fedora freetype:
Better protect `flex' handling (CVE-2017-8105, rh#1446501)
- Add freetype-2.7.1-safety-guard.patch from Fedora freetype:
Add safety guard (CVE-2017-8287, rh#1446074)
freetype-2.7.1-protect-flex-handling.patch | 47 ++++++++++++++++++++++++++++++
freetype-2.7.1-safety-guard.patch | 36 +++++++++++++++++++++++
freetype-freeworld.spec | 16 ++++++++--
3 files changed, 97 insertions(+), 2 deletions(-)
---
diff --git a/freetype-2.7.1-protect-flex-handling.patch b/freetype-2.7.1-protect-flex-handling.patch
new file mode 100644
index 0000000..01ff261
--- /dev/null
+++ b/freetype-2.7.1-protect-flex-handling.patch
@@ -0,0 +1,47 @@
+From f958c48ee431bef8d4d466b40c9cb2d4dbcb7791 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Fri, 24 Mar 2017 09:15:10 +0100
+Subject: [PATCH] [psaux] Better protect `flex' handling.
+
+Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=935
+
+* src/psaux/t1decode.c (t1_decoder_parse_charstrings)
+<callothersubr>: Since there is not a single flex operator but a
+series of subroutine calls, malformed fonts can call arbitrary other
+operators after the start of a flex, possibly adding points. For
+this reason we have to check the available number of points before
+inserting a point.
+---
+ ChangeLog | 15 +++++++++++++++
+ src/psaux/t1decode.c | 9 +++++++++
+ 2 files changed, 24 insertions(+)
+
+diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c
+index af7b465e..7dd45135 100644
+--- a/src/psaux/t1decode.c
++++ b/src/psaux/t1decode.c
+@@ -780,10 +780,19 @@
+ /* point without adding any point to the outline */
+ idx = decoder->num_flex_vectors++;
+ if ( idx > 0 && idx < 7 )
++ {
++ /* in malformed fonts it is possible to have other */
++ /* opcodes in the middle of a flex (which don't */
++ /* increase `num_flex_vectors'); we thus have to */
++ /* check whether we can add a point */
++ if ( FT_SET_ERROR( t1_builder_check_points( builder, 1 ) ) )
++ goto Syntax_Error;
++
+ t1_builder_add_point( builder,
+ x,
+ y,
+ (FT_Byte)( idx == 3 || idx == 6 ) );
++ }
+ }
+ break;
+
+--
+2.12.2
+
diff --git a/freetype-2.7.1-safety-guard.patch b/freetype-2.7.1-safety-guard.patch
new file mode 100644
index 0000000..65ee149
--- /dev/null
+++ b/freetype-2.7.1-safety-guard.patch
@@ -0,0 +1,36 @@
+From 3774fc08b502c3e685afca098b6e8a195aded6a0 Mon Sep 17 00:00:00 2001
+From: Werner Lemberg <wl(a)gnu.org>
+Date: Sun, 26 Mar 2017 08:32:09 +0200
+Subject: [PATCH] * src/psaux/psobjs.c (t1_builder_close_contour): Add safety
+ guard.
+
+Reported as
+
+ https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=941
+---
+ ChangeLog | 8 ++++++++
+ src/psaux/psobjs.c | 8 ++++++++
+ 2 files changed, 16 insertions(+)
+
+diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c
+index d18e821a..0baf8368 100644
+--- a/src/psaux/psobjs.c
++++ b/src/psaux/psobjs.c
+@@ -1718,6 +1718,14 @@
+ first = outline->n_contours <= 1
+ ? 0 : outline->contours[outline->n_contours - 2] + 1;
+
++ /* in malformed fonts it can happen that a contour was started */
++ /* but no points were added */
++ if ( outline->n_contours && first == outline->n_points )
++ {
++ outline->n_contours--;
++ return;
++ }
++
+ /* We must not include the last point in the path if it */
+ /* is located on the first point. */
+ if ( outline->n_points > 1 )
+--
+2.12.2
+
diff --git a/freetype-freeworld.spec b/freetype-freeworld.spec
index 13f4fb2..ad2237b 100644
--- a/freetype-freeworld.spec
+++ b/freetype-freeworld.spec
@@ -1,7 +1,7 @@
Summary: A free and portable font rendering engine
Name: freetype-freeworld
Version: 2.7.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
URL: http://www.freetype.org
Source: http://download.savannah.gnu.org/releases/freetype/freetype-%{version}.ta...
@@ -12,7 +12,11 @@ Patch21: freetype-2.3.0-enable-spr.patch
Patch46: freetype-2.2.1-enable-valid.patch
## Security fixes:
-# none needed yet
+# https://bugzilla.redhat.com/show_bug.cgi?id=1446500
+Patch94: freetype-2.7.1-protect-flex-handling.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1446073
+Patch95: freetype-2.7.1-safety-guard.patch
Provides: freetype-bytecode
Provides: freetype-subpixel
@@ -42,6 +46,8 @@ It transparently overrides the system library using ld.so.conf.d.
%patch46 -p1 -b .enable-valid
+%patch94 -p1 -b .protect-flex-handling
+%patch95 -p1 -b .safety-guard
%build
%configure --disable-static \
@@ -85,6 +91,12 @@ echo "%{_libdir}/%{name}" \
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%changelog
+* Thu May 04 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.7.1-5
+- Add freetype-2.7.1-protect-flex-handling.patch from Fedora freetype:
+ Better protect `flex' handling (CVE-2017-8105, rh#1446501)
+- Add freetype-2.7.1-safety-guard.patch from Fedora freetype:
+ Add safety guard (CVE-2017-8287, rh#1446074)
+
* Mon Apr 10 2017 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 2.7.1-4
- Drop freetype-2.7.1-linear-scaling.patch again as per rh#1437999 discussion
6 years, 11 months
- 1
- 0
[kodi-pvr-mythtv/f25] First import
by Mohamed ElMorabity
commit e183c7feeee8fc3fa7f0f7604686b39020920b26
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Thu May 4 21:33:55 2017 +0200
First import
.gitignore | 1 +
gpl-2.0.txt | 339 +++++++++++++++++++++
kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch | 156 ++++++++++
kodi-pvr-mythtv.spec | 75 +++++
sources | 1 +
5 files changed, 572 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..8a7c7b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/kodi-pvr-mythtv-9eb2058.tar.gz
diff --git a/gpl-2.0.txt b/gpl-2.0.txt
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/gpl-2.0.txt
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch b/kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch
new file mode 100644
index 0000000..ba7583d
--- /dev/null
+++ b/kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch
@@ -0,0 +1,156 @@
+diff -up ./CMakeLists.txt.orig ./CMakeLists.txt
+--- ./CMakeLists.txt.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./CMakeLists.txt 2017-04-24 23:49:24.550567499 +0200
+@@ -10,6 +10,13 @@ enable_language(C)
+ find_package(Kodi REQUIRED)
+ find_package(kodiplatform REQUIRED)
+ find_package(p8-platform REQUIRED)
++find_package(PkgConfig)
++pkg_check_modules(CPPMYTH REQUIRED cppmyth)
++
++set(CFLAGS ${CPPMYTH_CFLAGS} ${CPPMYTH_CFLAGS_OTHERS})
++add_definitions(${CFLAGS})
++set(LIBS ${CPPMYTH_CFLAGS} ${CPPMYTH_LIBRARIES})
++link_libraries(${LIBS})
+
+ include_directories(${kodiplatform_INCLUDE_DIRS}
+ ${p8-platform_INCLUDE_DIRS}
+@@ -51,8 +58,6 @@ set(MYTHTV_SOURCES src/avinfo.cpp
+ src/fileOps.cpp
+ src/filestreaming.cpp)
+
+-add_subdirectory(lib/cppmyth)
+-
+ set(DEPLIBS ${p8-platform_LIBRARIES} cppmyth)
+ if(WIN32)
+ list(APPEND DEPLIBS ws2_32)
+diff -up ./src/avinfo.h.orig ./src/avinfo.h
+--- ./src/avinfo.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/avinfo.h 2017-04-24 23:47:36.928418218 +0200
+@@ -24,7 +24,7 @@
+ #include "demuxer/tsDemuxer.h"
+ #include "client.h"
+
+-#include <mythstream.h>
++#include <cppmyth/mythstream.h>
+
+ #include <set>
+ #include <vector>
+diff -up ./src/cppmyth/MythChannel.h.orig ./src/cppmyth/MythChannel.h
+--- ./src/cppmyth/MythChannel.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythChannel.h 2017-04-24 23:47:36.929418191 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythtypes.h>
++#include <cppmyth/mythtypes.h>
+
+ class MythChannel
+ {
+diff -up ./src/cppmyth/MythEPGInfo.h.orig ./src/cppmyth/MythEPGInfo.h
+--- ./src/cppmyth/MythEPGInfo.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythEPGInfo.h 2017-04-24 23:47:36.929418191 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythtypes.h>
++#include <cppmyth/mythtypes.h>
+
+ class MythEPGInfo
+ {
+diff -up ./src/cppmyth/MythProgramInfo.h.orig ./src/cppmyth/MythProgramInfo.h
+--- ./src/cppmyth/MythProgramInfo.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythProgramInfo.h 2017-04-24 23:47:36.929418191 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythtypes.h>
++#include <cppmyth/mythtypes.h>
+
+ class MythProgramInfo;
+ typedef std::map<std::string, MythProgramInfo> ProgramInfoMap;
+diff -up ./src/cppmyth/MythRecordingRule.h.orig ./src/cppmyth/MythRecordingRule.h
+--- ./src/cppmyth/MythRecordingRule.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythRecordingRule.h 2017-04-24 23:47:36.930418165 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythtypes.h>
++#include <cppmyth/mythtypes.h>
+
+ class MythRecordingRule
+ {
+diff -up ./src/cppmyth/MythScheduleManager.h.orig ./src/cppmyth/MythScheduleManager.h
+--- ./src/cppmyth/MythScheduleManager.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythScheduleManager.h 2017-04-24 23:47:36.930418165 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythcontrol.h>
++#include <cppmyth/mythcontrol.h>
+ #include "MythRecordingRule.h"
+ #include "MythProgramInfo.h"
+ #include "MythEPGInfo.h"
+diff -up ./src/demux.h.orig ./src/demux.h
+--- ./src/demux.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/demux.h 2017-04-24 23:47:36.931418138 +0200
+@@ -24,7 +24,7 @@
+ #include "demuxer/tsDemuxer.h"
+ #include "client.h"
+
+-#include <mythstream.h>
++#include <cppmyth/mythstream.h>
+ #include <p8-platform/threads/threads.h>
+ #include <p8-platform/threads/mutex.h>
+ #include <p8-platform/util/buffer.h>
+diff -up ./src/fileOps.h.orig ./src/fileOps.h
+--- ./src/fileOps.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/fileOps.h 2017-04-24 23:47:36.931418138 +0200
+@@ -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 2017-04-19 15:44:27.000000000 +0200
++++ ./src/filestreaming.h 2017-04-24 23:47:36.931418138 +0200
+@@ -21,7 +21,7 @@
+ *
+ */
+
+-#include <mythstream.h>
++#include <cppmyth/mythstream.h>
+
+ class FileStreaming : public Myth::Stream
+ {
+diff -up ./src/pvrclient-mythtv.h.orig ./src/pvrclient-mythtv.h
+--- ./src/pvrclient-mythtv.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/pvrclient-mythtv.h 2017-04-24 23:47:36.932418112 +0200
+@@ -29,12 +29,12 @@
+
+ #include <xbmc_pvr_types.h>
+ #include <p8-platform/threads/mutex.h>
+-#include <mythsharedptr.h>
+-#include <mythcontrol.h>
+-#include <mytheventhandler.h>
+-#include <mythlivetvplayback.h>
+-#include <mythrecordingplayback.h>
+-#include <mythdebug.h>
++#include <cppmyth/mythsharedptr.h>
++#include <cppmyth/mythcontrol.h>
++#include <cppmyth/mytheventhandler.h>
++#include <cppmyth/mythlivetvplayback.h>
++#include <cppmyth/mythrecordingplayback.h>
++#include <cppmyth/mythdebug.h>
+
+ #include <string>
+ #include <vector>
diff --git a/kodi-pvr-mythtv.spec b/kodi-pvr-mythtv.spec
new file mode 100644
index 0000000..5c429f6
--- /dev/null
+++ b/kodi-pvr-mythtv.spec
@@ -0,0 +1,75 @@
+%global commit 9eb2058844ef078288094db5b305ddce2d5cf961
+%global short_commit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20170419
+
+%global kodi_addon pvr.mythtv
+%global kodi_version 17.0
+
+Name: kodi-%(tr "." "-" <<<%{kodi_addon})
+# Use Epoch to manage upgrades from older upstream
+# (https://github.com/opdenkamp/xbmc-pvr-addons/)
+Epoch: 1
+Version: 4.12.14
+Release: 1%{?dist}
+Summary: MythTV PVR for Kodi
+
+Group: Applications/Multimedia
+License: GPLv2+
+URL: https://github.com/kodi-pvr/%{kodi_addon}/
+Source0: https://github.com/kodi-pvr/%{kodi_addon}/archive/%{short_commit}/%{name}...
+# GPLv2 license file
+Source1: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+# Use external cppmyth library
+Patch0: %{name}-4.12.14-use_external_cppmyth.patch
+
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: kodi-devel >= %{kodi_version}
+BuildRequires: kodi-platform-devel >= %{kodi_version}
+BuildRequires: pkgconfig(cppmyth) >= 2.9.4
+BuildRequires: platform-devel
+Requires: kodi >= %{kodi_version}
+ExclusiveArch: i686 x86_64
+
+%description
+Kodi frontend for MythTV (up to MythTV 0.28). Supports streaming of live TV &
+recordings, listening to radio channels, EPG and timers.
+
+
+%prep
+%autosetup -n %{kodi_addon}-%{commit} -p0
+
+# Drop bundled cppmyth library, except private headers
+find lib/cppmyth/ -type f -not -path "lib/cppmyth/src/private/*" -delete
+
+# Drop bundled zlib library
+rm -r depends/common/zlib/
+
+cp -p %{SOURCE1} .
+
+
+%build
+%cmake -DCMAKE_INSTALL_LIBDIR=%{_libdir}/kodi/ .
+%make_build
+
+
+%install
+%make_install
+
+
+%files
+%doc %{kodi_addon}/changelog.txt
+%license gpl-2.0.txt
+%{_libdir}/kodi/addons/%{kodi_addon}/
+%{_datadir}/kodi/addons/%{kodi_addon}/
+
+
+%changelog
+* Mon Apr 24 2017 Mohamed El Morabity <melmorabity(a)fedorapeople.org> - 1:4.12.14-1
+- Update to latest stable release for Kodi 17
+
+* Sun Jul 24 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:3.4.19-1
+- Update to latest stable release for Kodi 16
+
+* Mon Aug 24 2015 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:2.5.0-1
+- Initial RPM release
diff --git a/sources b/sources
index e69de29..1d29c5a 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+4fb8d8bacaba286c7643bbc408e2d28d kodi-pvr-mythtv-9eb2058.tar.gz
6 years, 11 months
- 1
- 0
[kodi-pvr-mythtv/f26] First import
by Mohamed ElMorabity
commit c559f5b8e6dd7d2a573fe6430b3270ecd47c88ec
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Thu May 4 21:33:55 2017 +0200
First import
.gitignore | 1 +
gpl-2.0.txt | 339 +++++++++++++++++++++
kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch | 156 ++++++++++
kodi-pvr-mythtv.spec | 75 +++++
sources | 1 +
5 files changed, 572 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..8a7c7b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/kodi-pvr-mythtv-9eb2058.tar.gz
diff --git a/gpl-2.0.txt b/gpl-2.0.txt
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/gpl-2.0.txt
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch b/kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch
new file mode 100644
index 0000000..ba7583d
--- /dev/null
+++ b/kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch
@@ -0,0 +1,156 @@
+diff -up ./CMakeLists.txt.orig ./CMakeLists.txt
+--- ./CMakeLists.txt.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./CMakeLists.txt 2017-04-24 23:49:24.550567499 +0200
+@@ -10,6 +10,13 @@ enable_language(C)
+ find_package(Kodi REQUIRED)
+ find_package(kodiplatform REQUIRED)
+ find_package(p8-platform REQUIRED)
++find_package(PkgConfig)
++pkg_check_modules(CPPMYTH REQUIRED cppmyth)
++
++set(CFLAGS ${CPPMYTH_CFLAGS} ${CPPMYTH_CFLAGS_OTHERS})
++add_definitions(${CFLAGS})
++set(LIBS ${CPPMYTH_CFLAGS} ${CPPMYTH_LIBRARIES})
++link_libraries(${LIBS})
+
+ include_directories(${kodiplatform_INCLUDE_DIRS}
+ ${p8-platform_INCLUDE_DIRS}
+@@ -51,8 +58,6 @@ set(MYTHTV_SOURCES src/avinfo.cpp
+ src/fileOps.cpp
+ src/filestreaming.cpp)
+
+-add_subdirectory(lib/cppmyth)
+-
+ set(DEPLIBS ${p8-platform_LIBRARIES} cppmyth)
+ if(WIN32)
+ list(APPEND DEPLIBS ws2_32)
+diff -up ./src/avinfo.h.orig ./src/avinfo.h
+--- ./src/avinfo.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/avinfo.h 2017-04-24 23:47:36.928418218 +0200
+@@ -24,7 +24,7 @@
+ #include "demuxer/tsDemuxer.h"
+ #include "client.h"
+
+-#include <mythstream.h>
++#include <cppmyth/mythstream.h>
+
+ #include <set>
+ #include <vector>
+diff -up ./src/cppmyth/MythChannel.h.orig ./src/cppmyth/MythChannel.h
+--- ./src/cppmyth/MythChannel.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythChannel.h 2017-04-24 23:47:36.929418191 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythtypes.h>
++#include <cppmyth/mythtypes.h>
+
+ class MythChannel
+ {
+diff -up ./src/cppmyth/MythEPGInfo.h.orig ./src/cppmyth/MythEPGInfo.h
+--- ./src/cppmyth/MythEPGInfo.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythEPGInfo.h 2017-04-24 23:47:36.929418191 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythtypes.h>
++#include <cppmyth/mythtypes.h>
+
+ class MythEPGInfo
+ {
+diff -up ./src/cppmyth/MythProgramInfo.h.orig ./src/cppmyth/MythProgramInfo.h
+--- ./src/cppmyth/MythProgramInfo.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythProgramInfo.h 2017-04-24 23:47:36.929418191 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythtypes.h>
++#include <cppmyth/mythtypes.h>
+
+ class MythProgramInfo;
+ typedef std::map<std::string, MythProgramInfo> ProgramInfoMap;
+diff -up ./src/cppmyth/MythRecordingRule.h.orig ./src/cppmyth/MythRecordingRule.h
+--- ./src/cppmyth/MythRecordingRule.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythRecordingRule.h 2017-04-24 23:47:36.930418165 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythtypes.h>
++#include <cppmyth/mythtypes.h>
+
+ class MythRecordingRule
+ {
+diff -up ./src/cppmyth/MythScheduleManager.h.orig ./src/cppmyth/MythScheduleManager.h
+--- ./src/cppmyth/MythScheduleManager.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythScheduleManager.h 2017-04-24 23:47:36.930418165 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythcontrol.h>
++#include <cppmyth/mythcontrol.h>
+ #include "MythRecordingRule.h"
+ #include "MythProgramInfo.h"
+ #include "MythEPGInfo.h"
+diff -up ./src/demux.h.orig ./src/demux.h
+--- ./src/demux.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/demux.h 2017-04-24 23:47:36.931418138 +0200
+@@ -24,7 +24,7 @@
+ #include "demuxer/tsDemuxer.h"
+ #include "client.h"
+
+-#include <mythstream.h>
++#include <cppmyth/mythstream.h>
+ #include <p8-platform/threads/threads.h>
+ #include <p8-platform/threads/mutex.h>
+ #include <p8-platform/util/buffer.h>
+diff -up ./src/fileOps.h.orig ./src/fileOps.h
+--- ./src/fileOps.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/fileOps.h 2017-04-24 23:47:36.931418138 +0200
+@@ -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 2017-04-19 15:44:27.000000000 +0200
++++ ./src/filestreaming.h 2017-04-24 23:47:36.931418138 +0200
+@@ -21,7 +21,7 @@
+ *
+ */
+
+-#include <mythstream.h>
++#include <cppmyth/mythstream.h>
+
+ class FileStreaming : public Myth::Stream
+ {
+diff -up ./src/pvrclient-mythtv.h.orig ./src/pvrclient-mythtv.h
+--- ./src/pvrclient-mythtv.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/pvrclient-mythtv.h 2017-04-24 23:47:36.932418112 +0200
+@@ -29,12 +29,12 @@
+
+ #include <xbmc_pvr_types.h>
+ #include <p8-platform/threads/mutex.h>
+-#include <mythsharedptr.h>
+-#include <mythcontrol.h>
+-#include <mytheventhandler.h>
+-#include <mythlivetvplayback.h>
+-#include <mythrecordingplayback.h>
+-#include <mythdebug.h>
++#include <cppmyth/mythsharedptr.h>
++#include <cppmyth/mythcontrol.h>
++#include <cppmyth/mytheventhandler.h>
++#include <cppmyth/mythlivetvplayback.h>
++#include <cppmyth/mythrecordingplayback.h>
++#include <cppmyth/mythdebug.h>
+
+ #include <string>
+ #include <vector>
diff --git a/kodi-pvr-mythtv.spec b/kodi-pvr-mythtv.spec
new file mode 100644
index 0000000..5c429f6
--- /dev/null
+++ b/kodi-pvr-mythtv.spec
@@ -0,0 +1,75 @@
+%global commit 9eb2058844ef078288094db5b305ddce2d5cf961
+%global short_commit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20170419
+
+%global kodi_addon pvr.mythtv
+%global kodi_version 17.0
+
+Name: kodi-%(tr "." "-" <<<%{kodi_addon})
+# Use Epoch to manage upgrades from older upstream
+# (https://github.com/opdenkamp/xbmc-pvr-addons/)
+Epoch: 1
+Version: 4.12.14
+Release: 1%{?dist}
+Summary: MythTV PVR for Kodi
+
+Group: Applications/Multimedia
+License: GPLv2+
+URL: https://github.com/kodi-pvr/%{kodi_addon}/
+Source0: https://github.com/kodi-pvr/%{kodi_addon}/archive/%{short_commit}/%{name}...
+# GPLv2 license file
+Source1: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+# Use external cppmyth library
+Patch0: %{name}-4.12.14-use_external_cppmyth.patch
+
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: kodi-devel >= %{kodi_version}
+BuildRequires: kodi-platform-devel >= %{kodi_version}
+BuildRequires: pkgconfig(cppmyth) >= 2.9.4
+BuildRequires: platform-devel
+Requires: kodi >= %{kodi_version}
+ExclusiveArch: i686 x86_64
+
+%description
+Kodi frontend for MythTV (up to MythTV 0.28). Supports streaming of live TV &
+recordings, listening to radio channels, EPG and timers.
+
+
+%prep
+%autosetup -n %{kodi_addon}-%{commit} -p0
+
+# Drop bundled cppmyth library, except private headers
+find lib/cppmyth/ -type f -not -path "lib/cppmyth/src/private/*" -delete
+
+# Drop bundled zlib library
+rm -r depends/common/zlib/
+
+cp -p %{SOURCE1} .
+
+
+%build
+%cmake -DCMAKE_INSTALL_LIBDIR=%{_libdir}/kodi/ .
+%make_build
+
+
+%install
+%make_install
+
+
+%files
+%doc %{kodi_addon}/changelog.txt
+%license gpl-2.0.txt
+%{_libdir}/kodi/addons/%{kodi_addon}/
+%{_datadir}/kodi/addons/%{kodi_addon}/
+
+
+%changelog
+* Mon Apr 24 2017 Mohamed El Morabity <melmorabity(a)fedorapeople.org> - 1:4.12.14-1
+- Update to latest stable release for Kodi 17
+
+* Sun Jul 24 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:3.4.19-1
+- Update to latest stable release for Kodi 16
+
+* Mon Aug 24 2015 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:2.5.0-1
+- Initial RPM release
diff --git a/sources b/sources
index e69de29..1d29c5a 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+4fb8d8bacaba286c7643bbc408e2d28d kodi-pvr-mythtv-9eb2058.tar.gz
6 years, 11 months
- 1
- 0
[kodi-pvr-mythtv] First import
by Mohamed ElMorabity
commit 3fd0098a96d3f6b019ee4ad3b53691eb3bf6da07
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Thu May 4 21:33:55 2017 +0200
First import
.gitignore | 1 +
gpl-2.0.txt | 339 +++++++++++++++++++++
kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch | 156 ++++++++++
kodi-pvr-mythtv.spec | 75 +++++
sources | 1 +
5 files changed, 572 insertions(+)
---
diff --git a/.gitignore b/.gitignore
index e69de29..8a7c7b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/kodi-pvr-mythtv-9eb2058.tar.gz
diff --git a/gpl-2.0.txt b/gpl-2.0.txt
new file mode 100644
index 0000000..d159169
--- /dev/null
+++ b/gpl-2.0.txt
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch b/kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch
new file mode 100644
index 0000000..ba7583d
--- /dev/null
+++ b/kodi-pvr-mythtv-4.12.14-use_external_cppmyth.patch
@@ -0,0 +1,156 @@
+diff -up ./CMakeLists.txt.orig ./CMakeLists.txt
+--- ./CMakeLists.txt.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./CMakeLists.txt 2017-04-24 23:49:24.550567499 +0200
+@@ -10,6 +10,13 @@ enable_language(C)
+ find_package(Kodi REQUIRED)
+ find_package(kodiplatform REQUIRED)
+ find_package(p8-platform REQUIRED)
++find_package(PkgConfig)
++pkg_check_modules(CPPMYTH REQUIRED cppmyth)
++
++set(CFLAGS ${CPPMYTH_CFLAGS} ${CPPMYTH_CFLAGS_OTHERS})
++add_definitions(${CFLAGS})
++set(LIBS ${CPPMYTH_CFLAGS} ${CPPMYTH_LIBRARIES})
++link_libraries(${LIBS})
+
+ include_directories(${kodiplatform_INCLUDE_DIRS}
+ ${p8-platform_INCLUDE_DIRS}
+@@ -51,8 +58,6 @@ set(MYTHTV_SOURCES src/avinfo.cpp
+ src/fileOps.cpp
+ src/filestreaming.cpp)
+
+-add_subdirectory(lib/cppmyth)
+-
+ set(DEPLIBS ${p8-platform_LIBRARIES} cppmyth)
+ if(WIN32)
+ list(APPEND DEPLIBS ws2_32)
+diff -up ./src/avinfo.h.orig ./src/avinfo.h
+--- ./src/avinfo.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/avinfo.h 2017-04-24 23:47:36.928418218 +0200
+@@ -24,7 +24,7 @@
+ #include "demuxer/tsDemuxer.h"
+ #include "client.h"
+
+-#include <mythstream.h>
++#include <cppmyth/mythstream.h>
+
+ #include <set>
+ #include <vector>
+diff -up ./src/cppmyth/MythChannel.h.orig ./src/cppmyth/MythChannel.h
+--- ./src/cppmyth/MythChannel.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythChannel.h 2017-04-24 23:47:36.929418191 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythtypes.h>
++#include <cppmyth/mythtypes.h>
+
+ class MythChannel
+ {
+diff -up ./src/cppmyth/MythEPGInfo.h.orig ./src/cppmyth/MythEPGInfo.h
+--- ./src/cppmyth/MythEPGInfo.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythEPGInfo.h 2017-04-24 23:47:36.929418191 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythtypes.h>
++#include <cppmyth/mythtypes.h>
+
+ class MythEPGInfo
+ {
+diff -up ./src/cppmyth/MythProgramInfo.h.orig ./src/cppmyth/MythProgramInfo.h
+--- ./src/cppmyth/MythProgramInfo.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythProgramInfo.h 2017-04-24 23:47:36.929418191 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythtypes.h>
++#include <cppmyth/mythtypes.h>
+
+ class MythProgramInfo;
+ typedef std::map<std::string, MythProgramInfo> ProgramInfoMap;
+diff -up ./src/cppmyth/MythRecordingRule.h.orig ./src/cppmyth/MythRecordingRule.h
+--- ./src/cppmyth/MythRecordingRule.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythRecordingRule.h 2017-04-24 23:47:36.930418165 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythtypes.h>
++#include <cppmyth/mythtypes.h>
+
+ class MythRecordingRule
+ {
+diff -up ./src/cppmyth/MythScheduleManager.h.orig ./src/cppmyth/MythScheduleManager.h
+--- ./src/cppmyth/MythScheduleManager.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/cppmyth/MythScheduleManager.h 2017-04-24 23:47:36.930418165 +0200
+@@ -19,7 +19,7 @@
+ *
+ */
+
+-#include <mythcontrol.h>
++#include <cppmyth/mythcontrol.h>
+ #include "MythRecordingRule.h"
+ #include "MythProgramInfo.h"
+ #include "MythEPGInfo.h"
+diff -up ./src/demux.h.orig ./src/demux.h
+--- ./src/demux.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/demux.h 2017-04-24 23:47:36.931418138 +0200
+@@ -24,7 +24,7 @@
+ #include "demuxer/tsDemuxer.h"
+ #include "client.h"
+
+-#include <mythstream.h>
++#include <cppmyth/mythstream.h>
+ #include <p8-platform/threads/threads.h>
+ #include <p8-platform/threads/mutex.h>
+ #include <p8-platform/util/buffer.h>
+diff -up ./src/fileOps.h.orig ./src/fileOps.h
+--- ./src/fileOps.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/fileOps.h 2017-04-24 23:47:36.931418138 +0200
+@@ -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 2017-04-19 15:44:27.000000000 +0200
++++ ./src/filestreaming.h 2017-04-24 23:47:36.931418138 +0200
+@@ -21,7 +21,7 @@
+ *
+ */
+
+-#include <mythstream.h>
++#include <cppmyth/mythstream.h>
+
+ class FileStreaming : public Myth::Stream
+ {
+diff -up ./src/pvrclient-mythtv.h.orig ./src/pvrclient-mythtv.h
+--- ./src/pvrclient-mythtv.h.orig 2017-04-19 15:44:27.000000000 +0200
++++ ./src/pvrclient-mythtv.h 2017-04-24 23:47:36.932418112 +0200
+@@ -29,12 +29,12 @@
+
+ #include <xbmc_pvr_types.h>
+ #include <p8-platform/threads/mutex.h>
+-#include <mythsharedptr.h>
+-#include <mythcontrol.h>
+-#include <mytheventhandler.h>
+-#include <mythlivetvplayback.h>
+-#include <mythrecordingplayback.h>
+-#include <mythdebug.h>
++#include <cppmyth/mythsharedptr.h>
++#include <cppmyth/mythcontrol.h>
++#include <cppmyth/mytheventhandler.h>
++#include <cppmyth/mythlivetvplayback.h>
++#include <cppmyth/mythrecordingplayback.h>
++#include <cppmyth/mythdebug.h>
+
+ #include <string>
+ #include <vector>
diff --git a/kodi-pvr-mythtv.spec b/kodi-pvr-mythtv.spec
new file mode 100644
index 0000000..5c429f6
--- /dev/null
+++ b/kodi-pvr-mythtv.spec
@@ -0,0 +1,75 @@
+%global commit 9eb2058844ef078288094db5b305ddce2d5cf961
+%global short_commit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20170419
+
+%global kodi_addon pvr.mythtv
+%global kodi_version 17.0
+
+Name: kodi-%(tr "." "-" <<<%{kodi_addon})
+# Use Epoch to manage upgrades from older upstream
+# (https://github.com/opdenkamp/xbmc-pvr-addons/)
+Epoch: 1
+Version: 4.12.14
+Release: 1%{?dist}
+Summary: MythTV PVR for Kodi
+
+Group: Applications/Multimedia
+License: GPLv2+
+URL: https://github.com/kodi-pvr/%{kodi_addon}/
+Source0: https://github.com/kodi-pvr/%{kodi_addon}/archive/%{short_commit}/%{name}...
+# GPLv2 license file
+Source1: http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+# Use external cppmyth library
+Patch0: %{name}-4.12.14-use_external_cppmyth.patch
+
+BuildRequires: cmake
+BuildRequires: gcc-c++
+BuildRequires: kodi-devel >= %{kodi_version}
+BuildRequires: kodi-platform-devel >= %{kodi_version}
+BuildRequires: pkgconfig(cppmyth) >= 2.9.4
+BuildRequires: platform-devel
+Requires: kodi >= %{kodi_version}
+ExclusiveArch: i686 x86_64
+
+%description
+Kodi frontend for MythTV (up to MythTV 0.28). Supports streaming of live TV &
+recordings, listening to radio channels, EPG and timers.
+
+
+%prep
+%autosetup -n %{kodi_addon}-%{commit} -p0
+
+# Drop bundled cppmyth library, except private headers
+find lib/cppmyth/ -type f -not -path "lib/cppmyth/src/private/*" -delete
+
+# Drop bundled zlib library
+rm -r depends/common/zlib/
+
+cp -p %{SOURCE1} .
+
+
+%build
+%cmake -DCMAKE_INSTALL_LIBDIR=%{_libdir}/kodi/ .
+%make_build
+
+
+%install
+%make_install
+
+
+%files
+%doc %{kodi_addon}/changelog.txt
+%license gpl-2.0.txt
+%{_libdir}/kodi/addons/%{kodi_addon}/
+%{_datadir}/kodi/addons/%{kodi_addon}/
+
+
+%changelog
+* Mon Apr 24 2017 Mohamed El Morabity <melmorabity(a)fedorapeople.org> - 1:4.12.14-1
+- Update to latest stable release for Kodi 17
+
+* Sun Jul 24 2016 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:3.4.19-1
+- Update to latest stable release for Kodi 16
+
+* Mon Aug 24 2015 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 1:2.5.0-1
+- Initial RPM release
diff --git a/sources b/sources
index e69de29..1d29c5a 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+4fb8d8bacaba286c7643bbc408e2d28d kodi-pvr-mythtv-9eb2058.tar.gz
6 years, 11 months
- 1
- 0