From 0851c77c5104ab3e1e62520ca0b7f1fb9e7132bd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 12 Oct 2011 20:54:12 +0200 Subject: misc fixes from bulk build --- package/xawtv/Makefile | 5 +++++ package/xawtv/patches/patch-Makefile | 7 ++++--- package/xawtv/patches/patch-Makefile.orig | 10 ---------- package/xawtv/patches/patch-console_fbtools_c | 10 ++++++++++ package/xawtv/patches/patch-console_record_c | 11 +++++++++++ package/xawtv/patches/patch-x11_rootv_c | 20 ++++++++++++++++++++ 6 files changed, 50 insertions(+), 13 deletions(-) delete mode 100644 package/xawtv/patches/patch-Makefile.orig create mode 100644 package/xawtv/patches/patch-console_fbtools_c create mode 100644 package/xawtv/patches/patch-console_record_c create mode 100644 package/xawtv/patches/patch-x11_rootv_c (limited to 'package/xawtv') diff --git a/package/xawtv/Makefile b/package/xawtv/Makefile index 238f3bd4b..f4c4ac60a 100644 --- a/package/xawtv/Makefile +++ b/package/xawtv/Makefile @@ -13,6 +13,8 @@ PKG_DEPENDS:= libxinerama libv4l PKG_SECTION:= x11/apps PKG_SITES:= http://linuxtv.org/downloads/xawtv/ +PKG_ARCH_DEPENDS:= x86 + DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 include $(TOPDIR)/mk/package.mk @@ -21,6 +23,9 @@ $(eval $(call PKG_template,XAWTV,xawtv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPEN CONFIG_STYLE:= manual +pre-configure: + $(SED) "s#@@GNU_TARGET_NAME@@#${GNU_TARGET_NAME}#" $(WRKBUILD)/Makefile + xawtv-install: $(INSTALL_DIR) $(IDIR_XAWTV)/etc/X11/app-defaults $(INSTALL_DATA) $(WRKINST)/etc/X11/app-defaults/Xawtv \ diff --git a/package/xawtv/patches/patch-Makefile b/package/xawtv/patches/patch-Makefile index 814892d9e..bdda68ed2 100644 --- a/package/xawtv/patches/patch-Makefile +++ b/package/xawtv/patches/patch-Makefile @@ -1,5 +1,5 @@ --- xawtv-3.102.orig/Makefile 2011-09-05 19:26:02.000000000 +0200 -+++ xawtv-3.102/Makefile 2011-09-18 21:53:53.767990433 +0200 ++++ xawtv-3.102/Makefile 2011-09-26 21:03:31.839340414 +0200 @@ -1,6 +1,6 @@ # passed to configure @@ -8,10 +8,11 @@ # arch name -- for build directory arch := $(shell echo "arch-`uname -m`-`uname -s`" | tr "A-Z" "a-z") -@@ -21,5 +21,5 @@ tag archive rpm dsc debs pbuild release +@@ -21,5 +21,5 @@ tag archive rpm dsc debs pbuild release $(arch)/Makefile: configure mkdir -p $(arch) - (cd $(arch); ../configure \ +- --prefix=$(prefix) ) + (cd $(arch); ../configure --disable-xft \ - --prefix=$(prefix) ) ++ --prefix=$(prefix) --host=@@GNU_TARGET_NAME@@ ) diff --git a/package/xawtv/patches/patch-Makefile.orig b/package/xawtv/patches/patch-Makefile.orig deleted file mode 100644 index ad7a5446d..000000000 --- a/package/xawtv/patches/patch-Makefile.orig +++ /dev/null @@ -1,10 +0,0 @@ ---- xawtv-3.102.orig/Makefile 2011-09-05 19:26:02.000000000 +0200 -+++ xawtv-3.102/Makefile 2011-09-18 20:40:23.159241503 +0200 -@@ -1,6 +1,6 @@ - - # passed to configure --prefix = /usr/local -+prefix = /usr - - # arch name -- for build directory - arch := $(shell echo "arch-`uname -m`-`uname -s`" | tr "A-Z" "a-z") diff --git a/package/xawtv/patches/patch-console_fbtools_c b/package/xawtv/patches/patch-console_fbtools_c new file mode 100644 index 000000000..aa4d98bb6 --- /dev/null +++ b/package/xawtv/patches/patch-console_fbtools_c @@ -0,0 +1,10 @@ +--- xawtv-3.102.orig/console/fbtools.c 2011-09-05 19:26:02.000000000 +0200 ++++ xawtv-3.102/console/fbtools.c 2011-09-26 21:10:50.109340133 +0200 +@@ -520,6 +520,6 @@ fb_catch_exit_signals(void) + + /* cleanup */ + fb_cleanup(); +- fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]); ++ fprintf(stderr,"Oops: %s\n",strsignal(termsig)); + exit(42); + } diff --git a/package/xawtv/patches/patch-console_record_c b/package/xawtv/patches/patch-console_record_c new file mode 100644 index 000000000..bb679f3fe --- /dev/null +++ b/package/xawtv/patches/patch-console_record_c @@ -0,0 +1,11 @@ +--- xawtv-3.102.orig/console/record.c 2011-09-05 19:26:02.000000000 +0200 ++++ xawtv-3.102/console/record.c 2011-09-26 21:09:52.219340170 +0200 +@@ -429,7 +429,7 @@ ctrlc(int signal) + { + if (verbose) + fprintf(stderr,"\n%s - exiting\n", +- sys_siglist[signal]); ++ strsignal(signal)); + stop = 1; + } + diff --git a/package/xawtv/patches/patch-x11_rootv_c b/package/xawtv/patches/patch-x11_rootv_c new file mode 100644 index 000000000..8e3393f54 --- /dev/null +++ b/package/xawtv/patches/patch-x11_rootv_c @@ -0,0 +1,20 @@ +--- xawtv-3.102.orig/x11/rootv.c 2011-09-05 19:26:02.000000000 +0200 ++++ xawtv-3.102/x11/rootv.c 2011-09-26 21:12:26.549340070 +0200 +@@ -133,7 +133,7 @@ catch_sig(int signal) + termsig = signal; + if (verbose) + fprintf(stderr,"received signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig,strsignal(termsig)); + } + + static void usage(FILE *fp) +@@ -422,7 +422,7 @@ main(int argc, char *argv[]) + } + if (verbose && termsig) + fprintf(stderr,"exiting on signal %d [%s]\n", +- termsig,sys_siglist[termsig]); ++ termsig,strsignal(termsig)); + if (do_mute && have_mute) + XvSetPortAttribute(dpy,port,XV_MUTE,1); + XvStopVideo(dpy,port,win); -- cgit v1.2.3