xawtv: cleanup & fix building with newer toolchains

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 71 insertions, 28 deletions

diff --git a/patches/xawtv-3.95/xawtv-cross.patch b/patches/xawtv-3.95/0001-fix-cross-compiling.patch
index 889f16756..8a4b320cc 100644
--- a/patches/xawtv-3.95/xawtv-cross.patch
+++ b/patches/xawtv-3.95/0001-fix-cross-compiling.patch
@@ -1,7 +1,17 @@
-Index: xawtv-3.95/Makefile.in
-===================================================================
---- xawtv-3.95.orig/Makefile.in
-+++ xawtv-3.95/Makefile.in
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 8 Dec 2012 12:46:27 +0100
+Subject: [PATCH] fix cross-compiling
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Makefile.in   |   31 ++++++++++++++++---------------
+ mk/Compile.mk |    4 ++--
+ 2 files changed, 18 insertions(+), 17 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 389a39c..a51b463 100644
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -29,28 +29,29 @@ VERSION		:= @VERSION@
  # for CFLAGS
  WARN_FLAGS	:= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
@@ -47,10 +57,10 @@ Index: xawtv-3.95/Makefile.in
  
  # stuff configure has found
  FOUND_AALIB	:= @FOUND_AALIB@
-Index: xawtv-3.95/mk/Compile.mk
-===================================================================
---- xawtv-3.95.orig/mk/Compile.mk
-+++ xawtv-3.95/mk/Compile.mk
+diff --git a/mk/Compile.mk b/mk/Compile.mk
+index 75dadde..7771ef0 100644
+--- a/mk/Compile.mk
++++ b/mk/Compile.mk
 @@ -20,8 +20,8 @@ tmpdep		= mk/$(subst /,_,$*).tmp
  depfile		= mk/$(subst /,_,$*).dep
  depfiles	= mk/*.dep
diff --git a/patches/xawtv-3.95/page_size.diff b/patches/xawtv-3.95/0002-Fix-build-against-newer-kernel-headers-which-do-not-.patch
index ccec0eb42..e35099df2 100644
--- a/patches/xawtv-3.95/page_size.diff
+++ b/patches/xawtv-3.95/0002-Fix-build-against-newer-kernel-headers-which-do-not-.patch
@@ -1,12 +1,20 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix build against newer kernel-headers which do not define PAGE_MASK anymore.
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 8 Dec 2012 12:46:50 +0100
+Subject: [PATCH] Fix build against newer kernel-headers which do not define
+ PAGE_MASK anymore.
 
-@DPATCH@
-diff -urN xawtv-3.95.orig/console/fbtools.c xawtv-3.95/console/fbtools.c
---- xawtv-3.95.orig/console/fbtools.c	2003-02-14 14:14:04.000000000 +0000
-+++ xawtv-3.95./console/fbtools.c	2006-08-23 10:57:40.000000000 +0000
+Taken from Debian.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ console/fbtools.c |    4 +---
+ console/matrox.c  |    3 +--
+ 2 files changed, 2 insertions(+), 5 deletions(-)
+
+diff --git a/console/fbtools.c b/console/fbtools.c
+index 6ad7ceb..516babb 100644
+--- a/console/fbtools.c
++++ b/console/fbtools.c
 @@ -21,8 +21,6 @@
  #include <linux/vt.h>
  #include <linux/fb.h>
@@ -16,7 +24,7 @@ diff -urN xawtv-3.95.orig/console/fbtools.c xawtv-3.95/console/fbtools.c
  #include "fbtools.h"
  
  /* -------------------------------------------------------------------- */
-@@ -424,7 +422,7 @@
+@@ -424,7 +422,7 @@ fb_init(char *device, char *mode, int vt)
  	goto err;
      }
  #endif
