From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 23 Mar 2010 22:17:48 +0000 (-0700)
Subject: geos_3.2.0.bb: Refine PACKAGES and contents.
X-Git-Tag: Release-2010-05/1~317
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef6e7b308e3cafdd7edb3d392996b0dec833089c;p=openembedded.git

geos_3.2.0.bb: Refine PACKAGES and contents.

* Create geos-c1 for C libraries
* Forcibly package libgeos into geos package
* Enhance description.
* Add --disable-inline, its not needed if gcc 4.4 or newer
  is in use. but many distros still use older gcc 4.x

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---

diff --git a/recipes/geos/geos_3.2.0.bb b/recipes/geos/geos_3.2.0.bb
index 832452f71d..388d059458 100644
--- a/recipes/geos/geos_3.2.0.bb
+++ b/recipes/geos/geos_3.2.0.bb
@@ -1,20 +1,30 @@
-DESCRIPTION = "GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology Suite (JTS)."
+DESCRIPTION = "GEOS (Geometry Engine - Open Source) is a C++ port of the Java Topology Suite (JTS). GEOS provides a spatial object model and fundamental geometric functions. It implements the geometry model defined in the OpenGIS Consortium Simple Features Specification for SQL"
 HOMEPAGE = "http://geos.refractions.net/"
 LICENSE = "LGPL"
 
 DEPENDS = "boost"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://download.osgeo.org/geos/geos-${PV}.tar.bz2;name=geos \
 	   file://geos-arm.patch;patch=1 \
 	  "
 
-S = "${WORKDIR}/geos-${PV}"
+S = "${WORKDIR}/${PN}-${PV}"
 
 inherit autotools pkgconfig lib_package binconfig
 
-EXTRA_OECONF = "--disable-swig"
+PACKAGES += "${PN}-c1"
+
+DESCRIPTION_${PN}-c1 = "Geometry engine for Geographic Information Systems - C Library"
+FILES_${PN}-c1 := "${libdir}/libgeos_c.so.*"
+
+DESCRIPTION_${PN} = "Geometry engine for Geographic Information Systems - C++ Library"
+FILES_${PN} := "${libdir}/libgeos-*"
+
+# --disable-inline is not needed if gcc 4.4+ is used
+EXTRA_OECONF = "--disable-swig --disable-inline"
+
 SRC_URI[geos.md5sum] = "bfad7129680f0107b6ca9a2b92a2c440"
 SRC_URI[geos.sha256sum] = "0a43b76429fd94fd572d79869f3ca5acdf44a9fa73844aa655016f09aaa1e6c7"