[oe-commits] org.oe.dev merge of 'bb1e5c664095ed80fd4291b2edb5f4136cc3b55a'

[rwhitby commit]

merge of 'bb1e5c664095ed80fd4291b2edb5f4136cc3b55a'
     and 'c03f5a74a6abc51297a66814aac66d5867322b6c'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: d7114bf167db1226dc6a0dbcf6f063728c94eaf0
ViewMTN: http://monotone.openembedded.org/revision.psp?id=d7114bf167db1226dc6a0dbcf6f063728c94eaf0
Files:
1
conf/distro/include/openmoko.inc
packages/gpstk/gpstk_1.2.bb
packages/openmoko-pim/openmoko-today_svn.bb
Diffs:

#
# mt diff -rbb1e5c664095ed80fd4291b2edb5f4136cc3b55a -rd7114bf167db1226dc6a0dbcf6f063728c94eaf0
#
# 
# no changes
# 


#
# mt diff -rc03f5a74a6abc51297a66814aac66d5867322b6c -rd7114bf167db1226dc6a0dbcf6f063728c94eaf0
#
# 
# 
# patch "conf/distro/include/openmoko.inc"
#  from [9d18e3f593f66db023a3c71daa1d1625b17f23fb]
#    to [700c80e404108499c50ee0091b0d7ec9ced05336]
# 
# patch "packages/gpstk/gpstk_1.2.bb"
#  from [d1ca46000ab0241bafe0de1c94f9f4a5f418df01]
#    to [55a89706b9d059206ec875fd6bf49078f53f1f86]
# 
# patch "packages/openmoko-pim/openmoko-today_svn.bb"
#  from [d31b786628d3ecb657ec6e6af6185000c93eaf96]
#    to [8868668fe6c32f7f8815bebb4e74929cfed7db2b]
# 
============================================================
--- conf/distro/include/openmoko.inc	9d18e3f593f66db023a3c71daa1d1625b17f23fb
+++ conf/distro/include/openmoko.inc	700c80e404108499c50ee0091b0d7ec9ced05336
@@ -90,6 +90,7 @@ PREFERRED_VERSION_fontconfig = "2.4.1"
 PREFERRED_VERSION_fontconfig = "2.4.1"
 
 # we don't ship gtk-directfb by default
+PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-ani  ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-gif  ?= "gtk+"
============================================================
--- packages/gpstk/gpstk_1.2.bb	d1ca46000ab0241bafe0de1c94f9f4a5f418df01
+++ packages/gpstk/gpstk_1.2.bb	55a89706b9d059206ec875fd6bf49078f53f1f86
@@ -1,13 +1,72 @@ SECTION = "libs"
 DESCRIPTION = "Libraries and applications to facilitate working with GPS data for research and high accuracy uses."
 HOMEPAGE = "http://www.gpstk.org/"
 LICENSE = "LGPL"
 SECTION = "libs"
 
+PR = "r1"
+
 SRC_URI = "${SOURCEFORGE_MIRROR}/gpstk/gpstk-${PV}-src.tar.gz \
 	   file://configure.patch;patch=1"
 
 inherit autotools lib_package
 
+EXTRA_OECONF = "--enable-shared"
+
 do_stage() {
     autotools_stage_all
 }