@@ -25,9 +33,10 @@ diff -urN xawtv-3.95.orig/console/fbtools.c xawtv-3.95/console/fbtools.c
      fb_mem = mmap(NULL,fb_fix.smem_len+fb_mem_offset,
  		  PROT_READ|PROT_WRITE,MAP_SHARED,fb,0);
      if (-1L == (long)fb_mem) {
-diff -urN xawtv-3.95.orig/console/matrox.c xawtv-3.95/console/matrox.c
---- xawtv-3.95.orig/console/matrox.c	2005-02-03 10:40:41.000000000 +0000
-+++ xawtv-3.95/console/matrox.c	2006-08-23 11:09:51.000000000 +0000
+diff --git a/console/matrox.c b/console/matrox.c
+index e9011a7..3b4424e 100644
+--- a/console/matrox.c
++++ b/console/matrox.c
 @@ -9,7 +9,6 @@
  #include <sys/ioctl.h>
  #include <sys/mman.h>
@@ -36,7 +45,7 @@ diff -urN xawtv-3.95.orig/console/matrox.c xawtv-3.95/console/matrox.c
  #include <linux/fb.h>
  
  #include "byteswap.h"
-@@ -226,7 +225,7 @@
+@@ -226,7 +225,7 @@ gfx_init(int fd)
  	return -1;
      }
      off = (unsigned long)fb_fix.mmio_start -
@@ -45,6 +54,3 @@ diff -urN xawtv-3.95.orig/console/matrox.c xawtv-3.95/console/matrox.c
      bmmio += off;
      mmio = (uint32_t*)bmmio;
      return 0;
-
-
-
diff --git a/patches/xawtv-3.95/0003-HACK-move-LDFLAGS-behind-objects.patch b/patches/xawtv-3.95/0003-HACK-move-LDFLAGS-behind-objects.patch
new file mode 100644
index 000000000..42072df5f
--- /dev/null
+++ b/patches/xawtv-3.95/0003-HACK-move-LDFLAGS-behind-objects.patch
@@ -0,0 +1,25 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 8 Dec 2012 12:45:33 +0100
+Subject: [PATCH] HACK: move LDFLAGS behind objects
+
+LDFLAGS is used for '-ldl' only, which must be specified after any object
+files.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ mk/Compile.mk |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mk/Compile.mk b/mk/Compile.mk
+index 7771ef0..abad750 100644
+--- a/mk/Compile.mk
++++ b/mk/Compile.mk
+@@ -24,7 +24,7 @@ compile_c	= $(CC) $(CFLAGS) $(CPPFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
+ compile_cc	= $(CXX) $(CXXFLAGS) $(CPPFLAGS) -Wp,-MD,$(tmpdep) -c -o $@ $<
+ fixup_deps	= sed -e "s|.*\.o:|$@:|" < $(tmpdep) > $(depfile) && rm -f $(tmpdep)
+ 
+-link_app	= $(CC) $(LDFLAGS) -o $@  $^ $(LDLIBS)
++link_app	= $(CC) -o $@  $^ $(LDFLAGS) $(LDLIBS)
+ link_so		= $(CC) $(LDFLAGS) -shared -Wl,-soname,$(@F) -o $@ $^ $(LDLIBS)
+ ar_lib		= rm -f $@ && ar -r $@ $^ && ranlib $@
+ 
diff --git a/patches/xawtv-3.95/series b/patches/xawtv-3.95/series
index a4286b6d3..6690aad21 100644
--- a/patches/xawtv-3.95/series
+++ b/patches/xawtv-3.95/series
@@ -1,2 +1,6 @@
-xawtv-cross.patch
-page_size.diff
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-fix-cross-compiling.patch
+0002-Fix-build-against-newer-kernel-headers-which-do-not-.patch
+0003-HACK-move-LDFLAGS-behind-objects.patch
+# de69570dbcf07775ea0988d4160e3b6c  - git-ptx-patches magic
diff --git a/rules/xawtv.make b/rules/xawtv.make
index a4af34330..c4d54e3e5 100644
--- a/rules/xawtv.make
+++ b/rules/xawtv.make
@@ -41,8 +41,6 @@ XAWTV_AUTOCONF := \
 	--disable-mmx
 
 XAWTV_MAKE_OPT = \
-	CPPFLAGS="$(CROSS_CPPFLAGS)" \
-	LDFLAGS_CUST="$(CROSS_LDFLAGS)" \
 	SYSROOT=$(SYSROOT) \
 	verbose=yes