From 18cefe8eb412d0aee1baa06369ee91e3d3ef1e83 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Fri, 8 Apr 2016 22:09:00 +0100 Subject: [PATCH 1/3] add automake/configure option cmake only builds 'kmix' - add option to use automake/configure for full build --- Core/tdemultimedia/tdemultimedia.SlackBuild | 49 +++++++++++++++++++-- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/Core/tdemultimedia/tdemultimedia.SlackBuild b/Core/tdemultimedia/tdemultimedia.SlackBuild index f12a295..447c2d1 100755 --- a/Core/tdemultimedia/tdemultimedia.SlackBuild +++ b/Core/tdemultimedia/tdemultimedia.SlackBuild @@ -24,10 +24,24 @@ PRGNAM=tdemultimedia VERSION=${VERSION:-R14.0.3} -BUILD=${BUILD:-1} -# You may or may not get away with removing -j1, but mostly it just breaks the build: -NUMJOBS=${NUMJOBS:-" -j1 "} +BUILD=${BUILD:-2} TAG=${TAG:-_tde} +PREFIX="/usr" + +# Set the number of parallel jobs [-jn] to whatever your system will support +# This is one of the builds that Trinity 'How to Build' advises may not build if greater than -j1 +NUMJOBS=${NUMJOBS:-" -j "} +# cmake only builds 'kmix' - uncomment to use automake/configure to be able to build all options +#USECMAKE="no" + +#For automake/configure build +Options() +{ +## Edit or comment out as required +# let configure find the tqt3 directories +QTDIR="" +return +} DOCS="AUTHORS COPYING* README*" @@ -143,6 +157,8 @@ cd ${PRGNAM} chown -R root:root . chmod -R u+w,go+r-w,a+rX-st . +if [ ! "${USECMAKE:-}" == "no" ] +then # Ummm...so this just builds kmix....? lmao mkdir -p build-${PRGNAM} cd build-${PRGNAM} @@ -155,7 +171,32 @@ cd build-${PRGNAM} -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DBUILD_ALL="ON" \ .. - make $NUMJOBS || exit 1 +else +# update admin for installed version of libtool +cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ +cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in + +make -f admin/Makefile.common + +mkdir -p build-${PRGNAM} +cd build-${PRGNAM} + +Options + +# Configure the package +LDFLAGS="${SLKLDFLAGS}" +CFLAGS="${SLKCFLAGS}" +CXXFLAGS="${SLKCFLAGS}" +../configure \ + --prefix=${PREFIX} \ + --sysconfdir="/etc/trinity" \ + --mandir=${PREFIX}/man \ + --disable-rpath \ + --disable-debug \ + --enable-closure +fi + + make ${NUMJOBS:-} || exit 1 make DESTDIR=$PKG install || exit 1 cd - From b5d195704a567bc59b634c2f424d9adf916a27b0 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Fri, 8 Apr 2016 22:28:02 +0100 Subject: [PATCH 2/3] add tdegames Slackbuild Option to choose games to be packaged Test for kolf dependency --- Apps/tdegames-R14.0.3.SlackBuild | 248 +++++++++++++++++++++++++++++++ 1 file changed, 248 insertions(+) create mode 100644 Apps/tdegames-R14.0.3.SlackBuild diff --git a/Apps/tdegames-R14.0.3.SlackBuild b/Apps/tdegames-R14.0.3.SlackBuild new file mode 100644 index 0000000..714d05c --- /dev/null +++ b/Apps/tdegames-R14.0.3.SlackBuild @@ -0,0 +1,248 @@ +#!/bin/sh +# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST +# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015 Eric Hameleers, Eindhoven, Netherlands +# Copyright 2015-2016 Thorn Inurcide thorninurcide@gmail.com +# 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. + +PRGNAM=tdegames +VERSION=${VERSION:-R14.0.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_tde} +PREFIX=/usr + + +Options() +{ +## Edit or comment out as required +# Set the number of parallel jobs [-jn] to whatever your system will support +NUMJOBS=${NUMJOBS:--j} +# let configure find the tqt3 directories +QTDIR="" +# if tdemultimedia has been built with cmake, only kmix has been built and without libartsmodules +# - in that case, remove it's requirement for kolf. +[[ ! $(grep -h libartsmodules.so /var/log/packages/tdemultimedia-* 2>/dev/null) ]] && sed -i 's| -lartsmodules||' kolf/Makefile.am +return 0 +} + + +ChooseGames() +{ +# Uncomment to choose the games to be built - otherwise the default is all +#CHOOSE="y" +# +if [ "${CHOOSE:-}" == "y" ] +then +# edit for games required +CHOICE="atlantik kasteroids katomic kbackgammon kbattleship kblackbox kbounce kenolaba kgoldrunner kjumpingcube klines kmahjongg kmines knetwalk kolf konquest kpat kpoker kreversi ksame kshisen ksmiletris ksnake ksokoban kspaceduel ktron ktuberling lskat twin4 klickety kfouleggs ksirtet" +sed -i "s|TOPSUBDIRS = .*$|TOPSUBDIRS = libtdegames doc libksirtet $CHOICE|" Makefile +# don't package carddecks if they're not needed for chosen games +[[ ! $(echo $CHOICE|grep -E "kpat|kpoker|lskat") ]] && sed -i 's|carddecks||' libtdegames/Makefile +# docs for chosen games only +sed -i "s|SUBDIRS =.*$|SUBDIRS =. $CHOICE|" doc/Makefile +fi +return +} + + +SlackDesc() +{ +echo " +# 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------------------------------------------------------| +tdegames: Games for the Trinity Desktop Environment +tdegames: +tdegames: atlantik, kasteroids, katomic, kbackgammon, kbattleship, kblackbox, +tdegames: kbounce, keneloba, kfouleggs, kjumpingcube, klickety, klines, +tdegames: kmahjongg, kmines, kolf, konquest, kpat, kpoker, kreversi, ksame, +tdegames: kshisen, ksirtet, ksmiletris, ksnake, ksokoban, kspaceduel, ktron, +tdegames: ktuberling, twin4, lskat. +tdegames: +tdegames: +tdegames: +tdegames: +" > $PKG/install/slack-desc +} + + +DOCS="AUTHORS ChangeLog* COPYING* README*" + +# Where do we look for sources? +SRCDIR=$(cd $(dirname $0); pwd) + + +TMP=${TMP:-/tmp/build} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.bz2" +SRCURL="http://tde-mirror.yosemite.net/trinity/releases/${VERSION}/applications/${PRGNAM}-${VERSION}.tar.bz2" + +# You can use your own private machine.conf file to overrule machine defaults: +if [ -e $SRCDIR/machine.conf ]; then + . $SRCDIR/machine.conf +elif [ -e /etc/slackbuild/machine.conf ]; then + . /etc/slackbuild/machine.conf +else + # Automatically determine the architecture we're building on: + MARCH=$( uname -m ) + if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + armv6hl) export ARCH=$MARCH ;; + 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: + case "$ARCH" in + i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + x86_64) SLKCFLAGS="-O2 -fPIC" + SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" + ;; + armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + *) SLKCFLAGS=${SLKCFLAGS:-"O2"} + SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} + ;; + esac +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +# Exit the script on errors: +set -e +trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR +# Catch unitialized variables: +set -u +P1=${1:-1} + +# Save old umask and set to 0022: +_UMASK_=$(umask) +umask 0022 + +# Create working directories: +mkdir -p $OUTPUT +mkdir -p $TMP/tmp-$PRGNAM +mkdir -p $PKG +rm -rf $PKG/* +rm -rf $TMP/tmp-$PRGNAM/* +rm -rf $OUTPUT/{checkout,configure,make,install,error,makepkg,patch}-$PRGNAM.log + +# Source file availability: +if ! [ -f ${SOURCE} ]; then + echo "Source '$(basename ${SOURCE})' not available yet..." + # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT + [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" + if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi + if ! [ "x${SRCURL}" == "x" ]; then + echo "Will download file to $(dirname $SOURCE)" + wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true + if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then + echo "Downloading '$(basename ${SOURCE})' failed... aborting the build." + mv -f "${SOURCE}" "${SOURCE}".FAIL + exit 1 + fi + else + echo "File '$(basename ${SOURCE})' not available... aborting the build." + exit 1 + fi +fi + +if [ "$P1" == "--download" ]; then + echo "Download complete." + exit 0 +fi + +cd $TMP/tmp-$PRGNAM +tar -xvf ${SOURCE} + +cd ${PRGNAM} +Options + +# update admin for installed version of libtool +cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ +cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in + +make -f admin/Makefile.common + +chown -R root:root . +chmod -R u+w,go+r-w,a+rX-st . + +mkdir -p build-${PRGNAM} +cd build-${PRGNAM} + + +# Configure the package +LDFLAGS="${SLKLDFLAGS}" +CFLAGS="${SLKCFLAGS}" +CXXFLAGS="${SLKCFLAGS}" +../configure \ + --prefix=${PREFIX} \ + --sysconfdir="/etc/trinity" \ + --mandir=${PREFIX}/man \ + --disable-rpath \ + --enable-closure + +ChooseGames + make ${NUMJOBS:-} || exit 1 + make DESTDIR=$PKG install || exit 1 +cd - + + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true +cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION +find $PKG/usr/doc -type f -exec chmod 644 {} \; + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/install +SlackDesc + +cd $PKG +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} +cd $OUTPUT +md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz} > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.${PKGTYPE:-txz}.md5 +cd - +cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt + +# Restore the original umask: +umask ${_UMASK_} + From e1011040379cd4b3d2afbb848d6ee5dfa42bff1d Mon Sep 17 00:00:00 2001 From: Ray-V Date: Fri, 8 Apr 2016 22:28:53 +0100 Subject: [PATCH 3/3] create directory --- Apps/{ => tdegames}/tdegames-R14.0.3.SlackBuild | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Apps/{ => tdegames}/tdegames-R14.0.3.SlackBuild (100%) diff --git a/Apps/tdegames-R14.0.3.SlackBuild b/Apps/tdegames/tdegames-R14.0.3.SlackBuild similarity index 100% rename from Apps/tdegames-R14.0.3.SlackBuild rename to Apps/tdegames/tdegames-R14.0.3.SlackBuild