diff --git a/l/virglrenderer/get_sources.sh b/l/virglrenderer/get_sources.sh index 46d6070..cfdb99a 100755 --- a/l/virglrenderer/get_sources.sh +++ b/l/virglrenderer/get_sources.sh @@ -1,9 +1,10 @@ #!/bin/bash SRC=virglrenderer -BRANCH=master -git clone -b $BRANCH --depth 1 https://gitlab.freedesktop.org/virgl/${SRC}.git/ $SRC -VERSION=`sed -e 's/\[/ /g' -e 's/\]/ /g' -e 's/,/ /g' -e 's/(/ /g' $SRC/configure.ac | awk -v DATE=\`date '+%Y%m%d'\` '$1=="AC_INIT" && $2=="virglrenderer" { printf "%s_%sgit\n", $NF, DATE }'` -chown -R root:root $SRC -mv $SRC ${SRC}-${VERSION} +VERSION=0.9.1 +set -x +wget -c https://gitlab.freedesktop.org/virgl/$SRC/-/archive/${SRC}-${VERSION}/${SRC}-${SRC}-${VERSION}.tar.bz2 || exit 1 +tar xjf ${SRC}-${SRC}-${VERSION}.tar.bz2 && rm -f ${SRC}-${SRC}-${VERSION}.tar.bz2 +mv ${SRC}-${SRC}-${VERSION} ${SRC}-${VERSION} +chown -R root:root ${SRC}-${VERSION} tar cf - ${SRC}-${VERSION} | xz -c9 > ${SRC}-${VERSION}.tar.xz [ -s ${SRC}-${VERSION}.tar.xz ] && rm -rf ${SRC}-${VERSION} diff --git a/l/virglrenderer/virglrenderer.SlackBuild b/l/virglrenderer/virglrenderer.SlackBuild index d76ac79..0dacb81 100755 --- a/l/virglrenderer/virglrenderer.SlackBuild +++ b/l/virglrenderer/virglrenderer.SlackBuild @@ -42,8 +42,6 @@ if [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="$SLKCFLAGS -fPIC -m64" fi -MAKE="make -j 5" - if [ "$TMP" = "" ]; then TMP=/tmp fi @@ -59,22 +57,17 @@ find . -perm 444 -exec chmod 644 {} \; find . -perm 777 -exec chmod 755 {} \; find . -perm 666 -exec chmod 644 {} \; -./autogen.sh --enable-autotools || exit 1 -make distclean || exit 1 +meson build -Dc_args="$SLKCFLAGS" \ + --buildtype=release \ + --prefix=/usr \ + --localstatedir=/var \ + --sharedstatedir=/var/lib \ + --mandir=man \ + --infodir=info \ + --libdir=lib$LIBSUFFIX || exit 1 -CFLAGS="$SLKCFLAGS -DNO_SDL_GLEXT" \ -CXXFLAGS="$SLKCFLAGS -DNO_SDL_GLEXT" \ -./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libdir=/usr/lib$LIBSUFFIX \ - --mandir=/usr/man \ - --docdir=/usr/doc/$APP-$VERSION \ - --enable-autotools \ - --build=$ARCH-slackware-linux || exit 1 - -$MAKE || exit 1 -make install DESTDIR=$PKG || exit 1 +ninja -C build || exit 1 +DESTDIR=$PKG ninja -C build install || exit 1 # Don't ship .la files: rm -fv $PKG/{,usr/}lib${LIBSUFFIX}/*.la