Gentoo Archives: gentoo-commits

From: "Christian Ruppert (idl0r)" <idl0r@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-xine/files: vdr-xine-0.9.4-gentoo.diff confd vdr-xine-0.9.4-build-system.patch
Date: Tue, 10 Jan 2012 14:30:17
Message-Id: 20120110143002.5C6292004B@flycatcher.gentoo.org
1 idl0r 12/01/10 14:30:02
2
3 Added: vdr-xine-0.9.4-gentoo.diff confd
4 vdr-xine-0.9.4-build-system.patch
5 Log:
6 Initial import.
7
8 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.1 media-plugins/vdr-xine/files/vdr-xine-0.9.4-gentoo.diff
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xine/files/vdr-xine-0.9.4-gentoo.diff?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xine/files/vdr-xine-0.9.4-gentoo.diff?rev=1.1&content-type=text/plain
15
16 Index: vdr-xine-0.9.4-gentoo.diff
17 ===================================================================
18 diff -ru xine-0.9.0-orig/xineLib.c xine-0.9.0/xineLib.c
19 --- xine-0.9.0-orig/xineLib.c 2009-01-18 17:40:13.228935882 +0100
20 +++ xine-0.9.0/xineLib.c 2009-01-18 17:41:28.815595331 +0100
21 @@ -2118,7 +2118,7 @@
22
23 bool cXineLib::readNoSignalStream(const int index, const string &suffix)
24 {
25 - string noSignalFileName = m_plugin->ConfigDirectory(PLUGIN_NAME_I18N);
26 + string noSignalFileName = "/usr/share/vdr/xine";
27 // noSignalFileName += "/noSignal.pes";
28 noSignalFileName += "/noSignal" + suffix + ".mpg";
29
30
31
32
33 1.1 media-plugins/vdr-xine/files/confd
34
35 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xine/files/confd?rev=1.1&view=markup
36 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xine/files/confd?rev=1.1&content-type=text/plain
37
38 Index: confd
39 ===================================================================
40 # /etc/conf.d/vdr.xine:
41
42 # Global config file for vdr rc-scripts
43
44 # -r:
45 # Enable xine to send keys to vdr-process
46
47 _EXTRAOPTS="-r"
48
49
50
51 1.1 media-plugins/vdr-xine/files/vdr-xine-0.9.4-build-system.patch
52
53 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xine/files/vdr-xine-0.9.4-build-system.patch?rev=1.1&view=markup
54 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-xine/files/vdr-xine-0.9.4-build-system.patch?rev=1.1&content-type=text/plain
55
56 Index: vdr-xine-0.9.4-build-system.patch
57 ===================================================================
58 From 537ad5fa86305cf55f37dd9c87a9ec3260668049 Mon Sep 17 00:00:00 2001
59 From: Christian Ruppert <idl0r@g.o>
60 Date: Tue, 10 Jan 2012 13:58:40 +0100
61 Subject: [PATCH] patch 1
62
63 ---
64 Makefile | 14 ++++++++------
65 1 files changed, 8 insertions(+), 6 deletions(-)
66
67 diff --git a/Makefile b/Makefile
68 index 674f4fb..e1fdba2 100644
69 --- a/Makefile
70 +++ b/Makefile
71 @@ -25,9 +25,9 @@ CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual
72
73 ### The directory environment:
74
75 -VDRDIR = ../../..
76 -LIBDIR = ../../lib
77 -TMPDIR = /tmp
78 +VDRDIR ?= ../../..
79 +LIBDIR ?= ../../lib
80 +TMPDIR ?= /tmp
81
82 ### Make sure that necessary options are included:
83
84 @@ -37,7 +37,7 @@ TMPDIR = /tmp
85
86 -include $(VDRDIR)/Make.config
87
88 -INCLUDES += `pkg-config --cflags libxine`
89 +INCLUDES += `pkg-config --cflags libxine`
90
91 # where to create fifos (xine expects them at /tmp/vdr-xine)
92 VDR_XINE_FIFO_DIR ?= /tmp/vdr-xine
93 @@ -114,9 +114,9 @@ $(DEPFILE): Makefile
94 -include $(DEPFILE)
95
96 ### Internationalization (I18N):
97 -
98 +ifeq ($(ENABLE_I18N), yes)
99 PODIR = po
100 -LOCALEDIR = $(VDRDIR)/locale
101 +LOCALEDIR = $(DESTDIR)$(VDRDIR)/locale
102 I18Npo = $(wildcard $(PODIR)/*.po)
103 I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
104 I18Npot = $(PODIR)/$(PLUGIN).pot
105 @@ -135,6 +135,8 @@ $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
106 @mkdir -p $(dir $@)
107 cp $< $@
108
109 +endif
110 +
111 .PHONY: i18n
112 i18n: $(I18Nmsgs) $(I18Npot)
113
114 --
115 1.7.3.4