wok rev 13122
amsn: Update deps and add patch to fix build.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Wed Jul 04 21:41:20 2012 +0000 (2012-07-04) |
parents | c3333f613204 |
children | 66adb9443756 |
files | amsn/receipt amsn/stuff/amsn-0.98.9-no-rebuild-on-install.patch amsn/stuff/amsn-v4l2.patch |
line diff
1.1 --- a/amsn/receipt Wed Jul 04 21:29:42 2012 +0000 1.2 +++ b/amsn/receipt Wed Jul 04 21:41:20 2012 +0000 1.3 @@ -10,17 +10,18 @@ 1.4 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 1.5 TAGS="chat messenger im" 1.6 1.7 -DEPENDS="tk tls jpeg xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \ 1.8 +DEPENDS="tk glib tls jpeg xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \ 1.9 xorg-libXdmcp xorg-libXss zlib libpng libv4l gcc-lib-base" 1.10 -BUILD_DEPENDS="tcl-dev tk-dev jpeg-dev xorg-libICE-dev xorg-libSM-dev \ 1.11 -xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev xorg-libXss-dev zlib-dev \ 1.12 -libpng-dev libv4l-dev autoconf automake" 1.13 +BUILD_DEPENDS="tls glib-dev tcl-dev tk-dev jpeg-dev xorg-libICE-dev \ 1.14 +xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev xorg-libXdmcp-dev \ 1.15 +xorg-libXss-dev zlib-dev libpng-dev libv4l-dev autoconf automake" 1.16 1.17 # Rules to configure and make the package. 1.18 compile_rules() 1.19 { 1.20 cd $src 1.21 patch -Np0 -i $stuff/$PACKAGE-v4l2.patch 1.22 + patch -Np0 -i $stuff/$PACKAGE-0.98.9-no-rebuild-on-install.patch 1.23 ./configure --prefix=/usr \ 1.24 --with-tcl=/usr/lib $CONFIGURE_ARGS && \ 1.25 make && \
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/amsn/stuff/amsn-0.98.9-no-rebuild-on-install.patch Wed Jul 04 21:41:20 2012 +0000 2.3 @@ -0,0 +1,22 @@ 2.4 +--- Makefile.in 2012/05/18 19:28:05 12371 2.5 ++++ Makefile.in 2012/05/28 19:41:51 12400 2.6 +@@ -259,7 +259,9 @@ 2.7 + 2.8 + ln -sf $(dstdir)/$(PACKAGE)/desktop-icons/48x48/apps/amsn.png $(DESTDIR)$(dstdir)/pixmaps/ 2.9 + 2.10 +-install_libs:: rebuild_libs do_install_libs 2.11 ++install_libs:: clean_libs 2.12 ++ $(MAKE) rebuild_libs 2.13 ++ $(MAKE) do_install_libs 2.14 + 2.15 + do_install_libs:: $(LIBS_TO_INSTALL) 2.16 + rm -Rf $(DESTDIR)$(libdir)/$(PACKAGE) 2.17 +@@ -276,7 +278,7 @@ 2.18 + 2.19 + rebuild_libs: RPATH+=$(libdir)/$(PACKAGE) 2.20 + rebuild_libs: LIBDIR=$(libdir)/$(PACKAGE) 2.21 +-rebuild_libs: clean_libs $(LIBS_WITH_RPATH) 2.22 ++rebuild_libs: $(LIBS_WITH_RPATH) 2.23 + 2.24 + uninstall:: 2.25 + rm -Rf $(dstdir)/$(PACKAGE)
3.1 --- a/amsn/stuff/amsn-v4l2.patch Wed Jul 04 21:29:42 2012 +0000 3.2 +++ b/amsn/stuff/amsn-v4l2.patch Wed Jul 04 21:41:20 2012 +0000 3.3 @@ -1,24 +1,19 @@ 3.4 -Add support for v4l2 on Linux so it can compile against modern 3.5 -kernel headers. #363201 3.6 +--- configure.ac 2012-05-23 21:21:14.000000000 +0200 3.7 ++++ configure.ac 2012-06-02 12:29:24.836921683 +0200 3.8 +@@ -378,6 +378,10 @@ 3.9 + AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux) 3.10 + fi 3.11 3.12 -Patch by Kevin McCarthy <signals@gentoo.org> 3.13 - 3.14 ---- configure.ac 3.15 -+++ configure.ac 3.16 -@@ -382,6 +382,10 @@ 3.17 - AC_CHECK_HEADERS(sys/videodev2.h,FOUND_OS=solaris,FOUND_OS=linux) 3.18 - fi 3.19 - 3.20 +if test "$FOUND_OS" = "linux"; then 3.21 + AC_CHECK_HEADERS(linux/videodev2.h) 3.22 +fi 3.23 + 3.24 #--------------------------------------------------------------------------------------------- 3.25 - 3.26 + 3.27 dnl --------------------------------------------------------------------- 3.28 ---- utils/linux/capture/capture.h 3.29 -+++ utils/linux/capture/capture.h 3.30 -@@ -33,7 +33,11 @@ 3.31 +--- utils/linux/capture/capture.h 2011-04-12 02:20:59.000000000 +0200 3.32 ++++ utils/linux/capture/capture.h 2012-06-02 12:29:24.836921683 +0200 3.33 +@@ -34,7 +34,11 @@ 3.34 #ifdef HAVE_SYS_VIDEODEV2_H 3.35 # include <sys/videodev2.h> 3.36 #else 3.37 @@ -29,5 +24,20 @@ 3.38 + #include <linux/videodev.h> 3.39 + #endif 3.40 #endif 3.41 - 3.42 - #include "grab-ng.h" 3.43 + */ 3.44 + 3.45 +--- utils/linux/capture/libng/plugins/Rules.mk 2012-05-18 17:31:32.000000000 +0200 3.46 ++++ utils/linux/capture/libng/plugins/Rules.mk 2012-06-02 12:51:59.523065502 +0200 3.47 +@@ -2,6 +2,13 @@ 3.48 + TARGETS-plugins := $(capture_dir)/libng/plugins/conv-mjpeg.so 3.49 + TARGETS-plugins += $(patsubst %,$(capture_dir)/libng/plugins/%.so,${LIBNG_PLUGINS}) 3.50 + 3.51 ++plugin_link_so = $(CC) $(LDFLAGS) $^ $(LDLIBS) $(capture_dir)/capture.so $(SHARED) -o $@ 3.52 ++ifeq ($(verbose),no) 3.53 ++ echo_plugin_link_so = echo " LDP " $@ 3.54 ++else 3.55 ++ echo_plugin_link_so = echo $(plugin_link_so) 3.56 ++endif 3.57 ++ 3.58 + # global targets 3.59 + all:: $(TARGETS-plugins)