Disable OSGEARTH still problematic with osgearth-git

5 files changed, 14 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9ce616baec8..b2fcea3c3b29 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,6 @@ pkgbase = omnetpp-qt
 	makedepends = flex
 	makedepends = perl
 	makedepends = openscenegraph
-	makedepends = osgearth-git
 	depends = libxml2
 	depends = qt5-base
 	depends = tcl
@@ -28,7 +27,6 @@ pkgbase = omnetpp-qt
 	depends = graphviz
 	depends = clang
 	depends = openscenegraph
-	depends = osgearth-git
 	provides = omnetpp
 	conflicts = omnetpp
 	source = OMNeT++.desktop
@@ -40,9 +38,9 @@ pkgbase = omnetpp-qt
 	source = download.sh
 	source = omnetpp-5.4-src-linux.tgz::https://www.omnetpp.org/component/jdownloads/send/31-release-test-versions/2331-omnetpp-5-4-linux
 	sha512sums = a5772a605592ed2db839609f8298d1d71fb9141eb1b30dac584b788414dfe49b250ba803351a3a84f90c6b89f8e09e7b129a037af17c9b94c22dff2003a5edd8
-	sha512sums = 21520f76019cde594f27e4adbc15ebb0ec890f8e265863656f3e261c1864d843a229c30d6309f465fbbae7cb27a2b6e603378bab6b87149bdf629f55a9abf8df
-	sha512sums = a23a6ebb71c4fa0aa86263a6306378783b9b3cb249e3d7ec1cd7d184b48cd6a57c9974c21d3161aef1806177e379e895838c52e335fae2e8769f6c3befeb13cc
-	sha512sums = 799d9aa8ae5d9804706188ff237f9e662e678fd88fb2da45023fe04f71e67e87243f1df4b6a33e9e3c6fd6e6f1309f779b3c3ad7c6d8ff34f9ceb49116ab3558
+	sha512sums = 94f08a8e03e441a4609d0bfb35b92b4c8c702b7e3f9f39f2455572ef8e50894be781cc33792d50a730e801f232457f140b944f49931910e0d6c7f00b45d0b618
+	sha512sums = 325fd32ca57295ae1968e356146942753d450b167e5b506ff8e802839d525a4e45e91ed2fcbd069ba8ba23ba7903c7a938c2c8276d6eb22428d06a8670a00c97
+	sha512sums = b4d36b1104b0f341cc133111559ad9af7fb76d80a8281f61ae990e5e0e813fb7bd2ae4a1b73941c53ca87f81b14e5cf7396d1009f4a06d2066910677b73f7d21
 	sha512sums = c33f06978b91b57b16244ceef7296609f93195ec4a99be98d42fdfb68f223fff26de66aacd0165e94f212bae7b9f5b622c512e92265c660a356195ca876a717d
 	sha512sums = facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1
 	sha512sums = 6104720105bc1bc3903e3530281cbced5ad7a973c9d3e65150ae87418316b1f9b54e02462988d040eb28709cd44adeb3ee5ca74f29e353dd55a9daa0199f52a2
diff --git a/Makefile.inc b/Makefile.inc
index d50ed8bc3050..c3e27a270f3e 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -13,7 +13,7 @@ OMNETPP_EDITION = Academic Public License -- NOT FOR COMMERCIAL USE
 #
 WITH_QTENV ?= yes
 WITH_OSG ?= yes
-WITH_OSGEARTH ?= yes
+WITH_OSGEARTH ?= no
 WITH_NETBUILDER ?= yes
 WITH_PARSIM ?= yes
 WITH_SYSTEMC ?= no
@@ -157,7 +157,7 @@ QTENV_LDFLAGS = -Wl,-rpath-link=/usr/lib
 OSG_CFLAGS = 
 OSG_LIBS = -losg -losgDB -losgGA -losgViewer -losgUtil -lOpenThreads
 OSGEARTH_CFLAGS = 
-OSGEARTH_LIBS = -losgEarth -losgEarthUtil
+OSGEARTH_LIBS = 
 ZLIB_CFLAGS = 
 ZLIB_LIBS = -lz
 MPI_CFLAGS = -pthread
diff --git a/PKGBUILD b/PKGBUILD
index 17ad405bed76..9833ca7ee971 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@ _pkgname='omnetpp'
 pkgdesc='OMNeT++ Discrete Event Simulator. OMNeT++ is an extensible, modular, component-based C++ simulation library and framework, primarily for building network simulators: QT version'
 url='http://www.omnetpp.org'
 license=('custom')
-depends=(libxml2 qt5-base tcl tk blt jdk8-openjdk openmpi libpcap doxygen graphviz clang openscenegraph osgearth-git)
-makedepends=(sh wget qt5-base cmake gcc bison flex perl openscenegraph osgearth-git)
+depends=(libxml2 qt5-base tcl tk blt jdk8-openjdk openmpi libpcap doxygen graphviz clang openscenegraph)
+makedepends=(sh wget qt5-base cmake gcc bison flex perl openscenegraph)
 arch=('i686' 'x86_64')
 provides=('omnetpp')
 conflicts=('omnetpp')
