diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile index 2f114634c430..b12442d86b2e 100644 --- a/devel/sdl20/Makefile +++ b/devel/sdl20/Makefile @@ -1,210 +1,210 @@ PORTNAME= sdl2 -DISTVERSION= 2.0.18 +DISTVERSION= 2.0.20 CATEGORIES= devel MASTER_SITES= https://www.libsdl.org/release/ DISTNAME= SDL2-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Cross-platform multimedia development API LICENSE= ZLIB LICENSE_FILE= ${WRKSRC}/LICENSE.txt GNU_CONFIGURE= yes USES= gmake iconv libtool localbase:ldflags pathfix pkgconfig USE_CSTD= c99 USE_LDCONFIG= yes CONFIGURE_ARGS+= --disable-arts \ --enable-diskaudio \ --enable-dummyaudio \ --enable-video-dummy \ --disable-dbus \ --disable-esd --disable-esd-shared \ --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 HIDAPI JACK NAS OSS PIPEWARE PTHREADS \ PULSEAUDIO SAMPLERATE 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 SNDIO UDEV \ VIDEO_KMSDRM VIDEO_OPENGL VIDEO_OPENGLES1 \ VIDEO_OPENGLES2 VIDEO_VULKAN VIDEO_WAYLAND \ VIDEO_X11 OPTIONS_DEFAULT= ASM 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_OPENGLES1 VIDEO_OPENGLES2 \ VIDEO_VULKAN VIDEO_WAYLAND VIDEO_X11 OPTIONS_DEFINE_powerpc= ALTIVEC OPTIONS_DEFINE_powerpc64= ALTIVEC OPTIONS_DEFAULT_powerpc= ALTIVEC OPTIONS_DEFAULT_powerpc64= ALTIVEC ALSA_DESC= Audio output via the ALSA audio architecture 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 PIPEWARE_DESC= Audio output via the Pipewire sound server PTHREADS_DESC= Use POSIX threads for multi-threading PULSEAUDIO_DESC= Audio output via the PulseAudio sound server 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 UDEV_DESC= Use udev for input device detection VIDEO_KMSDRM_DESC= KMSDRM display support VIDEO_OPENGL_DESC= OpenGL rendering support VIDEO_OPENGLES1_DESC= OpenGL ES 1.x rendering support VIDEO_OPENGLES2_DESC= OpenGL ES 2.x rendering support VIDEO_VULKAN_DESC= Vulkan rendering support VIDEO_WAYLAND_DESC= Wayland display support VIDEO_X11_DESC= X11 display support ALTIVEC_CONFIGURE_ENABLE= altivec ALSA_CONFIGURE_ENABLE= alsa alsa-shared ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_IMPLIES= SDL_AUDIO ASM_CONFIGURE_ENABLE= assembly HIDAPI_CONFIGURE_ENABLE= hidapi HIDAPI_IMPLIES= SDL_JOYSTICK JACK_CONFIGURE_ENABLE= jack jack-shared JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_IMPLIES= SDL_AUDIO NAS_CONFIGURE_ENABLE= nas nas-shared NAS_LIB_DEPENDS= libaudio.so:audio/nas NAS_IMPLIES= SDL_AUDIO OSS_CONFIGURE_ENABLE= oss OSS_IMPLIES= SDL_AUDIO PIPEWARE_CONFIGURE_ENABLE= pipewire pipewire-shared PIPEWARE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire PIPEWARE_IMPLIES= SDL_AUDIO PTHREADS_CONFIGURE_ENABLE= pthreads pthread-sem PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio pulseaudio-shared PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_IMPLIES= SDL_AUDIO 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_JOYSTICK_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto SDL_JOYSTICK_LIB_DEPENDS= libinotify.so:devel/libinotify 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 SNDIO_CONFIGURE_ENABLE= sndio sndio-shared SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio SNDIO_IMPLIES= SDL_AUDIO UDEV_CONFIGURE_ENABLE= libudev UDEV_LIB_DEPENDS= libudev.so:devel/libudev-devd UDEV_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto VIDEO_KMSDRM_CONFIGURE_ENABLE= video-kmsdrm kmsdrm-shared VIDEO_KMSDRM_USES= gl VIDEO_KMSDRM_USE= GL=gbm VIDEO_KMSDRM_IMPLIES= SDL_VIDEO VIDEO_OPENGL_CONFIGURE_ENABLE= video-opengl VIDEO_OPENGL_USES= gl VIDEO_OPENGL_USE= GL=opengl VIDEO_OPENGL_IMPLIES= SDL_VIDEO VIDEO_OPENGLES_CONFIGURE_ENABLE=video-opengles VIDEO_OPENGLES1_CONFIGURE_ENABLE=video-opengles1 VIDEO_OPENGLES1_USES= gl VIDEO_OPENGLES1_USE= GL=egl,glesv1 VIDEO_OPENGLES1_IMPLIES= SDL_VIDEO VIDEO_OPENGLES VIDEO_OPENGLES2_CONFIGURE_ENABLE=video-opengles2 VIDEO_OPENGLES2_USES= gl VIDEO_OPENGLES2_USE= GL=egl,glesv2 VIDEO_OPENGLES2_IMPLIES= SDL_VIDEO VIDEO_OPENGLES VIDEO_VULKAN_CONFIGURE_ENABLE= video-vulkan VIDEO_VULKAN_IMPLIES= SDL_LOADSO SDL_VIDEO VIDEO_WAYLAND_CONFIGURE_ENABLE= video-wayland wayland-shared video-wayland-qt-touch VIDEO_WAYLAND_BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols \ ${LOCALBASE}/include/linux/input.h:devel/evdev-proto VIDEO_WAYLAND_LIB_DEPENDS= libwayland-egl.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon VIDEO_WAYLAND_IMPLIES= SDL_VIDEO VIDEO_OPENGLES2 VIDEO_X11_CONFIGURE_ENABLE= video-x11 x11-shared \ video-x11-xcursor \ video-x11-xdbe \ video-x11-xinerama \ video-x11-xinput \ video-x11-xfixes \ video-x11-xrandr \ video-x11-scrnsaver \ video-x11-xshape \ video-x11-vm VIDEO_X11_USES= xorg VIDEO_X11_USE= XORG=xcursor,xext,xinerama,xi,xfixes,xrandr,xscrnsaver,xxf86vm VIDEO_X11_IMPLIES= SDL_VIDEO .include # Similar to x11/pixman .if ${ARCH} == "armv6" || ${ARCH} == "armv7" BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils CFLAGS+= -B${LOCALBASE}/bin -no-integrated-as .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 '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 diff --git a/devel/sdl20/distinfo b/devel/sdl20/distinfo index e961a523f171..136a975e2f22 100644 --- a/devel/sdl20/distinfo +++ b/devel/sdl20/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1638578013 -SHA256 (SDL2-2.0.18.tar.gz) = 94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c -SIZE (SDL2-2.0.18.tar.gz) = 7294032 +TIMESTAMP = 1641920427 +SHA256 (SDL2-2.0.20.tar.gz) = c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06 +SIZE (SDL2-2.0.20.tar.gz) = 7207221 diff --git a/devel/sdl20/files/patch-noegl b/devel/sdl20/files/patch-noegl deleted file mode 100644 index e7aa6fdee394..000000000000 --- a/devel/sdl20/files/patch-noegl +++ /dev/null @@ -1,12 +0,0 @@ ---- src/video/kmsdrm/SDL_kmsdrmvideo.c.orig -+++ src/video/kmsdrm/SDL_kmsdrmvideo.c -@@ -1407,7 +1407,9 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window) - uint32_t surface_flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING; - uint32_t width, height; - -+#if SDL_VIDEO_OPENGL_EGL - EGLContext egl_context; -+#endif - - int ret = 0; - diff --git a/devel/sdl20/files/patch-wayland-1.20 b/devel/sdl20/files/patch-wayland-1.20 deleted file mode 100644 index 724894a1b714..000000000000 --- a/devel/sdl20/files/patch-wayland-1.20 +++ /dev/null @@ -1,35 +0,0 @@ -https://github.com/libsdl-org/sdl/commit/e2ade2bfc46d - -ld: error: undefined symbol: wl_proxy_marshal_flags ->>> referenced by SDL_waylanddatamanager.c ->>> build/.libs/SDL_waylanddatamanager.o:(Wayland_data_source_destroy) ->>> referenced by SDL_waylanddatamanager.c ->>> build/.libs/SDL_waylanddatamanager.o:(Wayland_data_offer_receive) ->>> referenced by SDL_waylanddatamanager.c ->>> build/.libs/SDL_waylanddatamanager.o:(Wayland_data_offer_destroy) ->>> referenced 109 more times - ---- src/video/wayland/SDL_waylanddyn.h.orig 2020-03-11 01:36:18 UTC -+++ src/video/wayland/SDL_waylanddyn.h -@@ -75,6 +75,8 @@ void SDL_WAYLAND_UnloadSymbols(void); - #define wl_proxy_create (*WAYLAND_wl_proxy_create) - #define wl_proxy_destroy (*WAYLAND_wl_proxy_destroy) - #define wl_proxy_marshal (*WAYLAND_wl_proxy_marshal) -+#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags) -+#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags) - #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) ---- src/video/wayland/SDL_waylandsym.h.orig 2020-03-11 01:36:18 UTC -+++ src/video/wayland/SDL_waylandsym.h -@@ -71,6 +71,10 @@ SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_co - SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10) - SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, ...)) - -+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20) -+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interfac, uint32_t version, uint32_t flags, ...)) -+SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, uint32_t flags, union wl_argument *args)) -+ - SDL_WAYLAND_INTERFACE(wl_seat_interface) - SDL_WAYLAND_INTERFACE(wl_surface_interface) - SDL_WAYLAND_INTERFACE(wl_shm_pool_interface) diff --git a/devel/sdl20/pkg-plist b/devel/sdl20/pkg-plist index 3c259708c4e0..e8a808000fd1 100644 --- a/devel/sdl20/pkg-plist +++ b/devel/sdl20/pkg-plist @@ -1,88 +1,88 @@ 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_hidapi.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_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 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_sensor.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-version.cmake lib/cmake/SDL2/sdl2-config.cmake lib/libSDL2-2.0.so.0 -lib/libSDL2-2.0.so.0.18.0 +lib/libSDL2-2.0.so.0.18.2 lib/libSDL2.a lib/libSDL2.so lib/libSDL2_test.a lib/libSDL2main.a libdata/pkgconfig/sdl2.pc share/aclocal/sdl2.m4