| 1 |
hd_brummy 14/09/26 11:03:09 |
| 2 |
|
| 3 |
Added: vdr-2.0.6_gentoo.patch |
| 4 |
Log: |
| 5 |
bump; removed use-flag setup depends; extended patchset for vdr-permashift-1; wrt bug 521570; wrt bug 499444 |
| 6 |
|
| 7 |
(Portage version: 2.2.13/cvs/Linux x86_64, signed Manifest commit with key 34C2808A) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-video/vdr/files/vdr-2.0.6_gentoo.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/files/vdr-2.0.6_gentoo.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vdr/files/vdr-2.0.6_gentoo.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: vdr-2.0.6_gentoo.patch |
| 16 |
=================================================================== |
| 17 |
diff -Naur vdr-2.0.6.orig/Makefile vdr-2.0.6/Makefile |
| 18 |
--- vdr-2.0.6.orig/Makefile 2014-09-22 22:17:23.000000000 +0200 |
| 19 |
+++ vdr-2.0.6/Makefile 2014-09-24 15:22:43.000000000 +0200 |
| 20 |
@@ -109,7 +109,7 @@ |
| 21 |
VDRVERSION = $(shell sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h) |
| 22 |
APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' config.h) |
| 23 |
|
| 24 |
-all: vdr i18n plugins |
| 25 |
+all: vdr i18n |
| 26 |
|
| 27 |
# Implicit rules: |
| 28 |
|
| 29 |
@@ -162,7 +162,7 @@ |
| 30 |
|
| 31 |
PODIR = po |
| 32 |
LOCALEDIR = locale |
| 33 |
-I18Npo = $(wildcard $(PODIR)/*.po) |
| 34 |
+I18Npo = $(foreach dir,$(LINGUAS),$(wildcard $(PODIR)/$(dir)*.po)) |
| 35 |
I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) |
| 36 |
I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr.mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) |
| 37 |
I18Npot = $(PODIR)/vdr.pot |
| 38 |
@@ -185,7 +185,7 @@ |
| 39 |
|
| 40 |
install-i18n: i18n |
| 41 |
@mkdir -p $(DESTDIR)$(LOCDIR) |
| 42 |
- cp -r $(LOCALEDIR)/* $(DESTDIR)$(LOCDIR) |
| 43 |
+ @(cd $(LOCALEDIR); for linguas in $(LINGUAS); do [ "$$linguas" = "en" ] && continue; cp -r --parents $$linguas* $(DESTDIR)$(LOCDIR); done) |
| 44 |
|
| 45 |
# The 'include' directory (for plugins): |
| 46 |
|
| 47 |
@@ -247,7 +247,7 @@ |
| 48 |
|
| 49 |
# Install the files (note that 'install-pc' must be first!): |
| 50 |
|
| 51 |
-install: install-pc install-bin install-dirs install-conf install-doc install-plugins install-i18n install-includes |
| 52 |
+install: install-pc install-bin install-dirs install-conf install-doc install-i18n install-includes |
| 53 |
|
| 54 |
# VDR binary: |
| 55 |
|
| 56 |
@@ -259,11 +259,12 @@ |
| 57 |
|
| 58 |
install-dirs: |
| 59 |
@mkdir -p $(DESTDIR)$(VIDEODIR) |
| 60 |
- @mkdir -p $(DESTDIR)$(CONFDIR) |
| 61 |
- @mkdir -p $(DESTDIR)$(CACHEDIR) |
| 62 |
+# @mkdir -p $(DESTDIR)$(CONFDIR) |
| 63 |
+# @mkdir -p $(DESTDIR)$(CACHEDIR) |
| 64 |
@mkdir -p $(DESTDIR)$(RESDIR) |
| 65 |
|
| 66 |
install-conf: |
| 67 |
+ @mkdir -p $(DESTDIR)$(CONFDIR) |
| 68 |
@cp -pn *.conf $(DESTDIR)$(CONFDIR) |
| 69 |
|
| 70 |
# Documentation: |
| 71 |
@@ -290,8 +291,11 @@ |
| 72 |
# Includes: |
| 73 |
|
| 74 |
install-includes: include-dir |
| 75 |
- @mkdir -p $(DESTDIR)$(INCDIR) |
| 76 |
- @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR) |
| 77 |
+# @mkdir -p $(DESTDIR)$(INCDIR) |
| 78 |
+# @cp -pLR include/vdr include/libsi $(DESTDIR)$(INCDIR) |
| 79 |
+ @mkdir -p $(DESTDIR)$(INCDIR)/vdr $(DESTDIR)$(INCDIR)/vdr/libsi |
| 80 |
+ @cp -pLR include/vdr $(DESTDIR)$(INCDIR) |
| 81 |
+ @cp -pLR include/libsi Make.config $(DESTDIR)$(INCDIR)/vdr |
| 82 |
|
| 83 |
# pkg-config file: |
Archives