Skip to contentSkip to conversation

vdr: update to 1.7.16 from 1.7.10

PATCH New Paul Menzel 1 participant 1 message Jan 9, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vdr: update to 1.7.16 from 1.7.10

Date: Mon, 12 Jul 2010 21:32:52 +0200

Several of Hennig’s patches were applied upstream and are not necessary anymore.

• recipes/vdr/files/cplusplus.patch: replaced by recipes/vdr/vdr-1.7.16/0002-tools.h-include-stdarg.h.patch
1. canonicalize_file_name() is available in uClibc now.
2. Deprecated C headers will remain in VDR instead of C++ headers [1].
• recipes/vdr/files/disable_plugin.patch: removed, since ncurses is found correctly now.
• recipes/vdr/files/fixpaths.patch: removed, since INCLUDES is not overwritten anymore since VDR 1.7.15 [2] and options can be passed from outside since 1.7.13 [3].
• recipes/vdr/files/libintl.patch → recipes/vdr/vdr-1.7.16/0003-uclibc-Add-lintl-to-LIBS.patch
1. Still needed. I do not know how to fix this upstream.
• recipes/vdr/vdr-1.7.10/linkerflags.patch → recipes/vdr/vdr-1.7.16/0001-Makefile-Pass-LDFLAGS.patch
1. Still needed and extended to cover all places to get rid of ERROR: QA Issue with libvdr-svcsvr: No GNU_HASH in the elf binary:. This patch will not be needed anymore in 1.7.17 [4].

Since 1.7.x are development releases and no users of VDR in OE are known to me simply replace 1.7.10 by 1.7.16.

This recipes is build tested for MACHINE = "beagleboard" with angstrom-2008.1, angstrom-2010.x, minimal, minimal-uclibc.

[1] http://www.linuxtv.org/pipermail/vdr/2010-December/024034.html
[2] http://www.linuxtv.org/pipermail/vdr/2010-April/022831.html
[3] http://www.linuxtv.org/pipermail/vdr/2010-February/022333.html
[4] http://www.linuxtv.org/pipermail/vdr/2010-December/024096.html

---
 recipes/vdr/files/cplusplus.patch                  |   54 ------
 recipes/vdr/files/disable_plugin.patch             |   18 --
 recipes/vdr/files/fixpaths.patch                   |   11 --
 recipes/vdr/files/libintl.patch                    |   13 --
 recipes/vdr/vdr-1.7.10/linkerflags.patch           |  186 --------------------
 .../vdr-1.7.16/0001-Makefile-Pass-LDFLAGS.patch    |  148 ++++++++++++++++
 .../vdr-1.7.16/0002-tools.h-include-stdarg.h.patch |   73 ++++++++
 .../vdr-1.7.16/0003-uclibc-Add-lintl-to-LIBS.patch |   27 +++
 recipes/vdr/vdr.inc                                |    2 +-
 recipes/vdr/{vdr_1.7.10.bb => vdr_1.7.16.bb}       |   20 +--
 10 files changed, 258 insertions(+), 294 deletions(-)
 delete mode 100644 recipes/vdr/files/cplusplus.patch
 delete mode 100644 recipes/vdr/files/disable_plugin.patch
 delete mode 100644 recipes/vdr/files/fixpaths.patch
 delete mode 100644 recipes/vdr/files/libintl.patch
 delete mode 100644 recipes/vdr/vdr-1.7.10/linkerflags.patch
 create mode 100644 recipes/vdr/vdr-1.7.16/0001-Makefile-Pass-LDFLAGS.patch
 create mode 100644 recipes/vdr/vdr-1.7.16/0002-tools.h-include-stdarg.h.patch
 create mode 100644 recipes/vdr/vdr-1.7.16/0003-uclibc-Add-lintl-to-LIBS.patch
 rename recipes/vdr/{vdr_1.7.10.bb => vdr_1.7.16.bb} (59%)
