vdr: Put common information in separate file and require it in the recipe.

• 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>
Signed-off-by: Holger Hans Peter Freyther <zecke@selfish.org>

diff --git a/recipes/vdr/files/linkerflags.patch b/recipes/vdr/vdr-1.7.10/linkerflags.patch
similarity index 100%
rename from recipes/vdr/files/linkerflags.patch
rename to recipes/vdr/vdr-1.7.10/linkerflags.patch

diff --git a/recipes/vdr/vdr.inc b/recipes/vdr/vdr.inc
new file mode 100644 (file)
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 (file)
--- 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/*"
-