Date: Sat, 23 Sep 2017 18:02:56 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450461 - in head/devel/sdl20: . files Message-ID: <201709231802.v8NI2u42073999@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Sep 23 18:02:56 2017 New Revision: 450461 URL: https://svnweb.freebsd.org/changeset/ports/450461 Log: devel/sdl20: update to 2.0.6 graphics/mesa-libs and misc/raspberrypi-userland conflict on <EGL/egl.h> which makes adding VIDEO_RPI non-trivial. Changes: https://discourse.libsdl.org/t/sdl-2-0-6-released/23109 ABI: https://abi-laboratory.pro/tracker/timeline/sdl/ Added: head/devel/sdl20/files/patch-clang (contents, props changed) Deleted: head/devel/sdl20/files/patch-src_video_x11_SDL__x11window.c Modified: head/devel/sdl20/Makefile (contents, props changed) head/devel/sdl20/distinfo (contents, props changed) head/devel/sdl20/pkg-plist (contents, props changed) Modified: head/devel/sdl20/Makefile ============================================================================== --- head/devel/sdl20/Makefile Sat Sep 23 17:00:09 2017 (r450460) +++ head/devel/sdl20/Makefile Sat Sep 23 18:02:56 2017 (r450461) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= sdl2 -PORTVERSION= 2.0.5 -PORTREVISION= 2 +PORTVERSION= 2.0.6 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ DISTNAME= SDL2-${PORTVERSION} @@ -46,26 +45,35 @@ CONFIGURE_ARGS+= --enable-sse2 .else CONFIGURE_ARGS+= --disable-sse2 .endif +.if defined(MACHINE_CPU) && ${MACHINE_CPU:Msse3} +CONFIGURE_ARGS+= --enable-sse3 +.else +CONFIGURE_ARGS+= --disable-sse3 +.endif MAKE_ENV= V=1 -OPTIONS_DEFINE= ALSA ASM DLOPEN ESOUND NAS OSS \ - 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 VIDEO_OPENGL 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 \ - SDL_THREADS SDL_TIMERS SDL_VIDEO VIDEO_OPENGL VIDEO_X11 +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 VIDEO_KMSDRM \ + VIDEO_OPENGL 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 \ + SDL_THREADS SDL_TIMERS SDL_VIDEO VIDEO_KMSDRM \ + VIDEO_OPENGL VIDEO_X11 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 +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 PULSEAUDIO_DESC= Audio output via the PulseAudio sound server PTHREADS_DESC= Use POSIX threads for multi-threading +SAMPLERATE_DESC= Audio rate conversion via libsamplerate SDL_ATOMIC_DESC= Enable the SDL Atomic subsystem SDL_AUDIO_DESC= Enable the SDL Audio subsystem SDL_CPUINFO_DESC= Enable the SDL CPUinfo subsystem @@ -79,12 +87,15 @@ SDL_RENDER_DESC= Enable the SDL Render subsystem SDL_THREADS_DESC= Enable the SDL Threads subsystem SDL_TIMERS_DESC= Enable the SDL Timers subsystem SDL_VIDEO_DESC= Enable the SDL Video subsystem +VIDEO_KMSDRM_DESC= KMSDRM rendering support VIDEO_OPENGL_DESC= OpenGL rendering support VIDEO_X11_DESC= X11 rendering support ASM_CONFIGURE_ENABLE= assembly DLOPEN_CONFIGURE_ENABLE= sdl-dlopen -PTHREADS_CONFIGURE_ENABLE= pthreads pthreads-sem +PTHREADS_CONFIGURE_ENABLE= pthreads pthread-sem +SAMPLERATE_CONFIGURE_ENABLE= libsamplerate libsamplerate-shared +SAMPLERATE_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate SDL_ATOMIC_CONFIGURE_ENABLE= atomic gcc-atomics SDL_AUDIO_CONFIGURE_ENABLE= audio SDL_CPUINFO_CONFIGURE_ENABLE= cpuinfo @@ -111,6 +122,16 @@ LIB_DEPENDS+= libasound.so:audio/alsa-lib CONFIGURE_ARGS+= --disable-alsa --disable-alsa-shared .endif +.if ${PORT_OPTIONS:MJACK} +.if !${PORT_OPTIONS:MSDL_AUDIO} +IGNORE= option JACK requires SDL_AUDIO +.endif +CONFIGURE_ARGS+= --enable-jack --enable-jack-shared +LIB_DEPENDS+= libjack.so:audio/jack +.else +CONFIGURE_ARGS+= --disable-jack --disable-jack-shared +.endif + .if ${PORT_OPTIONS:MESOUND} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option ESOUND requires SDL_AUDIO @@ -159,12 +180,23 @@ LIB_DEPENDS+= libsndio.so:audio/sndio CONFIGURE_ARGS+= --disable-sndio --disable-sndio-shared .endif +.if ${PORT_OPTIONS:MVIDEO_KMSDRM} +.if !${PORT_OPTIONS:MSDL_VIDEO} +IGNORE= option VIDEO_KMSDRM requires SDL_VIDEO +.endif +CONFIGURE_ARGS+= --enable-video-kmsdrm --enable-kmsdrm-shared +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/libdrm.pc:graphics/libdrm \ + ${LOCALBASE}/libdata/pkgconfig/gbm.pc:graphics/mesa-libs +.else +CONFIGURE_ARGS+= --disable-video-kmsdrm --disable-video-kmsdrm +.endif + .if ${PORT_OPTIONS:MVIDEO_OPENGL} .if !${PORT_OPTIONS:MSDL_VIDEO} IGNORE= option VIDEO_OPENGL requires SDL_VIDEO .endif CONFIGURE_ARGS+= --enable-video-opengl -USE_GL= gl +USE_GL+= gl .else CONFIGURE_ARGS+= --disable-video-opengl .endif Modified: head/devel/sdl20/distinfo ============================================================================== --- head/devel/sdl20/distinfo Sat Sep 23 17:00:09 2017 (r450460) +++ head/devel/sdl20/distinfo Sat Sep 23 18:02:56 2017 (r450461) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477121043 -SHA256 (SDL2-2.0.5.tar.gz) = 442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785 -SIZE (SDL2-2.0.5.tar.gz) = 4209352 +TIMESTAMP = 1506106261 +SHA256 (SDL2-2.0.6.tar.gz) = 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df +SIZE (SDL2-2.0.6.tar.gz) = 4420311 Added: head/devel/sdl20/files/patch-clang ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/sdl20/files/patch-clang Sat Sep 23 18:02:56 2017 (r450461) @@ -0,0 +1,35 @@ +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 Modified: head/devel/sdl20/pkg-plist ============================================================================== --- head/devel/sdl20/pkg-plist Sat Sep 23 17:00:09 2017 (r450460) +++ head/devel/sdl20/pkg-plist Sat Sep 23 18:02:56 2017 (r450461) @@ -67,11 +67,12 @@ include/SDL2/SDL_touch.h include/SDL2/SDL_types.h include/SDL2/SDL_version.h 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.cmake lib/libSDL2-2.0.so.0 -lib/libSDL2-2.0.so.0.4.1 +lib/libSDL2-2.0.so.0.6.0 lib/libSDL2.a lib/libSDL2.so lib/libSDL2_test.a
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709231802.v8NI2u42073999>