* [PATCH] Put common information in separate file and require it in the recipe.
@ 2010-01-09 14:28 Paul Menzel
2010-01-09 15:35 ` Koen Kooi
0 siblings, 1 reply; 8+ messages in thread
From: Paul Menzel @ 2010-01-09 14:28 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1.1: Type: text/plain, Size: 16420 bytes --]
Dear OE developers,
could this please be checked in. I build tested it and it saw no
differences.
The patch is also attached.
Thanks,
Paul
---
This hopefully lessens the effort to add new versions.
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
recipes/vdr/files/linkerflags.patch | 186 ------------------------------
recipes/vdr/vdr-1.7.10/linkerflags.patch | 186 ++++++++++++++++++++++++++++++
recipes/vdr/vdr.inc | 8 ++
recipes/vdr/vdr_1.7.10.bb | 13 +--
4 files changed, 197 insertions(+), 196 deletions(-)
delete mode 100644 recipes/vdr/files/linkerflags.patch
create mode 100644 recipes/vdr/vdr-1.7.10/linkerflags.patch
create mode 100644 recipes/vdr/vdr.inc
diff --git a/recipes/vdr/files/linkerflags.patch b/recipes/vdr/files/linkerflags.patch
deleted file mode 100644
index 63c4477..0000000
--- a/recipes/vdr/files/linkerflags.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-Index: vdr-1.7.10/Makefile
-===================================================================
---- vdr-1.7.10.orig/Makefile 2010-01-07 22:01:54.000000000 +0100
-+++ vdr-1.7.10/Makefile 2010-01-07 22:02:32.167165564 +0100
-@@ -20,7 +20,7 @@
- MANDIR = $(PREFIX)/share/man
- BINDIR = $(PREFIX)/bin
- LOCDIR = ./locale
--LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
-+LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS}
- INCLUDES = ${CFLAGS}
-
- PLUGINDIR= ./PLUGINS
-Index: vdr-1.7.10/PLUGINS/src/hello/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/hello/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/hello/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -19,6 +19,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -95,7 +96,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/osddemo/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/osddemo/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/osddemo/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -17,6 +17,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -68,7 +69,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/pictures/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/pictures/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/pictures/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -19,6 +19,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -95,7 +96,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/servicedemo/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -19,6 +19,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -70,11 +71,11 @@
- ### Targets:
-
- libvdr-$(PLUGIN1).so: $(PLUGIN1).o
-- $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- libvdr-$(PLUGIN2).so: $(PLUGIN2).o
-- $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/skincurses/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/skincurses/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/skincurses/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -19,6 +19,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -95,7 +96,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/sky/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/sky/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/sky/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -17,6 +17,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -68,7 +69,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/status/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/status/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/status/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -17,6 +17,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -68,7 +69,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -17,6 +17,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -68,7 +69,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
diff --git a/recipes/vdr/vdr-1.7.10/linkerflags.patch b/recipes/vdr/vdr-1.7.10/linkerflags.patch
new file mode 100644
index 0000000..63c4477
--- /dev/null
+++ b/recipes/vdr/vdr-1.7.10/linkerflags.patch
@@ -0,0 +1,186 @@
+Index: vdr-1.7.10/Makefile
+===================================================================
+--- vdr-1.7.10.orig/Makefile 2010-01-07 22:01:54.000000000 +0100
++++ vdr-1.7.10/Makefile 2010-01-07 22:02:32.167165564 +0100
+@@ -20,7 +20,7 @@
+ MANDIR = $(PREFIX)/share/man
+ BINDIR = $(PREFIX)/bin
+ LOCDIR = ./locale
+-LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
++LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS}
+ INCLUDES = ${CFLAGS}
+
+ PLUGINDIR= ./PLUGINS
+Index: vdr-1.7.10/PLUGINS/src/hello/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/hello/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/hello/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -19,6 +19,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -95,7 +96,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/osddemo/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/osddemo/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/osddemo/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -17,6 +17,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -68,7 +69,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/pictures/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/pictures/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/pictures/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -19,6 +19,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -95,7 +96,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/servicedemo/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -19,6 +19,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -70,11 +71,11 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN1).so: $(PLUGIN1).o
+- $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
++ $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ libvdr-$(PLUGIN2).so: $(PLUGIN2).o
+- $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
++ $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/skincurses/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/skincurses/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/skincurses/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -19,6 +19,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -95,7 +96,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/sky/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/sky/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/sky/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -17,6 +17,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -68,7 +69,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/status/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/status/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/status/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -17,6 +17,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -68,7 +69,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -17,6 +17,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -68,7 +69,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
diff --git a/recipes/vdr/vdr.inc b/recipes/vdr/vdr.inc
new file mode 100644
index 0000000..2e8cf40
--- /dev/null
+++ b/recipes/vdr/vdr.inc
@@ -0,0 +1,8 @@
+DESCRIPTION = "Video Disk Recorder (VDR) is a digital sat-receiver program using Linux and DVB technologies. It allows one to record MPEG2 streams, as well as output the stream to TV. It is also possible to watch DVDs (hardware accelerated) with some comfort and use an IR remote control."
+AUTHOR = "Klaus Schmidinger"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://www.tvdr.de"
+
+DEPENDS = "fontconfig freetype gettext libcap jpeg virtual/libintl"
+
+SRC_URI = "ftp://ftp.tvdr.de/vdr/Developer/${P}.tar.bz2"
diff --git a/recipes/vdr/vdr_1.7.10.bb b/recipes/vdr/vdr_1.7.10.bb
index a8fa82c..69ca012 100644
--- a/recipes/vdr/vdr_1.7.10.bb
+++ b/recipes/vdr/vdr_1.7.10.bb
@@ -1,13 +1,7 @@
-DESCRIPTION = "Video Disk Recorder (VDR) is a digital sat-receiver program using Linux and DVB technologies. It allows one to record MPEG2 streams, as well as output the stream to TV. It is also possible to watch DVDs (hardware accelerated) with some comfort and use an IR remote control."
-AUTHOR = "Klaus Schmidinger"
-LICENSE = "GPLv2"
-HOMEPAGE = "http://www.tvdr.de"
+require vdr.inc
PR = "r2"
-DEPENDS = "fontconfig freetype gettext libcap jpeg virtual/libintl"
-
-SRC_URI = "ftp://ftp.tvdr.de/vdr/Developer/${P}.tar.bz2 \
- file://fixpaths.patch;patch=1 \
+SRC_URI += " file://fixpaths.patch;patch=1 \
file://cplusplus.patch;patch=1 \
file://disable_plugin.patch;patch=1 \
file://linkerflags.patch;patch=1 \
@@ -27,7 +21,7 @@ do_install () {
'VIDEODIR=/var/lib/vdr/video' \
'PLUGINLIBDIR=${PLUGINDIR}' \
'LOCDIR=${datadir}/locale' \
- install
+ install
}
PACKAGES_DYNAMIC += "vdr-plugin-*"
@@ -39,4 +33,3 @@ python populate_packages_prepend () {
FILES_${PN} = "${bindir}/* /var/lib/vdr/conf/* ${sysconfdir}/*"
FILES_${PN}-dbg += "${PLUGINDIR}/.debug/*"
-
--
1.6.5.7
[-- Attachment #1.2: 0001-Put-common-information-in-separate-file-and-require-.patch --]
[-- Type: text/x-patch, Size: 16517 bytes --]
From f95262bdd359807f3deb10b7a887befe6d0cf975 Mon Sep 17 00:00:00 2001
From: Paul Menzel <paulepanter@users.sourceforge.net>
Date: Sat, 9 Jan 2010 12:11:40 +0100
Subject: [PATCH 1/2] Put common information in separate file and require it in the recipe.
This hopefully lessens the effort to add new versions.
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
recipes/vdr/files/linkerflags.patch | 186 ------------------------------
recipes/vdr/vdr-1.7.10/linkerflags.patch | 186 ++++++++++++++++++++++++++++++
recipes/vdr/vdr.inc | 8 ++
recipes/vdr/vdr_1.7.10.bb | 13 +--
4 files changed, 197 insertions(+), 196 deletions(-)
delete mode 100644 recipes/vdr/files/linkerflags.patch
create mode 100644 recipes/vdr/vdr-1.7.10/linkerflags.patch
create mode 100644 recipes/vdr/vdr.inc
diff --git a/recipes/vdr/files/linkerflags.patch b/recipes/vdr/files/linkerflags.patch
deleted file mode 100644
index 63c4477..0000000
--- a/recipes/vdr/files/linkerflags.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-Index: vdr-1.7.10/Makefile
-===================================================================
---- vdr-1.7.10.orig/Makefile 2010-01-07 22:01:54.000000000 +0100
-+++ vdr-1.7.10/Makefile 2010-01-07 22:02:32.167165564 +0100
-@@ -20,7 +20,7 @@
- MANDIR = $(PREFIX)/share/man
- BINDIR = $(PREFIX)/bin
- LOCDIR = ./locale
--LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
-+LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS}
- INCLUDES = ${CFLAGS}
-
- PLUGINDIR= ./PLUGINS
-Index: vdr-1.7.10/PLUGINS/src/hello/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/hello/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/hello/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -19,6 +19,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -95,7 +96,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/osddemo/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/osddemo/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/osddemo/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -17,6 +17,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -68,7 +69,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/pictures/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/pictures/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/pictures/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -19,6 +19,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -95,7 +96,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/servicedemo/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -19,6 +19,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -70,11 +71,11 @@
- ### Targets:
-
- libvdr-$(PLUGIN1).so: $(PLUGIN1).o
-- $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- libvdr-$(PLUGIN2).so: $(PLUGIN2).o
-- $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/skincurses/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/skincurses/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/skincurses/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -19,6 +19,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -95,7 +96,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/sky/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/sky/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/sky/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -17,6 +17,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -68,7 +69,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/status/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/status/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/status/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -17,6 +17,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -68,7 +69,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -17,6 +17,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -68,7 +69,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
diff --git a/recipes/vdr/vdr-1.7.10/linkerflags.patch b/recipes/vdr/vdr-1.7.10/linkerflags.patch
new file mode 100644
index 0000000..63c4477
--- /dev/null
+++ b/recipes/vdr/vdr-1.7.10/linkerflags.patch
@@ -0,0 +1,186 @@
+Index: vdr-1.7.10/Makefile
+===================================================================
+--- vdr-1.7.10.orig/Makefile 2010-01-07 22:01:54.000000000 +0100
++++ vdr-1.7.10/Makefile 2010-01-07 22:02:32.167165564 +0100
+@@ -20,7 +20,7 @@
+ MANDIR = $(PREFIX)/share/man
+ BINDIR = $(PREFIX)/bin
+ LOCDIR = ./locale
+-LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
++LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS}
+ INCLUDES = ${CFLAGS}
+
+ PLUGINDIR= ./PLUGINS
+Index: vdr-1.7.10/PLUGINS/src/hello/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/hello/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/hello/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -19,6 +19,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -95,7 +96,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/osddemo/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/osddemo/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/osddemo/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -17,6 +17,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -68,7 +69,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/pictures/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/pictures/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/pictures/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -19,6 +19,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -95,7 +96,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/servicedemo/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -19,6 +19,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -70,11 +71,11 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN1).so: $(PLUGIN1).o
+- $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
++ $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ libvdr-$(PLUGIN2).so: $(PLUGIN2).o
+- $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
++ $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/skincurses/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/skincurses/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/skincurses/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -19,6 +19,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -95,7 +96,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/sky/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/sky/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/sky/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -17,6 +17,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -68,7 +69,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/status/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/status/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/status/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -17,6 +17,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -68,7 +69,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -17,6 +17,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -68,7 +69,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
diff --git a/recipes/vdr/vdr.inc b/recipes/vdr/vdr.inc
new file mode 100644
index 0000000..2e8cf40
--- /dev/null
+++ b/recipes/vdr/vdr.inc
@@ -0,0 +1,8 @@
+DESCRIPTION = "Video Disk Recorder (VDR) is a digital sat-receiver program using Linux and DVB technologies. It allows one to record MPEG2 streams, as well as output the stream to TV. It is also possible to watch DVDs (hardware accelerated) with some comfort and use an IR remote control."
+AUTHOR = "Klaus Schmidinger"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://www.tvdr.de"
+
+DEPENDS = "fontconfig freetype gettext libcap jpeg virtual/libintl"
+
+SRC_URI = "ftp://ftp.tvdr.de/vdr/Developer/${P}.tar.bz2"
diff --git a/recipes/vdr/vdr_1.7.10.bb b/recipes/vdr/vdr_1.7.10.bb
index a8fa82c..69ca012 100644
--- a/recipes/vdr/vdr_1.7.10.bb
+++ b/recipes/vdr/vdr_1.7.10.bb
@@ -1,13 +1,7 @@
-DESCRIPTION = "Video Disk Recorder (VDR) is a digital sat-receiver program using Linux and DVB technologies. It allows one to record MPEG2 streams, as well as output the stream to TV. It is also possible to watch DVDs (hardware accelerated) with some comfort and use an IR remote control."
-AUTHOR = "Klaus Schmidinger"
-LICENSE = "GPLv2"
-HOMEPAGE = "http://www.tvdr.de"
+require vdr.inc
PR = "r2"
-DEPENDS = "fontconfig freetype gettext libcap jpeg virtual/libintl"
-
-SRC_URI = "ftp://ftp.tvdr.de/vdr/Developer/${P}.tar.bz2 \
- file://fixpaths.patch;patch=1 \
+SRC_URI += " file://fixpaths.patch;patch=1 \
file://cplusplus.patch;patch=1 \
file://disable_plugin.patch;patch=1 \
file://linkerflags.patch;patch=1 \
@@ -27,7 +21,7 @@ do_install () {
'VIDEODIR=/var/lib/vdr/video' \
'PLUGINLIBDIR=${PLUGINDIR}' \
'LOCDIR=${datadir}/locale' \
- install
+ install
}
PACKAGES_DYNAMIC += "vdr-plugin-*"
@@ -39,4 +33,3 @@ python populate_packages_prepend () {
FILES_${PN} = "${bindir}/* /var/lib/vdr/conf/* ${sysconfdir}/*"
FILES_${PN}-dbg += "${PLUGINDIR}/.debug/*"
-
--
1.6.5.7
[-- Attachment #2: Dies ist ein digital signierter Nachrichtenteil --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] Put common information in separate file and require it in the recipe.
2010-01-09 14:28 [PATCH] Put common information in separate file and require it in the recipe Paul Menzel
@ 2010-01-09 15:35 ` Koen Kooi
2010-01-09 17:55 ` [PATCH] vdr: " Paul Menzel
0 siblings, 1 reply; 8+ messages in thread
From: Koen Kooi @ 2010-01-09 15:35 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi,
Your commit message "Put common information in separate file and require
it in the recipe." doesn't really tell us what it is about, could you
make it look more like the ones we use in OE? e.g:
vdr: put common information in separate file and require it in the recipe.
regards,
Koen
On 09-01-10 15:28, Paul Menzel wrote:
> Dear OE developers,
>
>
> could this please be checked in. I build tested it and it saw no
> differences.
>
> The patch is also attached.
>
>
> Thanks,
>
> Paul
>
> ---
> This hopefully lessens the effort to add new versions.
>
> Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
> ---
> recipes/vdr/files/linkerflags.patch | 186 ------------------------------
> recipes/vdr/vdr-1.7.10/linkerflags.patch | 186 ++++++++++++++++++++++++++++++
> recipes/vdr/vdr.inc | 8 ++
> recipes/vdr/vdr_1.7.10.bb | 13 +--
> 4 files changed, 197 insertions(+), 196 deletions(-)
> delete mode 100644 recipes/vdr/files/linkerflags.patch
> create mode 100644 recipes/vdr/vdr-1.7.10/linkerflags.patch
> create mode 100644 recipes/vdr/vdr.inc
>
> diff --git a/recipes/vdr/files/linkerflags.patch b/recipes/vdr/files/linkerflags.patch
> deleted file mode 100644
> index 63c4477..0000000
> --- a/recipes/vdr/files/linkerflags.patch
> +++ /dev/null
> @@ -1,186 +0,0 @@
> -Index: vdr-1.7.10/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/Makefile 2010-01-07 22:01:54.000000000 +0100
> -+++ vdr-1.7.10/Makefile 2010-01-07 22:02:32.167165564 +0100
> -@@ -20,7 +20,7 @@
> - MANDIR = $(PREFIX)/share/man
> - BINDIR = $(PREFIX)/bin
> - LOCDIR = ./locale
> --LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
> -+LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS}
> - INCLUDES = ${CFLAGS}
> -
> - PLUGINDIR= ./PLUGINS
> -Index: vdr-1.7.10/PLUGINS/src/hello/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/hello/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/hello/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -19,6 +19,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -95,7 +96,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/osddemo/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/osddemo/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/osddemo/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -17,6 +17,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -68,7 +69,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/pictures/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/pictures/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/pictures/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -19,6 +19,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -95,7 +96,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/servicedemo/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -19,6 +19,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -70,11 +71,11 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN1).so: $(PLUGIN1).o
> -- $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - libvdr-$(PLUGIN2).so: $(PLUGIN2).o
> -- $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/skincurses/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/skincurses/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/skincurses/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -19,6 +19,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -95,7 +96,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/sky/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/sky/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/sky/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -17,6 +17,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -68,7 +69,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/status/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/status/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/status/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -17,6 +17,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -68,7 +69,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -17,6 +17,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -68,7 +69,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> diff --git a/recipes/vdr/vdr-1.7.10/linkerflags.patch b/recipes/vdr/vdr-1.7.10/linkerflags.patch
> new file mode 100644
> index 0000000..63c4477
> --- /dev/null
> +++ b/recipes/vdr/vdr-1.7.10/linkerflags.patch
> @@ -0,0 +1,186 @@
> +Index: vdr-1.7.10/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/Makefile 2010-01-07 22:01:54.000000000 +0100
> ++++ vdr-1.7.10/Makefile 2010-01-07 22:02:32.167165564 +0100
> +@@ -20,7 +20,7 @@
> + MANDIR = $(PREFIX)/share/man
> + BINDIR = $(PREFIX)/bin
> + LOCDIR = ./locale
> +-LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
> ++LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS}
> + INCLUDES = ${CFLAGS}
> +
> + PLUGINDIR= ./PLUGINS
> +Index: vdr-1.7.10/PLUGINS/src/hello/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/hello/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/hello/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -19,6 +19,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -95,7 +96,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/osddemo/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/osddemo/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/osddemo/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -17,6 +17,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -68,7 +69,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/pictures/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/pictures/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/pictures/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -19,6 +19,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -95,7 +96,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/servicedemo/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -19,6 +19,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -70,11 +71,11 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN1).so: $(PLUGIN1).o
> +- $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + libvdr-$(PLUGIN2).so: $(PLUGIN2).o
> +- $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/skincurses/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/skincurses/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/skincurses/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -19,6 +19,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -95,7 +96,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/sky/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/sky/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/sky/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -17,6 +17,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -68,7 +69,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/status/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/status/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/status/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -17,6 +17,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -68,7 +69,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -17,6 +17,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -68,7 +69,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> diff --git a/recipes/vdr/vdr.inc b/recipes/vdr/vdr.inc
> new file mode 100644
> index 0000000..2e8cf40
> --- /dev/null
> +++ b/recipes/vdr/vdr.inc
> @@ -0,0 +1,8 @@
> +DESCRIPTION = "Video Disk Recorder (VDR) is a digital sat-receiver program using Linux and DVB technologies. It allows one to record MPEG2 streams, as well as output the stream to TV. It is also possible to watch DVDs (hardware accelerated) with some comfort and use an IR remote control."
> +AUTHOR = "Klaus Schmidinger"
> +LICENSE = "GPLv2"
> +HOMEPAGE = "http://www.tvdr.de"
> +
> +DEPENDS = "fontconfig freetype gettext libcap jpeg virtual/libintl"
> +
> +SRC_URI = "ftp://ftp.tvdr.de/vdr/Developer/${P}.tar.bz2"
> diff --git a/recipes/vdr/vdr_1.7.10.bb b/recipes/vdr/vdr_1.7.10.bb
> index a8fa82c..69ca012 100644
> --- a/recipes/vdr/vdr_1.7.10.bb
> +++ b/recipes/vdr/vdr_1.7.10.bb
> @@ -1,13 +1,7 @@
> -DESCRIPTION = "Video Disk Recorder (VDR) is a digital sat-receiver program using Linux and DVB technologies. It allows one to record MPEG2 streams, as well as output the stream to TV. It is also possible to watch DVDs (hardware accelerated) with some comfort and use an IR remote control."
> -AUTHOR = "Klaus Schmidinger"
> -LICENSE = "GPLv2"
> -HOMEPAGE = "http://www.tvdr.de"
> +require vdr.inc
> PR = "r2"
>
> -DEPENDS = "fontconfig freetype gettext libcap jpeg virtual/libintl"
> -
> -SRC_URI = "ftp://ftp.tvdr.de/vdr/Developer/${P}.tar.bz2 \
> - file://fixpaths.patch;patch=1 \
> +SRC_URI += " file://fixpaths.patch;patch=1 \
> file://cplusplus.patch;patch=1 \
> file://disable_plugin.patch;patch=1 \
> file://linkerflags.patch;patch=1 \
> @@ -27,7 +21,7 @@ do_install () {
> 'VIDEODIR=/var/lib/vdr/video' \
> 'PLUGINLIBDIR=${PLUGINDIR}' \
> 'LOCDIR=${datadir}/locale' \
> - install
> + install
> }
>
> PACKAGES_DYNAMIC += "vdr-plugin-*"
> @@ -39,4 +33,3 @@ python populate_packages_prepend () {
>
> FILES_${PN} = "${bindir}/* /var/lib/vdr/conf/* ${sysconfdir}/*"
> FILES_${PN}-dbg += "${PLUGINDIR}/.debug/*"
> -
>
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFLSKJOMkyGM64RGpERAh6rAJ9frGALta8N8FfVcElufMSkPsvofQCfUqXC
0VC8XBqjjXXxXj9sDjik/+8=
=M9AN
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH] vdr: Put common information in separate file and require it in the recipe.
2010-01-09 15:35 ` Koen Kooi
@ 2010-01-09 17:55 ` Paul Menzel
2010-01-09 18:27 ` Rolf Leggewie
2010-01-19 9:57 ` Paul Menzel
0 siblings, 2 replies; 8+ messages in thread
From: Paul Menzel @ 2010-01-09 17:55 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1.1: Type: text/plain, Size: 1080 bytes --]
Dear Koen,
Am Samstag, den 09.01.2010, 16:35 +0100 schrieb Koen Kooi:
> Your commit message "Put common information in separate file and require
> it in the recipe." doesn't really tell us what it is about, could you
> make it look more like the ones we use in OE? e.g:
>
> vdr: put common information in separate file and require it in the recipe.
thank you for your comment. Please find the new patch attached. Maybe
there is some OE terminology to even shorten the message.
1. I hope
-SRC_URI = "ftp://ftp.tvdr.de/vdr/Developer/${P}.tar.bz2 \
- file://fixpaths.patch;patch=1 \
+SRC_URI += " file://fixpaths.patch;patch=1 \
file://cplusplus.patch;patch=1 \
file://disable_plugin.patch;patch=1 \
file://linkerflags.patch;patch=1 \
is the correct syntax or in a `\` needed in front of the first changed
file line. I did not notice any errors.
2. I did not bump the package release variable `PR` since no
functionality changed.
Thanks,
Paul
[-- Attachment #1.2: 0001-vdr-Put-common-information-in-separate-file-and-requ.patch --]
[-- Type: text/x-patch, Size: 16920 bytes --]
From e11277dcc623c00101a81d657d4c8b6fd0b11ed3 Mon Sep 17 00:00:00 2001
From: Paul Menzel <paulepanter@users.sourceforge.net>
Date: Sat, 9 Jan 2010 12:11:40 +0100
Subject: [PATCH 1/2] vdr: Put common information in separate file and require it in the recipe.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
• Some information in a recipe apply to all versions of a program. Factor them out into an extra file and include/require this in each recipe as seen in a lot of other programs/packages/recipes in OE.
• VDR’s plugins often change and therefore put patches to them in version dependent folder.
This hopefully lessens the effort to add new versions.
Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
recipes/vdr/files/linkerflags.patch | 186 ------------------------------
recipes/vdr/vdr-1.7.10/linkerflags.patch | 186 ++++++++++++++++++++++++++++++
recipes/vdr/vdr.inc | 8 ++
recipes/vdr/vdr_1.7.10.bb | 13 +--
4 files changed, 197 insertions(+), 196 deletions(-)
delete mode 100644 recipes/vdr/files/linkerflags.patch
create mode 100644 recipes/vdr/vdr-1.7.10/linkerflags.patch
create mode 100644 recipes/vdr/vdr.inc
diff --git a/recipes/vdr/files/linkerflags.patch b/recipes/vdr/files/linkerflags.patch
deleted file mode 100644
index 63c4477..0000000
--- a/recipes/vdr/files/linkerflags.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-Index: vdr-1.7.10/Makefile
-===================================================================
---- vdr-1.7.10.orig/Makefile 2010-01-07 22:01:54.000000000 +0100
-+++ vdr-1.7.10/Makefile 2010-01-07 22:02:32.167165564 +0100
-@@ -20,7 +20,7 @@
- MANDIR = $(PREFIX)/share/man
- BINDIR = $(PREFIX)/bin
- LOCDIR = ./locale
--LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
-+LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS}
- INCLUDES = ${CFLAGS}
-
- PLUGINDIR= ./PLUGINS
-Index: vdr-1.7.10/PLUGINS/src/hello/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/hello/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/hello/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -19,6 +19,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -95,7 +96,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/osddemo/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/osddemo/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/osddemo/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -17,6 +17,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -68,7 +69,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/pictures/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/pictures/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/pictures/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -19,6 +19,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -95,7 +96,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/servicedemo/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -19,6 +19,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -70,11 +71,11 @@
- ### Targets:
-
- libvdr-$(PLUGIN1).so: $(PLUGIN1).o
-- $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- libvdr-$(PLUGIN2).so: $(PLUGIN2).o
-- $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/skincurses/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/skincurses/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/skincurses/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -19,6 +19,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -95,7 +96,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/sky/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/sky/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/sky/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -17,6 +17,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -68,7 +69,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/status/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/status/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/status/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -17,6 +17,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -68,7 +69,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
-Index: vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile
-===================================================================
---- vdr-1.7.10.orig/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:01:07.000000000 +0100
-+++ vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:02:02.240496954 +0100
-@@ -17,6 +17,7 @@
-
- CXX ?= g++
- CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-+LIBS ?= ${LDFLAGS}
-
- ### The directory environment:
-
-@@ -68,7 +69,7 @@
- ### Targets:
-
- libvdr-$(PLUGIN).so: $(OBJS)
-- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
- @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-
- dist: clean
diff --git a/recipes/vdr/vdr-1.7.10/linkerflags.patch b/recipes/vdr/vdr-1.7.10/linkerflags.patch
new file mode 100644
index 0000000..63c4477
--- /dev/null
+++ b/recipes/vdr/vdr-1.7.10/linkerflags.patch
@@ -0,0 +1,186 @@
+Index: vdr-1.7.10/Makefile
+===================================================================
+--- vdr-1.7.10.orig/Makefile 2010-01-07 22:01:54.000000000 +0100
++++ vdr-1.7.10/Makefile 2010-01-07 22:02:32.167165564 +0100
+@@ -20,7 +20,7 @@
+ MANDIR = $(PREFIX)/share/man
+ BINDIR = $(PREFIX)/bin
+ LOCDIR = ./locale
+-LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
++LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS}
+ INCLUDES = ${CFLAGS}
+
+ PLUGINDIR= ./PLUGINS
+Index: vdr-1.7.10/PLUGINS/src/hello/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/hello/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/hello/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -19,6 +19,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -95,7 +96,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/osddemo/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/osddemo/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/osddemo/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -17,6 +17,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -68,7 +69,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/pictures/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/pictures/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/pictures/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -19,6 +19,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -95,7 +96,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/servicedemo/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -19,6 +19,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -70,11 +71,11 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN1).so: $(PLUGIN1).o
+- $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
++ $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ libvdr-$(PLUGIN2).so: $(PLUGIN2).o
+- $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
++ $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/skincurses/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/skincurses/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/skincurses/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -19,6 +19,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -95,7 +96,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/sky/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/sky/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/sky/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -17,6 +17,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -68,7 +69,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/status/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/status/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/status/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -17,6 +17,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -68,7 +69,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
+Index: vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile
+===================================================================
+--- vdr-1.7.10.orig/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:01:07.000000000 +0100
++++ vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:02:02.240496954 +0100
+@@ -17,6 +17,7 @@
+
+ CXX ?= g++
+ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
++LIBS ?= ${LDFLAGS}
+
+ ### The directory environment:
+
+@@ -68,7 +69,7 @@
+ ### Targets:
+
+ libvdr-$(PLUGIN).so: $(OBJS)
+- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
+ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+
+ dist: clean
diff --git a/recipes/vdr/vdr.inc b/recipes/vdr/vdr.inc
new file mode 100644
index 0000000..2e8cf40
--- /dev/null
+++ b/recipes/vdr/vdr.inc
@@ -0,0 +1,8 @@
+DESCRIPTION = "Video Disk Recorder (VDR) is a digital sat-receiver program using Linux and DVB technologies. It allows one to record MPEG2 streams, as well as output the stream to TV. It is also possible to watch DVDs (hardware accelerated) with some comfort and use an IR remote control."
+AUTHOR = "Klaus Schmidinger"
+LICENSE = "GPLv2"
+HOMEPAGE = "http://www.tvdr.de"
+
+DEPENDS = "fontconfig freetype gettext libcap jpeg virtual/libintl"
+
+SRC_URI = "ftp://ftp.tvdr.de/vdr/Developer/${P}.tar.bz2"
diff --git a/recipes/vdr/vdr_1.7.10.bb b/recipes/vdr/vdr_1.7.10.bb
index a8fa82c..69ca012 100644
--- a/recipes/vdr/vdr_1.7.10.bb
+++ b/recipes/vdr/vdr_1.7.10.bb
@@ -1,13 +1,7 @@
-DESCRIPTION = "Video Disk Recorder (VDR) is a digital sat-receiver program using Linux and DVB technologies. It allows one to record MPEG2 streams, as well as output the stream to TV. It is also possible to watch DVDs (hardware accelerated) with some comfort and use an IR remote control."
-AUTHOR = "Klaus Schmidinger"
-LICENSE = "GPLv2"
-HOMEPAGE = "http://www.tvdr.de"
+require vdr.inc
PR = "r2"
-DEPENDS = "fontconfig freetype gettext libcap jpeg virtual/libintl"
-
-SRC_URI = "ftp://ftp.tvdr.de/vdr/Developer/${P}.tar.bz2 \
- file://fixpaths.patch;patch=1 \
+SRC_URI += " file://fixpaths.patch;patch=1 \
file://cplusplus.patch;patch=1 \
file://disable_plugin.patch;patch=1 \
file://linkerflags.patch;patch=1 \
@@ -27,7 +21,7 @@ do_install () {
'VIDEODIR=/var/lib/vdr/video' \
'PLUGINLIBDIR=${PLUGINDIR}' \
'LOCDIR=${datadir}/locale' \
- install
+ install
}
PACKAGES_DYNAMIC += "vdr-plugin-*"
@@ -39,4 +33,3 @@ python populate_packages_prepend () {
FILES_${PN} = "${bindir}/* /var/lib/vdr/conf/* ${sysconfdir}/*"
FILES_${PN}-dbg += "${PLUGINDIR}/.debug/*"
-
--
1.6.5.7
[-- Attachment #2: Dies ist ein digital signierter Nachrichtenteil --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH] vdr: Put common information in separate file and require it in the recipe.
2010-01-09 17:55 ` [PATCH] vdr: " Paul Menzel
@ 2010-01-09 18:27 ` Rolf Leggewie
2010-01-19 9:57 ` Paul Menzel
1 sibling, 0 replies; 8+ messages in thread
From: Rolf Leggewie @ 2010-01-09 18:27 UTC (permalink / raw)
To: openembedded-devel
Paul Menzel wrote:
> Maybe there is some OE terminology to even shorten the message.
I usually call it "$PN: unify" Can't be much shorter than that ;-)
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] vdr: Put common information in separate file and require it in the recipe.
2010-01-09 17:55 ` [PATCH] vdr: " Paul Menzel
2010-01-09 18:27 ` Rolf Leggewie
@ 2010-01-19 9:57 ` Paul Menzel
2010-01-24 10:45 ` Holger Hans Peter Freyther
1 sibling, 1 reply; 8+ messages in thread
From: Paul Menzel @ 2010-01-19 9:57 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 18378 bytes --]
Am Samstag, den 09.01.2010, 18:55 +0100 schrieb Paul Menzel:
[…]
> From e11277dcc623c00101a81d657d4c8b6fd0b11ed3 Mon Sep 17 00:00:00 2001
> From: Paul Menzel <paulepanter@users.sourceforge.net>
> Date: Sat, 9 Jan 2010 12:11:40 +0100
> Subject: [PATCH 1/2] vdr: Put common information in separate file and require it in the recipe.
> MIME-Version: 1.0
> Content-Type: text/plain; charset=UTF-8
> Content-Transfer-Encoding: 8bit
>
> • Some information in a recipe apply to all versions of a program. Factor them out into an extra file and include/require this in each recipe as seen in a lot of other programs/packages/recipes in OE.
>
> • VDR’s plugins often change and therefore put patches to them in version dependent folder.
>
> This hopefully lessens the effort to add new versions.
>
> Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
> ---
> recipes/vdr/files/linkerflags.patch | 186 ------------------------------
> recipes/vdr/vdr-1.7.10/linkerflags.patch | 186 ++++++++++++++++++++++++++++++
> recipes/vdr/vdr.inc | 8 ++
> recipes/vdr/vdr_1.7.10.bb | 13 +--
> 4 files changed, 197 insertions(+), 196 deletions(-)
> delete mode 100644 recipes/vdr/files/linkerflags.patch
> create mode 100644 recipes/vdr/vdr-1.7.10/linkerflags.patch
> create mode 100644 recipes/vdr/vdr.inc
>
> diff --git a/recipes/vdr/files/linkerflags.patch b/recipes/vdr/files/linkerflags.patch
> deleted file mode 100644
> index 63c4477..0000000
> --- a/recipes/vdr/files/linkerflags.patch
> +++ /dev/null
> @@ -1,186 +0,0 @@
> -Index: vdr-1.7.10/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/Makefile 2010-01-07 22:01:54.000000000 +0100
> -+++ vdr-1.7.10/Makefile 2010-01-07 22:02:32.167165564 +0100
> -@@ -20,7 +20,7 @@
> - MANDIR = $(PREFIX)/share/man
> - BINDIR = $(PREFIX)/bin
> - LOCDIR = ./locale
> --LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
> -+LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS}
> - INCLUDES = ${CFLAGS}
> -
> - PLUGINDIR= ./PLUGINS
> -Index: vdr-1.7.10/PLUGINS/src/hello/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/hello/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/hello/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -19,6 +19,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -95,7 +96,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/osddemo/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/osddemo/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/osddemo/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -17,6 +17,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -68,7 +69,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/pictures/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/pictures/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/pictures/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -19,6 +19,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -95,7 +96,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/servicedemo/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -19,6 +19,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -70,11 +71,11 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN1).so: $(PLUGIN1).o
> -- $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - libvdr-$(PLUGIN2).so: $(PLUGIN2).o
> -- $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/skincurses/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/skincurses/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/skincurses/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -19,6 +19,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -95,7 +96,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/sky/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/sky/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/sky/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -17,6 +17,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -68,7 +69,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/status/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/status/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/status/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -17,6 +17,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -68,7 +69,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> -Index: vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile
> -===================================================================
> ---- vdr-1.7.10.orig/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:01:07.000000000 +0100
> -+++ vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:02:02.240496954 +0100
> -@@ -17,6 +17,7 @@
> -
> - CXX ?= g++
> - CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> -+LIBS ?= ${LDFLAGS}
> -
> - ### The directory environment:
> -
> -@@ -68,7 +69,7 @@
> - ### Targets:
> -
> - libvdr-$(PLUGIN).so: $(OBJS)
> -- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> -+ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> - @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> -
> - dist: clean
> diff --git a/recipes/vdr/vdr-1.7.10/linkerflags.patch b/recipes/vdr/vdr-1.7.10/linkerflags.patch
> new file mode 100644
> index 0000000..63c4477
> --- /dev/null
> +++ b/recipes/vdr/vdr-1.7.10/linkerflags.patch
> @@ -0,0 +1,186 @@
> +Index: vdr-1.7.10/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/Makefile 2010-01-07 22:01:54.000000000 +0100
> ++++ vdr-1.7.10/Makefile 2010-01-07 22:02:32.167165564 +0100
> +@@ -20,7 +20,7 @@
> + MANDIR = $(PREFIX)/share/man
> + BINDIR = $(PREFIX)/bin
> + LOCDIR = ./locale
> +-LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
> ++LIBS = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS}
> + INCLUDES = ${CFLAGS}
> +
> + PLUGINDIR= ./PLUGINS
> +Index: vdr-1.7.10/PLUGINS/src/hello/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/hello/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/hello/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -19,6 +19,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -95,7 +96,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/osddemo/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/osddemo/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/osddemo/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -17,6 +17,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -68,7 +69,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/pictures/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/pictures/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/pictures/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -19,6 +19,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -95,7 +96,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/servicedemo/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/servicedemo/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -19,6 +19,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -70,11 +71,11 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN1).so: $(PLUGIN1).o
> +- $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + libvdr-$(PLUGIN2).so: $(PLUGIN2).o
> +- $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/skincurses/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/skincurses/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/skincurses/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -19,6 +19,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -95,7 +96,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/sky/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/sky/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/sky/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -17,6 +17,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -68,7 +69,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/status/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/status/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/status/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -17,6 +17,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -68,7 +69,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> +Index: vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile
> +===================================================================
> +--- vdr-1.7.10.orig/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:01:07.000000000 +0100
> ++++ vdr-1.7.10/PLUGINS/src/svdrpdemo/Makefile 2010-01-07 22:02:02.240496954 +0100
> +@@ -17,6 +17,7 @@
> +
> + CXX ?= g++
> + CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
> ++LIBS ?= ${LDFLAGS}
> +
> + ### The directory environment:
> +
> +@@ -68,7 +69,7 @@
> + ### Targets:
> +
> + libvdr-$(PLUGIN).so: $(OBJS)
> +- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
> ++ $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ $(LIBS)
> + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
> +
> + dist: clean
> diff --git a/recipes/vdr/vdr.inc b/recipes/vdr/vdr.inc
> new file mode 100644
> index 0000000..2e8cf40
> --- /dev/null
> +++ b/recipes/vdr/vdr.inc
> @@ -0,0 +1,8 @@
> +DESCRIPTION = "Video Disk Recorder (VDR) is a digital sat-receiver program using Linux and DVB technologies. It allows one to record MPEG2 streams, as well as output the stream to TV. It is also possible to watch DVDs (hardware accelerated) with some comfort and use an IR remote control."
> +AUTHOR = "Klaus Schmidinger"
> +LICENSE = "GPLv2"
> +HOMEPAGE = "http://www.tvdr.de"
> +
> +DEPENDS = "fontconfig freetype gettext libcap jpeg virtual/libintl"
> +
> +SRC_URI = "ftp://ftp.tvdr.de/vdr/Developer/${P}.tar.bz2"
> diff --git a/recipes/vdr/vdr_1.7.10.bb b/recipes/vdr/vdr_1.7.10.bb
> index a8fa82c..69ca012 100644
> --- a/recipes/vdr/vdr_1.7.10.bb
> +++ b/recipes/vdr/vdr_1.7.10.bb
> @@ -1,13 +1,7 @@
> -DESCRIPTION = "Video Disk Recorder (VDR) is a digital sat-receiver program using Linux and DVB technologies. It allows one to record MPEG2 streams, as well as output the stream to TV. It is also possible to watch DVDs (hardware accelerated) with some comfort and use an IR remote control."
> -AUTHOR = "Klaus Schmidinger"
> -LICENSE = "GPLv2"
> -HOMEPAGE = "http://www.tvdr.de"
> +require vdr.inc
> PR = "r2"
>
> -DEPENDS = "fontconfig freetype gettext libcap jpeg virtual/libintl"
> -
> -SRC_URI = "ftp://ftp.tvdr.de/vdr/Developer/${P}.tar.bz2 \
> - file://fixpaths.patch;patch=1 \
> +SRC_URI += " file://fixpaths.patch;patch=1 \
> file://cplusplus.patch;patch=1 \
> file://disable_plugin.patch;patch=1 \
> file://linkerflags.patch;patch=1 \
> @@ -27,7 +21,7 @@ do_install () {
> 'VIDEODIR=/var/lib/vdr/video' \
> 'PLUGINLIBDIR=${PLUGINDIR}' \
> 'LOCDIR=${datadir}/locale' \
> - install
> + install
> }
>
> PACKAGES_DYNAMIC += "vdr-plugin-*"
> @@ -39,4 +33,3 @@ python populate_packages_prepend () {
>
> FILES_${PN} = "${bindir}/* /var/lib/vdr/conf/* ${sysconfdir}/*"
> FILES_${PN}-dbg += "${PLUGINDIR}/.debug/*"
> -
> --
> 1.6.5.7
Could someone please commit this patch.
Thanks,
Paul
[-- Attachment #2: Dies ist ein digital signierter Nachrichtenteil --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH] vdr: Put common information in separate file and require it in the recipe.
2010-01-19 9:57 ` Paul Menzel
@ 2010-01-24 10:45 ` Holger Hans Peter Freyther
2010-01-24 13:30 ` Paul Menzel
0 siblings, 1 reply; 8+ messages in thread
From: Holger Hans Peter Freyther @ 2010-01-24 10:45 UTC (permalink / raw)
To: openembedded-devel
On Tuesday 19 January 2010 10:57:38 Paul Menzel wrote:
> Am Samstag, den 09.01.2010, 18:55 +0100 schrieb Paul Menzel:
>
> Could someone please commit this patch.
Hi Paul,
two things. If you have a mail where 99.9% of text is quoted and only 0.1
percent is new, you are doing it wrong. Please throw away stuff when quoting.
The second part... could you please resend the patch? When I look here[1]
patchwork is getting your patch totally wrong... This means this and all the
patches based on it are not in my new staging branch and I'm not able to
review them.
thanks a lot
z.
[1] http://patchwork.openembedded.org/patch/1438/
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH] vdr: Put common information in separate file and require it in the recipe.
2010-01-24 10:45 ` Holger Hans Peter Freyther
@ 2010-01-24 13:30 ` Paul Menzel
2010-01-24 14:52 ` Holger Hans Peter Freyther
0 siblings, 1 reply; 8+ messages in thread
From: Paul Menzel @ 2010-01-24 13:30 UTC (permalink / raw)
To: openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1523 bytes --]
Dear Holger,
Am Sonntag, den 24.01.2010, 11:45 +0100 schrieb Holger Hans Peter Freyther:
> On Tuesday 19 January 2010 10:57:38 Paul Menzel wrote:
> > Am Samstag, den 09.01.2010, 18:55 +0100 schrieb Paul Menzel:
>
> >
> > Could someone please commit this patch.
>
> two things. If you have a mail where 99.9% of text is quoted and only 0.1
> percent is new, you are doing it wrong. Please throw away stuff when quoting.
Sorry, I will try to do so next time. Sometimes I am unsure about the
correct way. My intention was, if someone already had deleted my old
message s/he could still review my patch.
> The second part... could you please resend the patch?
I did.
> When I look here[1] patchwork is getting your patch totally wrong...
Actually it is almost correct in my opinion. What is displayed as the
patch is the needed mbox format for `git am`. Only that on the Web there
is always an extra line added and the items with UTF-8 bullets (•) were
stripped. I will check that later, because the Patchwork git log
mentioned something about UTF-8.
What `pwclient get 1438` retrieves is not useful though. :(
> This means this and all the
> patches based on it are not in my new staging branch and I'm not able to
> review them.
Probably I will have to resend the others too. I will check later.
On the other hand, I always attached my patches. But that does not fit
your workflow does it?
Thanks,
Paul
> [1] http://patchwork.openembedded.org/patch/1438/
[-- Attachment #2: Dies ist ein digital signierter Nachrichtenteil --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-01-24 14:54 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-09 14:28 [PATCH] Put common information in separate file and require it in the recipe Paul Menzel
2010-01-09 15:35 ` Koen Kooi
2010-01-09 17:55 ` [PATCH] vdr: " Paul Menzel
2010-01-09 18:27 ` Rolf Leggewie
2010-01-19 9:57 ` Paul Menzel
2010-01-24 10:45 ` Holger Hans Peter Freyther
2010-01-24 13:30 ` Paul Menzel
2010-01-24 14:52 ` Holger Hans Peter Freyther
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.