Index: branches/2017Q4/devel/sdl20/Makefile =================================================================== --- branches/2017Q4/devel/sdl20/Makefile (revision 452853) +++ branches/2017Q4/devel/sdl20/Makefile (revision 452854) @@ -1,247 +1,246 @@ # $FreeBSD$ PORTNAME= sdl2 -PORTVERSION= 2.0.6 -PORTREVISION= 1 +PORTVERSION= 2.0.7 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ DISTNAME= SDL2-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Cross-platform multimedia development API LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/COPYING.txt GNU_CONFIGURE= yes USES= gmake iconv libtool localbase:ldflags pathfix pkgconfig USE_LDCONFIG= yes CONFIGURE_ARGS+= --disable-video-opengles \ --disable-altivec \ --disable-arts \ --enable-diskaudio \ --enable-dummyaudio \ --enable-video-dummy \ --disable-dbus \ --disable-input-tslib \ --disable-rpath .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} CONFIGURE_ARGS+= --enable-mmx .else CONFIGURE_ARGS+= --disable-mmx .endif .if defined(MACHINE_CPU) && ${MACHINE_CPU:M3dnow} CONFIGURE_ARGS+= --enable-3dnow .else CONFIGURE_ARGS+= --disable-3dnow .endif .if defined(MACHINE_CPU) && ${MACHINE_CPU:Msse} CONFIGURE_ARGS+= --enable-sse .else CONFIGURE_ARGS+= --disable-sse .endif .if defined(MACHINE_CPU) && ${MACHINE_CPU:Msse2} 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 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 SDL_EVENTS_DESC= Enable the SDL Events subsystem SDL_FILE_DESC= Enable the SDL File subsystem SDL_HAPTIC_DESC= Enable the SDL Haptic subsystem SDL_JOYSTICK_DESC= Enable the SDL Joystick subsystem SDL_LOADSO_DESC= Enable the SDL Loadso subsystem SDL_POWER_DESC= Enable the SDL Power subsystem 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 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 SDL_EVENTS_CONFIGURE_ENABLE= events SDL_FILE_CONFIGURE_ENABLE= filesystem SDL_HAPTIC_CONFIGURE_ENABLE= haptic SDL_JOYSTICK_CONFIGURE_ENABLE= joystick SDL_LOADSO_CONFIGURE_ENABLE= loadso SDL_POWER_CONFIGURE_ENABLE= power SDL_RENDER_CONFIGURE_ENABLE= render SDL_THREADS_CONFIGURE_ENABLE= threads SDL_TIMERS_CONFIGURE_ENABLE= timers SDL_VIDEO_CONFIGURE_ENABLE= video .include .if ${PORT_OPTIONS:MALSA} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option ALSA requires SDL_AUDIO .endif CONFIGURE_ARGS+= --enable-alsa --enable-alsa-shared LIB_DEPENDS+= libasound.so:audio/alsa-lib .else 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 .endif CONFIGURE_ARGS+= --enable-esd --enable-esd-shared USE_GNOME+= esound .else CONFIGURE_ARGS+= --disable-esd --disable-esd-shared .endif .if ${PORT_OPTIONS:MNAS} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option NAS requires SDL_AUDIO .endif CONFIGURE_ARGS+= --enable-nas --enable-nas-shared LIB_DEPENDS+= libaudio.so:audio/nas .else CONFIGURE_ARGS+= --disable-nas --disable-nas-shared .endif .if ${PORT_OPTIONS:MOSS} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option OSS requires SDL_AUDIO .endif CONFIGURE_ARGS+= --enable-oss .else CONFIGURE_ARGS+= --disable-oss .endif .if ${PORT_OPTIONS:MPULSEAUDIO} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option PULSEAUDIO requires SDL_AUDIO .endif CONFIGURE_ARGS+= --enable-pulseaudio --enable-pulseaudio-shared .else CONFIGURE_ARGS+= --disable-pulseaudio --disable-pulseaudio-shared .endif .if ${PORT_OPTIONS:MSNDIO} .if !${PORT_OPTIONS:MSDL_AUDIO} IGNORE= option SNDIO requires SDL_AUDIO .endif CONFIGURE_ARGS+= --enable-sndio --enable-sndio-shared LIB_DEPENDS+= libsndio.so:audio/sndio .else 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 .else CONFIGURE_ARGS+= --disable-video-opengl .endif .if ${PORT_OPTIONS:MVIDEO_X11} .if !${PORT_OPTIONS:MSDL_VIDEO} IGNORE= option VIDEO_X11 requires SDL_VIDEO .endif CONFIGURE_ARGS+= --enable-video-x11 \ --enable-x11-shared \ --enable-video-x11-xcursor \ --enable-video-x11-xinerama \ --enable-video-x11-xinput \ --enable-video-x11-xrandr \ --enable-video-x11-scrnsaver \ --enable-video-x11-xshape \ --enable-video-x11-vm USE_XORG+= xinerama xcursor xi xrandr xscrnsaver xxf86vm xext .else CONFIGURE_ARGS+= --disable-video-x11 \ --disable-x11-shared \ --disable-video-x11-xcursor \ --disable-video-x11-xinerama \ --disable-video-x11-xinput \ --disable-video-x11-xrandr \ --disable-video-x11-scrnsaver \ --disable-video-x11-xshape \ --disable-video-x11-vm .endif .include .if !empty(ICONV_LIB) CONFIGURE_ARGS+= ac_cv_lib_iconv_iconv_open=yes ac_cv_func_iconv=yes .endif post-patch: @${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' \ -e 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/configure # Clang does not provide _m_prefetch @${REINPLACE_CMD} 's/_m_prefetch/__builtin_prefetch/' \ ${WRKSRC}/configure ${WRKSRC}/src/video/SDL_blit_A.c post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libSDL2.so .include Index: branches/2017Q4/devel/sdl20/distinfo =================================================================== --- branches/2017Q4/devel/sdl20/distinfo (revision 452853) +++ branches/2017Q4/devel/sdl20/distinfo (revision 452854) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506106261 -SHA256 (SDL2-2.0.6.tar.gz) = 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df -SIZE (SDL2-2.0.6.tar.gz) = 4420311 +TIMESTAMP = 1508786865 +SHA256 (SDL2-2.0.7.tar.gz) = ee35c74c4313e2eda104b14b1b86f7db84a04eeab9430d56e001cea268bf4d5e +SIZE (SDL2-2.0.7.tar.gz) = 4432499 Index: branches/2017Q4/devel/sdl20/files/patch-src_video_SDL__surface.c =================================================================== --- branches/2017Q4/devel/sdl20/files/patch-src_video_SDL__surface.c (revision 452853) +++ branches/2017Q4/devel/sdl20/files/patch-src_video_SDL__surface.c (nonexistent) @@ -1,31 +0,0 @@ -SDL_FreeSurface deallocates surface->map even if the surface is not yet freed -https://bugzilla.libsdl.org/show_bug.cgi?id=3852 - -Memory leak in SDL_FreeSurface (after bug 3852 fix) -https://bugzilla.libsdl.org/show_bug.cgi?id=3855 - ---- src/video/SDL_surface.c.orig 2017-09-22 18:51:01 UTC -+++ src/video/SDL_surface.c -@@ -1198,10 +1198,8 @@ SDL_FreeSurface(SDL_Surface * surface) - if (surface->flags & SDL_DONTFREE) { - return; - } -- if (surface->map != NULL) { -- SDL_FreeBlitMap(surface->map); -- surface->map = NULL; -- } -+ SDL_InvalidateMap(surface->map); -+ - if (--surface->refcount > 0) { - return; - } -@@ -1219,6 +1217,9 @@ SDL_FreeSurface(SDL_Surface * surface) - if (!(surface->flags & SDL_PREALLOC)) { - SDL_free(surface->pixels); - } -+ if (surface->map) { -+ SDL_FreeBlitMap(surface->map); -+ } - SDL_free(surface); - } - Property changes on: branches/2017Q4/devel/sdl20/files/patch-src_video_SDL__surface.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2017Q4/devel/sdl20/pkg-plist =================================================================== --- branches/2017Q4/devel/sdl20/pkg-plist (revision 452853) +++ branches/2017Q4/devel/sdl20/pkg-plist (revision 452854) @@ -1,81 +1,82 @@ bin/sdl2-config include/SDL2/SDL.h include/SDL2/SDL_assert.h include/SDL2/SDL_atomic.h include/SDL2/SDL_audio.h include/SDL2/SDL_bits.h include/SDL2/SDL_blendmode.h include/SDL2/SDL_clipboard.h include/SDL2/SDL_config.h include/SDL2/SDL_cpuinfo.h include/SDL2/SDL_egl.h include/SDL2/SDL_endian.h include/SDL2/SDL_error.h include/SDL2/SDL_events.h include/SDL2/SDL_filesystem.h include/SDL2/SDL_gamecontroller.h include/SDL2/SDL_gesture.h include/SDL2/SDL_haptic.h include/SDL2/SDL_hints.h include/SDL2/SDL_joystick.h include/SDL2/SDL_keyboard.h include/SDL2/SDL_keycode.h include/SDL2/SDL_loadso.h include/SDL2/SDL_log.h include/SDL2/SDL_main.h include/SDL2/SDL_messagebox.h include/SDL2/SDL_mouse.h include/SDL2/SDL_mutex.h include/SDL2/SDL_name.h include/SDL2/SDL_opengl.h include/SDL2/SDL_opengl_glext.h include/SDL2/SDL_opengles.h include/SDL2/SDL_opengles2.h include/SDL2/SDL_opengles2_gl2.h include/SDL2/SDL_opengles2_gl2ext.h include/SDL2/SDL_opengles2_gl2platform.h include/SDL2/SDL_opengles2_khrplatform.h include/SDL2/SDL_pixels.h include/SDL2/SDL_platform.h include/SDL2/SDL_power.h include/SDL2/SDL_quit.h include/SDL2/SDL_rect.h include/SDL2/SDL_render.h include/SDL2/SDL_revision.h include/SDL2/SDL_rwops.h include/SDL2/SDL_scancode.h include/SDL2/SDL_shape.h include/SDL2/SDL_stdinc.h include/SDL2/SDL_surface.h include/SDL2/SDL_system.h include/SDL2/SDL_syswm.h include/SDL2/SDL_test.h include/SDL2/SDL_test_assert.h include/SDL2/SDL_test_common.h include/SDL2/SDL_test_compare.h include/SDL2/SDL_test_crc32.h include/SDL2/SDL_test_font.h include/SDL2/SDL_test_fuzzer.h include/SDL2/SDL_test_harness.h include/SDL2/SDL_test_images.h include/SDL2/SDL_test_log.h include/SDL2/SDL_test_md5.h +include/SDL2/SDL_test_memory.h include/SDL2/SDL_test_random.h include/SDL2/SDL_thread.h include/SDL2/SDL_timer.h 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.6.0 +lib/libSDL2-2.0.so.0.7.0 lib/libSDL2.a lib/libSDL2.so lib/libSDL2_test.a lib/libSDL2main.a libdata/pkgconfig/sdl2.pc share/aclocal/sdl2.m4 Index: branches/2017Q4/x11/controllermap/Makefile =================================================================== --- branches/2017Q4/x11/controllermap/Makefile (revision 452853) +++ branches/2017Q4/x11/controllermap/Makefile (revision 452854) @@ -1,35 +1,35 @@ # $FreeBSD$ PORTNAME= controllermap -PORTVERSION= 2.0.6 +PORTVERSION= 2.0.7 CATEGORIES= x11 MASTER_SITES= http://www.libsdl.org/release/ DISTNAME= SDL2-${DISTVERSION} MAINTAINER= jbeich@FreeBSD.org COMMENT= Game controller mapping generator LICENSE= PD LICENSE_FILE= ${WRKSRC}/COPYING USE_SDL= sdl2 WRKSRC_SUBDIR= test CFLAGS+= `sdl2-config --cflags` LIBS+= `sdl2-config --libs` MAKEFILE= /dev/null MAKE_ENV= LDLIBS="${LIBS}" ALL_TARGET= ${PORTNAME} testgamecontroller testjoystick PLIST_FILES= ${ALL_TARGET:S,^,bin/,} PORTDATA= ${PORTNAME}.bmp axis.bmp button.bmp post-patch: @${REINPLACE_CMD} '/bmp/s,","${DATADIR}/,' \ ${ALL_TARGET:S,^,${WRKSRC}/,:S,$,.c,} do-install: ${INSTALL_PROGRAM} ${ALL_TARGET:S,^,${WRKSRC}/,} \ ${STAGEDIR}${PREFIX}/bin (cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDATA}" \ ${STAGEDIR}${DATADIR}) .include Index: branches/2017Q4/x11/controllermap/distinfo =================================================================== --- branches/2017Q4/x11/controllermap/distinfo (revision 452853) +++ branches/2017Q4/x11/controllermap/distinfo (revision 452854) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506106261 -SHA256 (SDL2-2.0.6.tar.gz) = 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df -SIZE (SDL2-2.0.6.tar.gz) = 4420311 +TIMESTAMP = 1508786865 +SHA256 (SDL2-2.0.7.tar.gz) = ee35c74c4313e2eda104b14b1b86f7db84a04eeab9430d56e001cea268bf4d5e +SIZE (SDL2-2.0.7.tar.gz) = 4432499 Index: branches/2017Q4 =================================================================== --- branches/2017Q4 (revision 452853) +++ branches/2017Q4 (revision 452854) Property changes on: branches/2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r452843