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.

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

4 files changed, 142 insertions, 1 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/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"