From 727a55eec1c1fe9be9094b1098a622e7a1f91f26 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 22 Dec 2017 00:33:08 +0100 Subject: deps: updates and recompilations --- deps/OpenAL/.url | 2 +- deps/OpenAL/OpenAL.SlackBuild | 4 +- deps/PyQt/.url | 2 +- deps/PyQt/PyQt.SlackBuild | 21 ++++---- deps/PyQt5/.url | 2 +- deps/PyQt5/PyQt5.SlackBuild | 4 +- deps/accountsservice/accountsservice.SlackBuild | 2 +- deps/cfitsio/.url | 2 +- deps/cfitsio/cfitsio.SlackBuild | 14 +++-- deps/ddcutil/.url | 2 +- deps/ddcutil/ddcutil.SlackBuild | 8 +-- deps/gpgme/.url | 2 +- deps/gpgme/gpgme.SlackBuild | 18 +++---- deps/json-glib/.url | 2 +- deps/json-glib/json-glib.SlackBuild | 59 ++++++++++----------- deps/libburn/.url | 2 +- deps/libburn/libburn.SlackBuild | 8 +-- deps/libpwquality/.url | 2 +- deps/libpwquality/libpwquality.SlackBuild | 6 +-- deps/libxkbcommon/.url | 2 +- deps/libxkbcommon/libxkbcommon.SlackBuild | 8 +-- deps/mesa/mesa.SlackBuild | 4 +- deps/mesa/mesa.no.mako.diff | 34 ++++++++++++ deps/mesa/mesa.no.mako.diff.gz | Bin 425 -> 0 bytes deps/ninja/.url | 2 +- deps/ninja/ninja.SlackBuild | 8 +-- deps/sip/.url | 2 +- deps/sip/sip.SlackBuild | 6 +-- deps/sni-qt/sni-qt.SlackBuild | 10 ++-- deps/wayland-protocols/.url | 4 +- .../wayland-protocols/wayland-protocols.SlackBuild | 8 +-- 31 files changed, 141 insertions(+), 109 deletions(-) create mode 100644 deps/mesa/mesa.no.mako.diff delete mode 100644 deps/mesa/mesa.no.mako.diff.gz diff --git a/deps/OpenAL/.url b/deps/OpenAL/.url index 2063047..ddc7105 100644 --- a/deps/OpenAL/.url +++ b/deps/OpenAL/.url @@ -1,2 +1,2 @@ -http://kcat.strangesoft.net/openal-releases/openal-soft-1.18.1.tar.bz2 +http://kcat.strangesoft.net/openal-releases/openal-soft-1.18.2.tar.bz2 diff --git a/deps/OpenAL/OpenAL.SlackBuild b/deps/OpenAL/OpenAL.SlackBuild index eba886e..d6c79c5 100755 --- a/deps/OpenAL/OpenAL.SlackBuild +++ b/deps/OpenAL/OpenAL.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=OpenAL SRCNAM=openal-soft -VERSION=${VERSION:-1.18.1} +VERSION=${VERSION:-1.18.2} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j4 "} @@ -36,7 +36,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; diff --git a/deps/PyQt/.url b/deps/PyQt/.url index a6a5e4a..7db5c55 100644 --- a/deps/PyQt/.url +++ b/deps/PyQt/.url @@ -1 +1 @@ -http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.12/PyQt4_gpl_x11-4.12.tar.gz +http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.12.1/PyQt4_gpl_x11-4.12.1.tar.gz diff --git a/deps/PyQt/PyQt.SlackBuild b/deps/PyQt/PyQt.SlackBuild index 664b191..22428c6 100755 --- a/deps/PyQt/PyQt.SlackBuild +++ b/deps/PyQt/PyQt.SlackBuild @@ -27,27 +27,26 @@ # Modified by Eric Hameleers PKGNAM=PyQt -VERSION=${VERSION:-4.12} +VERSION=${VERSION:-4.12.1} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + # Automatically determine the architecture we're building on: -MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i586 ;; - armv7hl) export ARCH=$MARCH ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "i686" ]; then diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url index 47f9852..ebc1ebc 100644 --- a/deps/PyQt5/.url +++ b/deps/PyQt5/.url @@ -1,2 +1,2 @@ -https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.9.1/PyQt5_gpl-5.9.1.tar.gz +https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.9.2/PyQt5_gpl-5.9.2.tar.gz diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild index 6b50832..b24bc5c 100755 --- a/deps/PyQt5/PyQt5.SlackBuild +++ b/deps/PyQt5/PyQt5.SlackBuild @@ -27,7 +27,7 @@ # Modified by Eric Hameleers PKGNAM=PyQt5 -VERSION=${VERSION:-5.9.1} +VERSION=${VERSION:-5.9.2} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -39,7 +39,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; diff --git a/deps/accountsservice/accountsservice.SlackBuild b/deps/accountsservice/accountsservice.SlackBuild index 1934a1d..fa52966 100755 --- a/deps/accountsservice/accountsservice.SlackBuild +++ b/deps/accountsservice/accountsservice.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=accountsservice VERSION=${VERSION:-0.6.45} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} diff --git a/deps/cfitsio/.url b/deps/cfitsio/.url index 9e1b756..6a97bc1 100644 --- a/deps/cfitsio/.url +++ b/deps/cfitsio/.url @@ -1,2 +1,2 @@ -http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3410.tar.gz +http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3420.tar.gz diff --git a/deps/cfitsio/cfitsio.SlackBuild b/deps/cfitsio/cfitsio.SlackBuild index 70efe61..6170ccf 100755 --- a/deps/cfitsio/cfitsio.SlackBuild +++ b/deps/cfitsio/cfitsio.SlackBuild @@ -22,13 +22,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=cfitsio -VERSION=${VERSION:-3.410} +VERSION=${VERSION:-3.420} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -40,8 +40,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then @@ -92,9 +92,13 @@ LDFLAGS="$SLKLDFLAGS" \ --build=$TARGET # Build and install: -make || exit 1 +make shared || exit 1 +make utils || exit 1 make install DESTDIR=$PKG || exit 1 +# Remove the static library: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libcfitsio.a + # Strip binaries (if any): find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/deps/ddcutil/.url b/deps/ddcutil/.url index b24f07b..7814641 100644 --- a/deps/ddcutil/.url +++ b/deps/ddcutil/.url @@ -1,2 +1,2 @@ -https://github.com/rockowitz/ddcutil/archive/v0.8.4.tar.gz +https://github.com/rockowitz/ddcutil/archive/v0.8.5.tar.gz diff --git a/deps/ddcutil/ddcutil.SlackBuild b/deps/ddcutil/ddcutil.SlackBuild index 2278e16..88a8e1f 100755 --- a/deps/ddcutil/ddcutil.SlackBuild +++ b/deps/ddcutil/ddcutil.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=ddcutil -VERSION=${VERSION:-0.8.4} +VERSION=${VERSION:-0.8.5} BUILD=${BUILD:-2} CWD=$(pwd) @@ -35,7 +35,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -43,8 +43,8 @@ if [ -z "$ARCH" ]; then export ARCH fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then diff --git a/deps/gpgme/.url b/deps/gpgme/.url index 9095d9c..6cfd060 100644 --- a/deps/gpgme/.url +++ b/deps/gpgme/.url @@ -1 +1 @@ -https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.9.0.tar.bz2 +https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.10.0.tar.bz2 diff --git a/deps/gpgme/gpgme.SlackBuild b/deps/gpgme/gpgme.SlackBuild index 02f1701..f4369d3 100755 --- a/deps/gpgme/gpgme.SlackBuild +++ b/deps/gpgme/gpgme.SlackBuild @@ -24,8 +24,8 @@ # Modified 2017 by Eric Hameleers PKGNAM=gpgme -VERSION=${VERSION:-1.9.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.10.0} +BUILD=${BUILD:-1} # Find out the default python version: if [ $( python -c 'import sys ; print sys.version_info[0]' ) -eq 3 ]; then @@ -34,10 +34,16 @@ else MYPY="python2" fi +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -45,12 +51,6 @@ if [ -z "$ARCH" ]; then export ARCH fi -NUMJOBS=${NUMJOBS:-" -j7 "} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" diff --git a/deps/json-glib/.url b/deps/json-glib/.url index 1ca85e4..f6f66ba 100644 --- a/deps/json-glib/.url +++ b/deps/json-glib/.url @@ -1 +1 @@ -http://ftp.gnome.org/pub/gnome/sources/json-glib/1.2/json-glib-1.2.8.tar.xz +http://ftp.gnome.org/pub/gnome/sources/json-glib/1.4/json-glib-1.4.2.tar.xz diff --git a/deps/json-glib/json-glib.SlackBuild b/deps/json-glib/json-glib.SlackBuild index 4af8d2a..68344c0 100755 --- a/deps/json-glib/json-glib.SlackBuild +++ b/deps/json-glib/json-glib.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=json-glib -VERSION=${VERSION:-1.2.8} +VERSION=${VERSION:-1.4.2} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j4 "} @@ -33,38 +33,33 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ -e $CWD/machine.conf ]; then - . $CWD/machine.conf ] -elif [ -e /etc/slackbuild/machine.conf ]; then - . /etc/slackbuild/machine.conf ] +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i586 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv5te" + LIBDIRSUFFIX="" else - # Automatically determine the architecture we're building on: - MARCH=$( uname -m ) - if [ -z "$ARCH" ]; then - case "$MARCH" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$MARCH ;; - esac - fi - # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: - if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv5te" - LIBDIRSUFFIX="" - else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" - fi + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi case "$ARCH" in diff --git a/deps/libburn/.url b/deps/libburn/.url index e2be923..75deef6 100644 --- a/deps/libburn/.url +++ b/deps/libburn/.url @@ -1,2 +1,2 @@ -http://files.libburnia-project.org/releases/libburn-1.4.6.tar.gz +http://files.libburnia-project.org/releases/libburn-1.4.8.tar.gz diff --git a/deps/libburn/libburn.SlackBuild b/deps/libburn/libburn.SlackBuild index 7e1ab1a..5b82850 100755 --- a/deps/libburn/libburn.SlackBuild +++ b/deps/libburn/libburn.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=libburn -VERSION=${VERSION:-1.4.6} +VERSION=${VERSION:-1.4.8} BUILD=${BUILD:-1} CWD=$(pwd) @@ -35,7 +35,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -43,8 +43,8 @@ if [ -z "$ARCH" ]; then export ARCH fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then diff --git a/deps/libpwquality/.url b/deps/libpwquality/.url index 8802b70..24e1977 100644 --- a/deps/libpwquality/.url +++ b/deps/libpwquality/.url @@ -1 +1 @@ -https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.3.0/libpwquality-1.3.0.tar.bz2 +https://github.com/libpwquality/libpwquality/releases/download/libpwquality-1.4.0/libpwquality-1.4.0.tar.bz2 diff --git a/deps/libpwquality/libpwquality.SlackBuild b/deps/libpwquality/libpwquality.SlackBuild index 61eea7a..bbfbd18 100755 --- a/deps/libpwquality/libpwquality.SlackBuild +++ b/deps/libpwquality/libpwquality.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=libpwquality -VERSION=${VERSION:-1.3.0} +VERSION=${VERSION:-1.4.0} BUILD=${BUILD:-1} CWD=$(pwd) @@ -35,7 +35,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -44,7 +44,7 @@ if [ -z "$ARCH" ]; then fi case "$ARCH" in - i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + i?86) SLKCFLAGS="-O2 -march=$ARCH -mtune=i686" SLKLDFLAGS=""; LIBDIRSUFFIX="" ;; x86_64) SLKCFLAGS="-O2 -fPIC" diff --git a/deps/libxkbcommon/.url b/deps/libxkbcommon/.url index 63f31ce..16a002a 100644 --- a/deps/libxkbcommon/.url +++ b/deps/libxkbcommon/.url @@ -1,2 +1,2 @@ -https://xkbcommon.org/download/libxkbcommon-0.7.2.tar.xz +https://xkbcommon.org/download/libxkbcommon-0.8.0.tar.xz diff --git a/deps/libxkbcommon/libxkbcommon.SlackBuild b/deps/libxkbcommon/libxkbcommon.SlackBuild index d80e2bf..22af0bb 100755 --- a/deps/libxkbcommon/libxkbcommon.SlackBuild +++ b/deps/libxkbcommon/libxkbcommon.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=libxkbcommon -VERSION=${VERSION:-0.7.2} +VERSION=${VERSION:-0.8.0} BUILD=${BUILD:-1} CWD=$(pwd) @@ -33,7 +33,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -42,8 +42,8 @@ if [ -z "$ARCH" ]; then fi # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" diff --git a/deps/mesa/mesa.SlackBuild b/deps/mesa/mesa.SlackBuild index 3d62eea..15b135b 100755 --- a/deps/mesa/mesa.SlackBuild +++ b/deps/mesa/mesa.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=mesa -VERSION=${VERSION:-17.2.5} +VERSION=${VERSION:-17.2.7} DEMOVERS=${DEMOVERS:-8.3.0} BUILD=${BUILD:-1} @@ -90,7 +90,7 @@ fi # Don't worry if Mako is not present: #sed -i "s,AX_CHECK_PYTHON_MAKO_MODULE(\$PYTHON_MAKO_REQUIRED),,g" configure.ac -zcat $CWD/mesa.no.mako.diff.gz | patch -p1 --verbose || exit 1 +cat $CWD/mesa.no.mako.diff | patch -p1 --verbose || exit 1 # This doesn't fully do the trick. See below. ;-) #./autogen.sh diff --git a/deps/mesa/mesa.no.mako.diff b/deps/mesa/mesa.no.mako.diff new file mode 100644 index 0000000..5135899 --- /dev/null +++ b/deps/mesa/mesa.no.mako.diff @@ -0,0 +1,34 @@ +--- ./configure.ac.orig 2015-04-09 06:28:58.000000000 -0500 ++++ ./configure.ac 2015-04-16 15:33:30.087481982 -0500 +@@ -114,19 +114,19 @@ + fi + fi + +-AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED) ++dnl AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED) + +-if test -z "$PYTHON2"; then +- if test ! -f "$srcdir/src/util/format_srgb.c"; then +- AC_MSG_ERROR([Python not found - unable to generate sources]) +- fi +-else +- if test "x$acv_mako_found" = xno; then +- if test ! -f "$srcdir/src/mesa/main/format_unpack.c"; then +- AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found]) +- fi +- fi +-fi ++dnl if test -z "$PYTHON2"; then ++dnl if test ! -f "$srcdir/src/util/format_srgb.c"; then ++dnl AC_MSG_ERROR([Python not found - unable to generate sources]) ++dnl fi ++dnl else ++dnl if test "x$acv_mako_found" = xno; then ++dnl if test ! -f "$srcdir/src/mesa/main/format_unpack.c"; then ++dnl AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found]) ++dnl fi ++dnl fi ++dnl fi + + AC_PROG_INSTALL + diff --git a/deps/mesa/mesa.no.mako.diff.gz b/deps/mesa/mesa.no.mako.diff.gz deleted file mode 100644 index ab6aa29..0000000 Binary files a/deps/mesa/mesa.no.mako.diff.gz and /dev/null differ diff --git a/deps/ninja/.url b/deps/ninja/.url index 93678d7..3bf2926 100644 --- a/deps/ninja/.url +++ b/deps/ninja/.url @@ -1 +1 @@ -https://github.com/ninja-build/ninja/archive/v1.7.2.tar.gz +https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz diff --git a/deps/ninja/ninja.SlackBuild b/deps/ninja/ninja.SlackBuild index e3a1ad9..ec75d03 100755 --- a/deps/ninja/ninja.SlackBuild +++ b/deps/ninja/ninja.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=ninja -VERSION=${VERSION:-1.7.2} +VERSION=${VERSION:-1.8.2} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -31,7 +31,7 @@ NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -43,8 +43,8 @@ CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then diff --git a/deps/sip/.url b/deps/sip/.url index 445277d..1e93d0f 100644 --- a/deps/sip/.url +++ b/deps/sip/.url @@ -1,2 +1,2 @@ -https://sourceforge.net/projects/pyqt/files/sip/sip-4.19.3/sip-4.19.3.tar.gz +https://sourceforge.net/projects/pyqt/files/sip/sip-4.19.6/sip-4.19.6.tar.gz diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild index f34860c..dee07cb 100755 --- a/deps/sip/sip.SlackBuild +++ b/deps/sip/sip.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008 Aleksandar Samardzic -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2017 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ PKGNAM=sip -VERSION=${VERSION:-4.19.3} +VERSION=${VERSION:-4.19.6} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -34,7 +34,7 @@ NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; diff --git a/deps/sni-qt/sni-qt.SlackBuild b/deps/sni-qt/sni-qt.SlackBuild index 1d090f9..e793059 100755 --- a/deps/sni-qt/sni-qt.SlackBuild +++ b/deps/sni-qt/sni-qt.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL +# Copyright 2015, 2016, 2017 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +23,13 @@ PKGNAM=sni-qt VERSION=${VERSION:-0.2.6} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:--j6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -37,8 +37,8 @@ if [ -z "$ARCH" ]; then export ARCH fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" diff --git a/deps/wayland-protocols/.url b/deps/wayland-protocols/.url index 739ffdc..45e2e88 100644 --- a/deps/wayland-protocols/.url +++ b/deps/wayland-protocols/.url @@ -1,3 +1,3 @@ -https://wayland.freedesktop.org/releases/wayland-protocols-1.11.tar.xz -https://wayland.freedesktop.org/releases/wayland-protocols-1.11.tar.xz.sig +https://wayland.freedesktop.org/releases/wayland-protocols-1.12.tar.xz +https://wayland.freedesktop.org/releases/wayland-protocols-1.12.tar.xz.sig diff --git a/deps/wayland-protocols/wayland-protocols.SlackBuild b/deps/wayland-protocols/wayland-protocols.SlackBuild index 4a46746..9e94b93 100755 --- a/deps/wayland-protocols/wayland-protocols.SlackBuild +++ b/deps/wayland-protocols/wayland-protocols.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=wayland-protocols -VERSION=${VERSION:-1.11} +VERSION=${VERSION:-1.12} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -36,7 +36,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -45,8 +45,8 @@ if [ -z "$ARCH" ]; then fi # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" -- cgit v1.2.3