diff options
author | nia <nia@pkgsrc.org> | 2020-03-17 12:49:29 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2020-03-17 12:49:29 +0000 |
commit | 844bc8fc47dcaf1235a4fcbc4482b20e94ec1a56 (patch) | |
tree | 89fc702d43ef1f5a36c53ac0258434482a611364 | |
parent | 912199db8d2476ea870c63b8c772db307c1c8d69 (diff) | |
download | pkgsrc-844bc8fc47dcaf1235a4fcbc4482b20e94ec1a56.tar.gz |
SDL2: Update to 2.0.12
In addition to lots of bug fixes, here are the major changes in this release:
General:
* Added SDL_GetTextureScaleMode() and SDL_SetTextureScaleMode() to get
and set the scaling mode used for a texture
* Added SDL_LockTextureToSurface(), similar to SDL_LockTexture() but the
locked area is exposed as a SDL surface.
* Added new blend mode, SDL_BLENDMODE_MUL, which does a modulate and
blend operation
* Added the hint SDL_HINT_DISPLAY_USABLE_BOUNDS to override the results
of SDL_GetDisplayUsableBounds() for display index 0.
* Added the window underneath the finger to the SDL_TouchFingerEvent
* Added SDL_GameControllerTypeForIndex(), SDL_GameControllerGetType() to
return the type of a game controller (Xbox 360, Xbox One, PS3, PS4, or
Nintendo Switch Pro)
* Added the hint SDL_HINT_GAMECONTROLLERTYPE to override the automatic
game controller type detection
* Added SDL_JoystickFromPlayerIndex() and
SDL_GameControllerFromPlayerIndex() to get the device associated with
a player index
* Added SDL_JoystickSetPlayerIndex() and
SDL_GameControllerSetPlayerIndex() to set the player index associated
with a device
* Added the hint SDL_HINT_GAMECONTROLLER_USE_BUTTON_LABELS to specify
whether Nintendo Switch Pro controllers should use the buttons as
labeled or swapped to match positional layout. The default is to use
the buttons as labeled.
* Added support for Nintendo GameCube controllers to the HIDAPI driver,
and a hint SDL_HINT_JOYSTICK_HIDAPI_GAMECUBE to control whether this
is used.
* Improved support for Xbox 360 and Xbox One controllers when using the
HIDAPI driver
* Added support for many game controllers, including:
* 8BitDo FC30 Pro
* 8BitDo M30 GamePad
* BDA PS4 Fightpad
* HORI Fighting Commander
* Hyperkin Duke
* Hyperkin X91
* MOGA XP5-A Plus
* NACON GC-400ES
* NVIDIA Controller v01.04
* PDP Versus Fighting Pad
* Razer Raion Fightpad for PS4
* Razer Serval
* Stadia Controller
* SteelSeries Stratus Duo
* Victrix Pro Fight Stick for PS4
* Xbox One Elite Series 2
* Fixed blocking game controller rumble calls when using the HIDAPI
driver
* Added SDL_zeroa() macro to zero an array of elements
* Added SDL_HasARMSIMD() which returns true if the CPU has ARM SIMD
(ARMv6+) features
Windows:
* Fixed crash when using the release SDL DLL with applications built
with gcc
* Fixed performance regression in event handling introduced in 2.0.10
* Added support for SDL_SetThreadPriority() for UWP applications
Linux:
* Added the hint SDL_HINT_VIDEO_X11_WINDOW_VISUALID to specify the
visual chosen for new X11 windows
* Added the hint SDL_HINT_VIDEO_X11_FORCE_EGL to specify whether X11
should use GLX or EGL by default
iOS / tvOS / macOS:
* Added SDL_Metal_CreateView() and SDL_Metal_DestroyView() to create
CAMetalLayer-backed NSView/UIView and attach it to the specified
window.
iOS/ tvOS:
* Added support for Bluetooth Steam Controllers as game controllers
tvOS:
* Fixed support for surround sound on Apple TV
Android:
* Added SDL_GetAndroidSDKVersion() to return the API level of the
current device
* Added support for audio capture using OpenSL-ES
* Added support for Bluetooth Steam Controllers as game controllers
* Fixed rare crashes when the app goes into the background or terminates
-rw-r--r-- | devel/SDL2/Makefile | 37 | ||||
-rw-r--r-- | devel/SDL2/PLIST | 4 | ||||
-rw-r--r-- | devel/SDL2/distinfo | 19 | ||||
-rw-r--r-- | devel/SDL2/options.mk | 4 | ||||
-rw-r--r-- | devel/SDL2/patches/patch-configure | 10 | ||||
-rw-r--r-- | devel/SDL2/patches/patch-src_video_wayland_SDL__waylanddyn.h | 14 | ||||
-rw-r--r-- | devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c | 19 | ||||
-rw-r--r-- | devel/SDL2/patches/patch-src_video_wayland_SDL__waylandsym.h | 14 | ||||
-rw-r--r-- | devel/SDL2/patches/patch-src_video_wayland_SDL__waylandvideo.c | 15 | ||||
-rw-r--r-- | devel/SDL2/patches/patch-src_video_x11_SDL__x11opengl.c | 23 |
10 files changed, 50 insertions, 109 deletions
diff --git a/devel/SDL2/Makefile b/devel/SDL2/Makefile index 924ed48476e..ca0718350a9 100644 --- a/devel/SDL2/Makefile +++ b/devel/SDL2/Makefile @@ -1,44 +1,41 @@ -# $NetBSD: Makefile,v 1.46 2020/03/15 21:09:47 nia Exp $ +# $NetBSD: Makefile,v 1.47 2020/03/17 12:49:29 nia Exp $ -DISTNAME= SDL2-2.0.10 -PKGREVISION= 5 +DISTNAME= SDL2-2.0.12 CATEGORIES= devel -MASTER_SITES= http://www.libsdl.org/release/ +MASTER_SITES= https://www.libsdl.org/release/ MAINTAINER= nia@NetBSD.org HOMEPAGE= https://www.libsdl.org/ COMMENT= Simple DirectMedia Layer - cross-platform multimedia library LICENSE= zlib -USE_LANGUAGES= c c++ -USE_LIBTOOL= yes -USE_TOOLS+= gmake pkg-config autoconf automake autoreconf -GNU_CONFIGURE= yes -PKGCONFIG_OVERRIDE+= sdl2.pc.in +USE_LANGUAGES= c c++ +USE_LIBTOOL= yes +USE_TOOLS+= gmake pkg-config +GNU_CONFIGURE= yes CONFIGURE_ENV+= SDL_RLD_FLAGS="${COMPILER_RPATH_FLAG}${PREFIX}/lib \ ${COMPILER_RPATH_FLAG}${X11BASE}/lib" -CONFIGURE_ARGS+= --disable-esd +CONFIGURE_ARGS+= --disable-alsa-shared +CONFIGURE_ARGS+= --disable-jack-shared +CONFIGURE_ARGS+= --disable-libsamplerate-shared +CONFIGURE_ARGS+= --disable-wayland-shared CONFIGURE_ARGS+= --disable-x11-shared +CONFIGURE_ARGS+= --disable-esd -# Use audio(4) over ossaudio(4) on NetBSD. +# SDL has native audio(4) support, avoid building ossaudio(4) support. CONFIGURE_ARGS.NetBSD+= --disable-oss +PKGCONFIG_OVERRIDE+= sdl2.pc.in + CHECK_PORTABILITY_SKIP+= build-scripts/androidbuildlibs.sh CHECK_PORTABILITY_SKIP+= build-scripts/iosbuild.sh -.include "../../mk/bsd.prefs.mk" - -.if ${OPSYS} != "Linux" -BUILDLINK_TRANSFORM+= rm:-ldl -.endif - -CFLAGS+= -DPREFIX=\"${PREFIX}\" - .include "options.mk" +.include "../../audio/libsamplerate/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" -.include "../../mk/libusb.buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" +BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/SDL2/PLIST b/devel/SDL2/PLIST index 52065232881..22e50cb741e 100644 --- a/devel/SDL2/PLIST +++ b/devel/SDL2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2018/11/01 21:08:28 adam Exp $ +@comment $NetBSD: PLIST,v 1.10 2020/03/17 12:49:29 nia Exp $ bin/sdl2-config include/SDL2/SDL.h include/SDL2/SDL_assert.h @@ -25,6 +25,7 @@ include/SDL2/SDL_loadso.h include/SDL2/SDL_log.h include/SDL2/SDL_main.h include/SDL2/SDL_messagebox.h +include/SDL2/SDL_metal.h include/SDL2/SDL_mouse.h include/SDL2/SDL_mutex.h include/SDL2/SDL_name.h @@ -73,6 +74,7 @@ include/SDL2/SDL_video.h include/SDL2/SDL_vulkan.h include/SDL2/begin_code.h include/SDL2/close_code.h +lib/cmake/SDL2/sdl2-config-version.cmake lib/cmake/SDL2/sdl2-config.cmake lib/libSDL2.la lib/libSDL2_test.la diff --git a/devel/SDL2/distinfo b/devel/SDL2/distinfo index d7d6e82fda0..7baca6a8002 100644 --- a/devel/SDL2/distinfo +++ b/devel/SDL2/distinfo @@ -1,14 +1,11 @@ -$NetBSD: distinfo,v 1.37 2020/02/24 11:55:36 nia Exp $ +$NetBSD: distinfo,v 1.38 2020/03/17 12:49:29 nia Exp $ -SHA1 (SDL2-2.0.10.tar.gz) = fb31312ea1d4b45db839796ae2336dfe3d5884e5 -RMD160 (SDL2-2.0.10.tar.gz) = b35818cbf8eaf0c9c4d3b6d7a293c05a368366b2 -SHA512 (SDL2-2.0.10.tar.gz) = f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 -Size (SDL2-2.0.10.tar.gz) = 5550762 bytes -SHA1 (patch-configure) = 1631314dab18886ea553ee53fac89e16718cacab +SHA1 (SDL2-2.0.12.tar.gz) = e8ba91bf5eb438dbcf1fedf0530a1bcbe30d3bb6 +RMD160 (SDL2-2.0.12.tar.gz) = 0f2c979da6151b622a6445e7fc8d4e3ea8987105 +SHA512 (SDL2-2.0.12.tar.gz) = 3f1f04af0f3d9dda9c84a2e9274ae8d83ea0da3fc367970a820036cc4dc1dbf990cfc37e4975ae05f0b45a4ffa739c6c19e470c00bf3f2bce9b8b63717b8b317 +Size (SDL2-2.0.12.tar.gz) = 5720162 bytes +SHA1 (patch-configure) = 3038dc62450f6b64197ee4aa42d8ec9518a608bd SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 1c5756e47ad906235369b46b36d7b0b1ee776156 SHA1 (patch-src_video_cocoa_SDL__cocoawindow.m) = 1d5ac9c17ceadf668925734b5cad311e26f2fc58 -SHA1 (patch-src_video_wayland_SDL__waylanddyn.h) = 0387bedd962154c4de0d6dda78b4e40f992215ac -SHA1 (patch-src_video_wayland_SDL__waylandevents.c) = 6d6ca278ac26cb85b310f6edfe17107403440c84 -SHA1 (patch-src_video_wayland_SDL__waylandsym.h) = 58bc720c947ca3031e31b66c967872db65a7b767 -SHA1 (patch-src_video_wayland_SDL__waylandvideo.c) = 27281242898fa622b0a30a6126fe542bc0ed7ac1 -SHA1 (patch-src_video_x11_SDL__x11opengl.c) = 70b63021c12c52760c0811c673b259844bdfcdc0 +SHA1 (patch-src_video_wayland_SDL__waylandevents.c) = 15ba8caf1b0036ffe859669cc1ed4a535d164e7b +SHA1 (patch-src_video_x11_SDL__x11opengl.c) = d506a17a0d7e3571e2ae4385cc864f9a2e4eeb3c diff --git a/devel/SDL2/options.mk b/devel/SDL2/options.mk index 46db2f5daf2..827a4ff7dce 100644 --- a/devel/SDL2/options.mk +++ b/devel/SDL2/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.15 2020/01/20 21:13:16 nia Exp $ +# $NetBSD: options.mk,v 1.16 2020/03/17 12:49:29 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.SDL2 PKG_OPTIONS_REQUIRED_GROUPS= gl @@ -6,6 +6,8 @@ PKG_SUPPORTED_OPTIONS= alsa dbus nas jack pulseaudio wayland x11 PKG_SUGGESTED_OPTIONS.Linux= alsa PKG_OPTIONS_GROUP.gl= opengl +.include "../../mk/bsd.fast.prefs.mk" + .if ${OPSYS} != "Darwin" PKG_SUGGESTED_OPTIONS+= x11 .endif diff --git a/devel/SDL2/patches/patch-configure b/devel/SDL2/patches/patch-configure index 0b0c2089dae..d9e5cdd9026 100644 --- a/devel/SDL2/patches/patch-configure +++ b/devel/SDL2/patches/patch-configure @@ -1,22 +1,22 @@ -$NetBSD: patch-configure,v 1.7 2018/12/30 14:47:04 maya Exp $ +$NetBSD: patch-configure,v 1.8 2020/03/17 12:49:29 nia Exp $ Adding --enable-new-dtags breaks sdl2-config on NetBSD. Allow overriding SDL_RLD_FLAGS so we can add /usr/X11R7/lib. ---- configure.orig 2018-10-31 15:07:22.000000000 +0000 +--- configure.orig 2020-03-11 01:36:18.000000000 +0000 +++ configure -@@ -24937,7 +24937,9 @@ SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" +@@ -25537,7 +25537,9 @@ SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" if test "x$enable_rpath" = "xyes"; then if test $ARCH = bsdi -o $ARCH = freebsd -o $ARCH = linux -o $ARCH = netbsd; then - SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}" -+ if test -n $SDL_RLD_FLAGS; then ++ if test -n "$SDL_RLD_FLAGS"; then + SDL_RLD_FLAGS="-Wl,-rpath,\${libdir}" + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linker option --enable-new-dtags" >&5 $as_echo_n "checking for linker option --enable-new-dtags... " >&6; } -@@ -24960,7 +24962,7 @@ _ACEOF +@@ -25560,7 +25562,7 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : have_enable_new_dtags=yes diff --git a/devel/SDL2/patches/patch-src_video_wayland_SDL__waylanddyn.h b/devel/SDL2/patches/patch-src_video_wayland_SDL__waylanddyn.h deleted file mode 100644 index 0afc533bc5c..00000000000 --- a/devel/SDL2/patches/patch-src_video_wayland_SDL__waylanddyn.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-src_video_wayland_SDL__waylanddyn.h,v 1.1 2020/02/24 11:55:36 nia Exp $ - -https://bugzilla.libsdl.org/show_bug.cgi?id=4924 - ---- src/video/wayland/SDL_waylanddyn.h.orig 2019-07-25 04:32:37.000000000 +0000 -+++ src/video/wayland/SDL_waylanddyn.h -@@ -74,6 +74,7 @@ void SDL_WAYLAND_UnloadSymbols(void); - #define wl_proxy_marshal (*WAYLAND_wl_proxy_marshal) - #define wl_proxy_set_user_data (*WAYLAND_wl_proxy_set_user_data) - #define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data) -+#define wl_proxy_get_version (*WAYLAND_wl_proxy_get_version) - #define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener) - #define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor) - #define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned) diff --git a/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c b/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c index 1ffd3512e40..088c4e43755 100644 --- a/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c +++ b/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c @@ -1,10 +1,8 @@ -$NetBSD: patch-src_video_wayland_SDL__waylandevents.c,v 1.3 2020/02/24 11:55:36 nia Exp $ +$NetBSD: patch-src_video_wayland_SDL__waylandevents.c,v 1.4 2020/03/17 12:49:29 nia Exp $ Allow building with Wayland on operating systems without evdev. -https://bugzilla.libsdl.org/show_bug.cgi?id=4924 - ---- src/video/wayland/SDL_waylandevents.c.orig 2019-07-25 04:32:36.000000000 +0000 +--- src/video/wayland/SDL_waylandevents.c.orig 2020-03-11 01:36:18.000000000 +0000 +++ src/video/wayland/SDL_waylandevents.c @@ -43,7 +43,15 @@ #include "xdg-shell-client-protocol.h" @@ -22,16 +20,3 @@ https://bugzilla.libsdl.org/show_bug.cgi?id=4924 #include <sys/select.h> #include <sys/mman.h> #include <poll.h> -@@ -788,8 +796,10 @@ data_device_handle_enter(void *data, str - if (has_mime == SDL_TRUE) { - dnd_action = WL_DATA_DEVICE_MANAGER_DND_ACTION_COPY; - } -- wl_data_offer_set_actions(data_device->drag_offer->offer, -- dnd_action, dnd_action); -+ if (wl_data_offer_get_version(data_device->drag_offer->offer) >= 3) { -+ wl_data_offer_set_actions(data_device->drag_offer->offer, -+ dnd_action, dnd_action); -+ } - } - } - diff --git a/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandsym.h b/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandsym.h deleted file mode 100644 index 83b2bb0273a..00000000000 --- a/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandsym.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-src_video_wayland_SDL__waylandsym.h,v 1.1 2020/02/24 11:55:36 nia Exp $ - -https://bugzilla.libsdl.org/show_bug.cgi?id=4924 - ---- src/video/wayland/SDL_waylandsym.h.orig 2019-07-25 04:32:36.000000000 +0000 -+++ src/video/wayland/SDL_waylandsym.h -@@ -40,6 +40,7 @@ SDL_WAYLAND_SYM(void, wl_proxy_destroy, - SDL_WAYLAND_SYM(int, wl_proxy_add_listener, (struct wl_proxy *, void (**)(void), void *)) - SDL_WAYLAND_SYM(void, wl_proxy_set_user_data, (struct wl_proxy *, void *)) - SDL_WAYLAND_SYM(void *, wl_proxy_get_user_data, (struct wl_proxy *)) -+SDL_WAYLAND_SYM(uint32_t, wl_proxy_get_version, (struct wl_proxy *)) - SDL_WAYLAND_SYM(uint32_t, wl_proxy_get_id, (struct wl_proxy *)) - SDL_WAYLAND_SYM(const char *, wl_proxy_get_class, (struct wl_proxy *)) - SDL_WAYLAND_SYM(void, wl_proxy_set_queue, (struct wl_proxy *, struct wl_event_queue *)) diff --git a/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandvideo.c b/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandvideo.c deleted file mode 100644 index 92aa2e93d38..00000000000 --- a/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandvideo.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_video_wayland_SDL__waylandvideo.c,v 1.1 2020/02/24 11:55:36 nia Exp $ - -https://bugzilla.libsdl.org/show_bug.cgi?id=4924 - ---- src/video/wayland/SDL_waylandvideo.c.orig 2019-07-25 04:32:36.000000000 +0000 -+++ src/video/wayland/SDL_waylandvideo.c -@@ -381,7 +381,7 @@ display_handle_global(void *data, struct - } else if (strcmp(interface, "zwp_pointer_constraints_v1") == 0) { - Wayland_display_add_pointer_constraints(d, id); - } else if (strcmp(interface, "wl_data_device_manager") == 0) { -- d->data_device_manager = wl_registry_bind(d->registry, id, &wl_data_device_manager_interface, 3); -+ d->data_device_manager = wl_registry_bind(d->registry, id, &wl_data_device_manager_interface, SDL_min(3, version)); - } else if (strcmp(interface, "zxdg_decoration_manager_v1") == 0) { - d->decoration_manager = wl_registry_bind(d->registry, id, &zxdg_decoration_manager_v1_interface, 1); - } else if (strcmp(interface, "org_kde_kwin_server_decoration_manager") == 0) { diff --git a/devel/SDL2/patches/patch-src_video_x11_SDL__x11opengl.c b/devel/SDL2/patches/patch-src_video_x11_SDL__x11opengl.c index 23f27d6d1a4..659e7ee0680 100644 --- a/devel/SDL2/patches/patch-src_video_x11_SDL__x11opengl.c +++ b/devel/SDL2/patches/patch-src_video_x11_SDL__x11opengl.c @@ -1,16 +1,17 @@ -$NetBSD: patch-src_video_x11_SDL__x11opengl.c,v 1.2 2017/01/26 03:46:20 nat Exp $ +$NetBSD: patch-src_video_x11_SDL__x11opengl.c,v 1.3 2020/03/17 12:49:29 nia Exp $ NetBSD's libGL version differs between xsrc and pkgsc. All hail the mighty symlink. ---- src/video/x11/SDL_x11opengl.c.orig 2016-10-20 03:56:26.000000000 +0000 +--- src/video/x11/SDL_x11opengl.c.orig 2020-03-11 01:36:18.000000000 +0000 +++ src/video/x11/SDL_x11opengl.c -@@ -38,6 +38,8 @@ - #define DEFAULT_OPENGL "/usr/X11R6/lib/libGL.1.dylib" - #elif defined(__QNXNTO__) - #define DEFAULT_OPENGL "libGL.so.3" -+#elif defined(__NetBSD__) -+#define DEFAULT_OPENGL "libGL.so" - #else - #define DEFAULT_OPENGL "libGL.so.1" - #endif +@@ -32,7 +32,8 @@ + #include "SDL_loadso.h" + #include "SDL_x11opengles.h" + +-#if defined(__IRIX__) ++#if defined(__IRIX__) || defined(__NetBSD__) ++/* NetBSD has different libGL versions in the base system and packages */ + /* IRIX doesn't have a GL library versioning system */ + #define DEFAULT_OPENGL "libGL.so" + #elif defined(__MACOSX__) |