From 23f45cf7e8e3846a214d343f295fbf02bed0e473 Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <drizzt@gentoo.org>
Date: Wed, 8 Nov 2006 23:41:07 +0000
Subject: [PATCH] Revbump. Fixed bug 140358 and bug 145424, thanks to "Danny
 van Dyk" for the patch.

Package-Manager: portage-2.1.2_rc1-r1
---
 dev-libs/pwlib/ChangeLog                    |   9 +-
 dev-libs/pwlib/Manifest                     |  25 +++-
 dev-libs/pwlib/files/digest-pwlib-1.10.2-r1 |   3 +
 dev-libs/pwlib/files/pwlib-1.10.2-asm.patch |  24 +++
 dev-libs/pwlib/pwlib-1.10.2-r1.ebuild       | 155 ++++++++++++++++++++
 5 files changed, 208 insertions(+), 8 deletions(-)
 create mode 100644 dev-libs/pwlib/files/digest-pwlib-1.10.2-r1
 create mode 100644 dev-libs/pwlib/files/pwlib-1.10.2-asm.patch
 create mode 100644 dev-libs/pwlib/pwlib-1.10.2-r1.ebuild

diff --git a/dev-libs/pwlib/ChangeLog b/dev-libs/pwlib/ChangeLog
index e663b2c5800d..d85e9ecbb91e 100644
--- a/dev-libs/pwlib/ChangeLog
+++ b/dev-libs/pwlib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/pwlib
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.110 2006/11/08 22:54:54 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.111 2006/11/08 23:41:07 drizzt Exp $
+
+*pwlib-1.10.2-r1 (08 Nov 2006)
+
+  08 Nov 2006; Timothy Redaelli <drizzt@gentoo.org>
+  +files/pwlib-1.10.2-asm.patch, +pwlib-1.10.2-r1.ebuild:
+  Revbump.
+  Fixed bug 140358 and bug 145424, thanks to "Danny van Dyk" for the patch.
 
   08 Nov 2006; Timothy Redaelli <drizzt@gentoo.org> pwlib-1.10.2.ebuild:
   Removed blocker to libdc1394>1.9.9 to fix bug #140283 (Thanks to Tomas Cohen
diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest
index 62c2080dd25c..b67a5920cf08 100644
--- a/dev-libs/pwlib/Manifest
+++ b/dev-libs/pwlib/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pwlib-1.10.2-asm.patch 986 RMD160 9884754a5d29c34c9b030f95c528c67c41ea3eb5 SHA1 d3ea2aaca29edc3c0861cafbad1db0a4bab80d16 SHA256 52099f9eba393af85ceac985ad284b20bfa052a39219607bb51d7e169c240dc2
+MD5 c39dc45921e068678b7b223839457aa7 files/pwlib-1.10.2-asm.patch 986
+RMD160 9884754a5d29c34c9b030f95c528c67c41ea3eb5 files/pwlib-1.10.2-asm.patch 986
+SHA256 52099f9eba393af85ceac985ad284b20bfa052a39219607bb51d7e169c240dc2 files/pwlib-1.10.2-asm.patch 986
 AUX pwlib-1.6.3-dyn-esd.patch 366 RMD160 1afe15d6578da7de00293edc4818b54fc1ca5540 SHA1 ba9177add96a9903646503bae739cf01cbc49d4f SHA256 1c84ea308fcaa1d38d348dd79ed936034a7528368285982e7101ba0b79ff94b9
 MD5 94fe183a68413eaeb8242cd30532d963 files/pwlib-1.6.3-dyn-esd.patch 366
 RMD160 1afe15d6578da7de00293edc4818b54fc1ca5540 files/pwlib-1.6.3-dyn-esd.patch 366
@@ -49,6 +53,10 @@ EBUILD pwlib-1.10.1.ebuild 4476 RMD160 8657a925df592ce23c7ab26c496b6704b5edabad
 MD5 981fc04ef22e3ce6385ed4bb463d0d2a pwlib-1.10.1.ebuild 4476
 RMD160 8657a925df592ce23c7ab26c496b6704b5edabad pwlib-1.10.1.ebuild 4476
 SHA256 843de81b8f50f0be28a2e107f37438741c978805d91c9e97674019a3e5ba1ec0 pwlib-1.10.1.ebuild 4476
