From 4273a9bfb8c37e716b1769f689559e1054e96734 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 6 Sep 2017 21:20:08 +0300 Subject: Add into SDL packages ENABLE_SAME_DIR_BUILD="true". Also disable vulkan in SDL2 packages, because it missing check for is vulkan present. --- packages/SDL.sh | 2 ++ packages/SDL2.sh | 8 ++++++++ packages/SDL_gfx.sh | 2 ++ packages/SDL_image.sh | 2 ++ packages/SDL_mixer.sh | 2 ++ packages/SDL_net.sh | 2 ++ packages/SDL_ttf.sh | 2 ++ 7 files changed, 20 insertions(+) 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" -- cgit v1.2.3-60-g2f50 From e37b5a61ef34a0f5dc2dbc48105dbcfde6e03271 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 7 Sep 2017 04:35:49 +0300 Subject: Add environment variable support in packages: ENV_LIBGL_DRIVERS_PATH Also add ENV_LIBGL_DRIVERS_PATH into mesa package. --- packages/mesa.sh | 1 + scripts/include/common.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/packages/mesa.sh b/packages/mesa.sh index 76bd32c..67c6c3a 100644 --- a/packages/mesa.sh +++ b/packages/mesa.sh @@ -6,6 +6,7 @@ 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 929bc7a..bdc71e0 100644 --- a/scripts/include/common.sh +++ b/scripts/include/common.sh @@ -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 { -- cgit v1.2.3-60-g2f50