From 9857d428cc7173b48607835a615f4c475619b3ff Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 22 Dec 2019 22:38:45 +0100 Subject: Deps: updates (lensfun, mlt, sip) and addition (md4c) --- deps/alldeps.SlackBuild | 1 + deps/lensfun/.url | 2 +- deps/lensfun/lensfun.SlackBuild | 15 ++--- deps/md4c/.url | 1 + deps/md4c/md4c.SlackBuild | 122 ++++++++++++++++++++++++++++++++++++++++ deps/md4c/slack-desc | 19 +++++++ deps/mlt/.url | 2 +- deps/mlt/mlt.SlackBuild | 4 +- deps/sip/.url | 2 +- deps/sip/sip.SlackBuild | 2 +- deps/updates.SlackBuild | 1 + 11 files changed, 158 insertions(+), 13 deletions(-) create mode 100644 deps/md4c/.url create mode 100755 deps/md4c/md4c.SlackBuild create mode 100644 deps/md4c/slack-desc diff --git a/deps/alldeps.SlackBuild b/deps/alldeps.SlackBuild index 83ca43a..f9f078d 100755 --- a/deps/alldeps.SlackBuild +++ b/deps/alldeps.SlackBuild @@ -15,6 +15,7 @@ QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR ALLDEPS=" \ extra-cmake-modules \ + md4c \ sni-qt \ libxkbcommon \ wayland \ diff --git a/deps/lensfun/.url b/deps/lensfun/.url index 3fc2a84..aee7ede 100644 --- a/deps/lensfun/.url +++ b/deps/lensfun/.url @@ -1 +1 @@ -http://sourceforge.net/projects/lensfun/files/0.3.2/lensfun-0.3.2.tar.gz +https://github.com/lensfun/lensfun/archive/v0.3.95.tar.gz diff --git a/deps/lensfun/lensfun.SlackBuild b/deps/lensfun/lensfun.SlackBuild index 14af1b5..ba64125 100755 --- a/deps/lensfun/lensfun.SlackBuild +++ b/deps/lensfun/lensfun.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2009, 2010, 2012, 2017 Eric Hameleers, Eindhoven, NL -# Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2012, 2017, 2019 Eric Hameleers, Eindhoven, NL +# Copyright 2017, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -25,7 +25,7 @@ PKGNAM=lensfun -VERSION=${VERSION:-0.3.2} +VERSION=${VERSION:-0.3.95} 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=${ARCH} -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then @@ -96,8 +96,9 @@ cd build -DBUILD_FOR_SSE=ON \ -DBUILD_FOR_SSE2=ON \ -DBUILD_TESTS=OFF \ + -DINSTALL_HELPER_SCRIPTS=ON \ .. - make + make VERBOSE=1 make install DESTDIR=$PKG cd .. diff --git a/deps/md4c/.url b/deps/md4c/.url new file mode 100644 index 0000000..e059ce8 --- /dev/null +++ b/deps/md4c/.url @@ -0,0 +1 @@ +https://github.com/mity/md4c/archive/release-0.4.2.tar.gz diff --git a/deps/md4c/md4c.SlackBuild b/deps/md4c/md4c.SlackBuild new file mode 100755 index 0000000..06903d5 --- /dev/null +++ b/deps/md4c/md4c.SlackBuild @@ -0,0 +1,122 @@ +#!/bin/sh + +# Copyright 2019 Eric Hameleers, Eindhoven, NL +# Copyright 2019 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# ----------------------------------------------------------------------------- + + +PKGNAM=md4c +VERSION=${VERSION:-0.4.2} +BUILD=${BUILD:-1} + +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=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 + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + SLKLDFLAGS="-L/usr/lib64" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + SLKLDFLAGS="" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf ${PKGNAM}*-$VERSION +tar xvf $CWD/${PKGNAM}*-$VERSION.tar.?z* || exit 1 +cd ${PKGNAM}*-$VERSION || exit 1 + +# Fix bogus permissions: +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Configure and compile: +mkdir -p build +cd build + cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_MANDIR=/usr/man \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DBUILD_TESTS=OFF \ + .. + make VERBOSE=1 + make install DESTDIR=$PKG +cd .. + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + *.md \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# Compress man page: +gzip -9 $PKG/usr/man/man?/*.1 + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Add a package description: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz + diff --git a/deps/md4c/slack-desc b/deps/md4c/slack-desc new file mode 100644 index 0000000..8574885 --- /dev/null +++ b/deps/md4c/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +md4c: md4c (C Markdown parser) +md4c: +md4c: MD4C stands for "Markdown for C" and that is exactly what +md4c: this project is about. +md4c: Markdown is the markup language you will commonly see used in +md4c: README.md files. +md4c: +md4c: +md4c: +md4c: md4c home: https://github.com/mity/md4c +md4c: diff --git a/deps/mlt/.url b/deps/mlt/.url index fe14862..9a2e287 100644 --- a/deps/mlt/.url +++ b/deps/mlt/.url @@ -1,2 +1,2 @@ -https://github.com/mltframework/mlt/archive/v6.16.0.tar.gz +https://github.com/mltframework/mlt/archive/v6.18.0.tar.gz diff --git a/deps/mlt/mlt.SlackBuild b/deps/mlt/mlt.SlackBuild index bb7d091..310b32e 100755 --- a/deps/mlt/mlt.SlackBuild +++ b/deps/mlt/mlt.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mlt -VERSION=${VERSION:-6.16.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-6.18.0} +BUILD=${BUILD:-1} PYTHONSITEPKG=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") diff --git a/deps/sip/.url b/deps/sip/.url index 98c6740..ef7b01f 100644 --- a/deps/sip/.url +++ b/deps/sip/.url @@ -1,2 +1,2 @@ -https://www.riverbankcomputing.com/static/Downloads/sip/4.19.19/sip-4.19.19.tar.gz +https://www.riverbankcomputing.com/static/Downloads/sip/4.19.20/sip-4.19.20.tar.gz diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild index af83f82..8c8e167 100755 --- a/deps/sip/sip.SlackBuild +++ b/deps/sip/sip.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sip -VERSION=${VERSION:-4.19.19} +VERSION=${VERSION:-4.19.20} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/deps/updates.SlackBuild b/deps/updates.SlackBuild index 3161973..83375c9 100755 --- a/deps/updates.SlackBuild +++ b/deps/updates.SlackBuild @@ -15,6 +15,7 @@ QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR ALLDEPS=" \ extra-cmake-modules \ + md4c \ sni-qt \ SDL_sound \ OpenAL \ -- cgit v1.2.3