From c20b3412198123187b3cb58fa3331ef6f648a468 Mon Sep 17 00:00:00 2001
From: Matthias Schwarzott <zzam@gentoo.org>
Date: Thu, 4 Jun 2009 12:37:15 +0000
Subject: Update to extensions patch v72. Do not support streamdevext patch for
 now. (Portage version: 2.1.6.13/cvs/Linux i686)

---
 .../vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff | 38 ++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff

(limited to 'media-video/vdr/files')

diff --git a/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff b/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff
new file mode 100644
index 000000000000..a36d2b7f8774
--- /dev/null
+++ b/media-video/vdr/files/vdr-1.6.0-extensions-72-gcc-4.4.diff
@@ -0,0 +1,38 @@
+diff -ru vdr-1.6.0-orig/menu.c vdr-1.6.0/menu.c
+--- vdr-1.6.0-orig/menu.c	2009-06-04 10:55:14.481017158 +0200
++++ vdr-1.6.0/menu.c	2009-06-04 10:57:12.690998810 +0200
+@@ -777,14 +777,14 @@
+         }
+ #endif /* PINPLUGIN */
+ #ifdef USE_LIEMIEXT
+-     char* p = strrchr(data.file, '~');
++     const char* p = strrchr(data.file, '~');
+      if (p) {
+         p++;
+         Utf8Strn0Cpy(name, p, sizeof(name));
+         Utf8Strn0Cpy(path, data.file, sizeof(path));
+-        p = strrchr(path, '~');
+-        if (p)
+-           p[0] = 0;
++        char *p2 = strrchr(path, '~');
++        if (p2)
++           p2[0] = 0;
+         }
+      else {
+         Utf8Strn0Cpy(name, data.file, sizeof(name));
+diff -ru vdr-1.6.0-orig/videodir.c vdr-1.6.0/videodir.c
+--- vdr-1.6.0-orig/videodir.c	2009-06-04 10:55:14.477693736 +0200
++++ vdr-1.6.0/videodir.c	2009-06-04 10:55:24.531019647 +0200
+@@ -199,9 +199,10 @@
+ #ifdef USE_HARDLINKCUTTER
+ static bool StatNearestDir(const char *FileName, struct stat *Stat)
+ {
+-  cString Name(FileName);
++  char *Name = strdup(FileName);
++  cString Name_str(Name, true); /* manage free for us */
+   char *p;
+-  while ((p = strrchr((const char*)Name + 1, '/')) != NULL) {
++  while ((p = strrchr(Name + 1, '/')) != NULL) {
+         *p = 0; // truncate at last '/'
+         if (stat(Name, Stat) == 0) {
+            isyslog("StatNearestDir: Stating %s", (const char*)Name);
-- 
cgit v1.2.3-65-gdbad