From 2a74fb3bb60a8595f6b8c869a5b98a2d11ee993c Mon Sep 17 00:00:00 2001 From: Stefan Knoblich Date: Thu, 16 Feb 2006 01:31:10 +0000 Subject: Version bump pwlib to 1.9.3 svn path=/trunk/; revision=135 --- dev-libs/pwlib/Manifest | 37 +++++- dev-libs/pwlib/files/digest-pwlib-1.9.3 | 3 + .../pwlib/files/pwlib-1.9.3-sdl-configure.patch | 48 +++++++ dev-libs/pwlib/pwlib-1.9.2.ebuild | 2 +- dev-libs/pwlib/pwlib-1.9.3.ebuild | 146 +++++++++++++++++++++ 5 files changed, 234 insertions(+), 2 deletions(-) create mode 100644 dev-libs/pwlib/files/digest-pwlib-1.9.3 create mode 100644 dev-libs/pwlib/files/pwlib-1.9.3-sdl-configure.patch create mode 100644 dev-libs/pwlib/pwlib-1.9.3.ebuild (limited to 'dev-libs') diff --git a/dev-libs/pwlib/Manifest b/dev-libs/pwlib/Manifest index 14c1dd7..9f278b1 100644 --- a/dev-libs/pwlib/Manifest +++ b/dev-libs/pwlib/Manifest @@ -1,13 +1,48 @@ MD5 38c8d9bfecf638ef091e5f0609bd43b9 Credits 376 +RMD160 5d4b639575a31a30a977390edc5dd9ec7566e2d5 Credits 376 +SHA256 1eafa1d2a78d9bc0dc0af22aaaac7b6369e7e055bf296b2d8ceb3425f69e82d8 Credits 376 MD5 7727b16f2fbed2161f1bc6c38aacaa36 files/digest-pwlib-1.8.4 64 +RMD160 a3b80321b4f46c23169e23b588d939dd6ee42267 files/digest-pwlib-1.8.4 64 +SHA256 ae2ae13ae6a3830f3b00d89a25de72a53506afab6da33e72f025c115aea25969 files/digest-pwlib-1.8.4 64 MD5 a874e4383164981b3881c8f636ec842b files/digest-pwlib-1.8.7 64 +RMD160 aaa29d0774f1df3f5cf8092a6a24b48318c35b75 files/digest-pwlib-1.8.7 64 +SHA256 b82851817950af6db90f71bc63811c32175016b5d6843101f9481071d623697b files/digest-pwlib-1.8.7 64 MD5 9a453a6b41e8aca4d29d93373e5e0fca files/digest-pwlib-1.9.1 69 +RMD160 9592f8c25cd6cfb6416ea03479d174f8b7d9c345 files/digest-pwlib-1.9.1 69 +SHA256 08c2d5293d0f0e059c804f8101390a76b5af09bbd63473275de4b336153aac27 files/digest-pwlib-1.9.1 69 MD5 3e5b0444209d255c7ea6715e47fdca0f files/digest-pwlib-1.9.2 64 +RMD160 baf4356f93b5ce289462905a3bf6675640e16bf0 files/digest-pwlib-1.9.2 64 +SHA256 d68ab710292d7b92c2e4d06dc06c398fb39986059ff2ace62638f6d8a3741769 files/digest-pwlib-1.9.2 64 +MD5 4418c753f33e931d75921aff783f7343 files/digest-pwlib-1.9.3 238 +RMD160 ca9679e89b2994eddb5fa57a9bccce805fd12507 files/digest-pwlib-1.9.3 238 +SHA256 b51f3e6789fda76d1d43a9ecfdb747f0e009a85999989f5005842a5d7a41d061 files/digest-pwlib-1.9.3 238 MD5 94fe183a68413eaeb8242cd30532d963 files/pwlib-1.6.3-dyn-esd.patch 366 +RMD160 1afe15d6578da7de00293edc4818b54fc1ca5540 files/pwlib-1.6.3-dyn-esd.patch 366 +SHA256 1c84ea308fcaa1d38d348dd79ed936034a7528368285982e7101ba0b79ff94b9 files/pwlib-1.6.3-dyn-esd.patch 366 MD5 cd832010589d81cab25d2523d62a3401 files/pwlib-1.8.7-instplugins.diff 1044 +RMD160 722bc5e665f787e14f9d0e54679c8ba3fcc5e7e6 files/pwlib-1.8.7-instplugins.diff 1044 +SHA256 39e0b892ae1aa82af87a92a71c8ba78a84ee18984732856ce2f228a6d4340552 files/pwlib-1.8.7-instplugins.diff 1044 MD5 da8502d5b18bd77cea009712eda82e2e files/pwlib-1.9.2-ldap-configure.patch 393 +RMD160 94a8adc05286cec6dc9443a8716137857c5f56f6 files/pwlib-1.9.2-ldap-configure.patch 393 +SHA256 5977e6538984d85b4deaca02578c81b2807432b13da2a83e9cacd48c6e29ce9e files/pwlib-1.9.2-ldap-configure.patch 393 MD5 7ed29358f47f15f2e488d2ee4dd887f2 files/pwlib-1.9.2-sdl-configure.patch 1202 +RMD160 121928dffcbbefc0d67eddc5c6f3639a8bb17ebc files/pwlib-1.9.2-sdl-configure.patch 1202 +SHA256 11f9197394fe549e104fa95c3831ecbc638778f2ee33be67f818afc25f765cb4 files/pwlib-1.9.2-sdl-configure.patch 1202 +MD5 e6f4109b8afd168be571ddc00b16707b files/pwlib-1.9.3-sdl-configure.patch 1403 +RMD160 240822a74944a5f54f147023b50966c72a232f24 files/pwlib-1.9.3-sdl-configure.patch 1403 +SHA256 467c44ad1d8d2c6f76e712e908476d3a1f948d5e3b1412546f1fb0b776068052 files/pwlib-1.9.3-sdl-configure.patch 1403 MD5 c5e8aafcba9e2996b152a154b7c4cf82 pwlib-1.8.4.ebuild 4797 +RMD160 fbd160b61717eb8cd3008c02d486592def9876ff pwlib-1.8.4.ebuild 4797 +SHA256 ca778ed36d922ccd80391ff94ac37c67c6052ddc7978b3da53d8cecb6ac45b1e pwlib-1.8.4.ebuild 4797 MD5 82886f6903aff217847b43066c8516fb pwlib-1.8.7.ebuild 4079 +RMD160 a93b95e06e1ad372e16b07ece11103fc9b2948ef pwlib-1.8.7.ebuild 4079 +SHA256 c5634b396c4d864fba8ae49f640bbbe86e4944d568a09722c0d50a92537aa2dc pwlib-1.8.7.ebuild 4079 MD5 ae3632ebd0872413284afc6c0f0e2fd7 pwlib-1.9.1.ebuild 4846 -MD5 2fc08ea65dd031cf5fbfe94b39609a8c pwlib-1.9.2.ebuild 4175 +RMD160 c954fa65384912035e17dbc295f786d9b8d8e975 pwlib-1.9.1.ebuild 4846 +SHA256 f13a1acd97f1e59db7043cdea03269913439b46b98d3334500c816cf716127c2 pwlib-1.9.1.ebuild 4846 +MD5 0a9dc88b4636b72d9c6dc84c22a4c19f pwlib-1.9.2.ebuild 4181 +RMD160 fba7130096c97a207c8125eff775ccf97d244e01 pwlib-1.9.2.ebuild 4181 +SHA256 34df73e91e0bd071a3a7573f1d3f322587431a799f30c6e62cf29e5eb55f5bcc pwlib-1.9.2.ebuild 4181 +MD5 a96bb319b8bd7e2c7db921ef1f49640d pwlib-1.9.3.ebuild 4183 +RMD160 08ea4ab49ed1f31c1fab3f5e1d03e54432f13426 pwlib-1.9.3.ebuild 4183 +SHA256 f147d69030f1894d0d0eb23205abb39ddeebec307bf8ee837397b1a22e78a50a pwlib-1.9.3.ebuild 4183 diff --git a/dev-libs/pwlib/files/digest-pwlib-1.9.3 b/dev-libs/pwlib/files/digest-pwlib-1.9.3 new file mode 100644 index 0000000..6481fba --- /dev/null +++ b/dev-libs/pwlib/files/digest-pwlib-1.9.3 @@ -0,0 +1,3 @@ +MD5 42d5e9d274bdb02b40f5e1db06307475 pwlib-1.9.3.tar.gz 1477547 +RMD160 2768829c5ba9e8f83576d7306a8f330ef4ed3c19 pwlib-1.9.3.tar.gz 1477547 +SHA256 f608eb6d2b0754b366b6ed4d42136ca3a95def98c7db3cfc706574c56a244031 pwlib-1.9.3.tar.gz 1477547 diff --git a/dev-libs/pwlib/files/pwlib-1.9.3-sdl-configure.patch b/dev-libs/pwlib/files/pwlib-1.9.3-sdl-configure.patch new file mode 100644 index 0000000..bf8f402 --- /dev/null +++ b/dev-libs/pwlib/files/pwlib-1.9.3-sdl-configure.patch @@ -0,0 +1,48 @@ +--- pwlib-1.9.3/configure.ac.orig 2006-01-31 10:23:43.000000000 +0100 ++++ pwlib-1.9.3/configure.ac 2006-02-16 00:42:27.000000000 +0100 +@@ -1476,6 +1476,7 @@ + AC_ARG_ENABLE(sdl, + [ --disable-sdl disable SDL support]) + ++ + if test "${enable_sdl}z" = "z" ; then + enable_sdl=$default_sdl + fi +@@ -1485,6 +1486,9 @@ + AC_MSG_NOTICE(SDL disabled) + AC_DEFINE(P_SDL, 0) + else ++ dnl check for sdl-config ++ AC_PATH_PROG([SDL_CONFIG], [sdl-config],, [$PATH:/usr/local/bin]) ++ + dnl SDL checks + if test "${SDLLIB:-unset}" = "unset" ; then + SDLLIB=SDL +@@ -1496,7 +1500,13 @@ + if test "${X11LIBDIR:-unset}" == "unset" ; then + X11LIBDIR=/usr/X11R6/lib + fi +- AC_CHECK_LIB(SDL, SDL_CreateYUVOverlay, HAS_SDL=1, HAS_SDL=, -L${X11LIBDIR} -lpthread -lX11 -lXext) ++ if test "x${SDL_CONFIG}" = "x" ; then ++ SDL_LIBS="-L${X11LIBDIR} -lpthread -lX11 -lXext -laa" ++ else ++ SDL_LIBS="`${SDL_CONFIG} --libs`" ++ fi ++ ++ AC_CHECK_LIB([SDL], [SDL_CreateYUVOverlay], [HAS_SDL=1], [HAS_SDL=], [$SDL_LIBS]) + fi + + dnl freeBSD SDL check +@@ -1516,7 +1526,11 @@ + if test ${SDLLIBDIR:-unset} != "unset" ; then + LDFLAGS="$LDFLAGS -L${SDLLIBDIR}" + fi +- ENDLDLIBS="$ENDLDLIBS -l${SDLLIB}" ++ if test "x${SDL_CONFIG}" = "x" ; then ++ ENDLDLIBS="$ENDLDLIBS -l${SDLLIB}" ++ else ++ ENDLDLIBS="$ENDLDLIBS `${SDL_CONFIG} --libs`" ++ fi + fi + fi + AC_SUBST(HAS_SDL) diff --git a/dev-libs/pwlib/pwlib-1.9.2.ebuild b/dev-libs/pwlib/pwlib-1.9.2.ebuild index 67518c2..6787fcf 100644 --- a/dev-libs/pwlib/pwlib-1.9.2.ebuild +++ b/dev-libs/pwlib/pwlib-1.9.2.ebuild @@ -8,7 +8,7 @@ IUSE="alsa ieee1394 ipv6 oss sdl ssl v4l v4l2" DESCRIPTION="Portable Multiplatform Class Libraries used by several VoIP applications" HOMEPAGE="http://www.voxgratia.org/" -SRC_URI="http://www.ekiga.org/downloads/sources/${P}.tar.gz" +SRC_URI="http://www.ekiga.org/downloads/beta1/sources/${P}.tar.gz" LICENSE="MPL-1.1" SLOT="0" diff --git a/dev-libs/pwlib/pwlib-1.9.3.ebuild b/dev-libs/pwlib/pwlib-1.9.3.ebuild new file mode 100644 index 0000000..a89f661 --- /dev/null +++ b/dev-libs/pwlib/pwlib-1.9.3.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/pwlib/pwlib-1.8.4.ebuild,v 1.2 2005/07/10 01:11:05 swegener Exp $ + +inherit eutils flag-o-matic multilib + +IUSE="alsa ieee1394 ipv6 oss sdl ssl v4l v4l2" + +DESCRIPTION="Portable Multiplatform Class Libraries used by several VoIP applications" +HOMEPAGE="http://www.voxgratia.org/" +SRC_URI="http://www.ekiga.org/downloads/beta2/sources/${P}.tar.gz" + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" + +RDEPEND=" + dev-libs/expat + net-nds/openldap + sdl? ( media-libs/libsdl ) + ssl? ( dev-libs/openssl ) + alsa? ( media-libs/alsa-lib ) + ieee1394? ( media-libs/libdv + sys-libs/libavc1394 + sys-libs/libraw1394 + =media-libs/libdc1394-2.0.0_pre1 )" + +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 + + autoconf || die "autoconf failed" +} + +src_compile() { + local myconf="" + + # may cause ICE (bug #70638) + filter-flags -fstack-protector + + econf \ + --enable-plugins \ + $(use_enable v4l2) \ + $(use_enable v4l) \ + $(use_enable ieee1394 dc) \ + $(use_enable ieee1394 avc) \ + $(use_enable oss) \ + $(use_enable alsa) \ + $(use_enable ipv6) \ + $(use_enable sdl) \ + $(use_enable ssl openssl) \ + ${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 +} -- cgit v1.2.3-65-gdbad