+EBUILD pwlib-1.10.2-r1.ebuild 4541 RMD160 f9a2a79acf6d463a5276b681bcbcc0a6b4266366 SHA1 5693bfd954979d5d5acc86cab2ec3b804a97c185 SHA256 2169f40fa3922be7a4f53f3a081041ed6f30258a4da07f8ea1dbb49149b98dbd
+MD5 a946187f097a2bb551a47140cf1915cf pwlib-1.10.2-r1.ebuild 4541
+RMD160 f9a2a79acf6d463a5276b681bcbcc0a6b4266366 pwlib-1.10.2-r1.ebuild 4541
+SHA256 2169f40fa3922be7a4f53f3a081041ed6f30258a4da07f8ea1dbb49149b98dbd pwlib-1.10.2-r1.ebuild 4541
 EBUILD pwlib-1.10.2.ebuild 4456 RMD160 fc0d573cb2b56640e675b3008021080cd36557b2 SHA1 88302b887cd5c731cb8026781ff3b9e93f16a5f1 SHA256 0c4a7edbcd967c03b65f7652ca05ed069822836b3f3c4a737be8091673324d8c
 MD5 8d25095e317ee96692c1479f5abaf5c7 pwlib-1.10.2.ebuild 4456
 RMD160 fc0d573cb2b56640e675b3008021080cd36557b2 pwlib-1.10.2.ebuild 4456
@@ -73,10 +81,10 @@ EBUILD pwlib-1.8.7.ebuild 4227 RMD160 269a4562b172061bae69b9d8d4d9f91504dd8aa4 S
 MD5 972beed85f1d3fca3d08d31a77a7c158 pwlib-1.8.7.ebuild 4227
 RMD160 269a4562b172061bae69b9d8d4d9f91504dd8aa4 pwlib-1.8.7.ebuild 4227
 SHA256 5645f6e21003d7a267c3e80f8e9e29021a8cfb1fd71fb87ea07bc41800aad3e1 pwlib-1.8.7.ebuild 4227
-MISC ChangeLog 17172 RMD160 d8d8fa4ea95b11bfad9c614d2140d6962fff42f9 SHA1 2eb57bc2284b622e7870f2735205673d345b5204 SHA256 82cb6904b4fd5a87f830542070a002dfa6d2e7ec0a12ba244623e50e704c39c8
-MD5 8f3a0a8525df101173be726b2656b69b ChangeLog 17172
-RMD160 d8d8fa4ea95b11bfad9c614d2140d6962fff42f9 ChangeLog 17172
-SHA256 82cb6904b4fd5a87f830542070a002dfa6d2e7ec0a12ba244623e50e704c39c8 ChangeLog 17172
+MISC ChangeLog 17402 RMD160 f5cb608507503df24f4f574fc070c4137efad993 SHA1 4231470887fb11e85942114123bc28f045d796f5 SHA256 e257b687a0d5b0cea78bf3f34c20b69663ab410f2b4aa13cdae0de5dc7ba7f2f
+MD5 d972862ade75fa0a95b286154f40da45 ChangeLog 17402
+RMD160 f5cb608507503df24f4f574fc070c4137efad993 ChangeLog 17402
+SHA256 e257b687a0d5b0cea78bf3f34c20b69663ab410f2b4aa13cdae0de5dc7ba7f2f ChangeLog 17402
 MISC metadata.xml 235 RMD160 1373a565e08a962328dc14bb2ccd2ed31f887a91 SHA1 be1055e9141769fc4e44c3cc9026c635aa97d8cc SHA256 6b190d921eb507c8ae01261acc24b4c26d9a7efdd79e244efda043d8d0b66756
 MD5 e7e31f6f265883cdf48d812f42a9f856 metadata.xml 235
 RMD160 1373a565e08a962328dc14bb2ccd2ed31f887a91 metadata.xml 235
@@ -90,6 +98,9 @@ SHA256 63a8de6ebd1f21855e6936af628e948143185eb8db0cb422e5691f5a691a283b files/di
 MD5 92fa0564cc1a4b24702bccb63267d039 files/digest-pwlib-1.10.2 241
 RMD160 6520f87a105b63fe7ae4a841a4c851701494af59 files/digest-pwlib-1.10.2 241
 SHA256 4c05999a32f13fdc9c6142e50af7668d3041ccad27b7f28459dc413f47381949 files/digest-pwlib-1.10.2 241
+MD5 92fa0564cc1a4b24702bccb63267d039 files/digest-pwlib-1.10.2-r1 241
+RMD160 6520f87a105b63fe7ae4a841a4c851701494af59 files/digest-pwlib-1.10.2-r1 241
+SHA256 4c05999a32f13fdc9c6142e50af7668d3041ccad27b7f28459dc413f47381949 files/digest-pwlib-1.10.2-r1 241
 MD5 e152a7da0e17cbe3bfe81b70a4317aaa files/digest-pwlib-1.6.3-r3 238
 RMD160 bf1648783e58c17f7a58df993c9d30a5445805f9 files/digest-pwlib-1.6.3-r3 238
 SHA256 96045bfb873ec80294c191733dc7cac35530674f1256554728c9e621bcc0c1af files/digest-pwlib-1.6.3-r3 238
