summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-plugins/vdr-vcd/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-plugins/vdr-vcd/files')
-rw-r--r--media-plugins/vdr-vcd/files/confd11
-rwxr-xr-xmedia-plugins/vdr-vcd/files/rc-addon.sh8
-rw-r--r--media-plugins/vdr-vcd/files/vdr-vcd-0.7-vdr-1.5.diff33
-rw-r--r--media-plugins/vdr-vcd/files/vdr-vcd-0.9_devicetrickspeed.patch17
-rw-r--r--media-plugins/vdr-vcd/files/vdr-vcd-0.9_vdr-1.7.2.diff17
-rw-r--r--media-plugins/vdr-vcd/files/vdr-vcd-0.9_xgettext.diff271
6 files changed, 357 insertions, 0 deletions
diff --git a/media-plugins/vdr-vcd/files/confd b/media-plugins/vdr-vcd/files/confd
new file mode 100644
index 000000000000..f7a429d1a283
--- /dev/null
+++ b/media-plugins/vdr-vcd/files/confd
@@ -0,0 +1,11 @@
+# /etc/conf.d/vdr.vcd:
+# $Id$
+
+# Config file for vdr plugin vcd
+
+#Device to read VCDs from
+# allowed values: cdrom-device names
+# default: VDR_CDREADER from /etc/conf.d/vdr.cd-dvd
+# (or if file does not exist /dev/cdrom)
+#VCD_DEVICE="/dev/cdrom"
+
diff --git a/media-plugins/vdr-vcd/files/rc-addon.sh b/media-plugins/vdr-vcd/files/rc-addon.sh
new file mode 100755
index 000000000000..ba0bcca6e041
--- /dev/null
+++ b/media-plugins/vdr-vcd/files/rc-addon.sh
@@ -0,0 +1,8 @@
+# plugin-startup-skript for vcd-plugin
+
+plugin_pre_vdr_start() {
+ [ -e /etc/conf.d/vdr.cd-dvd ] && . /etc/conf.d/vdr.cd-dvd
+ : ${VDR_CDREADER:=/dev/cdrom}
+ : ${VCD_DEVICE:=${VDR_CDREADER}}
+ add_plugin_param "--vcd ${VCD_DEVICE}"
+}
diff --git a/media-plugins/vdr-vcd/files/vdr-vcd-0.7-vdr-1.5.diff b/media-plugins/vdr-vcd/files/vdr-vcd-0.7-vdr-1.5.diff
new file mode 100644
index 000000000000..1daefefd2431
--- /dev/null
+++ b/media-plugins/vdr-vcd/files/vdr-vcd-0.7-vdr-1.5.diff
@@ -0,0 +1,33 @@
+diff -NaurwB vcd-0.7-1.4.5/menucontrol.c vcd-0.7-1.5.0/menucontrol.c
+--- vcd-0.7-1.4.5/menucontrol.c 2006-07-05 15:09:23.000000000 +0200
++++ vcd-0.7-1.5.0/menucontrol.c 2007-01-19 11:10:51.000000000 +0100
+@@ -63,7 +63,8 @@
+ {
+ if (visible) {
+ delete displayReplay;
+- needsFastResponse = visible = false;
++ visible = false;
++ SetNeedsFastResponse(visible);
+ modeOnly = false;
+ }
+ }
+@@ -170,7 +171,8 @@
+ {
+ if (visible) {
+ delete displayReplay;
+- needsFastResponse = visible = false;
++ visible = false;
++ SetNeedsFastResponse(visible);
+ modeOnly = false;
+ lastPlay = lastForward = false;
+ lastSpeed = -1;
+@@ -210,7 +212,8 @@
+ if (GetIndex(Current, Total) && Total > 0) {
+ if (!visible) {
+ displayReplay = Skins.Current()->DisplayReplay(modeOnly);
+- needsFastResponse = visible = true;
++ visible = true;
++ SetNeedsFastResponse(visible);
+ }
+ if (Initial) {
+ lastCurrent = lastTotal = -1;
diff --git a/media-plugins/vdr-vcd/files/vdr-vcd-0.9_devicetrickspeed.patch b/media-plugins/vdr-vcd/files/vdr-vcd-0.9_devicetrickspeed.patch
new file mode 100644
index 000000000000..69aefba987a7
--- /dev/null
+++ b/media-plugins/vdr-vcd/files/vdr-vcd-0.9_devicetrickspeed.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/show_bug.cgi?id=503452
+patch provided by E.Seifert
+
+--- vcd-0.9/player.c 2008-01-16 13:26:38.000000000 +0100
++++ vcd-0.9/player.c 2014-03-04 22:07:39.374281971 +0100
+@@ -161,7 +161,11 @@
+ int sp = (Speeds[nts] > 0) ? Mult / Speeds[nts] : -Speeds[nts] * Mult;
+ if (sp > MAX_VIDEO_SLOWMOTION)
+ sp = MAX_VIDEO_SLOWMOTION;
++#if VDRVERSNUM >= 20103
++ DeviceTrickSpeed(sp,true);
++#else
+ DeviceTrickSpeed(sp);
++#endif
+ }
+ }
+
diff --git a/media-plugins/vdr-vcd/files/vdr-vcd-0.9_vdr-1.7.2.diff b/media-plugins/vdr-vcd/files/vdr-vcd-0.9_vdr-1.7.2.diff
new file mode 100644
index 000000000000..b9da87923edd
--- /dev/null
+++ b/media-plugins/vdr-vcd/files/vdr-vcd-0.9_vdr-1.7.2.diff
@@ -0,0 +1,17 @@
+compile fix for >=vdr-1.7.2
+Joerg Bornkessel <hd_brummy@gentoo.org> 07 May 2009
+diff -Naur vcd-0.9.orig/player.h vcd-0.9/player.h
+--- vcd-0.9.orig/player.h 2009-05-07 17:10:46.839425275 +0200
++++ vcd-0.9/player.h 2009-05-07 17:12:55.446843178 +0200
+@@ -42,6 +42,11 @@
+ #define VIDEO_STREAM_SC 0xE0
+ #define SC_MASK 0xE0
+
++#if VDRVERSNUM > 10701
++#define I_FRAME 1
++#define FRAMESPERSEC 25
++#endif
++
+ class cVcdPlayer;
+
+ class cVcdPlayerControl : public cControl {
diff --git a/media-plugins/vdr-vcd/files/vdr-vcd-0.9_xgettext.diff b/media-plugins/vdr-vcd/files/vdr-vcd-0.9_xgettext.diff
new file mode 100644
index 000000000000..6228cc7319fe
--- /dev/null
+++ b/media-plugins/vdr-vcd/files/vdr-vcd-0.9_xgettext.diff
@@ -0,0 +1,271 @@
+https://bugs.gentoo.org/show_bug.cgi?id=414247
+fixed missing xgettext
+Signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> ( 2012/11/02 )
+diff -Naur vcd-0.9.old/Makefile vcd-0.9/Makefile
+--- vcd-0.9.old/Makefile 2008-01-16 16:29:39.000000000 +0100
++++ vcd-0.9/Makefile 2012-10-30 14:06:02.163762996 +0100
+@@ -53,7 +53,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:
+
+@@ -69,9 +69,34 @@
+
+ -include $(DEPFILE)
+
++### Internationalization (I18N):
++
++PODIR = po
++LOCALEDIR = $(VDRDIR)/locale
++I18Npo = $(wildcard $(PODIR)/*.po)
++I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
++I18Npot = $(PODIR)/$(PLUGIN).pot
++
++%.mo: %.po
++ msgfmt -c -o $@ $<
++
++$(I18Npot): $(wildcard *.c)
++ xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<dev@erichseifert.de>' -o $@ $^
++
++%.po: $(I18Npot)
++ msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
++ @touch $@
++
++$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
++ @mkdir -p $(dir $@)
++ cp $< $@
++
++.PHONY: i18n
++i18n: $(I18Nmsgs)
++
+ ### Targets:
+
+-all: libvdr-$(PLUGIN).so
++all: libvdr-$(PLUGIN).so i18n
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
+@@ -86,4 +111,5 @@
+ @echo Distribution package created as $(PACKAGE).tgz
+
+ clean:
++ @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~
+diff -Naur vcd-0.9.old/menu.c vcd-0.9/menu.c
+--- vcd-0.9.old/menu.c 2008-01-20 17:59:46.000000000 +0100
++++ vcd-0.9/menu.c 2012-10-30 14:04:10.837681821 +0100
+@@ -26,7 +26,7 @@
+
+ #include <vdr/interface.h>
+ #include <vdr/status.h>
+-#include "i18n.h"
++#include <vdr/i18n.h>
+ #include "menu.h"
+ #include "functions.h"
+ #include "setup.h"
+diff -Naur vcd-0.9.old/menucontrol.c vcd-0.9/menucontrol.c
+--- vcd-0.9.old/menucontrol.c 2008-01-16 13:43:39.000000000 +0100
++++ vcd-0.9/menucontrol.c 2012-10-30 14:03:43.051660837 +0100
+@@ -26,7 +26,7 @@
+
+ #include <vdr/interface.h>
+ #include <vdr/status.h>
+-#include "i18n.h"
++#include <vdr/i18n.h>
+ #include "menu.h"
+ #include "functions.h"
+ #include "setup.h"
+diff -Naur vcd-0.9.old/po/de_DE.po vcd-0.9/po/de_DE.po
+--- vcd-0.9.old/po/de_DE.po 1970-01-01 01:00:00.000000000 +0100
++++ vcd-0.9/po/de_DE.po 2012-10-30 14:08:28.409871746 +0100
+@@ -0,0 +1,62 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls@tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Klaus Schmidinger <kls@tvdr.de>, 2000
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.7.27\n"
++"Report-Msgid-Bugs-To: <dev@erichseifert.de>\n"
++"POT-Creation-Date: 2012-10-30 14:10+0200\n"
++"PO-Revision-Date: 2012-10-30 14:10+0200\n"
++"Last-Translator: Klaus Schmidinger <kls@tvdr.de>\n"
++"Language-Team: <vdr@linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-15\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++msgid "VideoCD"
++msgstr "VideoCD"
++
++msgid "No VideoCD detected"
++msgstr "Keine VideoCD erkannt"
++
++msgid "Eject"
++msgstr "Auswerfen"
++
++msgid "Key$Play"
++msgstr ""
++
++msgid "Tracks"
++msgstr "Tracks"
++
++msgid "SPI"
++msgstr "SPI"
++
++msgid "Jump: "
++msgstr ""
++
++msgid "VCD"
++msgstr "VCD"
++
++msgid "Setup.VCD$Drive speed"
++msgstr "Laufwerkgeschwindigkeit"
++
++msgid "Setup.VCD$Broken mode"
++msgstr "Nicht standardkonform"
++
++msgid "Setup.VCD$Hide main menu entry"
++msgstr "Hauptmenüeintrag ausblenden"
++
++msgid "Setup.VCD$Play tracks continuously"
++msgstr "Tracks nacheinander abspielen"
++
++msgid "Setup.VCD$Autostart replay"
++msgstr "Wiedergabe automatisch starten"
++
++msgid "Setup.VCD$Play sequence replay"
++msgstr "Wiedergabe nach Sequenz"
++
++msgid "No disc inserted"
++msgstr "Keine CD eingelegt"
+diff -Naur vcd-0.9.old/po/it_IT.po vcd-0.9/po/it_IT.po
+--- vcd-0.9.old/po/it_IT.po 1970-01-01 01:00:00.000000000 +0100
++++ vcd-0.9/po/it_IT.po 2012-10-30 14:08:28.414871756 +0100
+@@ -0,0 +1,64 @@
++# VDR plugin language source file.
++# Copyright (C) 2007 Klaus Schmidinger <kls@tvdr.de>
++# This file is distributed under the same license as the VDR package.
++# Alberto Carraro <bertocar@tin.it>, 2001
++# Antonio Ospite <ospite@studenti.unina.it>, 2003
++# Sean Carlos <seanc@libero.it>, 2005
++#
++msgid ""
++msgstr ""
++"Project-Id-Version: VDR 1.7.27\n"
++"Report-Msgid-Bugs-To: <dev@erichseifert.de>\n"
++"POT-Creation-Date: 2012-10-30 14:10+0200\n"
++"PO-Revision-Date: 2012-10-30 14:10+0200\n"
++"Last-Translator: Sean Carlos <seanc@libero.it>\n"
++"Language-Team: <vdr@linuxtv.org>\n"
++"Language: \n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-15\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++msgid "VideoCD"
++msgstr "VideoCD"
++
++msgid "No VideoCD detected"
++msgstr "Nessun VideoCD trovato"
++
++msgid "Eject"
++msgstr "Eject"
++
++msgid "Key$Play"
++msgstr ""
++
++msgid "Tracks"
++msgstr "Tracce"
++
++msgid "SPI"
++msgstr "SPI"
++
++msgid "Jump: "
++msgstr ""
++
++msgid "VCD"
++msgstr "VCD"
++
++msgid "Setup.VCD$Drive speed"
++msgstr "Velocità lettore"
++
++msgid "Setup.VCD$Broken mode"
++msgstr "Mod. non standard"
++
++msgid "Setup.VCD$Hide main menu entry"
++msgstr "Nascondi voce nel menu principale"
++
++msgid "Setup.VCD$Play tracks continuously"
++msgstr "Riproduci tracce in modo continuo"
++
++msgid "Setup.VCD$Autostart replay"
++msgstr "Riproduzione automatica all'avvio"
++
++msgid "Setup.VCD$Play sequence replay"
++msgstr "Riproduci in sequenza"
++
++msgid "No disc inserted"
++msgstr "Nessun disco inserito"
+diff -Naur vcd-0.9.old/psd.c vcd-0.9/psd.c
+--- vcd-0.9.old/psd.c 2008-01-20 17:59:59.000000000 +0100
++++ vcd-0.9/psd.c 2012-10-30 14:02:55.840626223 +0100
+@@ -21,7 +21,7 @@
+ */
+
+
+-#include "i18n.h"
++#include <vdr/i18n.h>
+ #include "psd.h"
+ #include "psdcontrol.h"
+
+diff -Naur vcd-0.9.old/psdcontrol.c vcd-0.9/psdcontrol.c
+--- vcd-0.9.old/psdcontrol.c 2008-01-16 13:30:53.000000000 +0100
++++ vcd-0.9/psdcontrol.c 2012-10-30 14:02:42.015616358 +0100
+@@ -27,7 +27,7 @@
+
+ #include <vdr/interface.h>
+ #include <vdr/status.h>
+-#include "i18n.h"
++#include <vdr/i18n.h>
+ #include "functions.h"
+ #include "setup.h"
+ #include "psdcontrol.h"
+diff -Naur vcd-0.9.old/setup.c vcd-0.9/setup.c
+--- vcd-0.9.old/setup.c 2008-01-15 16:27:44.000000000 +0100
++++ vcd-0.9/setup.c 2012-10-30 14:02:26.782605650 +0100
+@@ -22,7 +22,7 @@
+
+ #include <vdr/menuitems.h>
+ #include "setup.h"
+-#include "i18n.h"
++#include <vdr/i18n.h>
+
+ cVcdSetupData VcdSetupData;
+
+diff -Naur vcd-0.9.old/vcd.c vcd-0.9/vcd.c
+--- vcd-0.9.old/vcd.c 2008-01-16 13:33:17.000000000 +0100
++++ vcd-0.9/vcd.c 2012-10-30 14:01:52.628580657 +0100
+@@ -25,7 +25,7 @@
+ #include <vdr/interface.h>
+ #include <vdr/plugin.h>
+ #include "functions.h"
+-#include "i18n.h"
++#include <vdr/i18n.h>
+ #include "menu.h"
+ #include "menucontrol.h"
+ #include "psdcontrol.h"
+@@ -100,7 +100,6 @@
+
+ bool cPluginVcd::Start(void)
+ {
+- RegisterI18n(Phrases);
+ if (option_vcd)
+ vcd = new cVcd(option_vcd);
+ else