From 106d0460486d43fe37adeb41a4abbb17ddcd0834 Mon Sep 17 00:00:00 2001 From: Konstantin Dmitriev Date: Jan 16 2019 16:40:27 +0000 Subject: Do not use SDL 2.0.7 SDL 2.0.7 produces linker errors with MinGW builds: /usr/local/x86_64-w64-mingw32/sys-root/lib/libmingw32.a(lib64_libmingw32_a-crt0_c.o): In function `main': /install-mingw/build/crt-x86_64-w64-mingw32/../../download/mingw-w64-v5.0.3/mingw-w64-crt/crt/crt0_c.c:18: undefined reference to `WinMain' --- diff --git a/docker-builder-data/build/script/packet/sdl-2.0.5.sh b/docker-builder-data/build/script/packet/sdl-2.0.5.sh index e33942b..4a8bb74 100644 --- a/docker-builder-data/build/script/packet/sdl-2.0.5.sh +++ b/docker-builder-data/build/script/packet/sdl-2.0.5.sh @@ -1,6 +1,9 @@ DEPS="" PK_DIRNAME="SDL2-2.0.5" +## !!! SDL 2.0.7 produces linker errors with MinGW builds: +# /usr/local/x86_64-w64-mingw32/sys-root/lib/libmingw32.a(lib64_libmingw32_a-crt0_c.o): In function `main': +# /install-mingw/build/crt-x86_64-w64-mingw32/../../download/mingw-w64-v5.0.3/mingw-w64-crt/crt/crt0_c.c:18: undefined reference to `WinMain' PK_ARCHIVE="$PK_DIRNAME.tar.gz" PK_URL="https://www.libsdl.org/release/$PK_ARCHIVE" diff --git a/docker-builder-data/build/script/packet/sdl-2.0.7.sh b/docker-builder-data/build/script/packet/sdl-2.0.7.sh deleted file mode 100644 index 8672be2..0000000 --- a/docker-builder-data/build/script/packet/sdl-2.0.7.sh +++ /dev/null @@ -1,9 +0,0 @@ -DEPS="" - -PK_DIRNAME="SDL2-2.0.7" -PK_ARCHIVE="$PK_DIRNAME.tar.gz" -PK_URL="https://www.libsdl.org/release/$PK_ARCHIVE" - -PK_CONFIGURE_OPTIONS_DEFAULT="--host=$HOST --prefix=$INSTALL_PACKET_DIR" - -source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/sdl_mixer-2.0.1.sh b/docker-builder-data/build/script/packet/sdl_mixer-2.0.1.sh new file mode 100644 index 0000000..14a51df --- /dev/null +++ b/docker-builder-data/build/script/packet/sdl_mixer-2.0.1.sh @@ -0,0 +1,9 @@ +DEPS="sdl-2.0.5" + +PK_DIRNAME="SDL2_mixer-2.0.1" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="https://www.libsdl.org/projects/SDL_mixer/release/$PK_ARCHIVE" + +PK_CONFIGURE_OPTIONS_DEFAULT="--host=$HOST --prefix=$INSTALL_PACKET_DIR" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/sdl_mixer-2.0.4.sh b/docker-builder-data/build/script/packet/sdl_mixer-2.0.4.sh deleted file mode 100644 index 38ebe35..0000000 --- a/docker-builder-data/build/script/packet/sdl_mixer-2.0.4.sh +++ /dev/null @@ -1,9 +0,0 @@ -DEPS="sdl-2.0.7" - -PK_DIRNAME="SDL2_mixer-2.0.4" -PK_ARCHIVE="$PK_DIRNAME.tar.gz" -PK_URL="https://www.libsdl.org/projects/SDL_mixer/release/$PK_ARCHIVE" - -PK_CONFIGURE_OPTIONS_DEFAULT="--host=$HOST --prefix=$INSTALL_PACKET_DIR" - -source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/synfigstudio-master.sh b/docker-builder-data/build/script/packet/synfigstudio-master.sh index 2a095e9..9a455a9 100644 --- a/docker-builder-data/build/script/packet/synfigstudio-master.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-master.sh @@ -17,7 +17,7 @@ # adwaitaicons | gtk, rsvg # gnomethemes | gtk, rsvg -DEPS="synfigcore-master gtkmm-3.22.0 sdl_mixer-2.0.4" +DEPS="synfigcore-master gtkmm-3.22.0 sdl_mixer-2.0.1" DEPS_NATIVE="libtool-2.4.6 synfigcore-master" if [ "$PLATFORM" = "linux" ]; then