btw I can do a test build after my currently running bulk finishes,
but it's on i386 which misses some of the ports which use sdl2
On 2022/10/10 21:23, Thomas Frohwein wrote:
> On Sat, Sep 10, 2022 at 02:32:33AM -0400, Thomas Frohwein wrote:
> > Hi,
> >
> > Based on a diff from Brad and with a fix for the gamecontroller support
> > found by namn@. I've tested several consumers runtime. sthen@ said
> > Brad's diff that was the same except for the gamecontroller patch ran
> > into problems building games/devilutionx and games/warzone2100.
>
> In the meantime, SDL 2.24.1 has released. I had to update the devilutionx
> diff because apparently some of the cmake module internals changed.
>
> Could someone put this in a bulk build to make sure no new fallout emerges?
>
> Attaching updated diff for sdl2 2.24.1, devilutionx, and warzone2100. (The
> latter 2 were the fallouts that sthen@ noticed on a bulk build with sdl2
> 2.24.0).
>
> Release Notes:
> https://github.com/libsdl-org/SDL/releases/tag/release-2.24.1
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/sdl2/Makefile,v
> retrieving revision 1.40
> diff -u -p -r1.40 Makefile
> --- Makefile 2 May 2022 14:04:34 -0000 1.40
> +++ Makefile 11 Oct 2022 00:59:26 -0000
> @@ -1,13 +1,12 @@
> COMMENT= cross-platform multimedia library
>
> -V= 2.0.20
> +V= 2.24.1
> DISTNAME= SDL2-${V}
> PKGNAME= sdl2-${V}
> -REVISION= 0
> CATEGORIES= devel
> MASTER_SITES= https://www.libsdl.org/release/
>
> -SHARED_LIBS= SDL2 0.11 # 0.18
> +SHARED_LIBS= SDL2 0.12 # 0.18
>
> HOMEPAGE= https://www.libsdl.org/
>
> @@ -18,8 +17,8 @@ DEBUG_PACKAGES= ${BUILD_PACKAGES}
> # zlib
> PERMIT_PACKAGE= Yes
>
> -WANTLIB+= X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender Xss
> -WANTLIB+= Xxf86vm m pthread samplerate sndio usbhid xcb
> +WANTLIB+= X11 Xcursor Xext Xfixes Xi Xrandr Xrender Xss m pthread samplerate
> +WANTLIB+= sndio usbhid xcb
> # GL library is dlopen'd
> WANTLIB+= GL
>
> @@ -62,5 +61,8 @@ CONFIGURE_ARGS+= --enable-altivec=no
>
> # tests in test subdir, but interactive and not hooked up to build
> NO_TEST= Yes
> +
> +pre-configure:
> + ${SUBST_CMD} ${WRKSRC}/sdl2-config.cmake.in
>
> .include <bsd.port.mk>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/sdl2/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- distinfo 8 Mar 2022 11:38:36 -0000 1.14
> +++ distinfo 11 Oct 2022 00:59:26 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (SDL2-2.0.20.tar.gz) = xWq6HXtbDn6Znkp2mMcLY6M5T/lwS19uHFfgwW8E3QY=
> -SIZE (SDL2-2.0.20.tar.gz) = 7207221
> +SHA256 (SDL2-2.24.1.tar.gz) = vBIViLEQUGVZjOOAeAJqQUwo6pXmbtKtq0xE2Aswnhs=
> +SIZE (SDL2-2.24.1.tar.gz) = 7523849
> Index: patches/patch-Makefile_in
> ===================================================================
> RCS file: /cvs/ports/devel/sdl2/patches/patch-Makefile_in,v
> retrieving revision 1.12
> diff -u -p -r1.12 patch-Makefile_in
> --- patches/patch-Makefile_in 8 Mar 2022 11:38:36 -0000 1.12
> +++ patches/patch-Makefile_in 11 Oct 2022 00:59:26 -0000
> @@ -1,7 +1,7 @@
> Index: Makefile.in
> --- Makefile.in.orig
> +++ Makefile.in
> -@@ -133,7 +133,7 @@ LT_AGE = @LT_AGE@
> +@@ -135,7 +135,7 @@ LT_AGE = @LT_AGE@
> LT_CURRENT = @LT_CURRENT@
> LT_RELEASE = @LT_RELEASE@
> LT_REVISION = @LT_REVISION@
> Index: patches/patch-sdl2-config_cmake_in
> ===================================================================
> RCS file: patches/patch-sdl2-config_cmake_in
> diff -N patches/patch-sdl2-config_cmake_in
> --- patches/patch-sdl2-config_cmake_in 8 Mar 2022 11:38:36 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,76 +0,0 @@
> -Index: sdl2-config.cmake.in
> ---- sdl2-config.cmake.in.orig
> -+++ sdl2-config.cmake.in
> -@@ -10,72 +10,3 @@ set(SDL2_LIBDIR "${libdir}")
> - set(SDL2_INCLUDE_DIRS "${includedir}/SDL2")
> - set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@")
> - string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
> --
> --if(NOT TARGET SDL2::SDL2)
> -- # provide SDL2::SDL2, SDL2::SDL2main and SDL2::SDL2-static targets, like SDL2Config.cmake does, for compatibility
> --
> -- # Remove -lSDL2 as that is handled by CMake, note the space at the end so it does not replace e.g. -lSDL2main
> -- # This may require "libdir" beeing set (from above)
> -- string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS "@SDL_RLD_FLAGS@ @SDL_LIBS@ ")
> -- # also get rid of -lSDL2main, if you want to link against that use both SDL2::SDL2main and SDL2::SDL2 (in that order)
> -- # (SDL2Config.cmake has the same behavior)
> -- string(REPLACE "-lSDL2main" "" SDL2_EXTRA_LINK_FLAGS ${SDL2_EXTRA_LINK_FLAGS})
> -- string(STRIP "${SDL2_EXTRA_LINK_FLAGS}" SDL2_EXTRA_LINK_FLAGS)
> -- string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS_STATIC "@SDL_STATIC_LIBS@ ")
> -- string(STRIP "${SDL2_EXTRA_LINK_FLAGS_STATIC}" SDL2_EXTRA_LINK_FLAGS_STATIC)
> --
> --if(WIN32 AND NOT MSVC)
> -- # MINGW needs very special handling, because the link order must be exactly -lmingw32 -lSDL2main -lSDL2
> -- # for it to work at all (and -mwindows somewhere); a normal SHARED IMPORTED or STATIC IMPORTED library always puts itself first
> -- # so handle this like a header-only lib and put everything in INTERFACE_LINK_LIBRARIES
> --
> -- add_library(SDL2::SDL2 INTERFACE IMPORTED)
> -- set_target_properties(SDL2::SDL2 PROPERTIES
> -- INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}"
> -- INTERFACE_LINK_LIBRARIES "-L${SDL2_LIBDIR} -lSDL2")
> --
> -- add_library(SDL2::SDL2main INTERFACE IMPORTED)
> -- set_target_properties(SDL2::SDL2main PROPERTIES
> -- INTERFACE_LINK_LIBRARIES "-L${SDL2_LIBDIR} -lmingw32 -lSDL2main -mwindows")
> --
> --else() # (not WIN32) or MSVC
> --
> -- add_library(SDL2::SDL2 SHARED IMPORTED)
> -- set_target_properties(SDL2::SDL2 PROPERTIES
> -- INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}"
> -- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
> -- IMPORTED_LOCATION "${SDL2_LIBDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}SDL2${CMAKE_SHARED_LIBRARY_SUFFIX}")
> --
> -- if(MSVC)
> -- # This file is generated when building SDL2 with autotools and MinGW, and MinGW/dlltool
> -- # isn't able to generate .lib files that are usable by recent MSVC versions
> -- # (something about "module unsafe for SAFESEH"; SAFESEH is enabled by default in MSVC).
> -- # The .lib file for SDL2.dll *could* be generated with `gendef SDL2.dll` and then
> -- # `lib.exe /machine:x86 /def:SDL2.def /out:SDL2.lib` (or /machine:amd64)
> -- # but that requires lib.exe from a Visual Studio installation - and that still doesn't
> -- # give you a static SDL2main.lib with SAFESEH support that you'll need (unless you don't use SDL2main)
> -- # Note that when building SDL2 with CMake and MSVC, the result works with both MinGW and MSVC.
> --
> -- message(FATAL_ERROR, "This build of libSDL2 only supports MinGW, not MSVC (Visual C++), because it lacks .lib files!")
> -- # MSVC needs SDL2.lib set as IMPORTED_IMPLIB to link against (comment out message() call above if you added SDL2.lib yourself)
> -- set_target_properties(SDL2::SDL2 PROPERTIES IMPORTED_IMPLIB "${SDL2_LIBDIR}/SDL2.lib")
> -- else()
> -- # this mustn't be set for MSVC, so do it here in an extra call here
> -- set_target_properties(SDL2::SDL2 PROPERTIES INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}")
> -- endif()
> --
> -- add_library(SDL2::SDL2main STATIC IMPORTED)
> -- set_target_properties(SDL2::SDL2main PROPERTIES
> -- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
> -- IMPORTED_LOCATION "${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2main${CMAKE_STATIC_LIBRARY_SUFFIX}")
> --
> --endif() # (not WIN32) or MSVC
> --
> -- add_library(SDL2::SDL2-static STATIC IMPORTED)
> -- set_target_properties(SDL2::SDL2-static PROPERTIES
> -- INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIRS}"
> -- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
> -- IMPORTED_LOCATION "${SDL2_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}SDL2${CMAKE_STATIC_LIBRARY_SUFFIX}"
> -- INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS_STATIC}")
> --
> --endif() # NOT TARGET SDL2::SDL2
> Index: patches/patch-sdl2-config_in
> ===================================================================
> RCS file: /cvs/ports/devel/sdl2/patches/patch-sdl2-config_in,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-sdl2-config_in
> --- patches/patch-sdl2-config_in 8 Mar 2022 11:38:36 -0000 1.3
> +++ patches/patch-sdl2-config_in 11 Oct 2022 00:59:26 -0000
> @@ -1,7 +1,7 @@
> Index: sdl2-config.in
> --- sdl2-config.in.orig
> +++ sdl2-config.in
> -@@ -42,10 +42,10 @@ while test $# -gt 0; do
> +@@ -46,10 +46,10 @@ while test $# -gt 0; do
> echo @SDL_VERSION@
> ;;
> --cflags)
> Index: patches/patch-sdl2_pc_in
> ===================================================================
> RCS file: /cvs/ports/devel/sdl2/patches/patch-sdl2_pc_in,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-sdl2_pc_in
> --- patches/patch-sdl2_pc_in 8 Mar 2022 11:38:36 -0000 1.5
> +++ patches/patch-sdl2_pc_in 11 Oct 2022 00:59:26 -0000
> @@ -6,6 +6,6 @@ Index: sdl2.pc.in
> Requires:
> Conflicts:
> -Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@ @PKGCONFIG_LIBS_PRIV@ @SDL_STATIC_LIBS@
> --Cflags: -I${includedir}/SDL2 @SDL_CFLAGS@
> +-Cflags: -I${includedir} -I${includedir}/SDL2 @SDL_CFLAGS@
> +Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@ @X_LIBS@
> +Cflags: -I${includedir}/SDL2 @SDL_CFLAGS@ @X_CFLAGS@
> Index: patches/patch-src_SDL_c
> ===================================================================
> RCS file: /cvs/ports/devel/sdl2/patches/patch-src_SDL_c,v
> retrieving revision 1.9
> diff -u -p -r1.9 patch-src_SDL_c
> --- patches/patch-src_SDL_c 2 May 2022 14:04:34 -0000 1.9
> +++ patches/patch-src_SDL_c 11 Oct 2022 00:59:26 -0000
> @@ -1,10 +1,10 @@
> -Disable breaking if no haptic feedback support which disallows gamecontroller API
> -allow custom SDL GetPlatform name with env var SDL_PLATFORM
> +- Disable breaking if no haptic feedback support which disallows gamecontroller API
> +- Allow custom SDL GetPlatform name with env var SDL_PLATFORM
>
> Index: src/SDL.c
> --- src/SDL.c.orig
> +++ src/SDL.c
> -@@ -279,9 +279,6 @@ SDL_InitSubSystem(Uint32 flags)
> +@@ -301,9 +301,6 @@ SDL_InitSubSystem(Uint32 flags)
> }
> SDL_PrivateSubsystemRefCountIncr(SDL_INIT_GAMECONTROLLER);
> flags_initialized |= SDL_INIT_GAMECONTROLLER;
> @@ -14,13 +14,12 @@ Index: src/SDL.c
>
No comments:
Post a Comment