webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

vdr: update to 2.4.4

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2020-11-23 18:27:46 +01:00
committed by Michael Tremer
parent 2cb220fd3c
commit e4f287a268
9 changed files with 18 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/packages/vdr_eepg
View File

@@ -1,2 +1,2 @@
etc/vdr/plugins/eepg
usr/lib/vdr/libvdr-eepg.so.2.4.1
usr/lib/vdr/libvdr-eepg.so.2.4.4

8
config/rootfiles/packages/vdr_epgsearch
View File

@@ -5,10 +5,10 @@ etc/sysconfig/vdr-plugins.d/quickepgsearch.conf
etc/vdr/plugins/epgsearch
etc/vdr/plugins/epgsearch/conf.d
usr/bin/createcats
usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.1
usr/lib/vdr/libvdr-epgsearch.so.2.4.1
usr/lib/vdr/libvdr-epgsearchonly.so.2.4.1
usr/lib/vdr/libvdr-quickepgsearch.so.2.4.1
usr/lib/vdr/libvdr-conflictcheckonly.so.2.4.4
usr/lib/vdr/libvdr-epgsearch.so.2.4.4
usr/lib/vdr/libvdr-epgsearchonly.so.2.4.4
usr/lib/vdr/libvdr-quickepgsearch.so.2.4.4
#var/lib/vdr
#var/lib/vdr/data
var/lib/vdr/data/epgsearch

2
config/rootfiles/packages/vdr_streamdev
View File

@@ -4,4 +4,4 @@ etc/vdr/plugins/streamdev-server
etc/vdr/plugins/streamdev-server/streamdevhosts.conf
#usr/lib/vdr/bin
usr/lib/vdr/bin/externremux.sh
usr/lib/vdr/libvdr-streamdev-server.so.2.4.1
usr/lib/vdr/libvdr-streamdev-server.so.2.4.4

10
lfs/vdr
View File

@@ -24,11 +24,11 @@
include Config
VER = 2.4.1
VER = 2.4.4
# VDRPLUGVER must match with APIVERSION in config.h
# after change this update also all vdr plugins
VDRPLUGVER = 2.4.1
VDRPLUGVER = 2.4.4
THISAPP = vdr-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -37,7 +37,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr
PAK_VER = 11
PAK_VER = 12
DEPS = vdr_streamdev
@@ -65,7 +65,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = b2897fe6b6e6711d512a69642b1b8ec1
$(DL_FILE)_MD5 = ccf724c157740b2b153ca41ad38f1217
install : $(TARGET)
@@ -98,8 +98,6 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
# stime was removed from glibc with version 2.31
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr/vdr-2.4.1_replace_stime.patch
# Compile main package.
cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir

4
lfs/vdr_dvbapi
View File

@@ -33,11 +33,11 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_dvbapi
PAK_VER = 2
PAK_VER = 3
DEPS =
VDRPLUGVER = 2.4.1
VDRPLUGVER = 2.4.4
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
CFLAGS += $(EXTRA_FLAGS)

4
lfs/vdr_eepg
View File

@@ -36,11 +36,11 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_eepg
PAK_VER = 2
PAK_VER = 3
DEPS =
VDRPLUGVER = 2.4.1
VDRPLUGVER = 2.4.4
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
CFLAGS += $(EXTRA_FLAGS)

4
lfs/vdr_epgsearch
View File

@@ -33,11 +33,11 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/vdr-plugin-epgsearch
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_epgsearch
PAK_VER = 8
PAK_VER = 9
DEPS =
VDRPLUGVER = 2.4.1
VDRPLUGVER = 2.4.4
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
CFLAGS += $(EXTRA_FLAGS)

4
lfs/vdr_streamdev
View File

@@ -34,11 +34,11 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = vdr_streamdev
PAK_VER = 3
PAK_VER = 4
DEPS =
VDRPLUGVER = 2.4.1
VDRPLUGVER = 2.4.4
EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
CFLAGS += $(EXTRA_FLAGS)

47
src/patches/vdr/vdr-2.4.1_replace_stime.patch
View File

@@ -1,47 +0,0 @@
From dcfa8ba29f4c95edbdceb0f1bbae0e62fa40c4e2 Mon Sep 17 00:00:00 2001
From: Manuel Reimer <manuel.reimer@gmx.de>
Date: Sat, 14 Dec 2019 12:01:13 +0100
Subject: [PATCH 1/2] Replace obsolete stime() function with clock_settime()
---
eit.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/eit.c b/eit.c
index 50d8229..82294dc 100644
--- a/eit.c
+++ b/eit.c
@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data)
if (abs(diff) > MAX_TIME_DIFF) {
mutex.Lock();
if (abs(diff) > MAX_ADJ_DIFF) {
- if (stime(&dvbtim) == 0)
+ timespec ts = {0};
+ ts.tv_sec = dvbtim;
+ if (clock_settime(CLOCK_REALTIME, &ts) == 0)
isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);
else
esyslog("ERROR while setting system time: %m");
From 3395a81a07416f54b0aa94ba709b902d72dacce7 Mon Sep 17 00:00:00 2001
From: Manuel Reimer <manuel.reimer@gmx.de>
Date: Sun, 15 Dec 2019 11:26:42 +0100
Subject: [PATCH 2/2] Fix "struct timespec has more than one member" warning
---
eit.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eit.c b/eit.c
index 82294dc..098e627 100644
--- a/eit.c
+++ b/eit.c
@@ -391,7 +391,7 @@ cTDT::cTDT(const u_char *Data)
if (abs(diff) > MAX_TIME_DIFF) {
mutex.Lock();
if (abs(diff) > MAX_ADJ_DIFF) {
- timespec ts = {0};
+ timespec ts = {};
ts.tv_sec = dvbtim;
if (clock_settime(CLOCK_REALTIME, &ts) == 0)
isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim);