Merge branch 'master' of git+ssh://openadk.org/git/openadk

7 files changed, 124 insertions, 0 deletions

diff --git a/package/xawtv/Makefile b/package/xawtv/Makefile
new file mode 100644
index 000000000..f4c4ac60a
--- /dev/null
+++ b/package/xawtv/Makefile
@@ -0,0 +1,43 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		xawtv
+PKG_VERSION:=		3.102
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		3ee0f1d682d7e5734121bc420a74efd5
+PKG_DESCR:=		Video & Webcam application
+PKG_BUILDDEP:=		libXinerama v4l-utils
+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
+
+$(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
+
+xawtv-install:
+	$(INSTALL_DIR) $(IDIR_XAWTV)/etc/X11/app-defaults
+	$(INSTALL_DATA) $(WRKINST)/etc/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
+	$(INSTALL_DIR) $(IDIR_XAWTV)/usr/lib/xawtv
+	$(CP) $(WRKINST)/usr/lib/xawtv/*.so \
+		$(IDIR_XAWTV)/usr/lib/xawtv
+	$(INSTALL_DIR) $(IDIR_XAWTV)/usr/share/xawtv
+	$(CP) $(WRKINST)/usr/share/xawtv/* \
+		$(IDIR_XAWTV)/usr/share/xawtv
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xawtv/patches/patch-Makefile b/package/xawtv/patches/patch-Makefile
new file mode 100644
index 000000000..bdda68ed2
--- /dev/null
+++ b/package/xawtv/patches/patch-Makefile
@@ -0,0 +1,18 @@
+--- 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
new file mode 100644
index 000000000..cac9d71bc
--- /dev/null
+++ b/package/xawtv/patches/patch-Makefile_in
@@ -0,0 +1,11 @@
+--- 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-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-mk_Compile_mk b/package/xawtv/patches/patch-mk_Compile_mk
new file mode 100644
index 000000000..0c64d48fc
--- /dev/null
+++ b/package/xawtv/patches/patch-mk_Compile_mk
@@ -0,0 +1,11 @@
+--- 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
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);