[oe-commits] org.oe.dev merge of '29d752d6760fe8971e4d37f73f5bad5ed1b0abd7'

[mickeyl commit]

merge of '29d752d6760fe8971e4d37f73f5bad5ed1b0abd7'
     and 'c60a4268168f4df8d07b333ec16af3ae2aed261f'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 6c07eee198dafed29e3a6c1b152c679fa8468281
ViewMTN: http://monotone.openembedded.org/revision/info/6c07eee198dafed29e3a6c1b152c679fa8468281
Files:
1
packages/sphinx
packages/sphinx-speech
packages/sphinx-search
packages/sphinx-search/sphinx_0.9.8.bb
packages/tangogps/tangogps.inc
packages/tangogps/tangogps-fso_0.9.2.bb
packages/tangogps/tangogps_0.9.0.3.bb
Diffs:

#
# mt diff -r29d752d6760fe8971e4d37f73f5bad5ed1b0abd7 -r6c07eee198dafed29e3a6c1b152c679fa8468281
#
#
#
# rename "packages/sphinx"
#     to "packages/sphinx-speech"
# 
# add_dir "packages/sphinx-search"
# 
# add_file "packages/sphinx-search/sphinx_0.9.8.bb"
#  content [f339286278e7fe628d7ff22d9c5df4725b526cda]
#
============================================================
--- packages/sphinx-search/sphinx_0.9.8.bb	f339286278e7fe628d7ff22d9c5df4725b526cda
+++ packages/sphinx-search/sphinx_0.9.8.bb	f339286278e7fe628d7ff22d9c5df4725b526cda
@@ -0,0 +1,26 @@
+DESCRIPTION = "The Sphinx Fulltext Indexer"
+HOMEPAGE = "http://www.sphinxsearch.com/"
+LICENSE = "GPL"
+PRIORITY = "optional"
+DEPENDS = "expat"
+
+SRC_URI = "\
+  http://www.sphinxsearch.com/downloads/sphinx-${PV}.tar.gz \
+  http://snowball.tartarus.org/dist/libstemmer_c.tgz \
+"
+
+inherit autotools
+
+EXTRA_OECONF = "\
+  --without-mysql \
+  --with-libstemmer \
+"
+
+# miscompiles w/ O2
+FULL_OPTIMIZATION_arm = "-O1"
+
+inherit autotools
+
+do_configure_prepend() {
+	mv ${WORKDIR}/libstemmer_c/* libstemmer_c/
+}


#
# mt diff -rc60a4268168f4df8d07b333ec16af3ae2aed261f -r6c07eee198dafed29e3a6c1b152c679fa8468281
#
#
#
# add_file "packages/tangogps/tangogps.inc"
#  content [97b25ecc7023d4936767623dc36d5816ad40d54b]
# 
# patch "packages/tangogps/tangogps-fso_0.9.2.bb"
#  from [1829b3be52c4104bd5fa0b9abcd36ff3948b5930]
#    to [5cbb978159e893365e050b41da156f5424b7d760]
# 
# patch "packages/tangogps/tangogps_0.9.0.3.bb"
#  from [731daff061dae087ec470d68d35806ad95c3797a]
#    to [2b0676072dcb31c2e8e6893bc89f5d69d6011670]
#
============================================================
--- packages/tangogps/tangogps.inc	97b25ecc7023d4936767623dc36d5816ad40d54b
+++ packages/tangogps/tangogps.inc	97b25ecc7023d4936767623dc36d5816ad40d54b
@@ -0,0 +1,10 @@
+DESCRIPTION = "A lightweight and fast mapping application"
+LICENSE = "GPLv2"
+SECTION = "x11/applications"
+PRIORITY = "optional"
+DEPENDS = "curl gtk+ gconf gypsy"
+
+SRC_URI = "http://www.tangogps.org/downloads/tangogps-${PV}.tar.gz"
+S = "${WORKDIR}/tangogps-${PV}"
+
+inherit autotools
============================================================
--- packages/tangogps/tangogps-fso_0.9.2.bb	1829b3be52c4104bd5fa0b9abcd36ff3948b5930
+++ packages/tangogps/tangogps-fso_0.9.2.bb	5cbb978159e893365e050b41da156f5424b7d760
@@ -1,13 +1,8 @@
-LICENSE = "GPLv2"
-SECTION = "x11/applications"
-PRIORITY = "optional"
-DESCRIPTION = "lightweight and fast mapping application"
-DEPENDS = "curl gtk+ gconf gypsy dbus-glib"
+require tangogps.inc
 
-inherit autotools
+RDEPENDS = "frameworkd"
 
+SRC_URI += "\
+  file://0002-Get-GPS-data-via-the-gypsy-interface.patch;patch=1 \
+  file://0003-Try-to-request-the-GPS-resource-from-ousaged.patch;patch=1 \
+"
-SRC_URI = "http://www.tangogps.org/downloads/tangogps-${PV}.tar.gz\
-	file://0002-Get-GPS-data-via-the-gypsy-interface.patch;patch=1 \
-	file://0003-Try-to-request-the-GPS-resource-from-ousaged.patch;patch=1"
-
-S=${WORKDIR}/tangogps-${PV}
============================================================
--- packages/tangogps/tangogps_0.9.0.3.bb	731daff061dae087ec470d68d35806ad95c3797a
+++ packages/tangogps/tangogps_0.9.0.3.bb	2b0676072dcb31c2e8e6893bc89f5d69d6011670
@@ -1,10 +1,4 @@
-LICENSE = "GPLv2"
-SECTION = "x11/applications"
-PRIORITY = "optional"
-DESCRIPTION = "lightweight and fast mapping application"
-DEPENDS = "curl gtk+ gconf gpsd"
+require tangogps.inc
+
+DEPENDS += "gpsd"
 RDEPENDS = "gpsd"
-
-SRC_URI = "http://www.tangogps.org/downloads/${PN}-${PV}.tar.gz"
-
-inherit autotools