Fix building with USE="v4l2" and linux-headers-2.6.38. Remove USE="v4l ieee1394" wrt #290062, #359595 and #367085.

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

3 files changed, 174 insertions, 7 deletions

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index fd1ce6fbe282..b34c97d91b3e 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.157 2011/02/11 18:50:02 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.158 2011/08/07 10:30:12 ssuominen Exp $
+
+*pwlib-1.10.10-r3 (07 Aug 2011)
+
+  07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> +pwlib-1.10.10-r3.ebuild:
+  Fix building with USE="v4l2" and linux-headers-2.6.38. Remove USE="v4l
+  ieee1394" wrt #290062, #359595 and #367085.
 
   11 Feb 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   As talked with the rest of the team, none of us is willing to maintain this.
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index 01148eec324a..62b7db5f3e41 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX pwlib-1.10.1-vsprintf.patch 405 RMD160 83d78ae27b7813ca7fb82c9fb46ff90d8feff911 SHA1 94de3a7a19482a8cda6844e72a19b6738ae3987c SHA256 1bc01ffe75840552d115737a7b68a35e9e02cc88518e82eff127c57c50155d14
 AUX pwlib-1.10.10-openssl-1.patch 420 RMD160 6c6576dc19b09980d45d814854bf349de2846357 SHA1 d1f996016d3b94277b1a3632d7ea7e7c8996871c SHA256 d54e2a9b1671597379540dd4018f26624fceab0baab2e580dd28c7fa1812ca02
@@ -8,12 +8,13 @@ AUX pwlib-1.8.7-instplugins.diff 1044 RMD160 722bc5e665f787e14f9d0e54679c8ba3fcc
 AUX pwlib-1.9.3-sdl-configure.patch 1403 RMD160 240822a74944a5f54f147023b50966c72a232f24 SHA1 4d65a4a4c0663ac3c8a281ad6bfbe06a86727f1c SHA256 467c44ad1d8d2c6f76e712e908476d3a1f948d5e3b1412546f1fb0b776068052
 DIST pwlib-1.10.10.tar.gz 2266255 RMD160 b9e2f3f79911c377dc2d2fbef62d3628aa8364f7 SHA1 ebadd7403695c73fae69488a50a34d15763fd245 SHA256 90a04544e1a6eb4957f92f4845c94950ec3612e0378d1e281c3607548f5092f6
 EBUILD pwlib-1.10.10-r2.ebuild 4649 RMD160 b4dda3d8f8bc8f2dee43e254057625e81a3e1ef1 SHA1 6b07d18e7740a6414f1f80d6eac68207ef66806f SHA256 825caa4be37741d5ea0fb7667649e7b36ee090f086937af0c8a6db223ac37c73
-MISC ChangeLog 23021 RMD160 b3fb30a0036e59948bd2bdf8cbdd65534b9b80f4 SHA1 4a13a966b11acad37971984c713281fb4f8b8a82 SHA256 aa6c7e8c6a6b4edd7370dc0d08771e46c4d60633ce8ee031957413833d61b643
+EBUILD pwlib-1.10.10-r3.ebuild 4675 RMD160 da911fcab57a0a7d7c40536762f9e4b330943dc7 SHA1 a7c71a8bc1593b408d985196b088812e23bbfdaa SHA256 0f575606ef21f2d5d456af5d6edfed47d69116d6d8e7b914e692bd431b626c83
+MISC ChangeLog 23258 RMD160 f1adc127a9cea49964857b212f8f9d54c73c904b SHA1 8362dd0ebdc9d024b7bad4a85bdaac05e6c23845 SHA256 90bd366783fd5a42ecdbface28e7c1125502d81877b7bc18b8ba3eb7d7bbf2cc
 MISC metadata.xml 159 RMD160 1cb780cd4240aaeb1b22a09a786b8ed4b0803823 SHA1 c96c65dcb37a559953bf3446b6719b0cac3585a8 SHA256 6831e631b05a25ddae6c3e148d49b98877ee1dd318185a0c95f3cad8a89bf34d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1VhN8ACgkQCaWpQKGI+9SFswCeMh2jB3K7UUkqEGaZbAjETdUV
