From 40172654ddcf1976b4070fb7ef813a5a6ea1d181 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Weism=C3=BCller?= daniel.weismueller@ipfire.org Date: Tue, 18 Oct 2016 16:08:18 +0200 Subject: [PATCH] vdr_streamdev: changed dependency to vdr 2.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel Weismüller daniel.weismueller@ipfire.org --- config/rootfiles/packages/vdr_streamdev | 2 +- lfs/vdr_streamdev | 15 ++++++-------- src/patches/vdr-streamdev_recordings-64.patch | 29 --------------------------- 3 files changed, 7 insertions(+), 39 deletions(-) delete mode 100644 src/patches/vdr-streamdev_recordings-64.patch

diff --git a/config/rootfiles/packages/vdr_streamdev b/config/rootfiles/packages/vdr_streamdev index 458e7d8..887383f 100644 --- a/config/rootfiles/packages/vdr_streamdev +++ b/config/rootfiles/packages/vdr_streamdev @@ -5,4 +5,4 @@ etc/vdr/plugins/streamdev-server/streamdevhosts.conf #usr/lib/vdr #usr/lib/vdr/bin usr/lib/vdr/bin/externremux.sh -usr/lib/vdr/libvdr-streamdev-server.so.2.0.0 +usr/lib/vdr/libvdr-streamdev-server.so.2.2.0 diff --git a/lfs/vdr_streamdev b/lfs/vdr_streamdev index c230a69..aae82f0 100644 --- a/lfs/vdr_streamdev +++ b/lfs/vdr_streamdev @@ -25,19 +25,19 @@ include Config

VER = 0.6.1 -GIT_VER = 10db11ac -THISAPP = vdr-streamdev-$(GIT_VER) -DL_FILE = $(THISAPP).tar.xz +GIT_VER = 674bb5b +THISAPP = vdr-plugin-streamdev-$(VER)-$(GIT_VER) +DL_FILE = $(THISAPP).tar.gz

DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = vdr_streamdev -PAK_VER = 2 +PAK_VER = 3

DEPS = ""

-VDRPLUGVER = 2.0.0 +VDRPLUGVER = 2.2.0

EXTRA_FLAGS= -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CFLAGS += $(EXTRA_FLAGS) @@ -51,7 +51,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = e5011fd1a4b0624b192911f37c6040e3 +$(DL_FILE)_MD5 = 7eb0c36bb46d8b5d0aabd30f4b67e99a

install : $(TARGET)

@@ -84,9 +84,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-streamdev_recordings-64.patch - cd $(DIR_APP) && sed -i 's@$(VDRDIR)/device.h@/usr/include/vdr/device.h@' Makefile cd $(DIR_APP) && make $(MAKE_TUNING) LIBDIR=. VDRDIR=/usr/lib/vdr \ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ diff --git a/src/patches/vdr-streamdev_recordings-64.patch b/src/patches/vdr-streamdev_recordings-64.patch deleted file mode 100644 index 2dc5250..0000000 --- a/src/patches/vdr-streamdev_recordings-64.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur vdr-streamdev-10db11ac.org/server/connectionHTTP.c vdr-streamdev-10db11ac/server/connectionHTTP.c ---- vdr-streamdev-10db11ac.org/server/connectionHTTP.c 2013-02-18 12:43:02.000000000 +0100 -+++ vdr-streamdev-10db11ac/server/connectionHTTP.c 2013-04-29 15:16:40.049168127 +0200 -@@ -455,11 +455,11 @@ - return NULL; - - char *p = NULL; -- unsigned long l = strtoul(FileBase, &p, 0); -+ unsigned long long l = strtoull(FileBase, &p, 0); - if (p != FileBase && l > 0L) { - if (*p == ':') { - // get recording by dev:inode -- unsigned long inode = strtoul(p + 1, &p, 0); -+ unsigned long long inode = strtoull(p + 1, &p, 0); - if (*p == 0 && inode > 0) { - struct stat st; - cThreadLock RecordingsLock(&Recordings); -diff -Naur vdr-streamdev-10db11ac.org/server/menuHTTP.c vdr-streamdev-10db11ac/server/menuHTTP.c ---- vdr-streamdev-10db11ac.org/server/menuHTTP.c 2013-02-18 12:43:02.000000000 +0100 -+++ vdr-streamdev-10db11ac/server/menuHTTP.c 2013-04-29 15:15:30.352502787 +0200 -@@ -28,7 +28,7 @@ - { - struct stat st; - if (stat(current->FileName(), &st) == 0) -- return cString::sprintf("%lu:%lu.rec", st.st_dev, st.st_ino); -+ return cString::sprintf("%llu:%llu.rec", (unsigned long long) st.st_dev, (unsigned long long) st.st_ino); - return ""; - } -