Add v4l2 compatibilty #363201. Build amsnplus/snapshot from source instead of installing the shipped 32-bit binary and add imlib dep required to build it.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

5 files changed, 154 insertions, 6 deletions

diff --git a/net-im/amsn/ChangeLog b/net-im/amsn/ChangeLog
index 2880de7fd3ec..e93cdcc08e5d 100644
--- a/net-im/amsn/ChangeLog
+++ b/net-im/amsn/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/amsn
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.103 2011/04/04 14:46:21 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/ChangeLog,v 1.104 2011/04/28 15:42:27 signals Exp $
+
+*amsn-0.98.4-r1 (28 Apr 2011)
+
+  28 Apr 2011; Kevin McCarthy <signals@gentoo.org> +amsn-0.98.4-r1.ebuild,
+  +files/amsn-0.98.4-amsnplus-ldflags.patch, +files/amsn-0.98.4-v4l2.patch:
+  Add v4l2 compatibilty #363201. Build amsnplus/snapshot from source instead of
+  installing the shipped 32-bit binary and add imlib dep required to build it.
 
   04 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> -amsn-0.97.2.ebuild,
   -amsn-0.97.2-r1.ebuild, -amsn-0.98.1.ebuild, -amsn-0.98.1-r1.ebuild,
diff --git a/net-im/amsn/Manifest b/net-im/amsn/Manifest
index da6968f4b9e6..203af19178cc 100644
--- a/net-im/amsn/Manifest
+++ b/net-im/amsn/Manifest
@@ -1,20 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX amsn-0.97.2-TkCximage.patch 3451 RMD160 ecb50e3e98e8c0142c12a11be2345069286fbbba SHA1 be3c392d856ff7150f437c6419a6dd63f40e92dc SHA256 51b02012d51ad981d307f8b816aa783214a9b7811198136ef0fc1bd68ed5a8fc
 AUX amsn-0.97.2-http-fix.patch 771 RMD160 10eb6467d140e84ae8bc1726013b1630b1af78ff SHA1 12793ccdcfcaab341c515dbee991e5d4d5ce246b SHA256 9caa3e9b439f690114e4dc7609221dba3d662e857233208cc9e44009209d6b1c
 AUX amsn-0.97_rc1-nostrip.patch 281 RMD160 9276deedc6df1ea49031a11e61b171a7739703b4 SHA1 00e23dae355531073cb5317d64c1a5703b703981 SHA256 309684e00439feaee29240f59b486bbcd895bbfb057da99b1d06c6c57d98929d
 AUX amsn-0.98-noautoupdate.patch 1371 RMD160 ea2b1ca3dfda02b07be649973d273ec0eccb53a1 SHA1 6d472886ab0d9a218000f17bdcbf4fc143a37baa SHA256 e4ffbe486dd48b72e8a5fda212c76a800b760e2b9dab22c34df280cb544274af
+AUX amsn-0.98.4-amsnplus-ldflags.patch 452 RMD160 54d0f8c4cfc5b13e225d9fbd3426ad3d5a928613 SHA1 6d9dd12ec2bd2cc35f5e3effa74b00f7405f05ef SHA256 8c91329a99585153e353cfef73601b073337fc2306adeed0725fa7c1e2dccb6b
+AUX amsn-0.98.4-v4l2.patch 850 RMD160 8657bd6e05cb42ebc702e9863274a4755878bb57 SHA1 0838d1e15953cf413351c36fdfcc9e2ee88e709c SHA256 67b2e5c212ba91c5dedb4e82a14cf53ea6f1aa81dd1de879953f8378d66bbbe4
 DIST amsn-0.98.3-src.tar.bz2 13275477 RMD160 20f707062da4a5ab1eb6beec49d01dfd2ba90a99 SHA1 aa8383a11ce66352aceee27f9c291c1410b3403d SHA256 43b76da9d886fd2cdcf8a7e21c9872141228a2ad1defaca8ad537722a32e0d88
 DIST amsn-0.98.4-src.tar.bz2 13513233 RMD160 8e0c3bdde902540fe759b01978447cc60d8fbeb3 SHA1 e00761c945ad47e0b715c69f1f9f18f5a4bf287c SHA256 7aa11a7199b4cda5e814493dd160915ab4c4f96c04de2c1fe7c2fe23eeaba871
 EBUILD amsn-0.98.3.ebuild 1879 RMD160 740fc499d88e512c1a4256b349e455f0bab3c376 SHA1 16ab6050e4f31a396d0e6b67904e07745555352b SHA256 a84fa8b1a7fca24448ced62a3af7cb504221c1d0975a8b3244497bed2ffd959a
