groups/251.native_packages_lib.group: sdl2 switch to win32

Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>

2 files changed, 12 insertions, 8 deletions

diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index ed0360db..ab9dbe03 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -8,7 +8,7 @@ libevent libfastjson libfetch libffi libfirm libflac libgcrypt libgpg_error libi
 libjpeg_turbo libksba libmspack libnettle libogg libpcap libpipeline libpng
 libreadline libredwg libressl libsasl2 libshine libsndfile libsolv libssh libtasn1
 libtelnet libtheora libtirpc libudns libunistring libuv libvorbis libxml2
-libxslt libz libzip sdl1 sdl1_net sdl1_image wolfssl")";
+libxslt libz libzip sdl1 sdl1_net sdl1_image sdl2 wolfssl")";
 : ${PKG_GLIB_DEPENDS:="libffi libz pcre"};
 : ${PKG_GLIB_SHA256SUM:=fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a};
 : ${PKG_GLIB_VERSION:=2.54.0};
@@ -241,6 +241,16 @@ libxslt libz libzip sdl1 sdl1_net sdl1_image wolfssl")";
 : ${PKG_SDL1_IMAGE_VERSION:=1.2.12};
 : ${PKG_SDL1_IMAGE_URL:=https://www.libsdl.org/projects/SDL_image/release/SDL_image-${PKG_SDL1_IMAGE_VERSION}.tar.gz};
 : ${PKG_SDL1_IMAGE_CONFIGURE_ARGS_EXTRA:="--enable-jpg-shared --enable-png-shared --enable-tif-shared --disable-webp --disable-webp-shared"};
+: ${PKG_SDL2_DEPENDS:="w32api w32lib"};
+: ${PKG_SDL2_VERSION:=2.0.8};
+: ${PKG_SDL2_SHA256SUM:=edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec};
+: ${PKG_SDL2_URL:=https://www.libsdl.org/release/SDL2-${PKG_SDL2_VERSION}.tar.gz};
+: ${PKG_SDL2_CONFIGURE_ARGS_EXTRA:="--disable-video-vulkan --disable-video-opengles2 --disable-alsa --disable-static --disable-power"};
+: ${PKG_SDL2_CFLAGS_CONFIGURE_EXTRA:="-DWINAPI_UTF16_DEFAULT -DUNICODE -DWINVER=0x0601 -I${PREFIX_NATIVE}/include/w32api.ports -DSDL_DISABLE_WINDOWS_IME"};
+: ${PKG_SDL2_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX_NATIVE}/lib/w32lib -lkernel32 -luser32 -lgdi32 -limm32 -lshell32 -lu16ports"};
+: ${PKG_SDL2_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_SDL2_IN_TREE:=1};
+: ${PKG_SDL2_FORCE_AUTORECONF:=1};
 : ${PKG_WOLFSSL_SHA256SUM:=7de62300ce14daa0051bfefc7c4d6302f96cabc768b6ae49eda77523b118250c};
 : ${PKG_WOLFSSL_VERSION:=4.5.0};
 : ${PKG_WOLFSSL_URL:=https://github.com/wolfSSL/wolfssl/archive/v${PKG_WOLFSSL_VERSION}-stable.tar.gz};
diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group
index 709ac86b..9d81686d 100644
--- a/groups/261.native_packages_x11.group
+++ b/groups/261.native_packages_x11.group
@@ -8,7 +8,7 @@ freetype_pre fribidi gdk glew gtk2 gtk3 harfbuzz imlib2 libass libcaca
 libepoxy libfontenc libICE libpthread_stubs libSM libX11 libXau libXaw
 libXdamage libXdmcp libXext libxfce4ui libxfce4util libXfixes libXfont2
 libXft libXi libxkbfile libXmu libXpm libXt libXtst libXcursor mesa pango pixman
-rdesktop rxvt_unicode sdl2 st util_macros xcb xcb_proto xcb_util
+rdesktop rxvt_unicode st util_macros xcb xcb_proto xcb_util
 xcb_util_image xcb_util_wm xcowsay xcalc xeyes xfconf xorgproto Xrender xterm
 xtrans xwd xwin")";
 : ${PKG_ATK_DEPENDS:="glib"};
@@ -224,12 +224,6 @@ xtrans xwd xwin")";
 : ${PKG_RXVT_UNICODE_VERSION:=9.22};
 : ${PKG_RXVT_UNICODE_URL:=http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-${PKG_RXVT_UNICODE_VERSION}.tar.bz2};
 : ${PKG_RXVT_UNICODE_CONFIGURE_ARGS_EXTRA:=--disable-perl --disable-lastlog --disable-utmp --disable-wtmp};
-: ${PKG_SDL2_DEPENDS:="libICE libXext"};
-: ${PKG_SDL2_VERSION:=2.0.8};
-: ${PKG_SDL2_SHA256SUM:=edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec};
-: ${PKG_SDL2_URL:=https://www.libsdl.org/release/SDL2-${PKG_SDL2_VERSION}.tar.gz};
-: ${PKG_SDL2_CONFIGURE_ARGS_EXTRA:="--disable-video-vulkan --disable-video-opengles2 --disable-alsa --disable-static"};
-: ${PKG_SDL2_MAKEFLAGS_BUILD:=-j1};
 : ${PKG_ST_DEPENDS:="freetype fontconfig libX11 libXft"};
 : ${PKG_ST_SHA256SUM:=f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000};
 : ${PKG_ST_VERSION:=0.7};