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
From e11277dcc623c00101a81d657d4c8b6fd0b11ed3 Mon Sep 17 00:00:00 2001 From: Paul Menzel <[email protected]> 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 <[email protected]> --- 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
signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
