From d6fcdc8224f6ea73c131994e42fa8f12a16d0f37 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Thu, 1 Jun 2017 19:21:10 +0700 Subject: games/fgrun: Updated for version 2016.4.0. Signed-off-by: Willy Sudiarto Raharjo --- games/fgrun/fgrun.SlackBuild | 21 ++++++++---------- games/fgrun/fgrun.info | 8 +++---- ...run-1.7.0-update-required-SimGear-version.patch | 25 ---------------------- 3 files changed, 13 insertions(+), 41 deletions(-) delete mode 100644 games/fgrun/patches/fgrun-1.7.0-update-required-SimGear-version.patch diff --git a/games/fgrun/fgrun.SlackBuild b/games/fgrun/fgrun.SlackBuild index 2002f21c4a..76e8ec813d 100644 --- a/games/fgrun/fgrun.SlackBuild +++ b/games/fgrun/fgrun.SlackBuild @@ -3,13 +3,13 @@ # Written by Diego Pantano PRGNAM=fgrun -VERSION=${VERSION:-20131117_973f772} +VERSION=${VERSION:-2016.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -20,8 +20,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -39,26 +39,25 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION +rm -rf $PRGNAM-version-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* -cd $PRGNAM-$VERSION +cd $PRGNAM-version-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Fix a few bugs. patch -p1 < $CWD/patches/fgrun-1.6.1-fix-crash-when-setting-defaults.patch patch -p1 < $CWD/patches/fgrun-1.6.2-fix-reloadpath-logic.patch -patch -p1 < $CWD/patches/fgrun-1.7.0-update-required-SimGear-version.patch mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -std=c++11" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSIMGEAR_SHARED=ON \ -DCMAKE_BUILD_TYPE=Release .. @@ -74,9 +73,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 \ - AUTHORS COPYING ChangeLog NEWS README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog NEWS README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/games/fgrun/fgrun.info b/games/fgrun/fgrun.info index 03f3ebc590..58dd7faa7a 100644 --- a/games/fgrun/fgrun.info +++ b/games/fgrun/fgrun.info @@ -1,8 +1,8 @@ PRGNAM="fgrun" -VERSION="20131117_973f772" -HOMEPAGE="https://sourceforge.net/projects/fgrun/" -DOWNLOAD="https://ponce.cc/slackware/sources/repo/fgrun-20131117_973f772.tar.xz" -MD5SUM="05dbca9d72ca4c96ee97642c81ef4e82" +VERSION="2016.4.0" +HOMEPAGE="https://github.com/FlightGear/fgrun" +DOWNLOAD="https://github.com/FlightGear/fgrun/archive/version/2016.4.0/fgrun-2016.4.0.tar.gz" +MD5SUM="7f6f47db6e5c0a94385d85e76569f79d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="fltk FlightGear" diff --git a/games/fgrun/patches/fgrun-1.7.0-update-required-SimGear-version.patch b/games/fgrun/patches/fgrun-1.7.0-update-required-SimGear-version.patch deleted file mode 100644 index 9f37d95b25..0000000000 --- a/games/fgrun/patches/fgrun-1.7.0-update-required-SimGear-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 436f659bdcef3726ece7928e221ba7ea7805381e Mon Sep 17 00:00:00 2001 -From: Fabrice Bellet -Date: Sun, 22 Sep 2013 12:55:33 +0200 -Subject: [PATCH 5/5] Update required SimGear version - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index aa95c59..4b6fea5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -131,7 +131,7 @@ find_package(Boost REQUIRED) - find_package(ZLIB REQUIRED) - find_package(FLTK REQUIRED) - find_package(OpenSceneGraph 2.8.1 REQUIRED osgText osgDB osgParticle osgUtil osgViewer osgGA) --find_package(SimGear 2.8.0 REQUIRED) -+find_package(SimGear 2.12.0 REQUIRED) - if (ENABLE_NLS) - find_package(Gettext) - endif (ENABLE_NLS) --- -1.8.3.1 - -- cgit v1.2.3