pwlib: update SRC_URI, unify and clean-up.

* build still fails, bug 1622 still open

3 files changed, 39 insertions, 30 deletions

diff --git a/recipes/pwlib/pwlib.inc b/recipes/pwlib/pwlib.inc
new file mode 100644
index 0000000000..981becf42f
--- /dev/null
+++ b/recipes/pwlib/pwlib.inc
@@ -0,0 +1,31 @@
+HOMEPAGE = "http://openh323.sourceforge.net/"
+DESCRIPTION = "Portable Text and GUI C/C++ Class Libarary."
+LICENSE = "GPL"
+DEPENDS = "openssl openldap"
+
+INC_PR = "r1"
+
+# Somebody should teach these people about naming tarballs ;-)
+MIN_VER ?= "1"
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}_${@bb.data.getVar('PV',d,1).split('.')[1]}_${@bb.data.getVar('PV',d,1).split('.')[1]}"
+SRC_URI = "http://www.voxgratia.org/releases/${PN}-v1_${SHRT_VER}-${MIN_VER}src.tar.gz"
+
+inherit autotools
+
+EXTRA_OECONF="--enable-ipv6 --disable-sasl --disable-sdl \
+	      --disable-video --enable-plugins --with-plugins=oss"
+
+# Use openSSL
+
+export OPENSSLFLAG="1"
+export OPENSSLDIR="${STAGING_LIBDIR}"
+export OPENSSLLIBS="-lssl -lcrypt"
+export MACHTYPE="x86"
+export OSTYPE="linux"
+export OSRELEASE="openembedded"
+
+export CPLUS="${CXX}"
+
+do_compile() {
+	oe_runmake opt
+}
diff --git a/recipes/pwlib/pwlib_1.5.2.bb b/recipes/pwlib/pwlib_1.5.2.bb
index a4ced1f35c..0963a82ba2 100644
--- a/recipes/pwlib/pwlib_1.5.2.bb
+++ b/recipes/pwlib/pwlib_1.5.2.bb
@@ -1,32 +1,6 @@
-# pwlib .bb build file
-# Copyright (C) 2006, Advanced Micro Devices, Inc.  All Rights Reserved
-# Released under the MIT license (see /COPYING)
+require pwlib.inc
 
-HOMEPAGE="http://www.openh323.org/docs/PWLib/"
-DESCRIPTION="Portable Text and GUI C/C++ Class Libarary."
-LICENSE = "GPL"
+PR = "${INC_PR}.1"
 
-SRC_URI="http://www.openh323.org/bin/${PN}_${PV}.tar.gz"
-DEPENDS="openssl openldap"
-
-inherit autotools
-
-EXTRA_OECONF="--enable-ipv6 --disable-sasl --disable-sdl \
-	      --disable-video --enable-plugins --with-plugins=oss"
-
-S="${WORKDIR}/${PN}"
-
-# Use openSSL
-
-export OPENSSLFLAG="1"
-export OPENSSLDIR="${STAGING_LIBDIR}"
-export OPENSSLLIBS="-lssl -lcrypt"
-export MACHTYPE="x86"
-export OSTYPE="linux"
-export OSRELEASE="openembedded"
-
-export CPLUS="${CXX}"
-
-do_compile() {
-	oe_runmake opt
-}
+#seems like this very old source has vanished upstream
+SRC_URI = "http://www.angstrom-distribution.org/unstable/sources/pwlib_1.5.2.tar.gz"
diff --git a/recipes/pwlib/pwlib_1.6.6.4.bb b/recipes/pwlib/pwlib_1.6.6.4.bb
index c41400c001..fdadb359e7 100644
--- a/recipes/pwlib/pwlib_1.6.6.4.bb
+++ b/recipes/pwlib/pwlib_1.6.6.4.bb
@@ -1,3 +1,7 @@
+# status as of 2009/05/21: This particular bb file is broken beyond what I
+# (Laibsch) care to fix.  If you fix it, please base your changes on top
+# of pwlib.inc
+
 # pwlib .bb build file
 # Copyright (C) 2006, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see /COPYING)