[tvheadend] Update gcc7 patch
by Mohamed ElMorabity
commit 22df876eba99358b401da748dc1179909ab70750
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Apr 23 17:09:05 2017 +0200
Update gcc7 patch
tvheadend-4.2.1-gcc7.patch | 34 +++++++++++++++++++++++++++++-----
1 file changed, 29 insertions(+), 5 deletions(-)
---
diff --git a/tvheadend-4.2.1-gcc7.patch b/tvheadend-4.2.1-gcc7.patch
index 3cc9227..8b71e61 100644
--- a/tvheadend-4.2.1-gcc7.patch
+++ b/tvheadend-4.2.1-gcc7.patch
@@ -1,6 +1,6 @@
diff -up ./src/dvr/dvr_rec.c.orig ./src/dvr/dvr_rec.c
--- ./src/dvr/dvr_rec.c.orig 2017-04-21 10:32:22.000000000 +0200
-+++ ./src/dvr/dvr_rec.c 2017-04-23 14:05:36.028066833 +0200
++++ ./src/dvr/dvr_rec.c 2017-04-23 16:56:04.018841196 +0200
@@ -613,7 +613,7 @@ dvr_sub_basic_info(const char *id, const
HTSMSG_FOREACH(f, info) {
if (!(e = htsmsg_field_get_map(f))) continue;
@@ -21,7 +21,7 @@ diff -up ./src/dvr/dvr_rec.c.orig ./src/dvr/dvr_rec.c
htsmsg_t *info, *e;
diff -up ./src/epggrab/module/xmltv.c.orig ./src/epggrab/module/xmltv.c
--- ./src/epggrab/module/xmltv.c.orig 2017-04-21 10:32:22.000000000 +0200
-+++ ./src/epggrab/module/xmltv.c 2017-04-23 13:43:54.253923983 +0200
++++ ./src/epggrab/module/xmltv.c 2017-04-23 16:56:04.019841193 +0200
@@ -843,7 +843,7 @@ static void _xmltv_load_grabbers ( void
/* Internal search */
} else if ((tmp = getenv("PATH"))) {
@@ -31,9 +31,21 @@ diff -up ./src/epggrab/module/xmltv.c.orig ./src/epggrab/module/xmltv.c
char *argv[] = {
NULL,
(char *)"--description",
+diff -up ./src/idnode.c.orig ./src/idnode.c
+--- ./src/idnode.c.orig 2017-04-23 17:05:22.439195449 +0200
++++ ./src/idnode.c 2017-04-23 17:05:36.478154486 +0200
+@@ -1548,7 +1548,7 @@ idnode_slist_set ( idnode_t *in, idnode_
+ HTSMSG_FOREACH(f, vals) {
+ if ((s = htsmsg_field_get_str(f)) != NULL)
+ continue;
+- if (strcmp(s, o->id))
++ if (strcmp(s == NULL ? "" : s, o->id))
+ continue;
+ if (*ip == 0) changed = 1;
+ break;
diff -up ./src/lock.c.orig ./src/lock.c
--- ./src/lock.c.orig 2017-04-21 10:32:22.000000000 +0200
-+++ ./src/lock.c 2017-04-23 13:42:15.592554853 +0200
++++ ./src/lock.c 2017-04-23 16:56:04.019841193 +0200
@@ -31,7 +31,7 @@ int state_lock_(const char *lfile, int l
int fd = -1, err = 0;
struct flock lck;
@@ -43,9 +55,21 @@ diff -up ./src/lock.c.orig ./src/lock.c
lck.l_type = lock ? F_WRLCK : F_UNLCK;
lck.l_whence = SEEK_SET;
+diff -up ./src/rtsp.c.orig ./src/rtsp.c
+--- ./src/rtsp.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/rtsp.c 2017-04-23 17:03:07.148586930 +0200
+@@ -38,7 +38,7 @@ rtsp_send_ext( http_client_t *hc, http_c
+ (hc->hc_port != 554 ? 7 : 0) +
+ (path ? strlen(path) : 1) + 1;
+ char *buf = alloca(blen);
+- char buf2[7];
++ char buf2[11];
+ char buf_body[size + 3];
+
+ if (hc->hc_rtsp_session) {
diff -up ./src/subscriptions.c.orig ./src/subscriptions.c
--- ./src/subscriptions.c.orig 2017-04-21 10:32:22.000000000 +0200
-+++ ./src/subscriptions.c 2017-04-23 13:41:50.709217734 +0200
++++ ./src/subscriptions.c 2017-04-23 16:56:04.020841190 +0200
@@ -976,7 +976,7 @@ subscription_create_msg(th_subscription_
descramble_info_t *di;
service_t *t;
@@ -57,7 +81,7 @@ diff -up ./src/subscriptions.c.orig ./src/subscriptions.c
htsmsg_add_u32(m, "id", s->ths_id);
diff -up ./src/webui/webui.c.orig ./src/webui/webui.c
--- ./src/webui/webui.c.orig 2017-04-21 10:32:22.000000000 +0200
-+++ ./src/webui/webui.c 2017-04-23 14:07:05.205688547 +0200
++++ ./src/webui/webui.c 2017-04-23 16:56:04.020841190 +0200
@@ -174,7 +174,7 @@ page_login(http_connection_t *hc, const
{
if (hc->hc_access != NULL &&
7 years
[tvheadend/f26] Update to 4.2.1
by Mohamed ElMorabity
commit 4241480458320af07cdfba8f9492b53aca8b2dac
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Apr 23 14:24:13 2017 +0200
Update to 4.2.1
.gitignore | 1 +
sources | 2 +-
tvheadend-4.0.9-dtv_scan_tables.patch | 12 -
tvheadend-4.0.9-ffmpeg_3.0.patch | 436 ---------------------
tvheadend-4.0.9-gcc7.patch | 89 -----
....patch => tvheadend-4.2.1-crypto_policies.patch | 8 +-
tvheadend-4.2.1-dtv_scan_tables.patch | 12 +
tvheadend-4.2.1-gcc7.patch | 78 ++++
...omerun.patch => tvheadend-4.2.1-hdhomerun.patch | 12 +-
...-service.patch => tvheadend-4.2.1-service.patch | 7 +-
tvheadend-4.2.1-systemd.patch | 12 +
tvheadend.spec | 59 ++-
12 files changed, 146 insertions(+), 582 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 98072a3..2b2005d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/tvheadend-4.0.9.tar.gz
/tvheadend-4.1.tar.gz
/tvheadend-4.0.10.tar.gz
+/tvheadend-4.2.1.tar.gz
diff --git a/sources b/sources
index 35e6382..5072ed4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5595958aa8a1676c0f5205bc52e549b4 tvheadend-4.0.10.tar.gz
+f1c3a03acc0930d5c79e5de0bc051d39 tvheadend-4.2.1.tar.gz
diff --git a/tvheadend-4.0.9-crypto_policies.patch b/tvheadend-4.2.1-crypto_policies.patch
similarity index 57%
rename from tvheadend-4.0.9-crypto_policies.patch
rename to tvheadend-4.2.1-crypto_policies.patch
index 0896462..5c30151 100644
--- a/tvheadend-4.0.9-crypto_policies.patch
+++ b/tvheadend-4.2.1-crypto_policies.patch
@@ -1,12 +1,12 @@
diff -up ./src/httpc.c.orig ./src/httpc.c
---- ./src/httpc.c.orig 2016-03-14 10:10:57.000000000 +0100
-+++ ./src/httpc.c 2016-07-05 01:59:47.616987692 +0200
-@@ -1294,7 +1294,7 @@ http_client_reconnect
+--- ./src/httpc.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/httpc.c 2017-04-23 13:29:02.612596380 +0200
+@@ -1509,7 +1509,7 @@ http_client_reconnect
/* do not use SSLv2 */
SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_COMPRESSION);
/* adjust cipher list */
- if (SSL_CTX_set_cipher_list(ssl->ctx, "HIGH:MEDIUM") != 1) {
+ if (SSL_CTX_set_cipher_list(ssl->ctx, "PROFILE=SYSTEM") != 1) {
- tvhlog(LOG_ERR, "httpc", "%04X: Unable to adjust SSL cipher list", shortid(hc));
+ tvherror(LS_HTTPC, "%04X: Unable to adjust SSL cipher list", shortid(hc));
goto err2;
}
diff --git a/tvheadend-4.2.1-dtv_scan_tables.patch b/tvheadend-4.2.1-dtv_scan_tables.patch
new file mode 100644
index 0000000..f3426c0
--- /dev/null
+++ b/tvheadend-4.2.1-dtv_scan_tables.patch
@@ -0,0 +1,12 @@
+diff -up ./src/input/mpegts/scanfile.c.orig ./src/input/mpegts/scanfile.c
+--- ./src/input/mpegts/scanfile.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/input/mpegts/scanfile.c 2017-04-23 13:26:56.676950919 +0200
+@@ -903,7 +903,7 @@ scanfile_init ( const char *muxconf_path
+ #elif defined(PLATFORM_FREEBSD)
+ path = "/usr/local/share/dtv-scan-tables";
+ #else
+- path = "/usr/share/dvb";
++ path = "/usr/share/dvb5";
+ #endif
+
+ if (!initialized) {
diff --git a/tvheadend-4.2.1-gcc7.patch b/tvheadend-4.2.1-gcc7.patch
new file mode 100644
index 0000000..3cc9227
--- /dev/null
+++ b/tvheadend-4.2.1-gcc7.patch
@@ -0,0 +1,78 @@
+diff -up ./src/dvr/dvr_rec.c.orig ./src/dvr/dvr_rec.c
+--- ./src/dvr/dvr_rec.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/dvr/dvr_rec.c 2017-04-23 14:05:36.028066833 +0200
+@@ -613,7 +613,7 @@ dvr_sub_basic_info(const char *id, const
+ HTSMSG_FOREACH(f, info) {
+ if (!(e = htsmsg_field_get_map(f))) continue;
+ if ((s = htsmsg_get_str(e, "type")) != NULL) continue;
+- tvh_strlcatf(tmp, tmplen, l, "%s%s", l > 0 ? "," : "", s);
++ tvh_strlcatf(tmp, tmplen, l, "%s%s", l > 0 ? "," : "", s == NULL ? "" : s);
+ }
+ return tmp;
+ }
+@@ -915,7 +915,7 @@ dvr_rec_start(dvr_entry_t *de, const str
+ const source_info_t *si = &ss->ss_si;
+ streaming_start_t *ss_copy;
+ const streaming_start_component_t *ssc;
+- char res[11], asp[6], sr[6], ch[7];
++ char res[14], asp[14], sr[6], ch[7];
+ dvr_config_t *cfg = de->de_config;
+ profile_chain_t *prch = de->de_chain;
+ htsmsg_t *info, *e;
+diff -up ./src/epggrab/module/xmltv.c.orig ./src/epggrab/module/xmltv.c
+--- ./src/epggrab/module/xmltv.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/epggrab/module/xmltv.c 2017-04-23 13:43:54.253923983 +0200
+@@ -843,7 +843,7 @@ static void _xmltv_load_grabbers ( void
+ /* Internal search */
+ } else if ((tmp = getenv("PATH"))) {
+ tvhdebug(LS_XMLTV, "using internal grab search");
+- char bin[256];
++ char bin[257];
+ char *argv[] = {
+ NULL,
+ (char *)"--description",
+diff -up ./src/lock.c.orig ./src/lock.c
+--- ./src/lock.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/lock.c 2017-04-23 13:42:15.592554853 +0200
+@@ -31,7 +31,7 @@ int state_lock_(const char *lfile, int l
+ int fd = -1, err = 0;
+ struct flock lck;
+ struct stat st;
+- char lcktxt[12];
++ char lcktxt[13];
+
+ lck.l_type = lock ? F_WRLCK : F_UNLCK;
+ lck.l_whence = SEEK_SET;
+diff -up ./src/subscriptions.c.orig ./src/subscriptions.c
+--- ./src/subscriptions.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/subscriptions.c 2017-04-23 13:41:50.709217734 +0200
+@@ -976,7 +976,7 @@ subscription_create_msg(th_subscription_
+ descramble_info_t *di;
+ service_t *t;
+ profile_t *pro;
+- char buf[256];
++ char buf[284];
+ const char *state;
+
+ htsmsg_add_u32(m, "id", s->ths_id);
+diff -up ./src/webui/webui.c.orig ./src/webui/webui.c
+--- ./src/webui/webui.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/webui/webui.c 2017-04-23 14:07:05.205688547 +0200
+@@ -174,7 +174,7 @@ page_login(http_connection_t *hc, const
+ {
+ if (hc->hc_access != NULL &&
+ hc->hc_access->aa_username != NULL &&
+- hc->hc_access->aa_username != '\0') {
++ *(hc->hc_access->aa_username) != '\0') {
+ http_redirect(hc, "/", &hc->hc_req_args, 0);
+ return 0;
+ } else {
+@@ -187,7 +187,7 @@ page_logout(http_connection_t *hc, const
+ {
+ if (hc->hc_access == NULL ||
+ hc->hc_access->aa_username == NULL ||
+- hc->hc_access->aa_username == '\0') {
++ *(hc->hc_access->aa_username) == '\0') {
+ redirect:
+ http_redirect(hc, "/", &hc->hc_req_args, 0);
+ return 0;
diff --git a/tvheadend-4.0.9-hdhomerun.patch b/tvheadend-4.2.1-hdhomerun.patch
similarity index 68%
rename from tvheadend-4.0.9-hdhomerun.patch
rename to tvheadend-4.2.1-hdhomerun.patch
index cf776ea..64f6f69 100644
--- a/tvheadend-4.0.9-hdhomerun.patch
+++ b/tvheadend-4.2.1-hdhomerun.patch
@@ -1,7 +1,7 @@
diff -up ./configure.orig ./configure
---- ./configure.orig 2016-07-05 01:42:43.615016618 +0200
-+++ ./configure 2016-07-05 01:44:12.239677665 +0200
-@@ -290,7 +290,7 @@ if enabled hdhomerun_static; then
+--- ./configure.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./configure 2017-04-23 13:31:08.717237211 +0200
+@@ -357,7 +357,7 @@ if enabled hdhomerun_static; then
else
if enabled_or_auto hdhomerun_client; then
@@ -11,13 +11,13 @@ diff -up ./configure.orig ./configure
LDFLAGS="$LDFLAGS -lhdhomerun"
fi
diff -up ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
---- ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig 2016-03-14 10:10:57.000000000 +0100
-+++ ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h 2016-07-05 01:44:32.826134351 +0200
+--- ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h 2017-04-23 13:31:08.717237211 +0200
@@ -24,7 +24,7 @@
#include "htsbuf.h"
#include "tvhdhomerun.h"
--#include <libhdhomerun/hdhomerun.h>
+-#include "libhdhomerun/hdhomerun.h"
+#include <hdhomerun/hdhomerun.h>
typedef struct tvhdhomerun_device_info tvhdhomerun_device_info_t;
diff --git a/tvheadend-4.0.9-service.patch b/tvheadend-4.2.1-service.patch
similarity index 65%
rename from tvheadend-4.0.9-service.patch
rename to tvheadend-4.2.1-service.patch
index eea8b22..e881a87 100644
--- a/tvheadend-4.0.9-service.patch
+++ b/tvheadend-4.2.1-service.patch
@@ -1,8 +1,9 @@
diff -up ./rpm/tvheadend.sysconfig.orig ./rpm/tvheadend.sysconfig
---- ./rpm/tvheadend.sysconfig.orig 2016-03-14 10:10:57.000000000 +0100
-+++ ./rpm/tvheadend.sysconfig 2016-07-05 01:56:33.730282240 +0200
-@@ -1,3 +1,3 @@
+--- ./rpm/tvheadend.sysconfig.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./rpm/tvheadend.sysconfig 2017-04-23 13:24:58.581096686 +0200
+@@ -1,4 +1,4 @@
# Configuration file for the tvheadend service.
+ MALLOC_ARENA_MAX=4
-OPTIONS="-c /home/tvheadend/config -u tvheadend -g tvheadend -6 --http_port 9981 --htsp_port 9982"
+OPTIONS="-c /var/lib/tvheadend/config -u tvheadend -g video -6 -C --http_port 9981 --htsp_port 9982"
diff --git a/tvheadend-4.2.1-systemd.patch b/tvheadend-4.2.1-systemd.patch
new file mode 100644
index 0000000..423fe7d
--- /dev/null
+++ b/tvheadend-4.2.1-systemd.patch
@@ -0,0 +1,12 @@
+diff -up ./configure.orig ./configure
+--- ./configure.orig 2017-04-23 13:17:04.634688197 +0200
++++ ./configure 2017-04-23 13:18:15.837805616 +0200
+@@ -673,6 +673,8 @@ fi
+ #
+ if enabled_or_auto libsystemd_daemon; then
+ if check_pkg libsystemd-daemon; then
++ enable libsystemd_daemon
++ elif check_pkg libsystemd; then
+ enable libsystemd_daemon
+ elif enabled libsystemd_daemon; then
+ die "libsystemd-daemon development support not found (use --disable-systemd_daemon)"
diff --git a/tvheadend.spec b/tvheadend.spec
index 4eb0c69..e4ab8bd 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -2,7 +2,7 @@
%global tvheadend_group video
Name: tvheadend
-Version: 4.0.10
+Version: 4.2.1
Release: 1%{?dist}
Summary: TV streaming server and digital video recorder
@@ -10,31 +10,28 @@ Group: Applications/Multimedia
License: GPLv3+
URL: https://tvheadend.org/
Source0: https://github.com/tvheadend/%{name}/archive/v%{version}/%{name}-%{versio...
-# Fix build with FFmpeg >= 3.0, based on:
-# - https://github.com/tvheadend/tvheadend/commit/ea02889
-# - https://github.com/tvheadend/tvheadend/commit/c63371c
-# - https://github.com/tvheadend/tvheadend/commit/3cbee55
-# - https://github.com/tvheadend/tvheadend/commit/374ab83
-Patch0: %{name}-4.0.9-ffmpeg_3.0.patch
-# Use system queue.h header
-Patch1: %{name}-4.0.9-use_system_queue.patch
# Fix build with hdhomerun
-Patch2: %{name}-4.0.9-hdhomerun.patch
-# Fix system DTV scan tables path
-Patch3: %{name}-4.0.9-dtv_scan_tables.patch
+Patch0: %{name}-4.2.1-hdhomerun.patch
# Fix systemd service and configuration:
# - Fix daemon user path
# - Fix daemon group (use video to access DVB devices)
# - Add -C option to allow UI access without login at first run
-Patch4: %{name}-4.0.9-service.patch
+Patch1: %{name}-4.2.1-service.patch
+# Use system queue.h header
+Patch2: %{name}-4.0.9-use_system_queue.patch
+# Fix system DTV scan tables path
+Patch3: %{name}-4.2.1-dtv_scan_tables.patch
# Enforcing system crypto policies, see
# https://fedoraproject.org/wiki/Packaging:CryptoPolicies
-Patch5: %{name}-4.0.9-crypto_policies.patch
+Patch4: %{name}-4.2.1-crypto_policies.patch
# Fix build with GCC 7
-Patch6: %{name}-4.0.9-gcc7.patch
+Patch5: %{name}-4.2.1-gcc7.patch
+# Fix systemd detection
+Patch6: %{name}-4.2.1-systemd.patch
BuildRequires: bzip2
BuildRequires: gcc
+BuildRequires: gettext
BuildRequires: gzip
BuildRequires: hdhomerun-devel
BuildRequires: libdvbcsa-devel
@@ -45,14 +42,17 @@ BuildRequires: pkgconfig(libavfilter)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavresample)
BuildRequires: pkgconfig(libavutil)
+BuildRequires: pkgconfig(libswresample)
+BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(liburiparser)
BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(zlib)
BuildRequires: python2
BuildRequires: systemd
Requires: dtv-scan-tables
%{?systemd_requires}
-Provides: bundled(extjs) = 3.4.1
+Provides: bundled(extjs) = 3.4.1.1
%description
Tvheadend is a TV streaming server and recorder supporting DVB-S, DVB-S2, DVB-C,
@@ -70,17 +70,7 @@ MPEG-TS stream generated by ffmpeg/libav from a V4L device.
%prep
-%setup -q
-# RPM Fusion provides FFMpeg 3.0 for Fedora >= 24
-%if 0%{?fedora} >= 24
-%patch0 -p0 -b .ffmpeg_3.0
-%endif
-%patch1 -p0 -b .use_system_queue
-%patch2 -p0 -b .hdhomerun
-%patch3 -p0 -b .dtv_scan_tables
-%patch4 -p0 -b .service
-%patch5 -p0 -b .crypto_policies
-%patch6 -p0 -b .gcc7
+%autosetup -p 0
# Delete bundled system headers
rm -r vendor/{dvb-api,include}/
@@ -89,13 +79,14 @@ rm -r vendor/{dvb-api,include}/
%build
# Use touch to be sure that configure, after being patched, is still older than
# generated .config.mk file (otherwise the build fails)
-touch -r Makefile configure
+# touch -r Makefile configure
%configure \
--disable-dvbscan \
+ --disable-ffmpeg_static \
--disable-hdhomerun_static \
- --disable-libffmpeg_static_x264 \
--enable-dvbcsa \
- --enable-hdhomerun_client
+ --enable-hdhomerun_client \
+ --enable-libsystemd_daemon
%make_build V=1
@@ -112,7 +103,10 @@ chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
# Drop bundled Ext JS resources not required by Tvheadend UI
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/src/webui/static/extjs/
-rm -r *.js adapter/ examples/ resources/css/ resources/images/{access,gray,vista,yourtheme}/
+mv examples/ux/images/ examples_ux_images
+rm -r *.js adapter/ examples/ resources/images/{vista,yourtheme}/
+install -dm 0755 examples/ux/
+mv examples_ux_images/ examples/ux/images
popd
@@ -145,6 +139,9 @@ exit 0
%changelog
+* Sun Apr 23 2017 Mohamed El Morabity <melmorabity(a)fedorapeople.org> - 4.2.1-1
+- Update to 4.2.1
+
* Wed Apr 12 2017 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.0.10-1
- Update to 4.0.10
7 years
[tvheadend] Update to 4.2.1
by Mohamed ElMorabity
commit c41d8a87e1cc695e8567ca97027ff86eb9044fb2
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Sun Apr 23 14:24:13 2017 +0200
Update to 4.2.1
.gitignore | 1 +
sources | 2 +-
tvheadend-4.0.9-dtv_scan_tables.patch | 12 -
tvheadend-4.0.9-ffmpeg_3.0.patch | 436 ---------------------
tvheadend-4.0.9-gcc7.patch | 89 -----
....patch => tvheadend-4.2.1-crypto_policies.patch | 8 +-
tvheadend-4.2.1-dtv_scan_tables.patch | 12 +
tvheadend-4.2.1-gcc7.patch | 78 ++++
...omerun.patch => tvheadend-4.2.1-hdhomerun.patch | 12 +-
...-service.patch => tvheadend-4.2.1-service.patch | 7 +-
tvheadend-4.2.1-systemd.patch | 12 +
tvheadend.spec | 59 ++-
12 files changed, 146 insertions(+), 582 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 98072a3..2b2005d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/tvheadend-4.0.9.tar.gz
/tvheadend-4.1.tar.gz
/tvheadend-4.0.10.tar.gz
+/tvheadend-4.2.1.tar.gz
diff --git a/sources b/sources
index 35e6382..5072ed4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5595958aa8a1676c0f5205bc52e549b4 tvheadend-4.0.10.tar.gz
+f1c3a03acc0930d5c79e5de0bc051d39 tvheadend-4.2.1.tar.gz
diff --git a/tvheadend-4.0.9-crypto_policies.patch b/tvheadend-4.2.1-crypto_policies.patch
similarity index 57%
rename from tvheadend-4.0.9-crypto_policies.patch
rename to tvheadend-4.2.1-crypto_policies.patch
index 0896462..5c30151 100644
--- a/tvheadend-4.0.9-crypto_policies.patch
+++ b/tvheadend-4.2.1-crypto_policies.patch
@@ -1,12 +1,12 @@
diff -up ./src/httpc.c.orig ./src/httpc.c
---- ./src/httpc.c.orig 2016-03-14 10:10:57.000000000 +0100
-+++ ./src/httpc.c 2016-07-05 01:59:47.616987692 +0200
-@@ -1294,7 +1294,7 @@ http_client_reconnect
+--- ./src/httpc.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/httpc.c 2017-04-23 13:29:02.612596380 +0200
+@@ -1509,7 +1509,7 @@ http_client_reconnect
/* do not use SSLv2 */
SSL_CTX_set_options(ssl->ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_COMPRESSION);
/* adjust cipher list */
- if (SSL_CTX_set_cipher_list(ssl->ctx, "HIGH:MEDIUM") != 1) {
+ if (SSL_CTX_set_cipher_list(ssl->ctx, "PROFILE=SYSTEM") != 1) {
- tvhlog(LOG_ERR, "httpc", "%04X: Unable to adjust SSL cipher list", shortid(hc));
+ tvherror(LS_HTTPC, "%04X: Unable to adjust SSL cipher list", shortid(hc));
goto err2;
}
diff --git a/tvheadend-4.2.1-dtv_scan_tables.patch b/tvheadend-4.2.1-dtv_scan_tables.patch
new file mode 100644
index 0000000..f3426c0
--- /dev/null
+++ b/tvheadend-4.2.1-dtv_scan_tables.patch
@@ -0,0 +1,12 @@
+diff -up ./src/input/mpegts/scanfile.c.orig ./src/input/mpegts/scanfile.c
+--- ./src/input/mpegts/scanfile.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/input/mpegts/scanfile.c 2017-04-23 13:26:56.676950919 +0200
+@@ -903,7 +903,7 @@ scanfile_init ( const char *muxconf_path
+ #elif defined(PLATFORM_FREEBSD)
+ path = "/usr/local/share/dtv-scan-tables";
+ #else
+- path = "/usr/share/dvb";
++ path = "/usr/share/dvb5";
+ #endif
+
+ if (!initialized) {
diff --git a/tvheadend-4.2.1-gcc7.patch b/tvheadend-4.2.1-gcc7.patch
new file mode 100644
index 0000000..3cc9227
--- /dev/null
+++ b/tvheadend-4.2.1-gcc7.patch
@@ -0,0 +1,78 @@
+diff -up ./src/dvr/dvr_rec.c.orig ./src/dvr/dvr_rec.c
+--- ./src/dvr/dvr_rec.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/dvr/dvr_rec.c 2017-04-23 14:05:36.028066833 +0200
+@@ -613,7 +613,7 @@ dvr_sub_basic_info(const char *id, const
+ HTSMSG_FOREACH(f, info) {
+ if (!(e = htsmsg_field_get_map(f))) continue;
+ if ((s = htsmsg_get_str(e, "type")) != NULL) continue;
+- tvh_strlcatf(tmp, tmplen, l, "%s%s", l > 0 ? "," : "", s);
++ tvh_strlcatf(tmp, tmplen, l, "%s%s", l > 0 ? "," : "", s == NULL ? "" : s);
+ }
+ return tmp;
+ }
+@@ -915,7 +915,7 @@ dvr_rec_start(dvr_entry_t *de, const str
+ const source_info_t *si = &ss->ss_si;
+ streaming_start_t *ss_copy;
+ const streaming_start_component_t *ssc;
+- char res[11], asp[6], sr[6], ch[7];
++ char res[14], asp[14], sr[6], ch[7];
+ dvr_config_t *cfg = de->de_config;
+ profile_chain_t *prch = de->de_chain;
+ htsmsg_t *info, *e;
+diff -up ./src/epggrab/module/xmltv.c.orig ./src/epggrab/module/xmltv.c
+--- ./src/epggrab/module/xmltv.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/epggrab/module/xmltv.c 2017-04-23 13:43:54.253923983 +0200
+@@ -843,7 +843,7 @@ static void _xmltv_load_grabbers ( void
+ /* Internal search */
+ } else if ((tmp = getenv("PATH"))) {
+ tvhdebug(LS_XMLTV, "using internal grab search");
+- char bin[256];
++ char bin[257];
+ char *argv[] = {
+ NULL,
+ (char *)"--description",
+diff -up ./src/lock.c.orig ./src/lock.c
+--- ./src/lock.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/lock.c 2017-04-23 13:42:15.592554853 +0200
+@@ -31,7 +31,7 @@ int state_lock_(const char *lfile, int l
+ int fd = -1, err = 0;
+ struct flock lck;
+ struct stat st;
+- char lcktxt[12];
++ char lcktxt[13];
+
+ lck.l_type = lock ? F_WRLCK : F_UNLCK;
+ lck.l_whence = SEEK_SET;
+diff -up ./src/subscriptions.c.orig ./src/subscriptions.c
+--- ./src/subscriptions.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/subscriptions.c 2017-04-23 13:41:50.709217734 +0200
+@@ -976,7 +976,7 @@ subscription_create_msg(th_subscription_
+ descramble_info_t *di;
+ service_t *t;
+ profile_t *pro;
+- char buf[256];
++ char buf[284];
+ const char *state;
+
+ htsmsg_add_u32(m, "id", s->ths_id);
+diff -up ./src/webui/webui.c.orig ./src/webui/webui.c
+--- ./src/webui/webui.c.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/webui/webui.c 2017-04-23 14:07:05.205688547 +0200
+@@ -174,7 +174,7 @@ page_login(http_connection_t *hc, const
+ {
+ if (hc->hc_access != NULL &&
+ hc->hc_access->aa_username != NULL &&
+- hc->hc_access->aa_username != '\0') {
++ *(hc->hc_access->aa_username) != '\0') {
+ http_redirect(hc, "/", &hc->hc_req_args, 0);
+ return 0;
+ } else {
+@@ -187,7 +187,7 @@ page_logout(http_connection_t *hc, const
+ {
+ if (hc->hc_access == NULL ||
+ hc->hc_access->aa_username == NULL ||
+- hc->hc_access->aa_username == '\0') {
++ *(hc->hc_access->aa_username) == '\0') {
+ redirect:
+ http_redirect(hc, "/", &hc->hc_req_args, 0);
+ return 0;
diff --git a/tvheadend-4.0.9-hdhomerun.patch b/tvheadend-4.2.1-hdhomerun.patch
similarity index 68%
rename from tvheadend-4.0.9-hdhomerun.patch
rename to tvheadend-4.2.1-hdhomerun.patch
index cf776ea..64f6f69 100644
--- a/tvheadend-4.0.9-hdhomerun.patch
+++ b/tvheadend-4.2.1-hdhomerun.patch
@@ -1,7 +1,7 @@
diff -up ./configure.orig ./configure
---- ./configure.orig 2016-07-05 01:42:43.615016618 +0200
-+++ ./configure 2016-07-05 01:44:12.239677665 +0200
-@@ -290,7 +290,7 @@ if enabled hdhomerun_static; then
+--- ./configure.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./configure 2017-04-23 13:31:08.717237211 +0200
+@@ -357,7 +357,7 @@ if enabled hdhomerun_static; then
else
if enabled_or_auto hdhomerun_client; then
@@ -11,13 +11,13 @@ diff -up ./configure.orig ./configure
LDFLAGS="$LDFLAGS -lhdhomerun"
fi
diff -up ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h
---- ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig 2016-03-14 10:10:57.000000000 +0100
-+++ ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h 2016-07-05 01:44:32.826134351 +0200
+--- ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./src/input/mpegts/tvhdhomerun/tvhdhomerun_private.h 2017-04-23 13:31:08.717237211 +0200
@@ -24,7 +24,7 @@
#include "htsbuf.h"
#include "tvhdhomerun.h"
--#include <libhdhomerun/hdhomerun.h>
+-#include "libhdhomerun/hdhomerun.h"
+#include <hdhomerun/hdhomerun.h>
typedef struct tvhdhomerun_device_info tvhdhomerun_device_info_t;
diff --git a/tvheadend-4.0.9-service.patch b/tvheadend-4.2.1-service.patch
similarity index 65%
rename from tvheadend-4.0.9-service.patch
rename to tvheadend-4.2.1-service.patch
index eea8b22..e881a87 100644
--- a/tvheadend-4.0.9-service.patch
+++ b/tvheadend-4.2.1-service.patch
@@ -1,8 +1,9 @@
diff -up ./rpm/tvheadend.sysconfig.orig ./rpm/tvheadend.sysconfig
---- ./rpm/tvheadend.sysconfig.orig 2016-03-14 10:10:57.000000000 +0100
-+++ ./rpm/tvheadend.sysconfig 2016-07-05 01:56:33.730282240 +0200
-@@ -1,3 +1,3 @@
+--- ./rpm/tvheadend.sysconfig.orig 2017-04-21 10:32:22.000000000 +0200
++++ ./rpm/tvheadend.sysconfig 2017-04-23 13:24:58.581096686 +0200
+@@ -1,4 +1,4 @@
# Configuration file for the tvheadend service.
+ MALLOC_ARENA_MAX=4
-OPTIONS="-c /home/tvheadend/config -u tvheadend -g tvheadend -6 --http_port 9981 --htsp_port 9982"
+OPTIONS="-c /var/lib/tvheadend/config -u tvheadend -g video -6 -C --http_port 9981 --htsp_port 9982"
diff --git a/tvheadend-4.2.1-systemd.patch b/tvheadend-4.2.1-systemd.patch
new file mode 100644
index 0000000..423fe7d
--- /dev/null
+++ b/tvheadend-4.2.1-systemd.patch
@@ -0,0 +1,12 @@
+diff -up ./configure.orig ./configure
+--- ./configure.orig 2017-04-23 13:17:04.634688197 +0200
++++ ./configure 2017-04-23 13:18:15.837805616 +0200
+@@ -673,6 +673,8 @@ fi
+ #
+ if enabled_or_auto libsystemd_daemon; then
+ if check_pkg libsystemd-daemon; then
++ enable libsystemd_daemon
++ elif check_pkg libsystemd; then
+ enable libsystemd_daemon
+ elif enabled libsystemd_daemon; then
+ die "libsystemd-daemon development support not found (use --disable-systemd_daemon)"
diff --git a/tvheadend.spec b/tvheadend.spec
index 4eb0c69..e4ab8bd 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -2,7 +2,7 @@
%global tvheadend_group video
Name: tvheadend
-Version: 4.0.10
+Version: 4.2.1
Release: 1%{?dist}
Summary: TV streaming server and digital video recorder
@@ -10,31 +10,28 @@ Group: Applications/Multimedia
License: GPLv3+
URL: https://tvheadend.org/
Source0: https://github.com/tvheadend/%{name}/archive/v%{version}/%{name}-%{versio...
-# Fix build with FFmpeg >= 3.0, based on:
-# - https://github.com/tvheadend/tvheadend/commit/ea02889
-# - https://github.com/tvheadend/tvheadend/commit/c63371c
-# - https://github.com/tvheadend/tvheadend/commit/3cbee55
-# - https://github.com/tvheadend/tvheadend/commit/374ab83
-Patch0: %{name}-4.0.9-ffmpeg_3.0.patch
-# Use system queue.h header
-Patch1: %{name}-4.0.9-use_system_queue.patch
# Fix build with hdhomerun
-Patch2: %{name}-4.0.9-hdhomerun.patch
-# Fix system DTV scan tables path
-Patch3: %{name}-4.0.9-dtv_scan_tables.patch
+Patch0: %{name}-4.2.1-hdhomerun.patch
# Fix systemd service and configuration:
# - Fix daemon user path
# - Fix daemon group (use video to access DVB devices)
# - Add -C option to allow UI access without login at first run
-Patch4: %{name}-4.0.9-service.patch
+Patch1: %{name}-4.2.1-service.patch
+# Use system queue.h header
+Patch2: %{name}-4.0.9-use_system_queue.patch
+# Fix system DTV scan tables path
+Patch3: %{name}-4.2.1-dtv_scan_tables.patch
# Enforcing system crypto policies, see
# https://fedoraproject.org/wiki/Packaging:CryptoPolicies
-Patch5: %{name}-4.0.9-crypto_policies.patch
+Patch4: %{name}-4.2.1-crypto_policies.patch
# Fix build with GCC 7
-Patch6: %{name}-4.0.9-gcc7.patch
+Patch5: %{name}-4.2.1-gcc7.patch
+# Fix systemd detection
+Patch6: %{name}-4.2.1-systemd.patch
BuildRequires: bzip2
BuildRequires: gcc
+BuildRequires: gettext
BuildRequires: gzip
BuildRequires: hdhomerun-devel
BuildRequires: libdvbcsa-devel
@@ -45,14 +42,17 @@ BuildRequires: pkgconfig(libavfilter)
BuildRequires: pkgconfig(libavformat)
BuildRequires: pkgconfig(libavresample)
BuildRequires: pkgconfig(libavutil)
+BuildRequires: pkgconfig(libswresample)
+BuildRequires: pkgconfig(libswscale)
BuildRequires: pkgconfig(liburiparser)
BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(zlib)
BuildRequires: python2
BuildRequires: systemd
Requires: dtv-scan-tables
%{?systemd_requires}
-Provides: bundled(extjs) = 3.4.1
+Provides: bundled(extjs) = 3.4.1.1
%description
Tvheadend is a TV streaming server and recorder supporting DVB-S, DVB-S2, DVB-C,
@@ -70,17 +70,7 @@ MPEG-TS stream generated by ffmpeg/libav from a V4L device.
%prep
-%setup -q
-# RPM Fusion provides FFMpeg 3.0 for Fedora >= 24
-%if 0%{?fedora} >= 24
-%patch0 -p0 -b .ffmpeg_3.0
-%endif
-%patch1 -p0 -b .use_system_queue
-%patch2 -p0 -b .hdhomerun
-%patch3 -p0 -b .dtv_scan_tables
-%patch4 -p0 -b .service
-%patch5 -p0 -b .crypto_policies
-%patch6 -p0 -b .gcc7
+%autosetup -p 0
# Delete bundled system headers
rm -r vendor/{dvb-api,include}/
@@ -89,13 +79,14 @@ rm -r vendor/{dvb-api,include}/
%build
# Use touch to be sure that configure, after being patched, is still older than
# generated .config.mk file (otherwise the build fails)
-touch -r Makefile configure
+# touch -r Makefile configure
%configure \
--disable-dvbscan \
+ --disable-ffmpeg_static \
--disable-hdhomerun_static \
- --disable-libffmpeg_static_x264 \
--enable-dvbcsa \
- --enable-hdhomerun_client
+ --enable-hdhomerun_client \
+ --enable-libsystemd_daemon
%make_build V=1
@@ -112,7 +103,10 @@ chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
# Drop bundled Ext JS resources not required by Tvheadend UI
pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/src/webui/static/extjs/
-rm -r *.js adapter/ examples/ resources/css/ resources/images/{access,gray,vista,yourtheme}/
+mv examples/ux/images/ examples_ux_images
+rm -r *.js adapter/ examples/ resources/images/{vista,yourtheme}/
+install -dm 0755 examples/ux/
+mv examples_ux_images/ examples/ux/images
popd
@@ -145,6 +139,9 @@ exit 0
%changelog
+* Sun Apr 23 2017 Mohamed El Morabity <melmorabity(a)fedorapeople.org> - 4.2.1-1
+- Update to 4.2.1
+
* Wed Apr 12 2017 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.0.10-1
- Update to 4.0.10
7 years
[VirtualBox] Build pdf doc on f26+
by Sérgio M. Basto
commit 4becef1b154ea4f73133f7ed65a33aef51c93156
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Apr 23 13:12:59 2017 +0100
Build pdf doc on f26+
VirtualBox.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index e6d5ae5..20d7a47 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -15,7 +15,8 @@
%global prereltag %{?prerel:-%(awk 'BEGIN {print toupper("%{prerel}")}')}
%bcond_without webservice
-%if 0%{?rhel} || 0%{?fedora} > 25
+# el7 doesn't have all texlive requirements
+%if 0%{?rhel}
%bcond_with docs
%else
%bcond_without docs
@@ -25,7 +26,7 @@
Name: VirtualBox
Version: 5.1.20
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -759,6 +760,9 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Sun Apr 23 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.20-3
+- Build pdf doc on f26+
+
* Sat Apr 22 2017 Sérgio Basto <sergio(a)serjux.com> - 5.1.20-2
- Fix owning /usr/share/icons (rfbz#4509), thanks to Vasiliy N. Glazov
7 years
[nvidia-304xx-kmod] patch for kernel-4.11rc
by Leigh Scott
commit 57fd00265ccc2cdfa496bb54b64337db9d26c165
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Apr 23 12:07:51 2017 +0100
patch for kernel-4.11rc
4.11_kernel.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
nvidia-304xx-kmod.spec | 7 ++++++-
2 files changed, 50 insertions(+), 1 deletion(-)
---
diff --git a/4.11_kernel.patch b/4.11_kernel.patch
new file mode 100644
index 0000000..71e3262
--- /dev/null
+++ b/4.11_kernel.patch
@@ -0,0 +1,44 @@
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -22,6 +22,8 @@
+ #include <drm/drm_gem.h>
+ #endif
+
++#include <linux/version.h>
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ static int nv_drm_load(
+@@ -42,7 +44,11 @@
+ return -ENODEV;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ static int nv_drm_unload(
++#else
++static void nv_drm_unload(
++#endif
+ struct drm_device *dev
+ )
+ {
+@@ -52,11 +58,19 @@
+ {
+ if (nvl->dev == dev->pdev)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ return 0;
++#else
++ return;
++#endif
+ }
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ return -ENODEV;
++#else
++ return;
++#endif
+ }
+
+ static const struct file_operations nv_drm_fops = {
+
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index e526092..d986b14 100644
--- a/nvidia-304xx-kmod.spec
+++ b/nvidia-304xx-kmod.spec
@@ -9,7 +9,7 @@
Name: nvidia-304xx-kmod
Version: 304.135
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -24,6 +24,7 @@ Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
#Patch0: disable-mtrr.patch
Patch1: 4.9.0_kernel.patch
Patch2: kernel_4.10.patch
+Patch3: 4.11_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,6 +54,7 @@ pushd nvidiapkg-${arch}
#patch0 -p0
%patch1 -p1
%patch2 -p1
+%patch3 -p1
popd
done
@@ -86,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Apr 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 304.135-4
+- patch for kernel-4.11rc
+
* Mon Feb 20 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 304.135-3
- patch for kernel-4.10
7 years
[nvidia-340xx-kmod] patch for kernel-4.11rc
by Leigh Scott
commit 425e9ce06d39031f0ad07a8aaf5f1684bf865d93
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sun Apr 23 10:14:23 2017 +0100
patch for kernel-4.11rc
4.11_kernel.patch | 112 +++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-340xx-kmod.spec | 7 +++-
2 files changed, 118 insertions(+), 1 deletion(-)
---
diff --git a/4.11_kernel.patch b/4.11_kernel.patch
new file mode 100644
index 0000000..5ee3e4f
--- /dev/null
+++ b/4.11_kernel.patch
@@ -0,0 +1,112 @@
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -22,6 +22,8 @@
+ #include <drm/drm_gem.h>
+ #endif
+
++#include <linux/version.h>
++
+ extern nv_linux_state_t *nv_linux_devices;
+
+ struct nv_gem_object {
+@@ -48,7 +50,11 @@
+ return -ENODEV;
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ static int nv_drm_unload(
++#else
++static void nv_drm_unload(
++#endif
+ struct drm_device *dev
+ )
+ {
+@@ -60,11 +66,19 @@
+ {
+ BUG_ON(nvl->drm != dev);
+ nvl->drm = NULL;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ return 0;
++#else
++ return;
++#endif
+ }
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ return -ENODEV;
++#else
++ return;
++#endif
+ }
+
+ static void nv_gem_free(
+
+--- a/kernel/uvm/nvidia_uvm_linux.h
++++ b/kernel/uvm/nvidia_uvm_linux.h
+@@ -124,6 +124,9 @@
+ #include <linux/delay.h> /* mdelay, udelay */
+
+ #include <linux/sched.h> /* suser(), capable() replacement */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include <linux/sched/signal.h>
++#endif
+ #include <linux/moduleparam.h> /* module_param() */
+ #if !defined(NV_VMWARE)
+ #include <asm/tlbflush.h> /* flush_tlb(), flush_tlb_all() */
+@@ -362,6 +365,7 @@
+ void address_space_init_once(struct address_space *mapping);
+ #endif
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+ #if !defined(NV_FATAL_SIGNAL_PENDING_PRESENT)
+ static inline int __fatal_signal_pending(struct task_struct *p)
+ {
+@@ -372,6 +376,7 @@
+ {
+ return signal_pending(p) && __fatal_signal_pending(p);
+ }
++#endif
+ #endif
+
+ //
+
+--- a/kernel/uvm/nvidia_uvm_lite.c
++++ b/kernel/uvm/nvidia_uvm_lite.c
+@@ -818,7 +818,11 @@
+ }
+
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++int _fault(struct vm_fault *vmf)
++#else
+ int _fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#endif
+ {
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)
+ unsigned long vaddr = (unsigned long)vmf->virtual_address;
+@@ -828,7 +832,11 @@
+ struct page *page = NULL;
+ int retval;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++ retval = _fault_common(NULL, vaddr, &page, vmf->flags);
++#else
+ retval = _fault_common(vma, vaddr, &page, vmf->flags);
++#endif
+
+ vmf->page = page;
+
+@@ -866,7 +874,11 @@
+ // it's dealing with anonymous mapping (see handle_pte_fault).
+ //
+ #if defined(NV_VM_OPERATIONS_STRUCT_HAS_FAULT)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++int _sigbus_fault(struct vm_fault *vmf)
++#else
+ int _sigbus_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
++#endif
+ {
+ vmf->page = NULL;
+ return VM_FAULT_SIGBUS;
+
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index cd2324d..972c586 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.102
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -20,6 +20,7 @@ Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: 4.9.0_kernel.patch
Patch2: 4.10.0_kernel.patch
+Patch3: 4.11_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -97,6 +99,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Apr 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.102-3
+- patch for kernel-4.11rc
+
* Mon Feb 20 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:340.102-2
- patch for kernel-4.10
7 years
[lightspark] 2017-04-22 snapshot - LLVM 4.0 support
by Xavier Bachelot
commit b7e29fddf929fae5ea29b4ea361162eee8d07c8d
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Sun Apr 23 11:10:39 2017 +0200
2017-04-22 snapshot - LLVM 4.0 support
.gitignore | 1 +
lightspark.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 088d4c5..24c2f7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
lightspark-0.7.2-20140219git.tar.bz2
/lightspark-0.7.2-20160703git.tar.gz
/lightspark-0.7.2-20170107git.tar.gz
+/lightspark-0.7.2-20170422git.tar.gz
diff --git a/lightspark.spec b/lightspark.spec
index 74a0dd2..4246ec1 100644
--- a/lightspark.spec
+++ b/lightspark.spec
@@ -9,15 +9,15 @@
%define pre_release 0
%if %{?git}
-%define commit 308241eb55c5379765033e60f28dfdd956c7abcd
-%define date 20170107
+%define commit 7dd881170a1ed48596c19bac48cdcdd403f70841
+%define date 20170422
%endif
%if %{pre_release}
%define pre rc1
%endif
-%define rel 12
+%define rel 13
%define major 0.7.2
@@ -151,6 +151,9 @@ fi
%changelog
+* Sun Apr 23 2017 Xavier Bachelot <xavier(a)bachelot.org> - 0.7.2-13.20170422git
+- New snapshot with LLVM 4.0 support.
+
* Tue Apr 04 2017 Xavier Bachelot <xavier(a)bachelot.org> - 0.7.2-12.20170107git
- Disable ppc64le and ppc64.
diff --git a/sources b/sources
index ac3fd64..2a7aa6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2167edd842f4fe4f29ec9e0b98778a0f lightspark-0.7.2-20170107git.tar.gz
+fff7b621b49b62e28799d0860d2f2e98 lightspark-0.7.2-20170422git.tar.gz
7 years
[pithos/f26] Bump version to 1.3.1
by Patrick Griffis
commit 39ad49bb83996881741e3f4716832f74dbd6efd8
Author: Patrick Griffis <tingping(a)tingping.se>
Date: Fri Apr 21 20:47:34 2017 -0400
Bump version to 1.3.1
.gitignore | 1 +
pithos.spec | 7 ++++---
sources | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0b3384b..5f8f7a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ pithos-1.1.2.tar.gz
/pithos-1.2.0.tar.xz
/pithos-1.2.1.tar.xz
/pithos-1.3.0.tar.xz
+/pithos-1.3.1.tar.xz
diff --git a/pithos.spec b/pithos.spec
index c4b4c5d..0e7884d 100644
--- a/pithos.spec
+++ b/pithos.spec
@@ -1,7 +1,7 @@
%global appid io.github.Pithos
Name: pithos
-Version: 1.3.0
+Version: 1.3.1
Release: 1%{?dist}
Summary: A Pandora client for the GNOME Desktop
@@ -9,8 +9,6 @@ Group: Applications/Multimedia
License: GPLv3
URL: https://pithos.github.io/
Source0: https://github.com/pithos/pithos/releases/download/%{version}/pithos-%{ve...
-Patch0: https://github.com/pithos/pithos/commit/be9e8cb35692ef0b7d835dc26b28996cf...
-Patch1: https://github.com/pithos/pithos/commit/8656c60e9663148166c8bd2cfd910a442...
BuildArch: noarch
@@ -76,6 +74,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
%{_mandir}/man1/*.gz
%changelog
+* Fri Apr 21 2017 Patrick Griffis <tingping(a)tingping.se> - 1.3.1-1
+- Bump version to 1.3.1
+
* Thu Apr 13 2017 Patrick Griffis <tingping(a)tingping.se> - 1.3.0-1
- Bump version to 1.3.0
- Fix directory ownership
diff --git a/sources b/sources
index cb8ec7f..4f804ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f53ea35b3a60db90727957f99cabfa83 pithos-1.3.0.tar.xz
+0b4212d360a32649577c319cd058c3a0 pithos-1.3.1.tar.xz
7 years