From 7359b294b00253aed9f5df8312550b478ad2ff30 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sat, 13 Jan 2018 22:01:22 +0100
Subject: [PATCH] Tweak to build scripts

---
 data/linux/build-deps.sh | 67 ++++++++++++++++++++++------------------
 data/linux/build64.sh    | 10 ++----
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/data/linux/build-deps.sh b/data/linux/build-deps.sh
index 77a1fe8b4..7d117484a 100755
--- a/data/linux/build-deps.sh
+++ b/data/linux/build-deps.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# apt-get install build-essential libglib2.0-dev uuid-dev
+
 # ---------------------------------------------------------------------------------------------------------------------
 # set variables
 
@@ -13,7 +15,9 @@ FLAC_VERSION=1.3.2
 LIBSNDFILE_VERSION=1.0.28
 LIBGIG_VERSION=4.0.0
 LINUXSAMPLER_VERSION=2.0.0
-FLUIDSYNTH_VERSION=1.1.7
+FLUIDSYNTH_VERSION=1.1.6
+
+MAKE_ARGS="-j 8"
 
 # ---------------------------------------------------------------------------------------------------------------------
 # stop on error
@@ -86,7 +90,7 @@ if [ ! -f pkg-config-${PKG_CONFIG_VERSION}_$ARCH/build-done ]; then
 cp -r pkg-config-${PKG_CONFIG_VERSION} pkg-config-${PKG_CONFIG_VERSION}_$ARCH
 cd pkg-config-${PKG_CONFIG_VERSION}_$ARCH
 ./configure --enable-indirect-deps --with-internal-glib --with-pc-path=$PKG_CONFIG_PATH --prefix=$PREFIX
-make
+make ${MAKE_ARGS}
 make install
 touch build-done
 cd ..
@@ -105,8 +109,8 @@ cp -r liblo-${LIBLO_VERSION} liblo-${LIBLO_VERSION}_$ARCH
 cd liblo-${LIBLO_VERSION}_$ARCH
 ./configure --enable-static --disable-shared --prefix=$PREFIX \
 --enable-threads \
---disable-examples --disable-tools --disable-tests
-make
+--disable-examples --disable-tools
+make ${MAKE_ARGS}
 make install
 touch build-done
 cd ..
@@ -129,7 +133,7 @@ fi
 if [ ! -f zlib-${ZLIB_VERSION}/build-done ]; then
 cd zlib-${ZLIB_VERSION}
 ./configure --static --prefix=$PREFIX
-make
+make ${MAKE_ARGS}
 make install
 touch build-done
 cd ..
@@ -146,14 +150,12 @@ fi
 if [ ! -f file-${FILE_VERSION}/build-done ]; then
 cd file-${FILE_VERSION}
 ./configure --enable-static --disable-shared --prefix=$PREFIX
-make
+make ${MAKE_ARGS}
 make install
 touch build-done
 cd ..
 fi
 
-return
-
 # ---------------------------------------------------------------------------------------------------------------------
 # libogg
 
@@ -165,7 +167,7 @@ fi
 if [ ! -f libogg-${LIBOGG_VERSION}/build-done ]; then
 cd libogg-${LIBOGG_VERSION}
 ./configure --enable-static --disable-shared --prefix=$PREFIX
-make
+make ${MAKE_ARGS}
 make install
 touch build-done
 cd ..
@@ -182,7 +184,7 @@ fi
 if [ ! -f libvorbis-${LIBVORBIS_VERSION}/build-done ]; then
 cd libvorbis-${LIBVORBIS_VERSION}
 ./configure --enable-static --disable-shared --prefix=$PREFIX
-make
+make ${MAKE_ARGS}
 make install
 touch build-done
 cd ..
@@ -199,8 +201,9 @@ fi
 if [ ! -f flac-${FLAC_VERSION}/build-done ]; then
 cd flac-${FLAC_VERSION}
 chmod +x configure install-sh
-./configure --enable-static --disable-shared --prefix=$PREFIX
-make
+./configure --enable-static --disable-shared --prefix=$PREFIX \
+--disable-cpplibs
+make ${MAKE_ARGS}
 make install
 touch build-done
 cd ..
@@ -209,16 +212,16 @@ fi
 # ---------------------------------------------------------------------------------------------------------------------
 # libsndfile
 
-if [ ! -d libsndfile-${SNDFILE_VERSION} ]; then
-curl -O http://www.mega-nerd.com/libsndfile/files/libsndfile-${SNDFILE_VERSION}.tar.gz
-tar -xf libsndfile-${SNDFILE_VERSION}.tar.gz
+if [ ! -d libsndfile-${LIBSNDFILE_VERSION} ]; then
+curl -O http://www.mega-nerd.com/libsndfile/files/libsndfile-${LIBSNDFILE_VERSION}.tar.gz
+tar -xf libsndfile-${LIBSNDFILE_VERSION}.tar.gz
 fi
 
-if [ ! -f libsndfile-${SNDFILE_VERSION}/build-done ]; then
-cd libsndfile-${SNDFILE_VERSION}
-# sed -i -e "s/#include <Carbon.h>//" programs/sndfile-play.c
-./configure --enable-static --disable-shared --disable-sqlite --prefix=$PREFIX
-make
+if [ ! -f libsndfile-${LIBSNDFILE_VERSION}/build-done ]; then
+cd libsndfile-${LIBSNDFILE_VERSION}
+./configure --enable-static --disable-shared --prefix=$PREFIX \
+--disable-full-suite --disable-alsa --disable-sqlite
+make ${MAKE_ARGS}
 make install
 touch build-done
 cd ..
