aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2018-11-01 09:37:47 +0000
committerJan Beich <jbeich@FreeBSD.org>2018-11-01 09:37:47 +0000
commit8208603dc3ea38b4db1032f4a411bed3a100b26e (patch)
treebb0d9a1f89186668e39ad63a88c4e5b0fb484329
parent3dc9459d83c9e59c6ad595c7b0dfc85f0a21614b (diff)
downloadports-8208603dc3ea38b4db1032f4a411bed3a100b26e.tar.gz
ports-8208603dc3ea38b4db1032f4a411bed3a100b26e.zip
devel/sdl20: update to 2.0.9
Changes: https://discourse.libsdl.org/t/sdl-2-0-8-released/23957 Changes: https://discourse.libsdl.org/t/sdl-2-0-9-released/25228 ABI: https://abi-laboratory.pro/tracker/timeline/sdl/ PR: 226409 Submitted by: Greg V (previous version) Approved by: maintainer timeout (7 months) Tested via: 0ad, mpv, openra, pioneer, ppsspp (vulkan/joystick), stuntrally, wesnoth, xonotic, etc.
Notes
Notes: svn path=/head/; revision=483650
Diffstat
-rw-r--r--devel/sdl20/Makefile19
-rw-r--r--devel/sdl20/distinfo6
-rw-r--r--devel/sdl20/files/patch-clang35
-rw-r--r--devel/sdl20/files/patch-configure41
-rw-r--r--devel/sdl20/pkg-plist3
-rw-r--r--x11/controllermap/Makefile2
-rw-r--r--x11/controllermap/distinfo6
7 files changed, 20 insertions, 92 deletions
diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile
index ed904a58445f..54e99ce430b0 100644
--- a/devel/sdl20/Makefile
+++ b/devel/sdl20/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= sdl2
-PORTVERSION= 2.0.7
+PORTVERSION= 2.0.9
CATEGORIES= devel
MASTER_SITES= http://www.libsdl.org/release/
DISTNAME= SDL2-${PORTVERSION}
@@ -52,13 +52,13 @@ CONFIGURE_ARGS+= --disable-sse3
MAKE_ENV= V=1
-OPTIONS_DEFINE= ALSA ASM DLOPEN ESOUND JACK NAS OSS SAMPLERATE \
- PULSEAUDIO SNDIO PTHREADS SDL_ATOMIC SDL_AUDIO \
- SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \
- SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \
- SDL_THREADS SDL_TIMERS SDL_VIDEO UDEV \
- VIDEO_KMSDRM VIDEO_OPENGL VIDEO_OPENGLES2 \
- VIDEO_WAYLAND VIDEO_X11
+OPTIONS_DEFINE= ALSA ASM DLOPEN ESOUND HIDAPI JACK NAS OSS \
+ PULSEAUDIO SAMPLERATE SNDIO PTHREADS \
+ SDL_ATOMIC SDL_AUDIO SDL_CPUINFO SDL_EVENTS \
+ SDL_FILE SDL_HAPTIC SDL_JOYSTICK SDL_LOADSO \
+ SDL_POWER SDL_RENDER SDL_THREADS SDL_TIMERS \
+ SDL_VIDEO UDEV VIDEO_KMSDRM VIDEO_OPENGL \
+ VIDEO_OPENGLES2 VIDEO_WAYLAND VIDEO_X11
OPTIONS_DEFAULT= ASM DLOPEN OSS PTHREADS SDL_ATOMIC SDL_AUDIO \
SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \
SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \
@@ -68,6 +68,7 @@ OPTIONS_DEFAULT= ASM DLOPEN OSS PTHREADS SDL_ATOMIC SDL_AUDIO \
ALSA_DESC= Audio output via the ALSA audio architecture
DLOPEN_DESC= Use dlopen for loading 3rd party libraries
ESOUND_DESC= Audio output via the EsounD sound server
+HIDAPI_DESC= Use HIDAPI for low level joystick drivers
JACK_DESC= Audio output via the JackD sound server
NAS_DESC= Audio output via the Network Audio System
OSS_DESC= Audio output via the Open Sound System
@@ -96,6 +97,8 @@ VIDEO_X11_DESC= X11 display support
ASM_CONFIGURE_ENABLE= assembly
DLOPEN_CONFIGURE_ENABLE= sdl-dlopen
+HIDAPI_CONFIGURE_ENABLE= hidapi
+HIDAPI_IMPLIES= SDL_JOYSTICK
PTHREADS_CONFIGURE_ENABLE= pthreads pthread-sem
SAMPLERATE_CONFIGURE_ENABLE= libsamplerate libsamplerate-shared
SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate
diff --git a/devel/sdl20/distinfo b/devel/sdl20/distinfo
index c554f21e6adb..dd479fa12489 100644
--- a/devel/sdl20/distinfo
+++ b/devel/sdl20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508786865
-SHA256 (SDL2-2.0.7.tar.gz) = ee35c74c4313e2eda104b14b1b86f7db84a04eeab9430d56e001cea268bf4d5e
-SIZE (SDL2-2.0.7.tar.gz) = 4432499
+TIMESTAMP = 1540998442
+SHA256 (SDL2-2.0.9.tar.gz) = 255186dc676ecd0c1dbf10ec8a2cc5d6869b5079d8a38194c2aecdff54b324b1
+SIZE (SDL2-2.0.9.tar.gz) = 5246942
diff --git a/devel/sdl20/files/patch-clang b/devel/sdl20/files/patch-clang
deleted file mode 100644
index 193aff4155a7..000000000000
--- a/devel/sdl20/files/patch-clang
+++ /dev/null
@@ -1,35 +0,0 @@
-https://hg.libsdl.org/SDL/rev/b48d8a98e261 regressed Clang 3.9 + -O2 builds.
-<X11/Xmd.h> defines BOOL as unsigned char while <X11/Xdefs.h> defines Bool as int.
-
-(gdb) bt
-#0 0x000000080120025d in X11_InitXinput2Multitouch (_this=0x802000000)
- at .../SDL2-2.0.6/src/video/x11/SDL_x11xinput2.c:206
-#1 0x00000008011fccf9 in X11_VideoInit (_this=<optimized out>)
- at .../SDL2-2.0.6/src/video/x11/SDL_x11video.c:451
-#2 0x00000008011e9641 in SDL_VideoInit_REAL (driver_name=<optimized out>)
- at .../SDL2-2.0.6/src/video/SDL_video.c:532
-#3 0x0000000801161cec in SDL_InitSubSystem_REAL (flags=<optimized out>)
- at .../SDL2-2.0.6/src/SDL.c:170
-
---- src/video/x11/SDL_x11keyboard.c.orig 2017-09-22 18:51:01 UTC
-+++ src/video/x11/SDL_x11keyboard.c
-@@ -266,7 +266,7 @@ X11_InitKeyboard(_THIS)
- int best_distance;
- int best_index;
- int distance;
-- BOOL xkb_repeat = 0;
-+ Bool xkb_repeat = 0;
-
- X11_XAutoRepeatOn(data->display);
-
---- src/video/x11/SDL_x11sym.h.orig 2017-09-22 18:51:01 UTC
-+++ src/video/x11/SDL_x11sym.h
-@@ -180,7 +180,7 @@ SDL_X11_SYM(Status,XkbGetUpdatedMap,(Display* a,unsign
- SDL_X11_SYM(XkbDescPtr,XkbGetMap,(Display* a,unsigned int b,unsigned int c),(a,b,c),return)
- SDL_X11_SYM(void,XkbFreeClientMap,(XkbDescPtr a,unsigned int b, Bool c),(a,b,c),)
- SDL_X11_SYM(void,XkbFreeKeyboard,(XkbDescPtr a,unsigned int b, Bool c),(a,b,c),)
--SDL_X11_SYM(BOOL,XkbSetDetectableAutoRepeat,(Display* a, BOOL b, BOOL* c),(a,b,c),return)
-+SDL_X11_SYM(Bool,XkbSetDetectableAutoRepeat,(Display* a, Bool b, Bool* c),(a,b,c),return)
- #endif
-
- #if NeedWidePrototypes
diff --git a/devel/sdl20/files/patch-configure b/devel/sdl20/files/patch-configure
deleted file mode 100644
index 83308d6cf121..000000000000
--- a/devel/sdl20/files/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
---- configure.orig 2017-10-23 19:27:45 UTC
-+++ configure
-@@ -24567,9 +24567,9 @@ if test x$video_wayland = xyes; then
- WAYLAND_CORE_PROTOCOL_SOURCE='$(gen)/wayland-protocol.c'
- WAYLAND_CORE_PROTOCOL_HEADER='$(gen)/wayland-client-protocol.h'
- WAYLAND_PROTOCOLS_UNSTABLE_SOURCES=`echo $WAYLAND_PROTOCOLS_UNSTABLE |\
-- sed 's,[^ ]\+,\\$(gen)/&-protocol.c,g'`
-+ sed -E 's,[^ ]+,\\$(gen)/&-protocol.c,g'`
- WAYLAND_PROTOCOLS_UNSTABLE_HEADERS=`echo $WAYLAND_PROTOCOLS_UNSTABLE |\
-- sed 's,[^ ]\+,\\$(gen)/&-client-protocol.h,g'`
-+ sed -E 's,[^ ]+,\\$(gen)/&-client-protocol.h,g'`
- GEN_SOURCES="$GEN_SOURCES $WAYLAND_CORE_PROTOCOL_SOURCE $WAYLAND_PROTOCOLS_UNSTABLE_SOURCES"
- GEN_HEADERS="$GEN_HEADERS $WAYLAND_CORE_PROTOCOL_HEADER $WAYLAND_PROTOCOLS_UNSTABLE_HEADERS"
-
-@@ -24588,20 +24588,20 @@ $WAYLAND_CORE_PROTOCOL_HEADER: $WAYLAND_CORE_PROTOCOL_
- \$(RUN_CMD_CC)\$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \$< -o \$@"
-
- WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
-- do echo ; echo \$p | sed\
-- "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\$(gen)/&-client-protocol.h: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
-+ do echo ; echo \$p | sed -E\
-+ "s,^([a-z\\-]+)-unstable-(v[0-9]+)\$,\\$(gen)/&-client-protocol.h: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
- \\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
- \\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) client-header \\$< \\$@," ; done`
-
- WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
-- do echo ; echo \$p | sed\
-- "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\$(gen)/&-protocol.c: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
-+ do echo ; echo \$p | sed -E\
-+ "s,^([a-z\\-]+)-unstable-(v[0-9]+)\$,\\$(gen)/&-protocol.c: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
- \\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
- \\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) code \\$< \\$@," ; done`
-
- WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
-- do echo ; echo \$p | sed\
-- "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\\$(objects)/&-protocol.lo: \\$(gen)/&-protocol.c \\$(gen)/&-client-protocol.h\\\\
-+ do echo ; echo \$p | sed -E\
-+ "s,^([a-z\\-]+)-unstable-(v[0-9]+)\$,\\\$(objects)/&-protocol.lo: \\$(gen)/&-protocol.c \\$(gen)/&-client-protocol.h\\\\
- \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@," ; done`
-
- WAYLAND_PROTOCOLS_DEPENDS="
diff --git a/devel/sdl20/pkg-plist b/devel/sdl20/pkg-plist
index 5460f6ecc45a..17c859b06075 100644
--- a/devel/sdl20/pkg-plist
+++ b/devel/sdl20/pkg-plist
@@ -44,6 +44,7 @@ include/SDL2/SDL_render.h
include/SDL2/SDL_revision.h
include/SDL2/SDL_rwops.h
include/SDL2/SDL_scancode.h
+include/SDL2/SDL_sensor.h
include/SDL2/SDL_shape.h
include/SDL2/SDL_stdinc.h
include/SDL2/SDL_surface.h
@@ -73,7 +74,7 @@ include/SDL2/begin_code.h
include/SDL2/close_code.h
lib/cmake/SDL2/sdl2-config.cmake
lib/libSDL2-2.0.so.0
-lib/libSDL2-2.0.so.0.7.0
+lib/libSDL2-2.0.so.0.9.0
lib/libSDL2.a
lib/libSDL2.so
lib/libSDL2_test.a
diff --git a/x11/controllermap/Makefile b/x11/controllermap/Makefile
index e052b848a570..1a63d35a7d82 100644
--- a/x11/controllermap/Makefile
+++ b/x11/controllermap/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= controllermap
-PORTVERSION= 2.0.8
+PORTVERSION= 2.0.9
CATEGORIES= x11
MASTER_SITES= http://www.libsdl.org/release/
DISTNAME= SDL2-${DISTVERSION}
diff --git a/x11/controllermap/distinfo b/x11/controllermap/distinfo
index 1b7429d5410c..dd479fa12489 100644
--- a/x11/controllermap/distinfo
+++ b/x11/controllermap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519922082
-SHA256 (SDL2-2.0.8.tar.gz) = edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec
-SIZE (SDL2-2.0.8.tar.gz) = 4909017
+TIMESTAMP = 1540998442
+SHA256 (SDL2-2.0.9.tar.gz) = 255186dc676ecd0c1dbf10ec8a2cc5d6869b5079d8a38194c2aecdff54b324b1
+SIZE (SDL2-2.0.9.tar.gz) = 5246942
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 00:57:40 +0000