+EBUILD amsn-0.98.4-r1.ebuild 2135 RMD160 44ad02ff2976f4e1212cd265d877201d511b0bc8 SHA1 84801b01007f5ad5a1ce058c79510f835f9a5ab1 SHA256 97b44bd30e1a519dc9126d177de1721b6dc291eca0a33d8e780de6fb69ec386e
 EBUILD amsn-0.98.4.ebuild 1878 RMD160 7fe60ce2b5fe1f6851fcaf9cf75820e1327f6868 SHA1 251b1397d1a7512c28fb303eec46506472acd2de SHA256 d66257d76d87cde3d1e2ace8b313bdc226d7de2a3bca8f930b9e07bfb3c6d87b
-MISC ChangeLog 12964 RMD160 f5ad472a85cfe633a16ad0e0f65c07a7fed7e2b0 SHA1 75eeea495ffe48b7319ed2c8dcb02f59e223fc71 SHA256 643716b61b83ba715baabfdfceae5a7db254c4af2d8156f6c7bfdaa0d4f30719
+MISC ChangeLog 13304 RMD160 93c3807553ee6fc9fa172949d231f400cde5a92c SHA1 0c818c1c635999d8444c5ff1ae24f9330bc8f6c2 SHA256 1dd3da9c62f26ba6dac7dbe6b8907dd66b555914effc5fca564041de2acbf263
 MISC metadata.xml 228 RMD160 d75298dd38147e4c60991454366d6d9cc14985bb SHA1 9f2cadd0fee8f845e833c429f3e6d3a4e2a207b4 SHA256 0ca6e1352c0e4284a99ed8f0267b6835a5e33e2d8b94a08f1af6ad58fd72d942
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2Z2bkACgkQHB6c3gNBRYcbKQCdF6GhK8RrupNnEFaE/diYrMz2
-HFIAnRbTUqwC6VfPgz+c0DZu3KmfDOiJ
-=UWcq
+iQEcBAEBCAAGBQJNuYrsAAoJEMxKBLrQri3oeSsH/3MVpxarLNsWQUGxDu2aOOEa
+BvpLtB91x2yfYkP6WSr4iYFR0ZCpG5t2S7hzvM+vTsDk7KcLdoX0R+uILzUMeUoZ
+2WqdpNB5wxHtfIL5RtnO483hyAK9b1M61Z2MTp0LWV85J3RJjmXOMh88o8igqwwV
+cbjro9DFgjCzyxX3O0p2OlgcIuYzsKfIIQgqscTbVI50rUJpGYARBJY7J2tgIh3/
+WqX87Jf1aPCjLLsZsQRikEQnhjki8+FnjiosgKGNZzK8aalKF5aqyjwdcltdODPx
+/coLwjeA2R8fT4DDhGJNB7mhngGcKuQ5VvEOLHlutW60d7Ta7hWcHmjTDtu32mk=
+=hSTv
 -----END PGP SIGNATURE-----
