[SCM] vdr-plugin-vnsiserver/master: Dropped obsolete patches
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Fri Nov 4 23:55:58 UTC 2016
The following commit has been merged in the master branch:
commit 28854ca815ed9b425597bc281cf7f896e111bdd4
Author: Tobias Grimm <etobi at debian.org>
Date: Fri Nov 4 20:53:24 2016 +0100
Dropped obsolete patches
diff --git a/debian/patches/fix-RAM-timeshift-stream-corruption.patch b/debian/patches/fix-RAM-timeshift-stream-corruption.patch
deleted file mode 100644
index 99d076a..0000000
--- a/debian/patches/fix-RAM-timeshift-stream-corruption.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: fix RAM timeshift stream corruption
-Author: glenvt18 <glenvt18 at gmail.com>
-Origin: upstream
-Applied-Upstream: fbddc69b7af2a02311925a51d131e2e8032a60e3
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/videobuffer.c b/videobuffer.c
-index 885799c..c1da958 100644
---- a/videobuffer.c
-+++ b/videobuffer.c
-@@ -303,7 +303,7 @@ int cVideoBufferRAM::ReadBlock(uint8_t **buf, unsigned int size, time_t &endTime
- if (m_ReadPtr > (m_BufferSize - m_Margin))
- {
- int bytesToCopy = m_BufferSize - m_ReadPtr;
-- memmove(m_Buffer + (m_Margin - bytesToCopy), m_Buffer + m_ReadPtr, bytesToCopy);
-+ memmove(m_Buffer + (m_Margin - bytesToCopy), m_BufferPtr + m_ReadPtr, bytesToCopy);
- *buf = m_Buffer + (m_Margin - bytesToCopy);
- }
- else
---
-2.5.3
-
diff --git a/debian/patches/gcc6-fixes.patch b/debian/patches/gcc6-fixes.patch
deleted file mode 100644
index fdbfac3..0000000
--- a/debian/patches/gcc6-fixes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: GCC 6 related fixes
-Author: Tobias Grimm <etobi at debian.org>
-Bug: https://github.com/FernetMenta/vdr-plugin-vnsiserver/pull/38
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/config.h
-+++ b/config.h
-@@ -34,19 +34,19 @@
- // log output configuration
-
- #ifdef CONSOLEDEBUG
--#define DEBUGLOG(x...) printf("VNSI: "x)
-+#define DEBUGLOG(x...) printf("VNSI: " x)
- #elif defined DEBUG
--#define DEBUGLOG(x...) dsyslog("VNSI: "x)
-+#define DEBUGLOG(x...) dsyslog("VNSI: " x)
- #else
- #define DEBUGLOG(x...)
- #endif
-
- #ifdef CONSOLEDEBUG
--#define INFOLOG(x...) printf("VNSI: "x)
--#define ERRORLOG(x...) printf("VNSI-Error: "x)
-+#define INFOLOG(x...) printf("VNSI: " x )
-+#define ERRORLOG(x...) printf("VNSI-Error: " x)
- #else
--#define INFOLOG(x...) isyslog("VNSI: "x)
--#define ERRORLOG(x...) esyslog("VNSI-Error: "x)
-+#define INFOLOG(x...) isyslog("VNSI: " x)
-+#define ERRORLOG(x...) esyslog("VNSI-Error: " x)
- #endif
-
- // default settings
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 65d26e6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-fix-RAM-timeshift-stream-corruption.patch
-gcc6-fixes.patch
--
vdr-plugin-vnsiserver packaging
More information about the pkg-multimedia-commits
mailing list