Merge branch 'master' into zlib

21 files changed, 96 insertions, 24 deletions

diff --git a/.ci/buildlib.sh b/.ci/buildlib.sh
index 18ece90..fa6481d 100755
--- a/.ci/buildlib.sh
+++ b/.ci/buildlib.sh
@@ -1,21 +1,8 @@
 #!/bin/bash
 
-mkdir /usr/local/spm
-cp -r . /usr/local/spm
-export dir123=$(pwd)
-cd /usr/local/spm
-
-export installname="${1}_${2}"
-export envname="env"
 export srcbranch="$2"
-./.ci/run.sh ./getsrc.sh "$1" || exit 1
-./.ci/run.sh ./build.sh "$1" || exit 1
-
-echo mkdir "${dir123}/bin/${installname}"
-mkdir "${dir123}/bin/${installname}"
+export envname="${1}_${2}"
 
-echo cp -r "/usr/local/spm/bin/${installname}" "${dir123}/bin/"
-cp -r "/usr/local/spm/bin/${installname}" "${dir123}/bin/"
-
-echo "cp ./env/runenv.sh ${dir123}/bin/${installname}/"
-cp "./env/runenv.sh" "${dir123}/bin/${installname}/" || exit 1
+cd /usr/local/spm || exit 1
+./.ci/runretry.sh ./getsrc.sh "$1" || exit 1
+./.ci/run.sh ./build.sh "$1" || exit 1
diff --git a/.ci/copyfinal.sh b/.ci/copyfinal.sh
new file mode 100755
index 0000000..0e1fa55
--- /dev/null
+++ b/.ci/copyfinal.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+echo mkdir -p "./bin/${installname}"
+mkdir -p "./bin/${installname}"
+
+echo cp -r "/usr/local/spm/bin/${installname}" "./bin/"
+cp -r "/usr/local/spm/bin/${installname}" "./bin/"
+
+echo "/usr/local/spm/env/*.sh ./bin/${installname}/"
+cp /usr/local/spm/env/*.sh "./bin/${installname}/" || exit 1
+echo "cp /usr/local/spm/env/run${installname}.sh ./bin/${installname}/runenv.sh"
+cp "/usr/local/spm/env/run${installname}.sh" "./bin/${installname}/runenv.sh" || exit 1
diff --git a/.ci/copyspm.sh b/.ci/copyspm.sh
new file mode 100755
index 0000000..6cdf1aa
--- /dev/null
+++ b/.ci/copyspm.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+mkdir /usr/local/spm
+cp -r . /usr/local/spm
+export dir123=$(pwd)
+cd /usr/local/spm
diff --git a/.ci/run.sh b/.ci/run.sh
index 89461de..1c2a6a4 100755
--- a/.ci/run.sh
+++ b/.ci/run.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 cd scripts
-../.ci/retry.sh $* || exit 1
+$* || exit 1
 cd ..
diff --git a/.ci/runretry.sh b/.ci/runretry.sh
new file mode 100755
index 0000000..89461de
--- /dev/null
+++ b/.ci/runretry.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd scripts
+../.ci/retry.sh $* || exit 1
+cd ..
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5689de7..86bb08a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,7 @@ test:commands1:
   stage: test
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext
-  - ./.ci/run.sh ./getsrc.sh zlib
+  - ./.ci/runretry.sh ./getsrc.sh zlib
   - ls src/zlib
   - ./.ci/run.sh ./build.sh zlib
   - ls bin/zlib
@@ -33,7 +33,7 @@ test:commands1:
   - ./.ci/run.sh ./clean.sh zlib
   - mkdir bin/zlib
   - ./.ci/run.sh ./clean.sh zlib
-  - ./.ci/run.sh ./updatesrc.sh zlib
+  - ./.ci/runretry.sh ./updatesrc.sh zlib
   variables:
     srcbranch: v1.2.10
   <<: *job-artifacts
@@ -43,7 +43,7 @@ test:commands2:
   script:
   - ./.ci/install.sh git-core bash gcc g++ make autoconf automake autopoint gettext 
                      zlib1g-dev libtool
-  - ./.ci/run.sh ./getsrc.sh curl
+  - ./.ci/runretry.sh ./getsrc.sh curl
   - ls src/curl
   - ./.ci/run.sh ./build.sh curl
   - ls bin/curl
@@ -52,7 +52,7 @@ test:commands2:
   - ./.ci/run.sh ./clean.sh curl
   - mkdir bin/curl
   - ./.ci/run.sh ./clean.sh curl
-  - ./.ci/run.sh ./updatesrc.sh curl
+  - ./.ci/runretry.sh ./updatesrc.sh curl
   variables:
     srcbranch: curl-7_51_0
   <<: *job-artifacts
diff --git a/packages/SDL.sh b/packages/SDL.sh
index 4b47b5a..159562a 100644
--- a/packages/SDL.sh
+++ b/packages/SDL.sh
@@ -5,7 +5,10 @@ DEFAULT_BRANCH="SDL-1.2"
 ENV_PATH="bin"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
+ENV_ACLOCAL_PATH="share/aclocal"
+ENV_CPPFLAGS_PATH="include/SDL"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_gfx.sh b/packages/SDL_gfx.sh
index 0e44dc2..7e51d60 100644
--- a/packages/SDL_gfx.sh
+++ b/packages/SDL_gfx.sh
@@ -1,8 +1,10 @@
 SRCURL=https://github.com/ferzkopp/SDL_gfx.git
-DEFAULT_BRANCH="SDL-1.2"
+DEFAULT_BRANCH="master"
 
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
+ENV_CPPFLAGS_PATH="include/SDL"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_image.sh b/packages/SDL_image.sh
index 0e8f8cc..22d2812 100644
--- a/packages/SDL_image.sh
+++ b/packages/SDL_image.sh
@@ -4,6 +4,8 @@ DEFAULT_BRANCH="SDL-1.2"
 
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
+ENV_CPPFLAGS_PATH="include/SDL"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_mixer.sh b/packages/SDL_mixer.sh
index 7f53d17..42e0efc 100644
--- a/packages/SDL_mixer.sh
+++ b/packages/SDL_mixer.sh
@@ -4,6 +4,8 @@ DEFAULT_BRANCH="SDL-1.2"
 
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
+ENV_CPPFLAGS_PATH="include/SDL"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_net.sh b/packages/SDL_net.sh
index 5b55d35..524fa02 100644
--- a/packages/SDL_net.sh
+++ b/packages/SDL_net.sh
@@ -4,6 +4,8 @@ DEFAULT_BRANCH="SDL-1.2"
 
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
+ENV_CPPFLAGS_PATH="include/SDL"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_ttf.sh b/packages/SDL_ttf.sh
index 4e3696b..392f425 100644
--- a/packages/SDL_ttf.sh
+++ b/packages/SDL_ttf.sh
@@ -4,6 +4,8 @@ DEFAULT_BRANCH="SDL-1.2"
 
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
+ENV_CPPFLAGS_PATH="include/SDL"
 
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/cmake.sh b/packages/cmake.sh
index 9d43972..ef152e0 100644
--- a/packages/cmake.sh
+++ b/packages/cmake.sh
@@ -2,5 +2,6 @@ SRCURL=git://cmake.org/cmake.git
 DEFAULT_BRANCH="v3.7.2"
 
 ENV_PATH="bin"
+ENV_ACLOCAL_PATH="share/aclocal"
 
 BUILD_TYPE="cmake"
diff --git a/packages/curl.sh b/packages/curl.sh
index 58ba51e..bc0c3a2 100644
--- a/packages/curl.sh
+++ b/packages/curl.sh
@@ -3,7 +3,9 @@ SRCURL=https://github.com/curl/curl.git
 ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
+ENV_CPPFLAGS_PATH="include"
 
 ENABLE_SAME_DIR_BUILD="true"
 
diff --git a/packages/libpng.sh b/packages/libpng.sh
index 9da9556..b4695f7 100644
--- a/packages/libpng.sh
+++ b/packages/libpng.sh
@@ -3,6 +3,8 @@ SRCURL=git://git.code.sf.net/p/libpng/code
 ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
+#ENV_CPPFLAGS_PATH="include/libpngXX"
 
 BUILD_TYPE="automake"
diff --git a/packages/libxml2.sh b/packages/libxml2.sh
index 0496bdf..894e58b 100644
--- a/packages/libxml2.sh
+++ b/packages/libxml2.sh
@@ -3,7 +3,10 @@ SRCURL=git://git.gnome.org/libxml2
 ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
+ENV_ACLOCAL_PATH="share/aclocal"
+ENV_CPPFLAGS_PATH="include/libxml2"
 
 BUILD_TYPE="automake"
 CONFIGURE_FLAGS="--with-python-install-dir="${bindir}/lib/python""
diff --git a/packages/physfs.sh b/packages/physfs.sh
index 9addbb0..8bf51f6 100644
--- a/packages/physfs.sh
+++ b/packages/physfs.sh
@@ -5,5 +5,7 @@ DEFAULT_BRANCH="stable-2.0"
 ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
+ENV_CPPFLAGS_PATH="include"
 
 BUILD_TYPE="cmake"
diff --git a/packages/virglrenderer.sh b/packages/virglrenderer.sh
index 30eeabc..8c87c5b 100644
--- a/packages/virglrenderer.sh
+++ b/packages/virglrenderer.sh
@@ -3,7 +3,9 @@ SRCURL=git://people.freedesktop.org/~airlied/virglrenderer
 ENV_PATH="bin"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
+ENV_CPPFLAGS_PATH="include:include/virgl"
 
 BUILD_TYPE="automake"
 AUTORECONF_FLAGS="-v --install"
diff --git a/packages/zlib.sh b/packages/zlib.sh
index 5d30818..d3e4ade 100644
--- a/packages/zlib.sh
+++ b/packages/zlib.sh
@@ -4,7 +4,9 @@ DEFAULT_BRANCH="v1.2.11"
 ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
+ENV_CPPFLAGS_PATH="include"
 
 ENABLE_SAME_DIR_BUILD="true"
 
diff --git a/packages/zlib_ng.sh b/packages/zlib_ng.sh
index 49af866..ad426ac 100644
--- a/packages/zlib_ng.sh
+++ b/packages/zlib_ng.sh
@@ -4,6 +4,8 @@ DEFAULT_BRANCH="develop"
 ENV_PATH="bin:lib:include"
 ENV_LD_LIBRARY_PATH="lib"
 ENV_PKG_CONFIG_PATH="lib/pkgconfig"
+ENV_LDFLAGS_PATH="lib"
 ENV_MANPATH="share/man"
+ENV_CPPFLAGS_PATH="include"
 
 BUILD_TYPE="configure"
diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index 0df1bba..d57879b 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -78,11 +78,26 @@ function env_path {
     check_error $?
 }
 
+function env_aclocal_path {
+    echo "export ACLOCAL_PATH=${bindir}/$1:\$PATH" >>"${envfile}"
+    check_error $?
+}
+
 function env_lib_library_path {
     echo "export LD_LIBRARY_PATH=${bindir}/$1:\$LD_LIBRARY_PATH" >>"${envfile}"
     check_error $?
 }
 
+function env_ldflags_path {
+    echo "export LDFLAGS=${bindir}/$1 \$LDFLAGS" >>"${envfile}"
+    check_error $?
+}
+
+function env_cppflags_path {
+    echo "export CPPFLAGS=${bindir}/$1 \$CPPFLAGS" >>"${envfile}"
+    check_error $?
+}
+
 function env_pkg_config_path {
     echo "export PKG_CONFIG_PATH=${bindir}/$1:\$PKG_CONFIG_PATH" >>"${envfile}"
     check_error $?
@@ -239,7 +254,22 @@ function repack_paths {
         packedpaths="${packedpaths}${bindir}/$var:"
     done
     unset IFS
-    echo "export $2=${packedpaths}\$$2" >>"${envfile}"
+    echo "export $2=\"${packedpaths}\$$2\"" >>"${envfile}"
+    check_error $?
+}
+
+function repack_flags {
+    if [[ "$1" == "" ]]; then
+        return
+    fi
+    IFS=":"
+    packedpaths=""
+    for var in $1
+    do
+        packedpaths="${packedpaths}${3}${bindir}/$var "
+    done
+    unset IFS
+    echo "export $2=\"${packedpaths}\$$2\"" >>"${envfile}"
     check_error $?
 }
 
@@ -249,6 +279,9 @@ function package_use {
     repack_paths "$ENV_LD_LIBRARY_PATH" "LD_LIBRARY_PATH"
     repack_paths "$ENV_PKG_CONFIG_PATH" "PKG_CONFIG_PATH"
     repack_paths "$ENV_MANPATH" "MANPATH"
+    repack_paths "$ENV_ACLOCAL_PATH" "ACLOCAL_PATH"
+    repack_flags "$ENV_LDFLAGS_PATH" "LDFLAGS" "-L"
+    repack_flags "$ENV_CPPFLAGS_PATH" "CPPFLAGS" "-I"
 }
 
 function common_use_package {