Attachment 230955 Details for Bug 261149 – update to 2.0.20

[patch] update to 2.0.20

sdl2.diff (text/plain), 5.18 KB, created by Vladimir Druzenko on 2022-01-12 15:01:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2022-01-12 15:01:28 UTC

Size: 5.18 KB

patch

obsolete

>diff -urN devel/sdl20.orig/Makefile devel/sdl20/Makefile
>--- devel/sdl20.orig/Makefile
>+++ devel/sdl20/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	sdl2
>-DISTVERSION=	2.0.18
>+DISTVERSION=	2.0.20
> CATEGORIES=	devel
> MASTER_SITES=	https://www.libsdl.org/release/
> DISTNAME=	SDL2-${PORTVERSION}
>@@ -50,7 +50,7 @@
> 
> MAKE_ENV=	V=1
> 
>-OPTIONS_DEFINE=		ALSA ASM HIDAPI JACK NAS OSS PIPEWARE PTHREADS	\
>+OPTIONS_DEFINE=		ALSA ASM HIDAPI JACK NAS OSS PIPEWIRE PTHREADS	\
> 			PULSEAUDIO SAMPLERATE SDL_ATOMIC SDL_AUDIO	\
> 			SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC	\
> 			SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER	\
>@@ -74,7 +74,7 @@
> 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
>+PIPEWIRE_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
>@@ -115,9 +115,9 @@
> 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
>+PIPEWIRE_CONFIGURE_ENABLE=	pipewire pipewire-shared
>+PIPEWIRE_LIB_DEPENDS=		libpipewire-0.3.so:multimedia/pipewire
>+PIPEWIRE_IMPLIES=		SDL_AUDIO
> PTHREADS_CONFIGURE_ENABLE=	pthreads pthread-sem
> PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio pulseaudio-shared
> PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
>diff -urN devel/sdl20.orig/distinfo devel/sdl20/distinfo
>--- devel/sdl20.orig/distinfo
>+++ 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 = 1641985052
>+SHA256 (SDL2-2.0.20.tar.gz) = c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06
>+SIZE (SDL2-2.0.20.tar.gz) = 7207221
>diff -urN devel/sdl20.orig/files/patch-noegl devel/sdl20/files/patch-noegl
>--- devel/sdl20.orig/files/patch-noegl
>+++ devel/sdl20/files/patch-noegl
>@@ -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 -urN devel/sdl20.orig/files/patch-wayland-1.20 devel/sdl20/files/patch-wayland-1.20
>--- devel/sdl20.orig/files/patch-wayland-1.20
>+++ devel/sdl20/files/patch-wayland-1.20
>@@ -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 -urN devel/sdl20.orig/pkg-plist devel/sdl20/pkg-plist
>--- devel/sdl20.orig/pkg-plist
>+++ devel/sdl20/pkg-plist
>@@ -79,7 +79,7 @@
> 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

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 261149: 230955