@@ -108,7 +119,7 @@ SHA256 56d302889c4df1d12b155e947d06dd1484c7eae0b49c0838825aa1f0bc0b01e2 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFUmBIGDyatLGpTbYRAm9+AKCVKuDHlEVYtFF/atOz5zl3SjWmKQCfbG7x
-SXqV+MiuwI2dp3i94vHYZ1w=
-=JC2Q
+iD8DBQFFUmseGDyatLGpTbYRAlGhAJ9qClsjNENf2uk/Or+bmWdEF4bnYQCgnnrd
+YB3sjP2DJHFzr7wb+WlWFGA=
+=NTNU
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/pwlib/files/digest-pwlib-1.10.2-r1 b/dev-libs/pwlib/files/digest-pwlib-1.10.2-r1
new file mode 100644
index 000000000000..08b9c85b04b3
--- /dev/null
+++ b/dev-libs/pwlib/files/digest-pwlib-1.10.2-r1
@@ -0,0 +1,3 @@
+MD5 05ad5b279ed2053eb7ef0befff9166d0 pwlib-1.10.2.tar.gz 1485529
+RMD160 d0af8b73131773eb95bd89bf03e024ba861f7982 pwlib-1.10.2.tar.gz 1485529
+SHA256 a2981bee47971405098d39e9d518dcaeea84ccf9b49d46c2f8c35a84a8338e61 pwlib-1.10.2.tar.gz 1485529
diff --git a/dev-libs/pwlib/files/pwlib-1.10.2-asm.patch b/dev-libs/pwlib/files/pwlib-1.10.2-asm.patch
new file mode 100644
index 000000000000..c956db474cba
--- /dev/null
+++ b/dev-libs/pwlib/files/pwlib-1.10.2-asm.patch
@@ -0,0 +1,24 @@
+Fix inline assembly for invocation of g++ with -O0
+
+* SAR takes only an immediate or %cl as operands. Thus, %2 needs to be "c" as shift
+  can't be an immediate.
+* On x86_64 %3 will be stored in a %rXX, thus we need to widen all used registers to 64bit
+  or introduce matching suffixes for operands of different sizes. Easiest fix is to change all
+  input operands to unsigned long.
+
+Danny van Dyk <kugelfang at gentoo dot org>
+--- src/ptlib/common/jidctflt.cxx.orig	2006-03-07 21:50:28.000000000 +0100
++++ src/ptlib/common/jidctflt.cxx	2006-08-29 12:59:04.000000000 +0200
+@@ -89,10 +89,10 @@
+       "\tsar %2,%1\n"
+       "\tsub $-128,%1\n"
+       "\tcmovl %5,%1\n"	/* Use the sub to compare to 0 */
+-      "\tcmpl %4,%1\n" 
++      "\tcmp %4,%1\n" 
+       "\tcmovg %4,%1\n"
+       : "=r"(x) 
+-      : "0"(x), "Ir"(shift), "ir"(1UL<<(shift-1)), "r" (0xff), "r" (0)
++      : "0"((unsigned long)x), "c"((char)shift), "ir"(1UL<<(shift-1)), "r" (0xffUL), "r" (0UL)
+       );
+   return x;
+ }
diff --git a/dev-libs/pwlib/pwlib-1.10.2-r1.ebuild b/dev-libs/pwlib/pwlib-1.10.2-r1.ebuild
new file mode 100644
index 000000000000..ad28f244ccfc
--- /dev/null
+++ b/dev-libs/pwlib/pwlib-1.10.2-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.10.2-r1.ebuild,v 1.1 2006/11/08 23:41:07 drizzt Exp $
+
+WANT_AUTOCONF="latest"
+
+inherit eutils flag-o-matic multilib autotools
+
+IUSE="alsa debug ieee1394 ipv6 ldap oss sasl sdl ssl v4l v4l2 xml"
+
+DESCRIPTION="Portable Multiplatform Class Libraries used by several VoIP applications"
+HOMEPAGE="http://www.ekiga.org"
+SRC_URI="http://seconix.com/misc/ekiga-2.0.3/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	ieee1394? ( media-libs/libdv
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+		<media-libs/libdc1394-1.9.99 )
+	ldap? ( net-nds/openldap )
+	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}
+
+	# 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
+
+#	# fix "command not found" error during configure run
+#	epatch ${FILESDIR}/pwlib-1.9.2-ldap-configure.patch
+
+	# 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}/${P}-asm.patch
+
+	eautoconf || die "autoconf failed"
+}
+
+src_compile() {
+	local myconf=""
+	# may cause ICE (bug #70638)
+	filter-flags -fstack-protector
+	# disable-alsa breaks oss, see bug 127677
+	use alsa && myconf="--enable-alsa"
+
+	econf \
+		--enable-plugins \
+		$(use_enable v4l2) \
+		$(use_enable v4l) \
+		$(use_enable ieee1394 dc) \
+		$(use_enable ieee1394 avc) \
+		$(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} \
+		|| die "configure failed"
+
+	# 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 mpl-1.0.htm
+}
-- 
2.26.2