diff --git a/libraries/osgQt/README b/libraries/osgQt/README index bacfa07668..b52a0b7ed5 100644 --- a/libraries/osgQt/README +++ b/libraries/osgQt/README @@ -1,8 +1 @@ This is a Qt project for making use of OpenSceneGraph (OSG). - -By default, this SlackBuild will build a Qt4 library. -If a Qt5 version is desired instead, set the OSGQT -environment variable when building osgQt i.e. - OSGQT=5 sh osgQt.SlackBuild -In this case, the qt5 package is an additional requirement -when building. diff --git a/libraries/osgQt/osgQt.SlackBuild b/libraries/osgQt/osgQt.SlackBuild index 4ebbd9c554..f1a50aeeaa 100644 --- a/libraries/osgQt/osgQt.SlackBuild +++ b/libraries/osgQt/osgQt.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=osgQt -VERSION=${VERSION:-3.5.5} +VERSION=${VERSION:-20210405_8fa9e2a} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -64,15 +64,13 @@ else LIBDIRSUFFIX="" fi -osgqt="-DDESIRED_QT_VERSION=4"; [ "${OSGQT:-4}" = "5" ] && osgqt="-DDESIRED_QT_VERSION=5" - set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -87,8 +85,7 @@ cd build -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - $osgqt + -DCMAKE_BUILD_TYPE=Release make make install DESTDIR=$PKG diff --git a/libraries/osgQt/osgQt.info b/libraries/osgQt/osgQt.info index 9e9f97b07c..91a434a7ac 100644 --- a/libraries/osgQt/osgQt.info +++ b/libraries/osgQt/osgQt.info @@ -1,8 +1,8 @@ PRGNAM="osgQt" -VERSION="3.5.5" +VERSION="20210405_8fa9e2a" HOMEPAGE="https://github.com/openscenegraph/osgQt" -DOWNLOAD="https://github.com/openscenegraph/osgQt/archive/3.5.5/osgQt-3.5.5.tar.gz" -MD5SUM="90da7a650bfa20c0c42cda93dc61b27f" +DOWNLOAD="https://ponce.cc/slackware/sources/repo/osgQt-20210405_8fa9e2a.tar.xz" +MD5SUM="ead216e1acbe0e43eb194f75dcce206b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenSceneGraph"