pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/SDL2 SDL2: Update to 2.0.14
details: https://anonhg.NetBSD.org/pkgsrc/rev/2b49f743f8cd
branches: trunk
changeset: 444077:2b49f743f8cd
user: nia <nia%pkgsrc.org@localhost>
date: Sat Jan 02 15:54:03 2021 +0000
description:
SDL2: Update to 2.0.14
Simple DirectMedia Layer - SDL version 2.0.14 (stable)
In addition to lots of bug fixes, here are the major changes in this
release:
General:
* Added support for PS5 DualSense and Xbox Series X controllers to the
HIDAPI controller driver
* Added game controller button constants for paddles and new buttons
* Added game controller functions to get additional information:
* SDL_GameControllerGetSerial()
* SDL_GameControllerHasAxis()
* SDL_GameControllerHasButton()
* SDL_GameControllerGetNumTouchpads()
* SDL_GameControllerGetNumTouchpadFingers()
* SDL_GameControllerGetTouchpadFinger()
* SDL_GameControllerHasSensor()
* SDL_GameControllerSetSensorEnabled()
* SDL_GameControllerIsSensorEnabled()
* SDL_GameControllerGetSensorData()
* SDL_GameControllerRumbleTriggers()
* SDL_GameControllerHasLED()
* SDL_GameControllerSetLED()
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_PS5 to control whether the
HIDAPI driver for PS5 controllers should be used.
* Added joystick functions to get additional information:
* SDL_JoystickGetSerial()
* SDL_JoystickRumbleTriggers()
* SDL_JoystickHasLED()
* SDL_JoystickSetLED()
* Added an API to allow the application to create virtual joysticks:
* SDL_JoystickAttachVirtual()
* SDL_JoystickDetachVirtual()
* SDL_JoystickIsVirtual()
* SDL_JoystickSetVirtualAxis()
* SDL_JoystickSetVirtualButton()
* SDL_JoystickSetVirtualHat()
* Added SDL_LockSensors() and SDL_UnlockSensors() to guarantee exclusive
access to the sensor list
* Added SDL_HAPTIC_STEERING_AXIS to play an effect on the steering wheel
* Added the hint SDL_HINT_MOUSE_RELATIVE_SCALING to control whether
relative motion is scaled by the screen DPI or renderer logical size
* The default value for SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS is now
false for better compatibility with modern window managers
* Added SDL_GetPreferredLocales() to get the application’s current
locale setting
* Added the hint SDL_HINT_PREFERRED_LOCALES to override your
application’s default locale setting
* Added SDL_OpenURL() to open a URL in the system’s default browser
* Added SDL_HasSurfaceRLE() to tell whether a surface is currently using
RLE encoding
* Added SDL_SIMDRealloc() to reallocate memory obtained from
SDL_SIMDAlloc()
* Added SDL_GetErrorMsg() to get the last error in a thread-safe way
* Added SDL_crc32(), SDL_wcscasecmp(), SDL_wcsncasecmp(), SDL_trunc(),
SDL_truncf()
* Added clearer names for RGB pixel formats, e.g.
SDL_PIXELFORMAT_XRGB8888, SDL_PIXELFORMAT_XBGR8888, etc.
Windows:
* Added the RAWINPUT controller driver to support more than 4 Xbox
controllers simultaneously
* Added the hint SDL_HINT_JOYSTICK_RAWINPUT to control whether the
RAWINPUT driver should be used
* Added the hint SDL_HINT_JOYSTICK_HIDAPI_CORRELATE_XINPUT to control
whether XInput and WGI should be used to for complete controller
functionality with the RAWINPUT driver.
macOS:
* Added the SDL_WINDOW_METAL flag to specify that a window should be
created with a Metal view
* Added SDL_Metal_GetLayer() to get the CAMetalLayer backing a Metal
view
* Added SDL_Metal_GetDrawableSize() to get the size of a window’s
drawable, in pixels
Linux:
* Added Vulkan support to the KMSDRM video driver
* Added the hint SDL_HINT_AUDIO_DEVICE_APP_NAME to specify the name that
shows up in PulseAudio for your application
* Added the hint SDL_HINT_AUDIO_DEVICE_STREAM_NAME to specify the name
that shows up in PulseAudio associated with your audio stream
* Added the hint SDL_HINT_LINUX_JOYSTICK_DEADZONES to control whether
HID defined dead zones should be respected on Linux
* Added the hint SDL_HINT_THREAD_PRIORITY_POLICY to specify the thread
scheduler policy
* Added the hint SDL_HINT_THREAD_FORCE_REALTIME_TIME_CRITICAL to allow
time critical threads to use a realtime scheduling policy
Android:
* Added SDL_AndroidRequestPermission() to request a specific system
permission
* Added the hint SDL_HINT_ANDROID_BLOCK_ON_PAUSE_PAUSEAUDIO to control
whether audio will pause when the application goes intot he background
OS/2:
* Added support for OS/2, see docs/README-os2.md for details
Emscripten (running in a web browser):
* Added the hint SDL_HINT_EMSCRIPTEN_ASYNCIFY to control whether SDL
should call emscripten_sleep internally
diffstat:
devel/SDL2/Makefile | 12 +-
devel/SDL2/PLIST | 4 +-
devel/SDL2/distinfo | 17 +-
devel/SDL2/patches/patch-configure | 27 ---
devel/SDL2/patches/patch-sdl2-config.cmake.in | 15 -
devel/SDL2/patches/patch-src_audio_netbsd_SDL__netbsdaudio.c | 80 ----------
devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c | 56 -------
devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents__c.h | 15 -
devel/SDL2/patches/patch-src_video_wayland_SDL__waylandvideo.c | 15 -
devel/SDL2/patches/patch-src_video_x11_SDL__x11opengl.c | 19 --
10 files changed, 15 insertions(+), 245 deletions(-)
diffs (truncated from 332 to 300 lines):
diff -r 23add57ffe93 -r 2b49f743f8cd devel/SDL2/Makefile
--- a/devel/SDL2/Makefile Sat Jan 02 15:48:39 2021 +0000
+++ b/devel/SDL2/Makefile Sat Jan 02 15:54:03 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.53 2021/01/01 09:52:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.54 2021/01/02 15:54:03 nia Exp $
-DISTNAME= SDL2-2.0.12
-PKGREVISION= 6
+DISTNAME= SDL2-2.0.14
CATEGORIES= devel
MASTER_SITES= https://www.libsdl.org/release/
@@ -15,14 +14,17 @@
USE_TOOLS+= gmake pkg-config
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= SDL_RLD_FLAGS="${COMPILER_RPATH_FLAG}${PREFIX}/lib \
- ${COMPILER_RPATH_FLAG}${X11BASE}/lib"
+# Let pkgsrc handle the rpath.
+CONFIGURE_ARGS+= --disable-rpath
+# Explicitly link against libraries.
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
+
+# Deprecated, removed from pkgsrc.
CONFIGURE_ARGS+= --disable-esd
# SDL has native audio(4) support, avoid building ossaudio(4) support.
diff -r 23add57ffe93 -r 2b49f743f8cd devel/SDL2/PLIST
--- a/devel/SDL2/PLIST Sat Jan 02 15:48:39 2021 +0000
+++ b/devel/SDL2/PLIST Sat Jan 02 15:54:03 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2020/03/17 12:49:29 nia Exp $
+@comment $NetBSD: PLIST,v 1.11 2021/01/02 15:54:03 nia Exp $
bin/sdl2-config
include/SDL2/SDL.h
include/SDL2/SDL_assert.h
@@ -22,10 +22,12 @@
include/SDL2/SDL_keyboard.h
include/SDL2/SDL_keycode.h
include/SDL2/SDL_loadso.h
+include/SDL2/SDL_locale.h
include/SDL2/SDL_log.h
include/SDL2/SDL_main.h
include/SDL2/SDL_messagebox.h
include/SDL2/SDL_metal.h
+include/SDL2/SDL_misc.h
include/SDL2/SDL_mouse.h
include/SDL2/SDL_mutex.h
include/SDL2/SDL_name.h
diff -r 23add57ffe93 -r 2b49f743f8cd devel/SDL2/distinfo
--- a/devel/SDL2/distinfo Sat Jan 02 15:48:39 2021 +0000
+++ b/devel/SDL2/distinfo Sat Jan 02 15:54:03 2021 +0000
@@ -1,13 +1,6 @@
-$NetBSD: distinfo,v 1.43 2020/05/22 23:18:09 adam Exp $
+$NetBSD: distinfo,v 1.44 2021/01/02 15:54:03 nia Exp $
-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-sdl2-config.cmake.in) = c0f07237a70614d85708e8ca368797894b45ce36
-SHA1 (patch-src_audio_netbsd_SDL__netbsdaudio.c) = 4daf296544ff1df802f835be0370f80d62fac716
-SHA1 (patch-src_video_wayland_SDL__waylandevents.c) = 57e42371e072048e5b377aeb58bb1ffce72784f0
-SHA1 (patch-src_video_wayland_SDL__waylandevents__c.h) = 3a723a81f05052bd50e8cb1592ba747b5f59ea1a
-SHA1 (patch-src_video_wayland_SDL__waylandvideo.c) = 823e434710f8b946b13ea7a6751cf1c30ec48600
-SHA1 (patch-src_video_x11_SDL__x11opengl.c) = b3256a29a24ca286916464d210196dde6d6e922c
+SHA1 (SDL2-2.0.14.tar.gz) = 212b17d988c417a1a905ab09c50d1845cc48ddb7
+RMD160 (SDL2-2.0.14.tar.gz) = 24ddf4bab53fae92fb0c96c7d3e6ceecca91c5df
+SHA512 (SDL2-2.0.14.tar.gz) = ebc482585bd565bf3003fbcedd91058b2183e333b9ea566d2f386da0298ff970645d9d25c1aa4459c7c96e9ea839fd1c5f2da0242a56892865b2e456cdd027ee
+Size (SDL2-2.0.14.tar.gz) = 6089974 bytes
diff -r 23add57ffe93 -r 2b49f743f8cd devel/SDL2/patches/patch-configure
--- a/devel/SDL2/patches/patch-configure Sat Jan 02 15:48:39 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$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 2020-03-11 01:36:18.000000000 +0000
-+++ configure
-@@ -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
-+ 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; }
-@@ -25560,7 +25562,7 @@ _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
-
- have_enable_new_dtags=yes
-- SDL_RLD_FLAGS="$SDL_RLD_FLAGS -Wl,--enable-new-dtags"
-+ SDL_RLD_FLAGS="$SDL_RLD_FLAGS"
-
- fi
- rm -f core conftest.err conftest.$ac_objext \
diff -r 23add57ffe93 -r 2b49f743f8cd devel/SDL2/patches/patch-sdl2-config.cmake.in
--- a/devel/SDL2/patches/patch-sdl2-config.cmake.in Sat Jan 02 15:48:39 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-sdl2-config.cmake.in,v 1.1 2020/05/22 23:18:09 adam Exp $
-
-Use correct shared library suffix.
-
---- sdl2-config.cmake.in.orig 2020-05-22 23:10:38.000000000 +0000
-+++ sdl2-config.cmake.in
-@@ -22,7 +22,7 @@ if(NOT TARGET SDL2::SDL2)
- set_target_properties(SDL2::SDL2 PROPERTIES
- INTERFACE_INCLUDE_DIRECTORIES "@includedir@/SDL2"
- IMPORTED_LINK_INTERFACE_LANGUAGES "C"
-- IMPORTED_LOCATION "@libdir@/libSDL2.so"
-+ IMPORTED_LOCATION "@libdir@/libSDL2${CMAKE_SHARED_LIBRARY_SUFFIX}"
- INTERFACE_LINK_LIBRARIES "${SDL2_EXTRA_LINK_FLAGS}")
-
- add_library(SDL2::SDL2-static STATIC IMPORTED)
diff -r 23add57ffe93 -r 2b49f743f8cd devel/SDL2/patches/patch-src_audio_netbsd_SDL__netbsdaudio.c
--- a/devel/SDL2/patches/patch-src_audio_netbsd_SDL__netbsdaudio.c Sat Jan 02 15:48:39 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-$NetBSD: patch-src_audio_netbsd_SDL__netbsdaudio.c,v 1.6 2020/04/16 04:12:39 nia Exp $
-
-Use the preferred hardware sample rate
-https://bugzilla.libsdl.org/show_bug.cgi?id=5080
-
-Support 32-bit LPCM
-https://bugzilla.libsdl.org/show_bug.cgi?id=5076
-
---- src/audio/netbsd/SDL_netbsdaudio.c.orig 2020-03-11 01:36:18.000000000 +0000
-+++ src/audio/netbsd/SDL_netbsdaudio.c
-@@ -205,7 +205,7 @@ static int
- NETBSDAUDIO_OpenDevice(_THIS, void *handle, const char *devname, int iscapture)
- {
- SDL_AudioFormat format = 0;
-- audio_info_t info;
-+ audio_info_t info, hwinfo;
- struct audio_prinfo *prinfo = iscapture ? &info.record : &info.play;
-
- /* We don't care what the devname is...we'll try to open anything. */
-@@ -232,8 +232,20 @@ NETBSDAUDIO_OpenDevice(_THIS, void *hand
- }
-
- AUDIO_INITINFO(&info);
-+ AUDIO_INITINFO(&hwinfo);
-+
-+#ifdef AUDIO_GETFORMAT
-+ if (ioctl(this->hidden->audio_fd, AUDIO_GETFORMAT, &hwinfo) == -1) {
-+ return SDL_SetError("Couldn't get device format %s: %s", devname, strerror(errno));
-+ }
-+#else
-+ hwinfo.record.sample_rate = hwinfo.play.sample_rate = 48000;
-+#endif
-
- prinfo->encoding = AUDIO_ENCODING_NONE;
-+ prinfo->channels = this->spec.channels;
-+ prinfo->sample_rate = this->spec.freq = iscapture ?
-+ hwinfo.record.sample_rate : hwinfo.play.sample_rate;
-
- for (format = SDL_FirstAudioFormat(this->spec.format); format;) {
- switch (format) {
-@@ -261,6 +273,14 @@ NETBSDAUDIO_OpenDevice(_THIS, void *hand
- prinfo->encoding = AUDIO_ENCODING_ULINEAR_BE;
- prinfo->precision = 16;
- break;
-+ case AUDIO_S32LSB:
-+ prinfo->encoding = AUDIO_ENCODING_SLINEAR_LE;
-+ prinfo->precision = 32;
-+ break;
-+ case AUDIO_S32MSB:
-+ prinfo->encoding = AUDIO_ENCODING_SLINEAR_BE;
-+ prinfo->precision = 32;
-+ break;
- }
- if (prinfo->encoding != AUDIO_ENCODING_NONE) {
- break;
-@@ -274,21 +294,18 @@ NETBSDAUDIO_OpenDevice(_THIS, void *hand
-
- this->spec.format = format;
-
-- /* Calculate spec parameters based on our chosen format */
-- SDL_CalculateAudioSpec(&this->spec);
--
- info.mode = iscapture ? AUMODE_RECORD : AUMODE_PLAY;
-- info.blocksize = this->spec.size;
- info.hiwat = 5;
- info.lowat = 3;
-- prinfo->sample_rate = this->spec.freq;
-- prinfo->channels = this->spec.channels;
- (void) ioctl(this->hidden->audio_fd, AUDIO_SETINFO, &info);
-
- (void) ioctl(this->hidden->audio_fd, AUDIO_GETINFO, &info);
- this->spec.freq = prinfo->sample_rate;
- this->spec.channels = prinfo->channels;
-
-+ /* Calculate spec parameters based on our chosen format */
-+ SDL_CalculateAudioSpec(&this->spec);
-+
- if (!iscapture) {
- /* Allocate mixing buffer */
- this->hidden->mixlen = this->spec.size;
diff -r 23add57ffe93 -r 2b49f743f8cd devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c
--- a/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents.c Sat Jan 02 15:48:39 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-$NetBSD: patch-src_video_wayland_SDL__waylandevents.c,v 1.5 2020/04/05 16:22:42 nia Exp $
-
-Allow building with Wayland on operating systems without evdev.
-
-Fix wl_seat version fallback.
-
-https://bugzilla.libsdl.org/show_bug.cgi?id=5074
-
---- 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"
- #include "xdg-shell-unstable-v6-client-protocol.h"
-
-+#if defined(__linux__) || defined(__FreeBSD__)
- #include <linux/input.h>
-+#else
-+#define BTN_LEFT (0x110)
-+#define BTN_RIGHT (0x111)
-+#define BTN_MIDDLE (0x112)
-+#define BTN_SIDE (0x113)
-+#define BTN_EXTRA (0x114)
-+#endif
- #include <sys/select.h>
- #include <sys/mman.h>
- #include <poll.h>
-@@ -437,7 +445,7 @@ pointer_handle_axis(void *data, struct w
- {
- struct SDL_WaylandInput *input = data;
-
-- if(wl_seat_interface.version >= 5)
-+ if(wl_seat_get_version(input->seat) >= 5)
- pointer_handle_axis_common(input, SDL_FALSE, axis, value);
- else
- pointer_handle_axis_common_v1(input, time, axis, value);
-@@ -998,7 +1006,7 @@ static const struct wl_data_device_liste
- };
-
- void
--Wayland_display_add_input(SDL_VideoData *d, uint32_t id)
-+Wayland_display_add_input(SDL_VideoData *d, uint32_t id, uint32_t version)
- {
- struct SDL_WaylandInput *input;
- SDL_WaylandDataDevice *data_device = NULL;
-@@ -1008,10 +1016,7 @@ Wayland_display_add_input(SDL_VideoData
- return;
-
- input->display = d;
-- if (wl_seat_interface.version >= 5)
-- input->seat = wl_registry_bind(d->registry, id, &wl_seat_interface, 5);
-- else
-- input->seat = wl_registry_bind(d->registry, id, &wl_seat_interface, 1);
-+ input->seat = wl_registry_bind(d->registry, id, &wl_seat_interface, SDL_min(5, version));
- input->sx_w = wl_fixed_from_int(0);
- input->sy_w = wl_fixed_from_int(0);
- d->input = input;
diff -r 23add57ffe93 -r 2b49f743f8cd devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents__c.h
--- a/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandevents__c.h Sat Jan 02 15:48:39 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_video_wayland_SDL__waylandevents__c.h,v 1.1 2020/04/05 16:22:42 nia Exp $
-
-https://bugzilla.libsdl.org/show_bug.cgi?id=5074
-
---- src/video/wayland/SDL_waylandevents_c.h.orig 2020-03-11 01:36:18.000000000 +0000
-+++ src/video/wayland/SDL_waylandevents_c.h
-@@ -32,7 +32,7 @@ struct SDL_WaylandInput;
-
- extern void Wayland_PumpEvents(_THIS);
-
--extern void Wayland_display_add_input(SDL_VideoData *d, uint32_t id);
-+extern void Wayland_display_add_input(SDL_VideoData *d, uint32_t id, uint32_t version);
- extern void Wayland_display_destroy_input(SDL_VideoData *d);
-
- extern SDL_WaylandDataDevice* Wayland_get_data_device(struct SDL_WaylandInput *input);
diff -r 23add57ffe93 -r 2b49f743f8cd devel/SDL2/patches/patch-src_video_wayland_SDL__waylandvideo.c
--- a/devel/SDL2/patches/patch-src_video_wayland_SDL__waylandvideo.c Sat Jan 02 15:48:39 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_video_wayland_SDL__waylandvideo.c,v 1.3 2020/04/05 16:22:42 nia Exp $
-
-https://bugzilla.libsdl.org/show_bug.cgi?id=5074
-
---- src/video/wayland/SDL_waylandvideo.c.orig 2020-03-11 01:36:18.000000000 +0000
-+++ src/video/wayland/SDL_waylandvideo.c
Home |
Main Index |
Thread Index |
Old Index