@@ -28,9 +28,9 @@ source=(OMNeT++.desktop
 omnetpp-${pkgver}-src-linux.tgz::https://www.omnetpp.org/component/jdownloads/send/31-release-test-versions/2331-omnetpp-${_pkgver}-linux)
 
 sha512sums=('a5772a605592ed2db839609f8298d1d71fb9141eb1b30dac584b788414dfe49b250ba803351a3a84f90c6b89f8e09e7b129a037af17c9b94c22dff2003a5edd8'
-'21520f76019cde594f27e4adbc15ebb0ec890f8e265863656f3e261c1864d843a229c30d6309f465fbbae7cb27a2b6e603378bab6b87149bdf629f55a9abf8df'
-'a23a6ebb71c4fa0aa86263a6306378783b9b3cb249e3d7ec1cd7d184b48cd6a57c9974c21d3161aef1806177e379e895838c52e335fae2e8769f6c3befeb13cc'
-'799d9aa8ae5d9804706188ff237f9e662e678fd88fb2da45023fe04f71e67e87243f1df4b6a33e9e3c6fd6e6f1309f779b3c3ad7c6d8ff34f9ceb49116ab3558'
+'94f08a8e03e441a4609d0bfb35b92b4c8c702b7e3f9f39f2455572ef8e50894be781cc33792d50a730e801f232457f140b944f49931910e0d6c7f00b45d0b618'
+'325fd32ca57295ae1968e356146942753d450b167e5b506ff8e802839d525a4e45e91ed2fcbd069ba8ba23ba7903c7a938c2c8276d6eb22428d06a8670a00c97'
+'b4d36b1104b0f341cc133111559ad9af7fb76d80a8281f61ae990e5e0e813fb7bd2ae4a1b73941c53ca87f81b14e5cf7396d1009f4a06d2066910677b73f7d21'
 'c33f06978b91b57b16244ceef7296609f93195ec4a99be98d42fdfb68f223fff26de66aacd0165e94f212bae7b9f5b622c512e92265c660a356195ca876a717d'
 'facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1'
 '6104720105bc1bc3903e3530281cbced5ad7a973c9d3e65150ae87418316b1f9b54e02462988d040eb28709cd44adeb3ee5ca74f29e353dd55a9daa0199f52a2'
@@ -43,7 +43,7 @@ build() {
 	cp qtenv.pri ${srcdir}/${_pkgname}-${pkgver}/src/qtenv/
 	cp ver.h ${srcdir}/${_pkgname}-${pkgver}/src/common/
 	cd ${srcdir}/${_pkgname}-${pkgver}
-	#echo WITH_OSGEARTH=no >> configure.user
+	echo WITH_OSGEARTH=no >> configure.user
 	PATH=${srcdir}/${_pkgname}-${pkgver}/bin:$PATH
 	LD_LIBRARY_PATH=${srcdir}/${_pkgname}-${pkgver}/lib:$LD_LIBRARY_PATH
 	make
diff --git a/config.status b/config.status
index f75ed73ead2b..322e72bb5027 100644
--- a/config.status
+++ b/config.status
@@ -589,7 +589,7 @@ S["JAVA_LIBS"]=""
 S["JAVA_CFLAGS"]=""
 S["PREFER_SQLITE_RESULT_FILES"]="no"
 S["WITH_SYSTEMC"]="no"
-S["WITH_OSGEARTH"]="yes"
+S["WITH_OSGEARTH"]="no"
 S["WITH_OSG"]="yes"
 S["WITH_QTENV"]="yes"
 S["WITH_TKENV"]="no"
@@ -609,7 +609,7 @@ S["MPI_LIBS"]="-pthread -Wl,-rpath -Wl,/usr/lib/openmpi -Wl,--enable-new-dtags -
 S["MPI_CFLAGS"]="-pthread"
 S["ZLIB_LIBS"]="-lz"
 S["ZLIB_CFLAGS"]=""
-S["OSGEARTH_LIBS"]="-losgEarth -losgEarthUtil"
+S["OSGEARTH_LIBS"]=""
 S["OSGEARTH_CFLAGS"]=""
 S["OSG_LIBS"]="-losg -losgDB -losgGA -losgViewer -losgUtil -lOpenThreads"
 S["OSG_CFLAGS"]=""
diff --git a/qtenv.pri b/qtenv.pri
index 8a0e431c2bc7..bdac45b2e310 100644
--- a/qtenv.pri
+++ b/qtenv.pri
@@ -10,7 +10,7 @@ equals(WITH_OSG, yes) {
   DEFINES += WITH_OSG
 }
 
-WITH_OSGEARTH = yes
+WITH_OSGEARTH = no
 equals(WITH_OSGEARTH, yes) {
   DEFINES += WITH_OSGEARTH
 }