From 7a1f3e31e1470e31c3f77da812f2d67c9e0325ca Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Sat, 6 Feb 2016 14:43:38 +0700 Subject: [PATCH] graphics/osgEarth: Update Build. Signed-off-by: Willy Sudiarto Raharjo --- graphics/osgEarth/osgEarth.SlackBuild | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/graphics/osgEarth/osgEarth.SlackBuild b/graphics/osgEarth/osgEarth.SlackBuild index 02be4d2399..5e6ddca446 100644 --- a/graphics/osgEarth/osgEarth.SlackBuild +++ b/graphics/osgEarth/osgEarth.SlackBuild @@ -23,6 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=osgEarth +SRCNAM=osgearth TARBALLNAME=osgearth-osgearth VERSION=${VERSION:-2.3} BUILD=${BUILD:-1} @@ -61,7 +62,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $TARBALLNAME-$VERSION -tar xvf $CWD/$TARBALLNAME-$VERSION.tar.gz +tar xvf $CWD/$TARBALLNAME-$VERSION.tar.gz || tar xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $TARBALLNAME-$VERSION chown -R root:root . find -L . \ @@ -74,7 +75,7 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -lX11" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_BUILD_TYPE=Release .. \ @@ -87,9 +88,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - LICENSE.txt README.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install