Merge branch 'master' into libpng

10 files changed, 49 insertions, 5 deletions

diff --git a/packages/SDL.sh b/packages/SDL.sh
index 159562a..8822f49 100644
--- a/packages/SDL.sh
+++ b/packages/SDL.sh
@@ -10,6 +10,8 @@ ENV_MANPATH="share/man"
 ENV_ACLOCAL_PATH="share/aclocal"
 ENV_CPPFLAGS_PATH="include/SDL"
 
+ENABLE_SAME_DIR_BUILD="true"
+
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
 CONFIGURE_FLAGS="--disable-rpath --enable-sdl-dlopen --disable-loadso \
diff --git a/packages/SDL2.sh b/packages/SDL2.sh
index feb1a13..9861ac8 100644
--- a/packages/SDL2.sh
+++ b/packages/SDL2.sh
@@ -3,3 +3,11 @@ include "SDL"
 DEFAULT_BRANCH="default"
 
 ENV_CPPFLAGS_PATH="include/SDL2"
+
+CONFIGURE_FLAGS="--disable-rpath --enable-sdl-dlopen --disable-loadso \
+        --disable-video-ggi \
+        --disable-nas --disable-esd --disable-arts \
+        --disable-alsa-shared --disable-pulseaudio-shared \
+        --disable-x11-shared \
+        --disable-video-vulkan \
+        --enable-video-directfb"
diff --git a/packages/SDL_gfx.sh b/packages/SDL_gfx.sh
index 7e51d60..0527a26 100644
--- a/packages/SDL_gfx.sh
+++ b/packages/SDL_gfx.sh
@@ -6,5 +6,7 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
 ENV_CPPFLAGS_PATH="include/SDL"
 
+ENABLE_SAME_DIR_BUILD="true"
+
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/SDL_image.sh b/packages/SDL_image.sh
index 22d2812..ba66969 100644
--- a/packages/SDL_image.sh
+++ b/packages/SDL_image.sh
@@ -7,6 +7,8 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
 ENV_CPPFLAGS_PATH="include/SDL"
 
+ENABLE_SAME_DIR_BUILD="true"
+
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
 CONFIGURE_FLAGS="--disable-jpg-shared --disable-tif-shared --disable-png-shared --disable-webp-shared"
diff --git a/packages/SDL_mixer.sh b/packages/SDL_mixer.sh
index 42e0efc..b2dfdf1 100644
--- a/packages/SDL_mixer.sh
+++ b/packages/SDL_mixer.sh
@@ -7,6 +7,8 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
 ENV_CPPFLAGS_PATH="include/SDL"
 
+ENABLE_SAME_DIR_BUILD="true"
+
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
 CONFIGURE_FLAGS="--disable-music-mp3 \
diff --git a/packages/SDL_net.sh b/packages/SDL_net.sh
index 524fa02..c192422 100644
--- a/packages/SDL_net.sh
+++ b/packages/SDL_net.sh
@@ -7,6 +7,8 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
 ENV_CPPFLAGS_PATH="include/SDL"
 
+ENABLE_SAME_DIR_BUILD="true"
+
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
 CONFIGURE_FLAGS="--disable-gui"
diff --git a/packages/SDL_ttf.sh b/packages/SDL_ttf.sh
index 392f425..61d84be 100644
--- a/packages/SDL_ttf.sh
+++ b/packages/SDL_ttf.sh
@@ -7,5 +7,7 @@ ENV_PKG_CONFIG_PATH="lib/pkgconfig"
 ENV_LDFLAGS_PATH="lib"
 ENV_CPPFLAGS_PATH="include/SDL"
 
+ENABLE_SAME_DIR_BUILD="true"
+
 BUILD_TYPE="configure"
 SRC_INIT_COMMAND="./autogen.sh"
diff --git a/packages/drm.sh b/packages/drm.sh
new file mode 100644
index 0000000..dcbf883
--- /dev/null
+++ b/packages/drm.sh
@@ -0,0 +1,10 @@
+SRCURL=git://anongit.freedesktop.org/git/mesa/drm
+
+ENV_PATH="etc: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="automake"
diff --git a/packages/mesa.sh b/packages/mesa.sh
new file mode 100644
index 0000000..67c6c3a
--- /dev/null
+++ b/packages/mesa.sh
@@ -0,0 +1,12 @@
+SRCURL=git://anongit.freedesktop.org/git/mesa/mesa
+
+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"
+ENV_LIBGL_DRIVERS_PATH="lib/dri"
+
+BUILD_TYPE="automake"
+CONFIGURE_FLAGS='--enable-gles1 --enable-gles2 --enable-gles3 --with-gallium-drivers="" --with-dri-drivers="i915 i965" --with-vulkan-drivers="intel"'
diff --git a/scripts/include/common.sh b/scripts/include/common.sh
index 4fcb426..bdc71e0 100644
--- a/scripts/include/common.sh
+++ b/scripts/include/common.sh
@@ -126,8 +126,8 @@ function run_autoreconf {
 function run_src_script {
     cd "${srcdir}"
     check_error $?
-    echo $*
-    $*
+    echo $@
+    $@
     check_error $?
 }
 
@@ -146,7 +146,7 @@ function run_configure {
     cd "${builddir}"
     check_error $?
     echo "configure --prefix=\"${bindir}\" ${flags}"
-    "$srcdir"/configure --prefix="${bindir}" ${flags}
+    eval "$srcdir"/configure --prefix="${bindir}" ${flags}
     check_error $?
     unset flags
 }
@@ -159,7 +159,7 @@ function run_cmake {
     cd "${builddir}"
     check_error $?
     echo "cmake -DCMAKE_INSTALL_PREFIX:PATH=\"${bindir}\" \"$srcdir\" ${flags}"
-    cmake -DCMAKE_INSTALL_PREFIX:PATH="${bindir}" "$srcdir" ${flags}
+    eval cmake -DCMAKE_INSTALL_PREFIX:PATH="${bindir}" "$srcdir" ${flags}
     check_error $?
     unset flags
 }
@@ -298,8 +298,10 @@ function package_use {
     repack_paths "$ENV_PKG_CONFIG_PATH" "$OVERRIDE_ENV_PKG_CONFIG_PATH" "PKG_CONFIG_PATH"
     repack_paths "$ENV_MANPATH" "$OVERRIDE_ENV_MANPATH" "MANPATH"
     repack_paths "$ENV_ACLOCAL_PATH" "$OVERRIDE_ENV_ACLOCAL_PATH" "ACLOCAL_PATH"
+    repack_paths "$ENV_LIBGL_DRIVERS_PATH" "$OVERRIDE_ENV_LIBGL_DRIVERS_PATH" "LIBGL_DRIVERS_PATH"
     repack_flags "$ENV_LDFLAGS_PATH" "$OVERRIDE_ENV_LDFLAGS_PATH" "LDFLAGS" "-L"
     repack_flags "$ENV_CPPFLAGS_PATH" "$OVERRIDE_ENV_CPPFLAGS_PATH" "CPPFLAGS" "-I"
+    repack_flags "$ENV_LIBGL_DRIVERS_PATH" "$OVERRIDE_ENV_LIBGL_DRIVERS_PATH" "LIBGL_DRIVERS_PATH"
 }
 
 function common_use_package {
@@ -405,7 +407,7 @@ function package_build {
         run_enable_same_dir_build
     fi
     if [[ "$SRC_INIT_COMMAND" != "" ]]; then
-        run_src_script "$SRC_INIT_COMMAND"
+        eval run_src_script "$SRC_INIT_COMMAND"
     fi
 
     case "$BUILD_TYPE" in