# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1341438080 0
# Node ID 8eb47864172872c9f4374f931349cea55230eb20
# Parent  c3333f6132043dd03274172eac1261a32aa7832c
amsn: Update deps and add patch to fix build.

diff -r c3333f613204 -r 8eb478641728 amsn/receipt
--- a/amsn/receipt	Wed Jul 04 21:29:42 2012 +0000
+++ b/amsn/receipt	Wed Jul 04 21:41:20 2012 +0000
@@ -10,17 +10,18 @@
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
 TAGS="chat messenger im"
 
-DEPENDS="tk tls jpeg xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
+DEPENDS="tk glib tls jpeg xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \
 xorg-libXdmcp xorg-libXss zlib libpng libv4l gcc-lib-base"
-BUILD_DEPENDS="tcl-dev tk-dev jpeg-dev xorg-libICE-dev xorg-libSM-dev \
-xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXss-dev zlib-dev \
-libpng-dev libv4l-dev autoconf automake"
+BUILD_DEPENDS="tls glib-dev tcl-dev tk-dev jpeg-dev xorg-libICE-dev \
+xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev \
+xorg-libXss-dev zlib-dev libpng-dev libv4l-dev autoconf automake"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
 	patch -Np0 -i $stuff/$PACKAGE-v4l2.patch
+	patch -Np0 -i $stuff/$PACKAGE-0.98.9-no-rebuild-on-install.patch
 	./configure --prefix=/usr \
 	 --with-tcl=/usr/lib $CONFIGURE_ARGS && \
 	make && \
diff -r c3333f613204 -r 8eb478641728 amsn/stuff/amsn-0.98.9-no-rebuild-on-install.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/amsn/stuff/amsn-0.98.9-no-rebuild-on-install.patch	Wed Jul 04 21:41:20 2012 +0000
@@ -0,0 +1,22 @@
+--- Makefile.in	2012/05/18 19:28:05	12371
++++ Makefile.in	2012/05/28 19:41:51	12400
+@@ -259,7 +259,9 @@
+ 
+ 	ln -sf $(dstdir)/$(PACKAGE)/desktop-icons/48x48/apps/amsn.png $(DESTDIR)$(dstdir)/pixmaps/
+ 
+-install_libs:: rebuild_libs do_install_libs
++install_libs:: clean_libs
++	$(MAKE) rebuild_libs
++	$(MAKE) do_install_libs
+ 
+ do_install_libs:: $(LIBS_TO_INSTALL)
+ 	rm -Rf $(DESTDIR)$(libdir)/$(PACKAGE)
+@@ -276,7 +278,7 @@
+ 
+ rebuild_libs: RPATH+=$(libdir)/$(PACKAGE)
+ rebuild_libs: LIBDIR=$(libdir)/$(PACKAGE)
+-rebuild_libs: clean_libs $(LIBS_WITH_RPATH)
++rebuild_libs: $(LIBS_WITH_RPATH)
+ 
+ uninstall::
+ 	rm -Rf $(dstdir)/$(PACKAGE)
diff -r c3333f613204 -r 8eb478641728 amsn/stuff/amsn-v4l2.patch
--- a/amsn/stuff/amsn-v4l2.patch	Wed Jul 04 21:29:42 2012 +0000
+++ b/amsn/stuff/amsn-v4l2.patch	Wed Jul 04 21:41:20 2012 +0000
@@ -1,24 +1,19 @@
-Add support for v4l2 on Linux so it can compile against modern
-kernel headers. #363201
+--- configure.ac	2012-05-23 21:21:14.000000000 +0200
++++ configure.ac	2012-06-02 12:29:24.836921683 +0200
+@@ -378,6 +378,10 @@
+	AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux)
+ fi
 
-Patch by Kevin McCarthy <signals@gentoo.org>
-
---- configure.ac
-+++ configure.ac
-@@ -382,6 +382,10 @@
- 	AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux)
- fi
- 
 +if test "$FOUND_OS" = "linux"; then
 +    AC_CHECK_HEADERS(linux/videodev2.h)
 +fi
 +
  #---------------------------------------------------------------------------------------------
- 
+
  dnl ---------------------------------------------------------------------
---- utils/linux/capture/capture.h
-+++ utils/linux/capture/capture.h
-@@ -33,7 +33,11 @@
+--- utils/linux/capture/capture.h	2011-04-12 02:20:59.000000000 +0200
++++ utils/linux/capture/capture.h	2012-06-02 12:29:24.836921683 +0200
+@@ -34,7 +34,11 @@
  #ifdef HAVE_SYS_VIDEODEV2_H
  #   include <sys/videodev2.h>
  #else
@@ -29,5 +24,20 @@
 +		#include <linux/videodev.h>
 +	#endif
  #endif
- 
- #include "grab-ng.h"
+ */
+
+--- utils/linux/capture/libng/plugins/Rules.mk	2012-05-18 17:31:32.000000000 +0200
++++ utils/linux/capture/libng/plugins/Rules.mk	2012-06-02 12:51:59.523065502 +0200
+@@ -2,6 +2,13 @@
+ TARGETS-plugins := $(capture_dir)/libng/plugins/conv-mjpeg.so
+ TARGETS-plugins += $(patsubst %,$(capture_dir)/libng/plugins/%.so,${LIBNG_PLUGINS})
+
++plugin_link_so         = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(capture_dir)/capture.so $(SHARED) -o $@
++ifeq ($(verbose),no)
++  echo_plugin_link_so          = echo "  LDP    " $@
++else
++  echo_plugin_link_so          = echo $(plugin_link_so)
++endif
++
+ # global targets
+ all:: $(TARGETS-plugins)