| 1 |
hd_brummy 13/03/31 10:31:41 |
| 2 |
|
| 3 |
Added: channel_alternative.conf vdr-2.0.0_gentoo.patch |
| 4 |
Log: |
| 5 |
bump, major release |
| 6 |
|
| 7 |
(Portage version: 2.1.11.50/cvs/Linux i686, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-video/vdr/files/channel_alternative.conf |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/files/channel_alternative.conf?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/files/channel_alternative.conf?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: channel_alternative.conf |
| 16 |
=================================================================== |
| 17 |
# Alternative channel configuration file |
| 18 |
# |
| 19 |
# Syntax: original channel id;alternative channel id |
| 20 |
# Example: C-62499-10007-12003;C-0-196-14 |
| 21 |
# this means, if channel C-62499-10007-12003 is |
| 22 |
# not available for a recording, vdr will try to |
| 23 |
# use channel C-0-196-14 |
| 24 |
# |
| 25 |
# lines beginning with '#' are ignored |
| 26 |
# |
| 27 |
|
| 28 |
|
| 29 |
|
| 30 |
|
| 31 |
1.1 media-video/vdr/files/vdr-2.0.0_gentoo.patch |
| 32 |
|
| 33 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/files/vdr-2.0.0_gentoo.patch?rev=1.1&view=markup |
| 34 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/files/vdr-2.0.0_gentoo.patch?rev=1.1&content-type=text/plain |
| 35 |
|
| 36 |
Index: vdr-2.0.0_gentoo.patch |
| 37 |
=================================================================== |
| 38 |
disabled compile from included plugins, we dont support this way on gentoo |
| 39 |
support for linguas handling |
| 40 |
fixed install an multicore cpu |
| 41 |
|
| 42 |
changed path to install header files in own dir vdr, libsi |
| 43 |
|
| 44 |
Signed-of-by: Joerg Bornkessel <hd_brummy@g.o> (2013/03/30) |
| 45 |
|
| 46 |
diff -Naur vdr-1.7.42.orig/Makefile vdr-1.7.42/Makefile |
| 47 |
--- vdr-1.7.42.orig/Makefile 2013-03-30 21:19:19.000000000 +0100 |
| 48 |
+++ vdr-1.7.42/Makefile 2013-03-30 21:24:47.000000000 +0100 |
| 49 |
@@ -109,7 +109,7 @@ |
| 50 |
VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h) |
| 51 |
APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h) |
| 52 |
|
| 53 |
-all: vdr i18n plugins |
| 54 |
+all: vdr i18n |
| 55 |
|
| 56 |
# Implicit rules: |
| 57 |
|
| 58 |
@@ -162,7 +162,7 @@ |
| 59 |
|
| 60 |
PODIR = po |
| 61 |
LOCALEDIR = locale |
| 62 |
-I18Npo = $(wildcard $(PODIR)/*.po) |
| 63 |
+I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po)) |
| 64 |
I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) |
| 65 |
I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) |
| 66 |
I18Npot = $(PODIR)/vdr.pot |
| 67 |
@@ -185,7 +185,7 @@ |
| 68 |
|
| 69 |
install-i18n: i18n |
| 70 |
@mkdir -p $(DESTDIR)$(LOCDIR) |
| 71 |
- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR) |
| 72 |
+ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done) |
| 73 |
|
| 74 |
# The 'include' directory (for plugins): |
| 75 |
|
| 76 |
@@ -247,7 +247,7 @@ |
| 77 |
|
| 78 |
# Install the files (note that 'install-pc' must be first!): |
| 79 |
|
| 80 |
-install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes |
| 81 |
+install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes |
| 82 |
|
| 83 |
# VDR binary: |
| 84 |
|
| 85 |
@@ -259,11 +259,12 @@ |
| 86 |
|
| 87 |
install-dirs: |
| 88 |
@mkdir -p $(DESTDIR)$(VIDEODIR) |
| 89 |
- @mkdir -p $(DESTDIR)$(CONFDIR) |
| 90 |
+# @mkdir -p $(DESTDIR)$(CONFDIR) |
| 91 |
@mkdir -p $(DESTDIR)$(CACHEDIR) |
| 92 |
@mkdir -p $(DESTDIR)$(RESDIR) |
| 93 |
|
| 94 |
install-conf: |
| 95 |
+ @mkdir -p $(DESTDIR)$(CONFDIR) |
| 96 |
@cp -pn *.conf $(DESTDIR)$(CONFDIR) |
| 97 |
|
| 98 |
# Documentation: |
| 99 |
@@ -290,8 +291,11 @@ |
| 100 |
# Includes: |
| 101 |
|
| 102 |
install-includes: include-dir |
| 103 |
- @mkdir -p $(DESTDIR)$(INCDIR) |
| 104 |
- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR) |
| 105 |
+# @mkdir -p $(DESTDIR)$(INCDIR) |
| 106 |
+# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR) |
| 107 |
+ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi |
| 108 |
+ @cp -pLR include/vdr $(DESTDIR)$(INCDIR) |
| 109 |
+ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr |
| 110 |
|
| 111 |
# pkg-config file: |
Archives