recipes/vdr/files/cplusplus.patch deleted +0 -54
deleted file mode 100644
index 74e4731..0000000
@@ -1,54 +0,0 @@
-Index: vdr-1.7.10/tools.c
-===================================================================
---- vdr-1.7.10.orig/tools.c	2010-01-03 16:34:41.162295450 +0100
-+++ vdr-1.7.10/tools.c	2010-01-03 17:07:03.318358420 +0100
-@@ -8,9 +8,12 @@
-  */
- 
- #include "tools.h"
--#include <ctype.h>
-+#include <cctype>
- #include <dirent.h>
--#include <errno.h>
-+#include <cerrno>
-+#include <cstdarg>
-+#include <ctime>
-+
- extern "C" {
- #ifdef boolean
- #define HAVE_BOOLEAN
-@@ -18,11 +21,10 @@
- #include <jpeglib.h>
- #undef boolean
- }
--#include <stdarg.h>
-+
- #include <stdlib.h>
- #include <sys/time.h>
- #include <sys/vfs.h>
--#include <time.h>
- #include <unistd.h>
- #include <utime.h>
- #include "i18n.h"
-@@ -484,7 +486,7 @@
- {
-   if (!FileName)
-      return NULL;
--  char *TargetName = canonicalize_file_name(FileName);
-+  char *TargetName = realpath(FileName,NULL);
-   if (!TargetName) {
-      if (errno == ENOENT) // file doesn't exist
-         TargetName = strdup(FileName);
-Index: vdr-1.7.10/tools.h
-===================================================================
---- vdr-1.7.10.orig/tools.h	2010-01-03 16:30:20.441906815 +0100
-+++ vdr-1.7.10/tools.h	2010-01-03 16:30:57.168575048 +0100
-@@ -24,6 +24,8 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- 
-+#include <cstdarg>
-+
- typedef unsigned char uchar;
- 
- extern int SysLogLevel;
recipes/vdr/files/disable_plugin.patch deleted +0 -18
deleted file mode 100644
index 80cf236..0000000
@@ -1,18 +0,0 @@
-Index: vdr-1.7.10/Makefile
-===================================================================
---- vdr-1.7.10.orig/Makefile	2010-01-03 18:19:12.915007986 +0100
-+++ vdr-1.7.10/Makefile	2010-01-03 18:29:47.598277455 +0100
-@@ -142,11 +142,12 @@
- 	noapiv="";\
- 	for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\
- 	    echo "Plugin $$i:";\
--	    if ! grep -q "\$$(LIBDIR)/.*\$$(APIVERSION)" "$(PLUGINDIR)/src/$$i/Makefile" ; then\
-+	    if ! grep -q "\$$(LIBDIR)/.*\$$(APIVERSION)" "$(PLUGINDIR)/src/$$i/Makefile";  then \
- 	       echo "ERROR: plugin $$i doesn't honor APIVERSION - not compiled!";\
- 	       noapiv="$$noapiv $$i";\
- 	       continue;\
- 	       fi;\
-+	    if [ "$$i" = "skincurses" ]; then echo; echo "*** $$i plugin disbabled "; echo; continue; fi;\
- 	    $(MAKE) -C "$(PLUGINDIR)/src/$$i" all || failed="$$failed $$i";\
- 	    done;\
- 	if [ -n "$$noapiv" ] ; then echo; echo "*** plugins without APIVERSION:$$noapiv"; echo; fi;\
recipes/vdr/files/fixpaths.patch deleted +0 -11
deleted file mode 100644
index 418f2d9..0000000
@@ -1,11 +0,0 @@
---- vdr/Makefile~fixpaths	2009-10-18 15:59:25.000000000 +0200
-+++ vdr/Makefile	2009-12-13 12:28:22.000000000 +0100
-@@ -21,7 +21,7 @@
- BINDIR   = $(PREFIX)/bin
- LOCDIR   = ./locale
- LIBS     = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig
--INCLUDES = -I/usr/include/freetype2
-+INCLUDES = ${CFLAGS}
- 
- PLUGINDIR= ./PLUGINS
- PLUGINLIBDIR= $(PLUGINDIR)/lib
recipes/vdr/files/libintl.patch deleted +0 -13
deleted file mode 100644
index 57b2581..0000000
@@ -1,13 +0,0 @@
-Index: vdr-1.7.10/Makefile
-===================================================================
---- vdr-1.7.10.orig/Makefile	2010-01-07 22:02:32.000000000 +0100
-+++ vdr-1.7.10/Makefile	2010-01-07 22:03:01.803824516 +0100
-@@ -20,7 +20,7 @@
- MANDIR   = $(PREFIX)/share/man
- BINDIR   = $(PREFIX)/bin
- LOCDIR   = ./locale
--LIBS     = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig ${LDFLAGS}
-+LIBS     = -ljpeg -lpthread -ldl -lcap -lrt -lfreetype -lfontconfig -lintl ${LDFLAGS}
- INCLUDES = ${CFLAGS}
- 
- PLUGINDIR= ./PLUGINS
recipes/vdr/vdr-1.7.10/linkerflags.patch deleted +0 -186

186 lines not on this page · raw message

recipes/vdr/vdr-1.7.16/0001-Makefile-Pass-LDFLAGS.patch new file +148 -0

148 lines not on this page · raw message

recipes/vdr/vdr-1.7.16/0002-tools.h-include-stdarg.h.patch new file +73 -0

73 lines not on this page · raw message

recipes/vdr/vdr-1.7.16/0003-uclibc-Add-lintl-to-LIBS.patch new file +27 -0
new file mode 100644
index 0000000..38adc74
@@ -0,0 +1,27 @@
+From bf85fc2fd74a3615649ba62dd3e3d36a32d40c72 Mon Sep 17 00:00:00 2001
+From: Paul Menzel <[email protected]>
+Date: Wed, 14 Jul 2010 20:19:39 +0200
+Subject: [PATCH 3/3] uclibc: Add `-lintl` to `LIBS`.
+
+
+Signed-off-by: Paul Menzel <[email protected]>
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 48e3309..e12e2b2 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,7 +20,7 @@ PREFIX  ?= /usr/local
+ 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 -lintl
+ INCLUDES ?= -I/usr/include/freetype2
+ 
+ PLUGINDIR= ./PLUGINS
+-- 
+1.7.2.3
+
recipes/vdr/vdr.inc +1 -1
index 1077af9..7af81ad 100644
@@ -3,6 +3,6 @@ HOMEPAGE = "http://www.tvdr.de"
 SECTION = "console/multimedia"
 LICENSE = "GPLv2"
 AUTHOR = "Klaus Schmidinger"
-DEPENDS = "fontconfig freetype gettext libcap jpeg virtual/libintl"
+DEPENDS = "fontconfig freetype gettext libcap jpeg virtual/libintl ncurses"
 
 SRC_URI = "ftp://ftp.tvdr.de/vdr/Developer/${P}.tar.bz2"
recipes/vdr/vdr_1.7.16.bb renamed from recipes/vdr/vdr_1.7.10.bb +9 -11
similarity index 59%
rename from recipes/vdr/vdr_1.7.10.bb
rename to recipes/vdr/vdr_1.7.16.bb
index 8cc5757..12632ef 100644
@@ -1,16 +1,14 @@
 require vdr.inc
-PR = "r3"
+PR = "r0"
 
-SRC_URI += " file://fixpaths.patch \
-           file://cplusplus.patch \
-           file://disable_plugin.patch \
-           file://linkerflags.patch \
-          "
+SRC_URI += "file://0001-Makefile-Pass-LDFLAGS.patch \
+            file://0002-tools.h-include-stdarg.h.patch \
+           "
 
-SRC_URI_append_linux-uclibceabi = " file://libintl.patch "
-SRC_URI_append_uclinux-uclibc = " file://libintl.patch "
+SRC_URI_append_linux-uclibceabi = " file://0003-uclibc-Add-lintl-to-LIBS.patch "
+SRC_URI_append_uclinux-uclibc = " file://0003-uclibc-Add-lintl-to-LIBS.patch "
 
-CFLAGS_append += " -I${STAGING_INCDIR}/freetype2"
+EXTRA_OEMAKE += "INCLUDES=-I${STAGING_INCDIR}/freetype2"
 
 PLUGINDIR = "${libdir}/vdr/plugins"
 
@@ -34,5 +32,5 @@ python populate_packages_prepend () {
 FILES_${PN} = "${bindir}/* /var/lib/vdr/conf/* ${sysconfdir}/*"
 FILES_${PN}-dbg += "${PLUGINDIR}/.debug/*"
 
-SRC_URI[md5sum] = "c74ee966baca1c47ed6b9e2be3d1639b"
-SRC_URI[sha256sum] = "165bfcd811ef92cab50d11a88a76c481e105689438929414d27edfacfb312f52"
+SRC_URI[md5sum] = "d5cc4bf87e73385a843f5de4763639f0"
+SRC_URI[sha256sum] = "f760d196c6f976043774f6ad9ba1af956d24ad456f8b2fea7dd6a73d38c96e95"
Signature · 1 line
1.7.2.3