diff --git a/net-im/amsn/amsn-0.98.4-r1.ebuild b/net-im/amsn/amsn-0.98.4-r1.ebuild
new file mode 100644
index 000000000000..93d8238468f1
--- /dev/null
+++ b/net-im/amsn/amsn-0.98.4-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/amsn/amsn-0.98.4-r1.ebuild,v 1.1 2011/04/28 15:42:27 signals Exp $
+
+EAPI=2
+
+inherit autotools eutils fdo-mime gnome2-utils
+
+MY_P=${P/_rc/RC}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="aMSN Messenger client"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${MY_P}-src.tar.bz2"
+HOMEPAGE="http://www.amsn-project.net"
+
+# The tests are interactive
+RESTRICT="test"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc -sparc ~x86"
+IUSE="debug"
+
+DEPEND=">=dev-lang/tcl-8.4
+	>=dev-lang/tk-8.4
+	virtual/jpeg
+	media-libs/libpng
+	>=dev-tcltk/snack-2.2.10
+	>=net-libs/gupnp-igd-0.1.3
+	media-libs/libv4l
+	media-libs/imlib"
+#	>=net-libs/farsight2-0.0.14
+#	>=media-libs/gstreamer-0.10.23
+#	>=media-libs/gst-plugins-base-0.10.23
+
+RDEPEND="${DEPEND}
+	>=dev-tcltk/tls-1.5
+	virtual/ffmpeg[encode]"
+#	>=media-libs/gst-plugins-good-0.10.15
+#	>=media-libs/gst-plugins-bad-0.10.13
+#	>=media-plugins/gst-plugins-ffmpeg-0.10.7
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.98-noautoupdate.patch" \
+		"${FILESDIR}"/${PN}-0.98.4-v4l2.patch \
+		"${FILESDIR}"/${PN}-0.98.4-amsnplus-ldflags.patch
+	# only portage should strip files, bug 285682
+	sed -i -e "s/LDFLAGS += -s/LDFLAGS += /" Makefile.in || die "sed failed"
+	# Ships with a 32-bit binary, we want to rebuild it
+	rm -f plugins/amsnplus/snapshot
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable debug) || die "configure script failed"
+}
+
+src_install() {
+	make -C plugins/amsnplus || die
+	make DESTDIR="${D}" install || die
+	dodoc AGREEMENT TODO README FAQ CREDITS
+
+	domenu amsn.desktop
+	sed -i -e s:.png:: "${D}/usr/share/applications/amsn.desktop"
+
+	cd desktop-icons
+	for i in *; do
+		if [ -e ${i}/msn.png ]; then
+			insinto /usr/share/icons/hicolor/${i}/apps
+			doins  ${i}/msn.png
+		fi
+	done
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	ewarn "You might have to remove ~/.amsn prior to running as user if amsn hangs on start-up."
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-im/amsn/files/amsn-0.98.4-amsnplus-ldflags.patch b/net-im/amsn/files/amsn-0.98.4-amsnplus-ldflags.patch
new file mode 100644
index 000000000000..af22be1b2131
--- /dev/null
+++ b/net-im/amsn/files/amsn-0.98.4-amsnplus-ldflags.patch
@@ -0,0 +1,16 @@
+Respect LDFLAGS, CFLAGS and CC when building amsnplus/snapshot
+
+Patch by Kevin McCarthy <signals@gentoo.org>
+
+--- plugins/amsnplus/Makefile
++++ plugins/amsnplus/Makefile
+@@ -1,6 +1,6 @@
+ snapshot:
+-	gcc snapshot.c -o snapshot `imlib-config --cflags` `imlib-config --libs`
++	$(CC) $(CFLAGS) $(LDFLAGS)  snapshot.c -o snapshot `imlib-config --cflags` `imlib-config --libs`
+ 
+ all: snapshot
+ clean:
+-	rm snapshot
+\ No newline at end of file
++	rm snapshot
diff --git a/net-im/amsn/files/amsn-0.98.4-v4l2.patch b/net-im/amsn/files/amsn-0.98.4-v4l2.patch
new file mode 100644
index 000000000000..815a6ad198c0
--- /dev/null
+++ b/net-im/amsn/files/amsn-0.98.4-v4l2.patch
@@ -0,0 +1,33 @@
+Add support for v4l2 on Linux so it can compile against modern
+kernel headers. #363201
+
+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 @@
+ #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
+ 
+ #include "grab-ng.h"