Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bd924b86ed89fa42d063680e55600b3e83e2a55c
commit bd924b86ed89fa42d063680e55600b3e83e2a55c
Author: Pingax <pin...@frugalware.org>
Date: Fri Feb 15 19:15:05 2013 +0100
amsn-0.98.9-3-i686
* Use another patch to fix v4l build
diff --git a/source/xapps-extra/amsn/FrugalBuild
b/source/xapps-extra/amsn/FrugalBuild
index 1215cb2..014b8b7 100644
--- a/source/xapps-extra/amsn/FrugalBuild
+++ b/source/xapps-extra/amsn/FrugalBuild
@@ -3,21 +3,21 @@
pkgname=amsn
pkgver=0.98.9
-pkgrel=2
+pkgrel=3
pkgdesc="aMSN is a great messenger client"
depends=('libice>=1.0.5-1' 'libjpeg>=8a' 'libx11>=1.2.1-1' \
'libsm>=1.1.0-1' 'libstdc++' 'libpng>=1.4.1' 'tk>=8.5.7-2' \
- 'libv4l')
+ 'libv4l' 'farstream')
rodepends=('tls')
groups=('xapps-extra')
archs=('i686' 'x86_64')
options=('force')
_F_sourceforge_ext='-src.tar.bz2'
Finclude sourceforge
-source=("${source[@]}" amsn.patch chrpath.patch)
+source=("${source[@]}" amsn.patch v4l2.patch)
sha1sums=('3c389dacb33d96b6e7a0edf218319f5384b69ee3' \
'97a871735cefde7e7d8bdc575ed91bb2700c7f4d' \
- 'a2035a197931fd4a0086d3ae9c54971a4a3cb9b3')
+ 'beae36381fe897ea73a562f57382ec461ada5134')
conflicts=('amsn-plugin-actionsmenu' \
'amsn-plugin-amsnplus' \
diff --git a/source/xapps-extra/amsn/v4l2.patch
b/source/xapps-extra/amsn/v4l2.patch
new file mode 100644
index 0000000..c6eeabe
--- /dev/null
+++ b/source/xapps-extra/amsn/v4l2.patch
@@ -0,0 +1,44 @@
+--- 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
+
++if test "$FOUND_OS" = "linux"; then
++ AC_CHECK_HEADERS(linux/videodev2.h)
++fi
++
+
#---------------------------------------------------------------------------------------------
+
+ dnl ---------------------------------------------------------------------
+--- 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
+-# include <linux/videodev.h>
++ #ifdef HAVE_LINUX_VIDEODEV2_H
++ #include <linux/videodev2.h>
++ #else
++ #include <linux/videodev.h>
++ #endif
+ #endif
+ */
+
+--- 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)
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
