diff options
Diffstat (limited to 'misc/goldencheetah')
| -rw-r--r-- | misc/goldencheetah/README | 15 | ||||
| -rw-r--r-- | misc/goldencheetah/goldencheetah.SlackBuild | 97 | ||||
| -rw-r--r-- | misc/goldencheetah/goldencheetah.info | 8 |
3 files changed, 83 insertions, 37 deletions
diff --git a/misc/goldencheetah/README b/misc/goldencheetah/README index a5ae478cd3..eaea231c15 100644 --- a/misc/goldencheetah/README +++ b/misc/goldencheetah/README @@ -2,9 +2,12 @@ GoldenCheetah is a software package that: * Downloads ride data directly from the CycleOps PowerTap and the SRM PowerControl V. Support for SRM PowerControl VI and VII is planned for the future. -* Imports ride data downloaded with other programs, including TrainingPeaks - WKO+ and the manufacturers' software for the Ergomo, Garmin, Polar, - PowerTap, and SRM devices. -* Provides a rich set of analysis tools, including a critical power graph, - BikeScore calculation, histogram analysis, a best interval finder, and a - pedal force versus pedal velocity chart, to name just a few. +* Imports ride data downloaded with other programs, including + TrainingPeaks WKO+ and the manufacturers' software for the Ergomo, + Garmin, Polar, PowerTap, and SRM devices. +* Provides a rich set of analysis tools, including a critical power + graph, BikeScore calculation, histogram analysis, a best interval + finder, and a pedal force versus pedal velocity chart, to name just + a few. + +Optional dependencies: R, libkml diff --git a/misc/goldencheetah/goldencheetah.SlackBuild b/misc/goldencheetah/goldencheetah.SlackBuild index a3dec7778e..c92061c31c 100644 --- a/misc/goldencheetah/goldencheetah.SlackBuild +++ b/misc/goldencheetah/goldencheetah.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for GoldenCheetah -# Copyright 2018-2020 Kyle Guinn <elyk03@gmail.com> +# Copyright 2018-2023 Kyle Guinn <elyk03@gmail.com> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,11 +22,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=goldencheetah SRCNAM=GoldenCheetah -VERSION=${VERSION:-3.5} -BUILD=${BUILD:-3} +VERSION=${VERSION:-3.6} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$(uname -m)" in @@ -36,9 +39,13 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM-$VERSION +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} DOCS="COPYING doc/user/GC3-Manual.pdf doc/user/GC3-FAQ.pdf" @@ -68,36 +75,72 @@ cd $SRCNAM-$VERSION chown -R root:root . chmod -R u+w,go-w,a+rX-st . -# GoldenCheetah statically links its own version of qwt, which doesn't seem to -# correspond to any released version. The build system uses -L/-l flags to +# GoldenCheetah statically links its own version of qwt, which is likely a fork +# from around version 6.1.0 or 6.1.1. The build system uses -L/-l flags to # refer to the static lib, but due to other -L flags and symlinked directories, # it might find the system qwt instead. Replace the flags with a filename. -sed -i 's|-L\(\$\${PWD}/../qwt/lib\) -l\(qwtd\?\)|\1/lib\2.a|' src/src.pro - -# We don't have a '-qt4' suffix on lrelease. -sed -i 's|\(lrelease\)-qt4|\1|' src/src.pro +sed -i 's|-L\(\$\${PWD}/\.\./qwt/lib\) -l\(qwtd\?\)|\1/lib\2.a|' src/src.pro + +# Use the system levmar if available. +# Builtin copy is version 2.6 without lapack support. +# TODO: Replace other builtins (qzip?, qxt, lmfit). +if [ -f /usr/include/levmar/levmar.h ]; then + sed -i 's|\.\./contrib/levmar[^ ]* *||g' src/src.pro + echo "INCLUDEPATH += /usr/include/levmar" >> src/src.pro + echo "LIBS += -llevmar" >> src/src.pro +fi # Copy the default config files, then modify them below. cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri cp src/gcconfig.pri.in src/gcconfig.pri # Set up the build configuration. -sed -i 's|^#\(CONFIG += release\)|\1|' src/gcconfig.pri -sed -i 's|^#\(QMAKE_LEX = flex\)|\1|' src/gcconfig.pri -sed -i 's|^#\(QMAKE_YACC = bison\)|\1|' src/gcconfig.pri -sed -i 's|^#\(LIBZ_INCLUDE =\)|\1|' src/gcconfig.pri -sed -i 's|^#\(LIBZ_LIBS = -lz\)|\1|' src/gcconfig.pri +sed -i 's|^#\(CONFIG += release\)\>|\1|' src/gcconfig.pri +sed -i 's|^#\(QMAKE_LEX = flex\)\>|\1|' src/gcconfig.pri +sed -i 's|^#\(QMAKE_YACC = bison\)\>|\1|' src/gcconfig.pri + +# Use -b y to force bison >= 3.7 to copy y.tab.h's contents into y.tab.cpp +# instead of #including it, since qmake's renaming to $base_yacc.{h,cpp} +# breaks the #include. +#echo "QMAKE_YACCFLAGS_MANGLE = -p $base -b y" >> src/gcconfig.pri +#echo "QMAKE_YACC_HEADER = y.tab.h" >> src/gcconfig.pri +#echo "QMAKE_YACC_SOURCE = y.tab.cpp" >> src/gcconfig.pri +# But that breaks parallel builds (multiple build steps produce temporary files +# with the same y.tab.{h,cpp} names). Make the files available by both names. +sed -i 's|^#\(QMAKE_MOVE =\) cp|\1 ln -sf|' src/gcconfig.pri + +# Required GSL support. +echo "GSL_INCLUDES = $(pkg-config --cflags gsl)" >> src/gcconfig.pri +echo "GSL_LIBS = $(pkg-config --libs gsl)" >> src/gcconfig.pri # Enable optional dependencies found in stock Slackware. -# Also enable optional video and webengine from QT5 since QT5 is required. -# TODO: Enable other optional dependencies (python3, R, libsamplerate, ...) -sed -i 's|^#\(ICAL_INSTALL =\).*|\1 /usr|' src/gcconfig.pri -sed -i 's|^#\(LIBUSB_INSTALL =\).*|\1 /usr|' src/gcconfig.pri -sed -i 's|^#\(CONFIG += link_pkgconfig\)|\1|' src/gcconfig.pri -sed -i 's|^#\(PKGCONFIG =\)|\1|' src/gcconfig.pri -sed -i 's|^\(DEFINES += GC_VIDEO_NONE\)|#\1|' src/gcconfig.pri -sed -i 's|^#\(DEFINES += GC_VIDEO_QT5\)|\1|' src/gcconfig.pri -sed -i 's|^#\(DEFINES += NOWEBKIT\)|\1|' src/gcconfig.pri +sed -i 's|^#\(ICAL_INSTALL =\).*|\1 /usr|' src/gcconfig.pri +sed -i 's|^#\(LIBUSB_INSTALL =\).*|\1 /usr|' src/gcconfig.pri +sed -i 's|^#\(LIBUSB_USE_V_1 = true\)\>|\1|' src/gcconfig.pri +sed -i 's|^#\(SAMPLERATE_INSTALL =\).*|\1 /usr|' src/gcconfig.pri +sed -i 's|^#\(CONFIG += link_pkgconfig\)\>|\1|' src/gcconfig.pri +sed -i 's|^#\(PKGCONFIG =\).*|\1|' src/gcconfig.pri +sed -i 's|^#\(LIBZ_INCLUDE =\).*|\1|' src/gcconfig.pri +sed -i 's|^#\(LIBZ_LIBS = -lz\)\>|\1|' src/gcconfig.pri +sed -i 's|^\(DEFINES += GC_VIDEO_NONE\)\>|#\1|' src/gcconfig.pri +sed -i 's|^#\(DEFINES += GC_VIDEO_QT5\)\>|\1|' src/gcconfig.pri + +# Optional Python support. Regenerate the SIP files. +echo "DEFINES += GC_WANT_PYTHON" >> src/gcconfig.pri +echo "PYTHONINCLUDES = $(pkg-config --cflags python3-embed)" >> src/gcconfig.pri +echo "PYTHONLIBS = $(pkg-config --libs python3-embed)" >> src/gcconfig.pri +rm -f src/Python/SIP/sip* +make -C src/Python/SIP -f Makefile.hack + +# Optional KML support. +if pkg-config --exists libkml; then + sed -i 's|^#\(KML_INSTALL =\).*|\1 /usr|' src/gcconfig.pri +fi + +# Optional R support. +if pkg-config --exists libR; then + sed -i 's|^#\(DEFINES += GC_WANT_R\)\>|\1|' src/gcconfig.pri +fi qmake-qt5 \ -recursive \ @@ -128,4 +171,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/misc/goldencheetah/goldencheetah.info b/misc/goldencheetah/goldencheetah.info index 324df46ea8..cf1039e7d4 100644 --- a/misc/goldencheetah/goldencheetah.info +++ b/misc/goldencheetah/goldencheetah.info @@ -1,10 +1,10 @@ PRGNAM="goldencheetah" -VERSION="3.5" +VERSION="3.6" HOMEPAGE="https://www.goldencheetah.org/" -DOWNLOAD="https://github.com/GoldenCheetah/GoldenCheetah/archive/V3.5/GoldenCheetah-3.5.tar.gz" -MD5SUM="ed25ef3dfb447b1c4d9cc7387da5d7e7" +DOWNLOAD="https://github.com/GoldenCheetah/GoldenCheetah/archive/v3.6/GoldenCheetah-3.6.tar.gz" +MD5SUM="f802f36e855bbac79cf44826e94576c2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="qt5" +REQUIRES="levmar" MAINTAINER="Kyle Guinn" EMAIL="elyk03@gmail.com" |