+
+
+# This is a handcrafted do_install because 'make install' isn't working.
+# This should install the same files as my native (x86) jam based build, but doesn't since the Makefiles 
+# aren't up to date (e.g. bc2sp3 is missing). 
+# Koen - 20070325
+do_install() {
+
+install -d ${D}${bindir}
+install -d ${D}${libdir}
+install -d ${D}${includedir}/
+
+for i in bc2sp3 calgps DDBase ddmerge DiscFix EditRinex ephdiff example1 example2 example3 example4 example5 \
+         fic2rin ficacheck ficafic ficcheck ficdiff ficfica findMoreThan12 IonoBias mergeFIC mergeRinMet \
+         mergeRinNav mergeRinObs mergeSRI mkord mpsolve navdmp NavMerge novaRinex ordClock ordEdit ordGen \
+         ordLinEs ordPlot ordStats poscvt posInterp PRSolve ResCor resplot reszilla RinexDump rinexpvt \
+         rinexthin RinSum rmwcheck rmwdiff rnwcheck rnwdiff rowcheck rowdiff rstats rtAshtech sp3version \
+         TECMaps timeconvert tnl tsrif tsrifsu tsriftu vecsol wheresat 
+        do install -m 755 `find . -name $i` ${D}${bindir}/ || true 
+done
+	cp -pPr src/.libs/libgps* ${D}${libdir}/ 
+
+for i in AlmanacStore.hpp AlmOrbit.hpp ANSITime.hpp Bancroft.hpp BasicFramework.hpp BCEphemerisStore.hpp \
+         BinexData.hpp BinexFilterOperators.hpp BinexStream.hpp BinUtils.hpp BivarStats.hpp CheckPRData.hpp \
+	 CivilTime.hpp ClockModel.hpp CodeBuffer.hpp CommandOption.hpp CommandOptionParser.hpp \
+	 CommandOptionWithCommonTimeArg.hpp CommandOptionWithPositionArg.hpp CommandOptionWithTimeArg.hpp \
+	 CommonTime.hpp convhelp.hpp DayTime.hpp DOP.hpp ECEF.hpp EngAlmanac.hpp EngEphemeris.hpp EngNav.hpp \
+	 EphemerisRange.hpp EphemerisStore.hpp EpochClockModel.hpp Exception.hpp Expression.hpp ExtractC1.hpp \
+	 ExtractCombinationData.hpp ExtractD1.hpp ExtractD2.hpp ExtractData.hpp ExtractL1.hpp ExtractL2.hpp \
+	 ExtractLC.hpp ExtractP1.hpp ExtractP2.hpp ExtractPC.hpp FFBinaryStream.hpp FFData.hpp FFStreamError.hpp \
+	 FFStream.hpp FFTextStream.hpp FICAStream.hpp FICBase.hpp FICData109.hpp FICData162.hpp FICData62.hpp \
+	 FICData9.hpp FICData.hpp FICFilterOperators.hpp FICHeader.hpp FICStreamBase.hpp FICStream.hpp \
+	 FileFilterFrame.hpp FileFilterFrameWithHeader.hpp FileFilter.hpp FileHunter.hpp FileSpec.hpp \
+	 FileStore.hpp FileUtils.hpp GenXSequence.hpp Geodetic.hpp GeoidModel.hpp geometry.hpp getopt.h \
+	 gps_constants.hpp GPSEpochWeekSecond.hpp GPSGeoid.hpp gpstkplatform.h GPSWeekSecond.hpp GPSWeekZcount.hpp \
+	 GPSZcount29.hpp GPSZcount32.hpp GPSZcount.hpp icd_200_constants.hpp IonoModel.hpp IonoModelStore.hpp \
+	 JulianDate.hpp LinearClockModel.hpp LoopedFramework.hpp MathBase.hpp MatrixBase.hpp \
+	 MatrixBaseOperators.hpp MatrixFunctors.hpp Matrix.hpp MatrixImplementation.hpp MatrixOperators.hpp \
+	 mergePCodeWords.h MiscMath.hpp MJD.hpp ModeledPR.hpp ModeledPseudorangeBase.hpp ModeledReferencePR.hpp \
+	 MOPSWeight.hpp MSCData.hpp MSCStream.hpp ObsClockModel.hpp ObsEpochMap.hpp ObsID.hpp ObsRngDev.hpp \
+	 ORDEpoch.hpp PCodeConst.hpp PolyFit.hpp Position.hpp PRSolution.hpp RACRotation.hpp \
+	 RinexEphemerisStore.hpp RinexMetBase.hpp RinexMetData.hpp RinexMetFilterOperators.hpp \
+	 RinexMetHeader.hpp RinexMetStream.hpp RinexNavBase.hpp RinexNavData.hpp RinexNavFilterOperators.hpp \
+	 RinexNavHeader.hpp RinexNavStream.hpp RinexObsBase.hpp RinexObsData.hpp RinexObsFilterOperators.hpp \
+	 RinexObsHeader.hpp RinexObsID.hpp RinexObsStream.hpp RinexSatID.hpp RinexUtilities.hpp RTFileFrame.hpp \
+	 RungeKutta4.hpp SatID.hpp SimpleIURAWeight.hpp SMODFData.hpp SMODFStream.hpp SolverBase.hpp SolverLMS.hpp \
+	 SolverWMS.hpp SP3Base.hpp SP3Data.hpp SP3EphemerisStore.hpp SP3Header.hpp SP3SatID.hpp SP3Stream.hpp \
+	 Stats.hpp stl_helpers.hpp StringUtils.hpp SVExclusionList.hpp SVPCodeGen.hpp SystemTime.hpp \
+	 TabularEphemerisStore.hpp TimeConstants.hpp TimeConverters.hpp TimeString.hpp TimeTag.hpp Triple.hpp \
+	 TropModel.hpp UnixTime.hpp ValidType.hpp VectorBase.hpp VectorBaseOperators.hpp \
+	 Vector.hpp VectorOperators.hpp WeightBase.hpp WGS84Geoid.hpp WxObsMap.hpp X1Sequence.hpp \
+	 X2Sequence.hpp Xvt.hpp YDSTime.hpp
+        do install -m 644 `find . -name $i` ${D}${includedir}/ || true
+done
+}
============================================================
--- packages/openmoko-pim/openmoko-today_svn.bb	d31b786628d3ecb657ec6e6af6185000c93eaf96
+++ packages/openmoko-pim/openmoko-today_svn.bb	8868668fe6c32f7f8815bebb4e74929cfed7db2b
@@ -1,7 +1,7 @@ LICENSE = "GPL"
 DESCRIPTION = "OpenMoko Today application."
 SECTION = "openmoko/pim"
 LICENSE = "GPL"
-DEPENDS = "openmoko-libs"
+DEPENDS = "openmoko-libs eds-dbus"
 PV = "0.1+svn${SRCDATE}"
 
 inherit autotools pkgconfig gtk-icon-cache openmoko