Attachment 327598 Details for Bug 414247 – Patch that makes media-plugins/vdr-vcd-0.9 compile again against >=vdr-1.7.27

[patch] Patch that makes media-plugins/vdr-vcd-0.9 compile again against >=vdr-1.7.27

vcd-0.9-vdr-1.7.27-i18n.patch (text/plain), 7.03 KB, created by Erich Seifert on 2012-10-28 15:45:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Erich Seifert

Created: 2012-10-28 15:45:02 UTC

Size: 7.03 KB

patch

obsolete

>--- Makefile	2012-10-28 01:07:13.236481146 +0200
>+++ Makefile	2012-10-28 01:09:16.774561992 +0200
>@@ -54,7 +54,7 @@
> 
> ### The object files (add further files here):
> 
>-OBJS = $(PLUGIN).o functions.o i18n.o menu.o player.o viewer.o setup.o menucontrol.o psd.o psdcontrol.o
>+OBJS = $(PLUGIN).o functions.o menu.o player.o viewer.o setup.o menucontrol.o psd.o psdcontrol.o
> 
> ### Implicit rules:
> 
>--- vcd.c	2008-01-16 13:33:17.000000000 +0100
>+++ vcd.c	2012-10-28 01:09:35.279573687 +0200
>@@ -25,7 +25,6 @@
> #include <vdr/interface.h>
> #include <vdr/plugin.h>
> #include "functions.h"
>-#include "i18n.h"
> #include "menu.h"
> #include "menucontrol.h"
> #include "psdcontrol.h"
>@@ -100,7 +99,6 @@
> 
> bool cPluginVcd::Start(void)
> {
>-  RegisterI18n(Phrases);
>   if (option_vcd)
>      vcd = new cVcd(option_vcd);
>   else
>--- menu.c	2008-01-20 17:59:46.000000000 +0100
>+++ menu.c	2012-10-28 01:09:47.040581234 +0200
>@@ -26,7 +26,6 @@
> 
> #include <vdr/interface.h>
> #include <vdr/status.h>
>-#include "i18n.h"
> #include "menu.h"
> #include "functions.h"
> #include "setup.h"
>--- menucontrol.c	2008-01-16 13:43:39.000000000 +0100
>+++ menucontrol.c	2012-10-28 01:10:47.420622067 +0200
>@@ -26,7 +26,6 @@
> 
> #include <vdr/interface.h>
> #include <vdr/status.h>
>-#include "i18n.h"
> #include "menu.h"
> #include "functions.h"
> #include "setup.h"
>--- psd.c	2008-01-20 17:59:59.000000000 +0100
>+++ psd.c	2012-10-28 01:11:07.029635854 +0200
>@@ -21,7 +21,6 @@
>  */
> 
> 
>-#include "i18n.h"
> #include "psd.h"
> #include "psdcontrol.h"
> 
>--- psdcontrol.c	2008-01-16 13:30:53.000000000 +0100
>+++ psdcontrol.c	2012-10-28 01:11:26.766649268 +0200
>@@ -27,7 +27,6 @@
> 
> #include <vdr/interface.h>
> #include <vdr/status.h>
>-#include "i18n.h"
> #include "functions.h"
> #include "setup.h"
> #include "psdcontrol.h"
>--- setup.c	2008-01-15 16:27:44.000000000 +0100
>+++ setup.c	2012-10-28 01:10:12.769598570 +0200
>@@ -22,7 +22,6 @@
> 
> #include <vdr/menuitems.h>
> #include "setup.h"
>-#include "i18n.h"
> 
> cVcdSetupData VcdSetupData;
> 
>--- i18n.h	2008-01-16 13:40:30.000000000 +0100
>+++ i18n.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,30 +0,0 @@
>-/*
>- * i18n.h: Internationalization
>- *
>- * VCD Player plugin for VDR (the Video Disk Recorder)
>- * Copyright (C) 2002  Thomas Heiligenmann  <thomas@heiligenmann.de>
>- *
>- * This program is free software; you can redistribute it and/or modify
>- * it under the terms of the GNU General Public License as published by
>- * the Free Software Foundation; either version 2 of the License, or
>- * (at your option) any later version.
>- *
>- * This program is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- * GNU General Public License for more details.
>- *
>- * You should have received a copy of the GNU General Public License
>- * along with this program; if not, write to the Free Software Foundation,
>- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
>- *
>- */
>-
>-#ifndef __VCD_I18N_H
>-#define __VCD_I18N_H
>-
>-#include <vdr/i18n.h>
>-
>-extern const tI18nPhrase Phrases[];
>-
>-#endif //__VCD_I18N_H
>--- i18n.c	2008-01-20 18:00:50.000000000 +0100
>+++ i18n.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,269 +0,0 @@
>-/*
>- * i18n.c: Internationalization
>- *
>- * VCD Player plugin for VDR (the Video Disk Recorder)
>- * Copyright (C) 2002  Thomas Heiligenmann  <thomas@heiligenmann.de>
>- *
>- * This program is free software; you can redistribute it and/or modify
>- * it under the terms of the GNU General Public License as published by
>- * the Free Software Foundation; either version 2 of the License, or
>- * (at your option) any later version.
>- *
>- * This program is distributed in the hope that it will be useful,
>- * but WITHOUT ANY WARRANTY; without even the implied warranty of
>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>- * GNU General Public License for more details.
>- *
>- * You should have received a copy of the GNU General Public License
>- * along with this program; if not, write to the Free Software Foundation,
>- * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
>- *
>- * Italian translations provided by Gringo <vdr-italian@tiscali.it>
>- *
>- */
>-
>-
>-#include "i18n.h"
>-
>-const tI18nPhrase Phrases[] = {
>-  { "VideoCD",
>-    "VideoCD",
>-    "",
>-    "VideoCD",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-  },
>-  { "Tracks",
>-    "Tracks",
>-    "",
>-    "Tracce",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-  },
>-  { "VideoCD SPI",
>-    "VideoCD SPI",
>-    "",
>-    "VideoCD SPI",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-  },
>-  { "SPI",
>-    "SPI",
>-    "",
>-    "SPI",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-  },
>-  { "No disc inserted",
>-    "Keine CD eingelegt",
>-    "",
>-    "Nessun disco inserito",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-  },
>-  { "No VideoCD detected",
>-    "Keine VideoCD erkannt",
>-    "",
>-    "Nessun VideoCD trovato",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-  },
>-  { "VCD",
>-    "VCD",
>-    "",
>-    "VCD",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-  },
>-  { "Setup.VCD$Drive speed",
>-    "Laufwerkgeschwindigkeit",
>-    "",
>-    "Velocità lettore",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-  },
>-  { "Setup.VCD$Broken mode",
>-    "Nicht standardkonform",
>-    "",
>-    "Mod. non standard",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-  },
>-  { "Setup.VCD$Hide main menu entry",
>-    "Hauptmenüeintrag ausblenden",
>-    "",
>-    "Nascondi voce nel menu principale",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-  },
>-  { "Setup.VCD$Play tracks continuously",
>-    "Tracks nacheinander abspielen",
>-    "",
>-    "Riproduci tracce in modo continuo",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-  },
>-  { "Setup.VCD$Autostart replay",
>-    "Wiedergabe automatisch starten",
>-    "",
>-    "Riproduzione automatica all'avvio",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-  },
>-  { "Setup.VCD$Play sequence replay",
>-    "Wiedergabe nach Sequenz",
>-    "",
>-    "Riproduci in sequenza",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-    "",
>-  },
>-  { "Eject",
>-    "Auswerfen",
>-    "Izvrzi",
>-    "Eject",
>-    "Eject",
>-    "Ejectar",
>-    "Ejection",
>-    "Eject",
>-    "Avaa",
>-    "Wyrzucenie",
>-    "Expulsar",
>-    "Exsagogi",
>-    "Mata ut",
>-    "Ejecteaza",
>-    "Kidobni",
>-    "Expulsar",
>-  },
>-  { NULL }
>-};
>-

Actions: View | Diff

Attachments on bug 414247: 327598 | 327776