| 1 |
hd_brummy 15/02/06 18:59:53 |
| 2 |
|
| 3 |
Added: duplicates-0.0.5_Makefile-new.diff |
| 4 |
Log: |
| 5 |
patched for new makefile handling |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 34C2808A) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-plugins/vdr-duplicates/files/duplicates-0.0.5_Makefile-new.diff |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-duplicates/files/duplicates-0.0.5_Makefile-new.diff?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-duplicates/files/duplicates-0.0.5_Makefile-new.diff?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: duplicates-0.0.5_Makefile-new.diff |
| 16 |
=================================================================== |
| 17 |
New Makefile handling up from vdr-1.7.34 |
| 18 |
completed german translation |
| 19 |
minor fixes in .po files |
| 20 |
Signed-of-by: Joerg Bornkessel <hd_brummy@g.o> 2015/Jan/03 |
| 21 |
diff -Naur duplicates-0.0.5.orig/Makefile duplicates-0.0.5/Makefile |
| 22 |
--- duplicates-0.0.5.orig/Makefile 2015-02-03 10:40:33.661259290 +0100 |
| 23 |
+++ duplicates-0.0.5/Makefile 2015-02-03 10:53:20.542203193 +0100 |
| 24 |
@@ -6,48 +6,50 @@ |
| 25 |
# The official name of this plugin. |
| 26 |
# This name will be used in the '-P...' option of VDR to load the plugin. |
| 27 |
# By default the main source file also carries this name. |
| 28 |
-# IMPORTANT: the presence of this macro is important for the Make.config |
| 29 |
-# file. So it must be defined, even if it is not used here! |
| 30 |
-# |
| 31 |
+ |
| 32 |
PLUGIN = duplicates |
| 33 |
|
| 34 |
### The version number of this plugin (taken from the main source file): |
| 35 |
|
| 36 |
VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') |
| 37 |
|
| 38 |
-### The C++ compiler and options: |
| 39 |
- |
| 40 |
-CXX ?= g++ |
| 41 |
-CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses |
| 42 |
- |
| 43 |
### The directory environment: |
| 44 |
|
| 45 |
-VDRDIR = ../../.. |
| 46 |
-LIBDIR = ../../lib |
| 47 |
-TMPDIR = /tmp |
| 48 |
+# Use package data if installed...otherwise assume we're under the VDR source directory: |
| 49 |
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc)) |
| 50 |
+LIBDIR = $(call PKGCFG,libdir) |
| 51 |
+LOCDIR = $(call PKGCFG,locdir) |
| 52 |
+PLGCFG = $(call PKGCFG,plgcfg) |
| 53 |
+# |
| 54 |
+TMPDIR ?= /tmp |
| 55 |
|
| 56 |
-### Make sure that necessary options are included: |
| 57 |
+### The compiler options: |
| 58 |
|
| 59 |
--include $(VDRDIR)/Make.global |
| 60 |
+export CFLAGS = $(call PKGCFG,cflags) |
| 61 |
+export CXXFLAGS = $(call PKGCFG,cxxflags) |
| 62 |
|
| 63 |
-### Allow user defined options to overwrite defaults: |
| 64 |
+### The version number of VDR's plugin API: |
| 65 |
|
| 66 |
--include $(VDRDIR)/Make.config |
| 67 |
+APIVERSION = $(call PKGCFG,apiversion) |
| 68 |
|
| 69 |
-### The version number of VDR's plugin API (taken from VDR's "config.h"): |
| 70 |
+### Allow user defined options to overwrite defaults: |
| 71 |
|
| 72 |
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) |
| 73 |
+-include $(PLGCFG) |
| 74 |
|
| 75 |
### The name of the distribution archive: |
| 76 |
|
| 77 |
ARCHIVE = $(PLUGIN)-$(VERSION) |
| 78 |
PACKAGE = vdr-$(ARCHIVE) |
| 79 |
|
| 80 |
+### The name of the shared object file: |
| 81 |
+ |
| 82 |
+SOFILE = libvdr-$(PLUGIN).so |
| 83 |
+ |
| 84 |
### Includes and Defines (add further entries here): |
| 85 |
|
| 86 |
-INCLUDES += -I$(VDRDIR)/include |
| 87 |
+INCLUDES += |
| 88 |
|
| 89 |
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' |
| 90 |
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' |
| 91 |
|
| 92 |
### The object files (add further files here): |
| 93 |
|
| 94 |
@@ -55,52 +57,57 @@ |
| 95 |
|
| 96 |
### The main target: |
| 97 |
|
| 98 |
-all: libvdr-$(PLUGIN).so i18n |
| 99 |
+all: $(SOFILE) i18n |
| 100 |
|
| 101 |
### Implicit rules: |
| 102 |
|
| 103 |
%.o: %.c |
| 104 |
- $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< |
| 105 |
+ $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $< |
| 106 |
|
| 107 |
### Dependencies: |
| 108 |
|
| 109 |
MAKEDEP = $(CXX) -MM -MG |
| 110 |
DEPFILE = .dependencies |
| 111 |
$(DEPFILE): Makefile |
| 112 |
- @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ |
| 113 |
+ @$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ |
| 114 |
|
| 115 |
-include $(DEPFILE) |
| 116 |
|
| 117 |
### Internationalization (I18N): |
| 118 |
|
| 119 |
PODIR = po |
| 120 |
-LOCALEDIR = $(VDRDIR)/locale |
| 121 |
I18Npo = $(wildcard $(PODIR)/*.po) |
| 122 |
-I18Nmsgs = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) |
| 123 |
+I18Nmo = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file)))) |
| 124 |
+I18Nmsgs = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file)))))) |
| 125 |
I18Npot = $(PODIR)/$(PLUGIN).pot |
| 126 |
|
| 127 |
%.mo: %.po |
| 128 |
msgfmt -c -o $@ $< |
| 129 |
|
| 130 |
$(I18Npot): $(wildcard *.c) |
| 131 |
- xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ $^ |
| 132 |
+ xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ `ls $^` |
| 133 |
|
| 134 |
%.po: $(I18Npot) |
| 135 |
- msgmerge -U --no-wrap --no-location --backup=none -q $@ $< |
| 136 |
+ msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $< |
| 137 |
@touch $@ |
| 138 |
|
| 139 |
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo |
| 140 |
- @mkdir -p $(dir $@) |
| 141 |
- cp $< $@ |
| 142 |
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo |
| 143 |
+ install -D -m644 $< $@ |
| 144 |
|
| 145 |
.PHONY: i18n |
| 146 |
-i18n: $(I18Nmsgs) $(I18Npot) |
| 147 |
+i18n: $(I18Nmo) $(I18Npot) |
| 148 |
+ |
| 149 |
+install-i18n: $(I18Nmsgs) |
| 150 |
|
| 151 |
### Targets: |
| 152 |
|
| 153 |
-libvdr-$(PLUGIN).so: $(OBJS) |
| 154 |
+$(SOFILE): $(OBJS) |
| 155 |
$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@ |
| 156 |
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) |
| 157 |
+ |
| 158 |
+install-lib: $(SOFILE) |
| 159 |
+ install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION) |
| 160 |
+ |
| 161 |
+install: install-lib install-i18n |
| 162 |
|
| 163 |
dist: $(I18Npo) clean |
| 164 |
@-rm -rf $(TMPDIR)/$(ARCHIVE) |
| 165 |
@@ -111,4 +118,5 @@ |
| 166 |
@echo Distribution package created as $(PACKAGE).tgz |
| 167 |
|
| 168 |
clean: |
| 169 |
- @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot |
| 170 |
+ @-rm -f $(PODIR)/*.mo $(PODIR)/*.pot |
| 171 |
+ @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ |
| 172 |
diff -Naur duplicates-0.0.5.orig/Makefile-vdr-1.7.33 duplicates-0.0.5/Makefile-vdr-1.7.33 |
| 173 |
diff -Naur duplicates-0.0.5.orig/po/de_DE.po duplicates-0.0.5/po/de_DE.po |
| 174 |
--- duplicates-0.0.5.orig/po/de_DE.po 2012-12-13 09:32:52.000000000 +0100 |
| 175 |
+++ duplicates-0.0.5/po/de_DE.po 2015-02-03 11:12:44.879118021 +0100 |
| 176 |
@@ -5,20 +5,19 @@ |
| 177 |
# |
| 178 |
msgid "" |
| 179 |
msgstr "" |
| 180 |
-"Project-Id-Version: vdr-duplicates 0.0.1\n" |
| 181 |
+"Project-Id-Version: vdr-duplicates 0.0.6\n" |
| 182 |
"Report-Msgid-Bugs-To: <see README>\n" |
| 183 |
"POT-Creation-Date: 2011-12-20 18:14+0200\n" |
| 184 |
-"PO-Revision-Date: 2011-06-05 23:37+0100\n" |
| 185 |
-"Last-Translator: Reiner Paulus <flex0r@×××.net>\n" |
| 186 |
+"PO-Revision-Date: 2015-02-03 11:12+0100\n" |
| 187 |
+"Last-Translator: Joerg Bornkessel <hd_brummy@g.o>\n" |
| 188 |
"Language-Team: \n" |
| 189 |
-"Language: \n" |
| 190 |
+"Language: de\n" |
| 191 |
"MIME-Version: 1.0\n" |
| 192 |
-"Content-Type: text/plain; charset=utf-8\n" |
| 193 |
+"Content-Type: text/plain; charset=UTF-8\n" |
| 194 |
"Content-Transfer-Encoding: 8bit\n" |
| 195 |
"Plural-Forms: nplurals=2; plural=(n != 1);\n" |
| 196 |
-"X-Poedit-Language: German\n" |
| 197 |
-"X-Poedit-Country: GERMANY\n" |
| 198 |
-"X-Poedit-SourceCharset: utf-8\n" |
| 199 |
+"X-Poedit-SourceCharset: UTF-8\n" |
| 200 |
+"X-Generator: Poedit 1.5.5\n" |
| 201 |
|
| 202 |
msgid "Shows duplicate recordings" |
| 203 |
msgstr "Zeigt doppelte Aufnahmen an" |
| 204 |
@@ -35,4 +34,4 @@ |
| 205 |
msgstr "%d Aufnahmen ohne Beschreibung" |
| 206 |
|
| 207 |
msgid "Compare title" |
| 208 |
-msgstr "" |
| 209 |
+msgstr "Vergleiche Titel" |
| 210 |
diff -Naur duplicates-0.0.5.orig/po/fi_FI.po duplicates-0.0.5/po/fi_FI.po |
| 211 |
--- duplicates-0.0.5.orig/po/fi_FI.po 2015-02-03 10:40:33.661259290 +0100 |
| 212 |
+++ duplicates-0.0.5/po/fi_FI.po 2015-02-03 11:13:00.607116870 +0100 |
| 213 |
@@ -12,7 +12,7 @@ |
| 214 |
"PO-Revision-Date: 2011-12-12 19:57+0300\n" |
| 215 |
"Last-Translator: Timo Eskola <timo@×××××××.net>\n" |
| 216 |
"Language-Team: Finnish\n" |
| 217 |
-"Language: \n" |
| 218 |
+"Language: fi\n" |
| 219 |
"MIME-Version: 1.0\n" |
| 220 |
"Content-Type: text/plain; charset=UTF-8\n" |
| 221 |
"Content-Transfer-Encoding: 8bit\n" |
| 222 |
diff -Naur duplicates-0.0.5.orig/po/it_IT.po duplicates-0.0.5/po/it_IT.po |
| 223 |
--- duplicates-0.0.5.orig/po/it_IT.po 2015-02-03 10:40:33.661259290 +0100 |
| 224 |
+++ duplicates-0.0.5/po/it_IT.po 2015-02-03 11:13:17.167115659 +0100 |
| 225 |
@@ -12,7 +12,7 @@ |
| 226 |
"PO-Revision-Date: 2011-06-05 23:37+0100\n" |
| 227 |
"Last-Translator: Diego Pierotto <vdr-italian@×××××××.it>\n" |
| 228 |
"Language-Team: \n" |
| 229 |
-"Language: \n" |
| 230 |
+"Language: it\n" |
| 231 |
"MIME-Version: 1.0\n" |
| 232 |
"Content-Type: text/plain; charset=utf-8\n" |
| 233 |
"Content-Transfer-Encoding: 8bit\n" |
Archives