-ylwAmgLFmTpDGNRmIMYkSdZ705RLUVPK
-=dHez
+iF4EAREIAAYFAk4+aG8ACgkQXkR9YqOcLPHDGQD+IbvjH51nsoe0R91SHdYEmfrt
+N+16Xxfsh8bIC/J8H3EA/2X+BliTB7AYT+jYI+aMWm0eH503awVt/KVF5M7IBKl2
+=9WVc
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild b/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild
new file mode 100644
index 000000000000..eac51e16b45f
--- /dev/null
+++ b/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild,v 1.1 2011/08/07 10:30:12 ssuominen Exp $
+
+EAPI="1"
+
+inherit eutils flag-o-matic multilib autotools toolchain-funcs
+
+IUSE="alsa debug ipv6 ldap oss sasl sdl ssl v4l2 xml"
+
+DESCRIPTION="Portable Multiplatform Class Libraries used by several VoIP applications"
+HOMEPAGE="http://www.ekiga.org"
+SRC_URI="http://www.ekiga.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	ldap? ( >=net-nds/openldap-2.3.35 )
+	sasl? ( dev-libs/cyrus-sasl )
+	sdl? ( media-libs/libsdl )
+	ssl? ( dev-libs/openssl )
+	xml? ( dev-libs/expat )"
+DEPEND="${RDEPEND}
+	>=sys-devel/bison-1.28
+	>=sys-devel/flex-2.5.4a
+	>=sys-apps/sed-4"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# use videodev2.h in v4l2 headers
+	sed -i -e 's:videodev.h:videodev2.h:' \
+		plugins/vidinput_v4l2/vidinput_v4l2.h \
+		include/ptlib/unix/ptlib/videoio.h || die
+
+	# filter out -O3, -Os and -mcpu embedded compiler flags
+	sed -i \
+		-e "s:-mcpu=\$(CPUTYPE)::" \
+		-e "s:-O3 -DNDEBUG:-DNDEBUG:" \
+		-e "s:-Os::" \
+		make/unix.mak
+
+	# don't break make install if there are no plugins to install
+	epatch "${FILESDIR}"/pwlib-1.8.7-instplugins.diff
+
+	# use sdl-config to query required libraries
+	epatch "${FILESDIR}"/pwlib-1.9.3-sdl-configure.patch
+
+	# this patch fixes bugs: #145424 and #140358
+	epatch "${FILESDIR}"/${PN}-1.10.2-asm.patch
+
+	# security - we obviousl need to patch..
+	epatch "${FILESDIR}"/pwlib-1.10.1-vsprintf.patch
+
+	epatch "${FILESDIR}"/${P}-openssl-1.patch
+
+	eautoconf
+}
+
+src_compile() {
+	tc-export CC CXX
+	local myconf=""
+	# may cause ICE (bug #70638)
+	filter-flags -fstack-protector
+	# disable-alsa breaks oss, see bug 127677
+	use alsa && myconf="--enable-alsa"
+
+	# disabling avc, bug 272848 and dc, bug 367085
+	econf \
+		--enable-plugins \
+		--disable-avc \
+		$(use_enable v4l2) \
+		--disable-v4l \
+		--disable-dc \
+		$(use_enable oss) \
+		$(use_enable ipv6) \
+		$(use_enable sdl) \
+		$(use_enable ssl openssl) \
+		$(use_enable debug exceptions) \
+		$(use_enable debug memcheck) \
+		$(use_enable ldap openldap) \
+		$(use_enable sasl) \
+		$(use_enable xml expat) \
+		${myconf}
+
+	# Horrible hack to strip out -L/usr/lib to allow upgrades
+	# problem is it adds -L/usr/lib before -L${S} when SSL is
+	# enabled.  Same thing for -I/usr/include.
+#	sed -i  -e "s:^\(LDFLAGS.*\)-L/usr/lib:\1:" \
+#		-e "s:^\(STDCCFLAGS.*\)-I/usr/include:\1:" \
+#		${S}/make/ptbuildopts.mak
+
+#	sed -i  -e "s:^\(LDFLAGS[\s]*=.*\) -L/usr/lib:\1:" \
+#		-e "s:^\(LDFLAGS[\s]*=.*\) -I/usr/include:\1:" \
+#		-e "s:^\(CCFLAGS[\s]*=.*\) -I/usr/include:\1:" \
+#		${S}/make/ptlib-config
+
+	emake -j1 opt || die "make failed"
+}
+
+src_install() {
+	local libdir libname
+
+	libdir=$(get_libdir)
+
+	# makefile doesn't create ${D}/usr/bin
+	make PREFIX=/usr DESTDIR="${D}" install || die "install failed"
+
+	## vv will try to fix the mess below, requires a lot of patching though...
+
+	# update 2005/08/22:
+	#
+	# locations in *.mak files haven been fixed
+	# directories have been replaced w/ symlinks
+	# (left to not break things, doing some testing atm)
+
+	# Note: reactivating this seems to be the only easy solution to slot pwlib ebuild
+	#       and keep applications happy (e.g. gnomemeeting / ekiga)
+
+#	dosym /usr/include /usr/share/pwlib/include
+#	dosym /usr/${libdir} /usr/share/pwlib/${libdir}
+#
+#	# just in case...
+#	if [[ "${libdir}" = "lib64" ]]; then
+#		dosym /usr/share/pwlib/lib64 /usr/share/pwlib/lib
+#	fi
+
+	## ^^ bad stuff
+
+	# fix symlink
+	libname=$(basename "`ls "${D}"/usr/${libdir}/libpt_*_*_r.so.${PV}`")
+	rm "${D}"/usr/${libdir}/libpt.so
+	dosym ${libname} /usr/${libdir}/libpt.so
+
+	# fix makefiles to use headers from /usr/include and libs from /usr/lib
+	# instead of /usr/share/pwlib
+	# Note: change to /usr/include/pwlib-${PV} (or whereever includes will be)
+	#       once pwlib ebuilds get slotted
+	sed -i  -e "s:-I\$(PWLIBDIR)\(/include[a-zA-Z0-9_/-]\+\):-I/usr/include\1:g" \
+		-e "s:-I\$(PWLIBDIR)/include::g" \
+		-e "s:^\(PW_LIBDIR[ \t]\+=\).*:\1 /usr/${libdir}:" \
+		"${D}"/usr/share/pwlib/make/*.mak
+
+	# dodgy configure/makefiles forget to expand this
+	# Note: change to /usr/share/pwlib/${PV} (or whatever PWLIBDIR should point to)
+	#       once pwlib ebuilds get slotted
+	sed -i -e "s:\${exec_prefix}:/usr:" \
+		"${D}"/usr/bin/ptlib-config \
+		"${D}"/usr/share/pwlib/make/ptlib-config
+
+	# copy version.h
+	insinto /usr/share/pwlib
+	doins version.h
+
+	dodoc ReadMe.txt ReadMe_QOS.txt History.txt
+	dohtml mpl-1.0.htm
+}