update to latest upstream

8 files changed, 18 insertions, 93 deletions

diff --git a/package/xawtv/Makefile b/package/xawtv/Makefile
index eaf36026f..54501ece8 100644
--- a/package/xawtv/Makefile
+++ b/package/xawtv/Makefile
@@ -4,16 +4,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xawtv
-PKG_VERSION:=		3.102
+PKG_VERSION:=		3.103
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		3ee0f1d682d7e5734121bc420a74efd5
-PKG_DESCR:=		Video & Webcam application
-PKG_BUILDDEP:=		libXinerama v4l-utils
+PKG_MD5SUM:=		18822bb3660540fa9ea8b643a5b30d6b
+PKG_DESCR:=		video & webcam application
+PKG_BUILDDEP:=		autotool libXinerama v4l-utils
 PKG_DEPENDS:=		libxinerama libv4l
 PKG_SECTION:=		x11/apps
 PKG_SITES:=		http://linuxtv.org/downloads/xawtv/
 
-PKG_ARCH_DEPENDS:=	x86
+PKG_ARCH_DEPENDS:=	x86 x86_64
 
 DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
 
@@ -21,15 +21,10 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XAWTV,xawtv,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIG_STYLE:=		manual
-
-pre-configure:
-	$(SED) "s#@@GNU_TARGET_NAME@@#${GNU_TARGET_NAME}#" $(WRKBUILD)/Makefile
+AUTOTOOL_STYLE:=	autoreconf
+XAKE_FLAGS:=		SUID_ROOT=-m755
 
 xawtv-install:
-	$(INSTALL_DIR) $(IDIR_XAWTV)/etc/X11/app-defaults
-	$(INSTALL_DATA) $(WRKINST)/usr/lib/X11/app-defaults/Xawtv \
-		$(IDIR_XAWTV)/etc/X11/app-defaults
 	$(INSTALL_DIR) $(IDIR_XAWTV)/usr/bin
 	$(INSTALL_BIN) $(WRKINST)/usr/bin/xawtv \
 		$(IDIR_XAWTV)/usr/bin
diff --git a/package/xawtv/patches/patch-Makefile b/package/xawtv/patches/patch-Makefile
deleted file mode 100644
index bdda68ed2..000000000
--- a/package/xawtv/patches/patch-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- xawtv-3.102.orig/Makefile	2011-09-05 19:26:02.000000000 +0200
-+++ xawtv-3.102/Makefile	2011-09-26 21:03:31.839340414 +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")
-@@ -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) --host=@@GNU_TARGET_NAME@@	)
diff --git a/package/xawtv/patches/patch-Makefile_in b/package/xawtv/patches/patch-Makefile_in
deleted file mode 100644
index cac9d71bc..000000000
--- a/package/xawtv/patches/patch-Makefile_in
+++ /dev/null
@@ -1,11 +0,0 @@
---- xawtv-3.102.orig/Makefile.in	2011-09-05 19:26:02.000000000 +0200
-+++ xawtv-3.102/Makefile.in	2011-09-18 20:42:35.107990034 +0200
-@@ -3,7 +3,7 @@ VPATH		:= $(srcdir)
- 
- # for package builds (buildroot install + no root privs needed)
- DESTDIR=
--SUID_ROOT=-m4755 -o root
-+SUID_ROOT=-m755
- STRIP_FLAG=
- 
- # install paths
diff --git a/package/xawtv/patches/patch-configure_ac b/package/xawtv/patches/patch-configure_ac
new file mode 100644
index 000000000..b9dd83619
--- /dev/null
+++ b/package/xawtv/patches/patch-configure_ac
@@ -0,0 +1,11 @@
+--- xawtv-3.103.orig/configure.ac	2013-04-02 15:19:10.000000000 +0200
++++ xawtv-3.103/configure.ac	2014-05-19 16:15:31.000000000 +0200
+@@ -119,7 +119,7 @@ fi
+ AC_CHECK_LIB(ossaudio,main,LIBOSS="-lossaudio")
+ AC_CHECK_LIB(ncursesw,initscr,LIBCURSES="-lncursesw")
+ if test "$LIBCURSES" = ""; then
+-  AC_CHECK_LIB(ncurses,initscr,LIBCURSES="-lncurses")
++  AC_CHECK_LIB(ncurses,initscr,LIBCURSES="-lncurses -ltinfo")
+ fi
+ if test "$LIBCURSES" = ""; then
+   AC_CHECK_LIB(curses,initscr,LIBCURSES="-lcurses")
diff --git a/package/xawtv/patches/patch-console_fbtools_c b/package/xawtv/patches/patch-console_fbtools_c
deleted file mode 100644
index aa4d98bb6..000000000
--- a/package/xawtv/patches/patch-console_fbtools_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index bb679f3fe..000000000
--- a/package/xawtv/patches/patch-console_record_c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-mk_Compile_mk b/package/xawtv/patches/patch-mk_Compile_mk
deleted file mode 100644
index 0c64d48fc..000000000
--- a/package/xawtv/patches/patch-mk_Compile_mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- xawtv-3.102.orig/mk/Compile.mk	2011-09-05 19:26:02.000000000 +0200
-+++ xawtv-3.102/mk/Compile.mk	2011-09-18 20:39:27.867990854 +0200
-@@ -13,7 +13,7 @@
- ########################################################################
- 
- # verbose yes/no
--verbose		?= no
-+verbose		?= yes
- 
- # dependency files
- tmpdep		= mk/$(subst /,_,$*).tmp
diff --git a/package/xawtv/patches/patch-x11_rootv_c b/package/xawtv/patches/patch-x11_rootv_c
deleted file mode 100644
index 8e3393f54..000000000
--- a/package/xawtv/patches/patch-x11_rootv_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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);