public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in dev-libs/pwlib: ChangeLog pwlib-1.10.10-r3.ebuild
@ 2011-08-07 10:30 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-08-07 10:30 UTC (permalink / raw
  To: gentoo-commits

ssuominen    11/08/07 10:30:13

  Modified:             ChangeLog
  Added:                pwlib-1.10.10-r3.ebuild
  Log:
  Fix building with USE="v4l2" and linux-headers-2.6.38. Remove USE="v4l ieee1394" wrt #290062, #359595 and #367085.
  
  (Portage version: 2.2.0_alpha47/cvs/Linux x86_64)

Revision  Changes    Path
1.158                dev-libs/pwlib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/ChangeLog?rev=1.158&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/ChangeLog?rev=1.158&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/ChangeLog?r1=1.157&r2=1.158

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v
retrieving revision 1.157
retrieving revision 1.158
diff -u -r1.157 -r1.158
--- ChangeLog	11 Feb 2011 18:50:02 -0000	1.157
+++ ChangeLog	7 Aug 2011 10:30:12 -0000	1.158
@@ -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.



1.1                  dev-libs/pwlib/pwlib-1.10.10-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild?rev=1.1&content-type=text/plain

Index: pwlib-1.10.10-r3.ebuild
===================================================================
# 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
}






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-libs/pwlib: ChangeLog pwlib-1.10.10-r3.ebuild
@ 2011-09-13 18:21 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-09-13 18:21 UTC (permalink / raw
  To: gentoo-commits

ssuominen    11/09/13 18:21:08

  Modified:             ChangeLog pwlib-1.10.10-r3.ebuild
  Log:
  Stabilize for everyone.
  
  (Portage version: 2.2.0_alpha55/cvs/Linux x86_64)

Revision  Changes    Path
1.159                dev-libs/pwlib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/ChangeLog?rev=1.159&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/ChangeLog?rev=1.159&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/ChangeLog?r1=1.158&r2=1.159

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- ChangeLog	7 Aug 2011 10:30:12 -0000	1.158
+++ ChangeLog	13 Sep 2011 18:21:07 -0000	1.159
@@ -1,6 +1,9 @@
 # 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.158 2011/08/07 10:30:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.159 2011/09/13 18:21:07 ssuominen Exp $
+
+  13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> pwlib-1.10.10-r3.ebuild:
+  Stabilize for everyone.
 
 *pwlib-1.10.10-r3 (07 Aug 2011)
 



1.2                  dev-libs/pwlib/pwlib-1.10.10-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild?r1=1.1&r2=1.2

Index: pwlib-1.10.10-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pwlib-1.10.10-r3.ebuild	7 Aug 2011 10:30:12 -0000	1.1
+++ pwlib-1.10.10-r3.ebuild	13 Sep 2011 18:21:07 -0000	1.2
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild,v 1.2 2011/09/13 18:21:07 ssuominen Exp $
 
 EAPI="1"
 
@@ -14,7 +14,7 @@
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	ldap? ( >=net-nds/openldap-2.3.35 )






^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in dev-libs/pwlib: ChangeLog pwlib-1.10.10-r3.ebuild
@ 2011-10-31 16:35 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 3+ messages in thread
From: Samuli Suominen (ssuominen) @ 2011-10-31 16:35 UTC (permalink / raw
  To: gentoo-commits

ssuominen    11/10/31 16:35:33

  Modified:             ChangeLog pwlib-1.10.10-r3.ebuild
  Log:
  Rename USE="v4l2" to USE="v4l" wrt #385241
  
  (Portage version: 2.2.0_alpha71_p73/cvs/Linux x86_64)

Revision  Changes    Path
1.161                dev-libs/pwlib/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/ChangeLog?rev=1.161&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/ChangeLog?rev=1.161&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/ChangeLog?r1=1.160&r2=1.161

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- ChangeLog	13 Sep 2011 18:21:57 -0000	1.160
+++ ChangeLog	31 Oct 2011 16:35:33 -0000	1.161
@@ -1,9 +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.160 2011/09/13 18:21:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/ChangeLog,v 1.161 2011/10/31 16:35:33 ssuominen Exp $
+
+  31 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> pwlib-1.10.10-r3.ebuild:
+  Rename USE="v4l2" to USE="v4l" wrt #385241
 
   13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> -pwlib-1.10.10-r2.ebuild:
-  [This is a placeholder. Please ignore.]
+  old
 
   13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> pwlib-1.10.10-r3.ebuild:
   Stabilize for everyone.



1.3                  dev-libs/pwlib/pwlib-1.10.10-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild?r1=1.2&r2=1.3

Index: pwlib-1.10.10-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pwlib-1.10.10-r3.ebuild	13 Sep 2011 18:21:07 -0000	1.2
+++ pwlib-1.10.10-r3.ebuild	31 Oct 2011 16:35:33 -0000	1.3
@@ -1,12 +1,12 @@
 # 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.2 2011/09/13 18:21:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.10.10-r3.ebuild,v 1.3 2011/10/31 16:35:33 ssuominen Exp $
 
 EAPI="1"
 
 inherit eutils flag-o-matic multilib autotools toolchain-funcs
 
-IUSE="alsa debug ipv6 ldap oss sasl sdl ssl v4l2 xml"
+IUSE="alsa debug ipv6 ldap oss sasl sdl ssl v4l xml"
 
 DESCRIPTION="Portable Multiplatform Class Libraries used by several VoIP applications"
 HOMEPAGE="http://www.ekiga.org"
@@ -72,7 +72,7 @@
 	econf \
 		--enable-plugins \
 		--disable-avc \
-		$(use_enable v4l2) \
+		$(use_enable v4l v4l2) \
 		--disable-v4l \
 		--disable-dc \
 		$(use_enable oss) \






^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2011-10-31 16:35 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-13 18:21 [gentoo-commits] gentoo-x86 commit in dev-libs/pwlib: ChangeLog pwlib-1.10.10-r3.ebuild Samuli Suominen (ssuominen)
  -- strict thread matches above, loose matches on Subject: below --
2011-10-31 16:35 Samuli Suominen (ssuominen)
2011-08-07 10:30 Samuli Suominen (ssuominen)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox