Browse Source

Use git commit for tre download/build instead of website

Signed-off-by: falkTX <falktx@falktx.com>
pull/10/head
falkTX 4 years ago
parent
commit
d2d1b84afc
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 9 additions and 5 deletions
  1. +3
    -3
      bootstrap-jack2.sh
  2. +5
    -1
      setup/functions.sh
  3. +1
    -1
      setup/versions.sh

+ 3
- 3
bootstrap-jack2.sh View File

@@ -138,8 +138,8 @@ fi
# tre (win32 only)

if [ "${WIN32}" -eq 1 ]; then
download tre "${TRE_VERSION}" "https://laurikari.net/tre"
build_autoconf tre "${TRE_VERSION}" "--disable-nls"
download tre "${TRE_VERSION}" "https://github.com/laurikari/tre.git" "" "git"
build_autoconfgen tre "${TRE_VERSION}" "--disable-nls"
fi

# ---------------------------------------------------------------------------------------------------------------------
@@ -155,7 +155,7 @@ if [ "${WIN64}" -eq 1 ]; then
source setup/functions.sh

copy_download tre tre-x32 "${TRE_VERSION}"
build_autoconf tre-x32 "${TRE_VERSION}" "--disable-nls --libdir=${PAWPAW_PREFIX}/lib32"
build_autoconfgen tre-x32 "${TRE_VERSION}" "--disable-nls --libdir=${PAWPAW_PREFIX}/lib32"

if [ ! -e "${PAWPAW_PREFIX}/lib/libtre32.a" ]; then
ln -s "${PAWPAW_PREFIX}/lib32/libtre.a" "${PAWPAW_PREFIX}/lib/libtre32.a"


+ 5
- 1
setup/functions.sh View File

@@ -206,7 +206,11 @@ function build_autoconfgen() {

if [ ! -f "${pkgdir}/.stamp_preconfigured" ]; then
pushd "${pkgdir}"
autoconf
if [ -f utils/autogen.sh ]; then
./utils/autogen.sh
else
autoconf
fi
touch .stamp_preconfigured
popd
fi


+ 1
- 1
setup/versions.sh View File

@@ -96,6 +96,6 @@ DB_VERSION=5.3.28
OPUS_VERSION=1.3.1
PORTAUDIO_VERSION=19.6.0
RTAUDIO_VERSION=e03448bd15c1c34e842459939d755f5f89e880ed
TRE_VERSION=0.8.0
TRE_VERSION=6092368aabdd0dbb0fbceb2766a37b98e0ff6911

# ---------------------------------------------------------------------------------------------------------------------

Loading…
Cancel
Save