From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 23 Jul 2021 06:11:48 +0000 (+0000)
Subject: vdr: cleanup unused patch
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e3eb960c9a4b828a951dadd1658d5b6f5f58caea;p=people%2Fms%2Fipfire-2.x.git

vdr: cleanup unused patch

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/vdr b/lfs/vdr
index 95196bbed2..5c7c1ac15b 100644
--- a/lfs/vdr
+++ b/lfs/vdr
@@ -101,8 +101,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 
-#	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/vdr-2.4-gcc-11.patch
-
 	# Compile main package.
 	cd $(DIR_APP) && make $(MAKE_OPTIONS) $(MAKETUNING) vdr include-dir
 
diff --git a/src/patches/vdr-2.4-gcc-11.patch b/src/patches/vdr-2.4-gcc-11.patch
deleted file mode 100644
index 1c56b5a835..0000000000
--- a/src/patches/vdr-2.4-gcc-11.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 46b480c798c2d5f4acb8874f25e5129f2cf7f224 Mon Sep 17 00:00:00 2001
-From: Klaus Schmidinger <vdr@tvdr.de>
-Date: Wed, 16 Sep 2020 13:30:59 +0200
-Subject: [PATCH] Fixed checking the return value of the Open() call in
- cFileName::SetOffset()
-
-diff --git a/recording.c b/recording.c
-index 810ef80..1fc34cd 100644
---- a/recording.c
-+++ b/recording.c
-@@ -3025,8 +3025,8 @@ cUnbufferedFile *cFileName::SetOffset(int Number, off_t Offset)
-            }
-         // found a non existing file suffix
-         }
--     if (Open() >= 0) {
--        if (!record && Offset >= 0 && file && file->Seek(Offset, SEEK_SET) != Offset) {
-+     if (Open()) {
-+        if (!record && Offset >= 0 && file->Seek(Offset, SEEK_SET) != Offset) {
-            LOG_ERROR_STR(fileName);
-            return NULL;
-            }
--- 
-2.26.2
-