@@ -239,7 +242,7 @@ patch -p1 -i ../patches/libgig_fix-build.patch
 touch patched
 fi
 ./configure --enable-static --disable-shared --prefix=$PREFIX
-make
+make ${MAKE_ARGS}
 make install
 touch build-done
 cd ..
@@ -258,7 +261,6 @@ cd linuxsampler-${LINUXSAMPLER_VERSION}
 if [ ! -f patched ]; then
 patch -p1 -i ../patches/linuxsampler_allow-no-drivers-build.patch
 patch -p1 -i ../patches/linuxsampler_disable-ladspa-fx.patch
-# sed -i -e "s/HAVE_AU/HAVE_VST/" src/hostplugins/Makefile.am
 touch patched
 fi
 rm configure
@@ -269,8 +271,7 @@ make -f Makefile.svn configure
 --disable-asio-driver --disable-midishare-driver --disable-mmemidi-driver \
 --disable-coreaudio-driver --disable-coremidi-driver \
 --disable-instruments-db --disable-sf2-engine
-# sed -i -e "s/bison (GNU Bison) //" config.h
-make -j 8
+make ${MAKE_ARGS}
 make install
 sed -i -e "s|-llinuxsampler|-llinuxsampler -L$PREFIX/lib/libgig -lgig -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lpthread -lm|" $PREFIX/lib/pkgconfig/linuxsampler.pc
 touch build-done
@@ -284,6 +285,12 @@ if [ ! -d $PREFIX/include/glib-2.0 ]; then
 cp -r /usr/include/glib-2.0 $PREFIX/include/
 fi
 
+if [ ! -f $PREFIX/lib/pkgconfig/glib-2.0.pc ]; then
+cp /usr/lib/x86_64-linux-gnu/pkgconfig/glib-2.0.pc $PREFIX/lib/pkgconfig/
+cp /usr/lib/x86_64-linux-gnu/pkgconfig/gthread-2.0.pc $PREFIX/lib/pkgconfig/
+cp /usr/lib/x86_64-linux-gnu/pkgconfig/libpcre.pc $PREFIX/lib/pkgconfig/
+fi
+
 # ---------------------------------------------------------------------------------------------------------------------
 # fluidsynth
 
@@ -295,12 +302,12 @@ fi
 if [ ! -f fluidsynth-${FLUIDSYNTH_VERSION}/build-done ]; then
 cd fluidsynth-${FLUIDSYNTH_VERSION}
 ./configure --enable-static --disable-shared --prefix=$PREFIX \
- --disable-dbus-support --disable-aufile-support \
- --disable-pulse-support --disable-alsa-support --disable-portaudio-support --disable-oss-support --disable-jack-support \
- --disable-coreaudio --disable-coremidi --disable-dart --disable-lash --disable-ladcca \
- --without-readline \
- --enable-libsndfile-support
-make
+--enable-libsndfile-support \
+--disable-dbus-support --disable-aufile-support \
+--disable-pulse-support --disable-alsa-support --disable-portaudio-support --disable-oss-support --disable-jack-support \
+--disable-coreaudio --disable-coremidi --disable-dart --disable-lash --disable-ladcca \
+--without-readline
+make ${MAKE_ARGS}
 make install
 sed -i -e "s|-lfluidsynth|-lfluidsynth -lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -logg -lpthread -lm|" $PREFIX/lib/pkgconfig/fluidsynth.pc
 touch build-done
diff --git a/data/linux/build64.sh b/data/linux/build64.sh
index e73f88dfc..509ee3660 100755
--- a/data/linux/build64.sh
+++ b/data/linux/build64.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-MAKE_FLAGS="-j 8 HAVE_FFMPEG=false HAVE_PROJECTM=false HAVE_PULSEAUDIO=false EXTERNAL_PLUGINS=false"
+MAKE_FLAGS="-j 8 HAVE_FFMPEG=false HAVE_PULSEAUDIO=false EXTERNAL_PLUGINS=false"
 
 if [ ! -f Makefile ]; then
   cd ../..
@@ -19,11 +19,9 @@ unset CPPFLAGS
 ##############################################################################################
 # Complete 64bit build
 
-export CFLAGS="-O2 -m64"
+export CFLAGS="-m64"
 export CXXFLAGS=$CFLAGS
 export LDFLAGS="-m64"
-
-# export PATH=$TARGETDIR/carla/bin:$TARGETDIR/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PKG_CONFIG_PATH=$TARGETDIR/carla/lib/pkgconfig:$TARGETDIR/carla64/lib/pkgconfig
 
 make $MAKE_FLAGS
@@ -31,11 +29,9 @@ make $MAKE_FLAGS
 ##############################################################################################
 # Build 32bit bridges
 
-export CFLAGS="-O2 -m32"
+export CFLAGS="-m32"
 export CXXFLAGS=$CFLAGS
 export LDFLAGS="-m32"
-
-# export PATH=$TARGETDIR/carla32/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PKG_CONFIG_PATH=$TARGETDIR/carla32/lib/pkgconfig
 
 make posix32 $MAKE_FLAGS