wok rev 11040

Up: amsn to 0.98.4.
author Christopher Rogers <slaxemulator@gmail.com>
date Sun Oct 16 07:42:24 2011 +0000 (2011-10-16)
parents 2b66f7a527f5
children 06c778aefe9f
files amsn/receipt amsn/stuff/amsn-v4l2.patch
line diff
     1.1 --- a/amsn/receipt	Sun Oct 16 07:40:38 2011 +0000
     1.2 +++ b/amsn/receipt	Sun Oct 16 07:42:24 2011 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="amsn"
     1.7 -VERSION="0.98.3"
     1.8 +VERSION="0.98.4"
     1.9  CATEGORY="network"
    1.10  SHORT_DESC="Alvaro's Messenger"
    1.11  MAINTAINER="erjo@slitaz.org"
    1.12 @@ -10,19 +10,18 @@
    1.13  BUILD_DEPENDS="tcl-dev tk-dev xorg-libXss-dev libv4l-dev libv4l"
    1.14  TARBALL="$PACKAGE-$VERSION-src.tar.gz"
    1.15  WEB_SITE="http://amsn-project.net/"
    1.16 -WGET_URL="http://freefr.dl.sourceforge.net/sourceforge/amsn/$TARBALL
    1.17 - http://switch.dl.sourceforge.net/sourceforge/amsn/$TARBALL"
    1.18 +WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
    1.19  TAGS="chat messenger im"
    1.20  
    1.21 -
    1.22  # Rules to configure and make the package.
    1.23  compile_rules()
    1.24  {
    1.25  	cd $src
    1.26 +	patch -Np0 -i $stuff/$PACKAGE-v4l2.patch
    1.27  	./configure --prefix=/usr \
    1.28  	 --with-tcl=/usr/lib $CONFIGURE_ARGS && \
    1.29 -	make -j4 && \
    1.30 -	make DESTDIR=$PWD/_pkg install
    1.31 +	make && \
    1.32 +	make DESTDIR=$DESTDIR install
    1.33  }
    1.34  
    1.35  # Rules to gen a SliTaz package suitable for Tazpkg.
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/amsn/stuff/amsn-v4l2.patch	Sun Oct 16 07:42:24 2011 +0000
     2.3 @@ -0,0 +1,33 @@
     2.4 +Add support for v4l2 on Linux so it can compile against modern
     2.5 +kernel headers. #363201
     2.6 +
     2.7 +Patch by Kevin McCarthy <signals@gentoo.org>
     2.8 +
     2.9 +--- configure.ac
    2.10 ++++ configure.ac
    2.11 +@@ -382,6 +382,10 @@
    2.12 + 	AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux)
    2.13 + fi
    2.14 + 
    2.15 ++if test "$FOUND_OS" = "linux"; then
    2.16 ++    AC_CHECK_HEADERS(linux/videodev2.h)
    2.17 ++fi
    2.18 ++
    2.19 + #---------------------------------------------------------------------------------------------
    2.20 + 
    2.21 + dnl ---------------------------------------------------------------------
    2.22 +--- utils/linux/capture/capture.h
    2.23 ++++ utils/linux/capture/capture.h
    2.24 +@@ -33,7 +33,11 @@
    2.25 + #ifdef HAVE_SYS_VIDEODEV2_H
    2.26 + #   include <sys/videodev2.h>
    2.27 + #else
    2.28 +-#   include <linux/videodev.h>
    2.29 ++	#ifdef HAVE_LINUX_VIDEODEV2_H
    2.30 ++		#include <linux/videodev2.h>
    2.31 ++	#else
    2.32 ++		#include <linux/videodev.h>
    2.33 ++	#endif
    2.34 + #endif
    2.35 + 
    2.36 + #include "grab-ng.h"