Attachment #230955 for bug #261149

View | Details | Raw Unified | Return to bug 261149
Collapse All | Expand All




PORTNAME=	sdl2
DISTVERSION=	2.0.20
CATEGORIES=	devel
MASTER_SITES=	https://www.libsdl.org/release/
DISTNAME=	SDL2-${PORTVERSION}


MAKE_ENV=	V=1

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	\

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
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

NAS_IMPLIES=			SDL_AUDIO
OSS_CONFIGURE_ENABLE=		oss
OSS_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

Lines 1-3 Link Here

(-)devel/sdl20/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1638578013	1	TIMESTAMP = 1641985052
2	SHA256 (SDL2-2.0.18.tar.gz) = 94d40cd73dbfa10bb6eadfbc28f355992bb2d6ef6761ad9d4074eff95ee5711c	2	SHA256 (SDL2-2.0.20.tar.gz) = c56aba1d7b5b0e7e999e4a7698c70b63a3394ff9704b5f6e1c57e0c16f04dd06
3	SIZE (SDL2-2.0.18.tar.gz) = 7294032	3	SIZE (SDL2-2.0.20.tar.gz) = 7207221




--- 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;





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)

Lines 79-85 Link Here

(-)devel/sdl20/pkg-plist (-1 / +1 lines)
79	lib/cmake/SDL2/sdl2-config-version.cmake	79	lib/cmake/SDL2/sdl2-config-version.cmake
80	lib/cmake/SDL2/sdl2-config.cmake	80	lib/cmake/SDL2/sdl2-config.cmake
81	lib/libSDL2-2.0.so.0	81	lib/libSDL2-2.0.so.0
82	lib/libSDL2-2.0.so.0.18.0	82	lib/libSDL2-2.0.so.0.18.2
83	lib/libSDL2.a	83	lib/libSDL2.a
84	lib/libSDL2.so	84	lib/libSDL2.so
85	lib/libSDL2_test.a	85	lib/libSDL2_test.a

Return to bug 261149

Lines 1-5 Link Here

(-)devel/sdl20/Makefile (-6 / +6 lines)
1	PORTNAME= sdl2	1	PORTNAME= sdl2
2	DISTVERSION= 2.0.18	2	DISTVERSION= 2.0.20
3	CATEGORIES= devel	3	CATEGORIES= devel
4	MASTER_SITES= https://www.libsdl.org/release/	4	MASTER_SITES= https://www.libsdl.org/release/
5	DISTNAME= SDL2-${PORTVERSION}	5	DISTNAME= SDL2-${PORTVERSION}
Lines 50-56 Link Here
50		50
51	MAKE_ENV= V=1	51	MAKE_ENV= V=1
52		52
53	OPTIONS_DEFINE= ALSA ASM HIDAPI JACK NAS OSS PIPEWARE PTHREADS \	53	OPTIONS_DEFINE= ALSA ASM HIDAPI JACK NAS OSS PIPEWIRE PTHREADS \
54	PULSEAUDIO SAMPLERATE SDL_ATOMIC SDL_AUDIO \	54	PULSEAUDIO SAMPLERATE SDL_ATOMIC SDL_AUDIO \
55	SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \	55	SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \
56	SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \	56	SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \
Lines 74-80 Link Here
74	JACK_DESC= Audio output via the JackD sound server	74	JACK_DESC= Audio output via the JackD sound server
75	NAS_DESC= Audio output via the Network Audio System	75	NAS_DESC= Audio output via the Network Audio System
76	OSS_DESC= Audio output via the Open Sound System	76	OSS_DESC= Audio output via the Open Sound System
77	PIPEWARE_DESC= Audio output via the Pipewire sound server	77	PIPEWIRE_DESC= Audio output via the Pipewire sound server
78	PTHREADS_DESC= Use POSIX threads for multi-threading	78	PTHREADS_DESC= Use POSIX threads for multi-threading
79	PULSEAUDIO_DESC= Audio output via the PulseAudio sound server	79	PULSEAUDIO_DESC= Audio output via the PulseAudio sound server
80	SAMPLERATE_DESC= Audio rate conversion via libsamplerate	80	SAMPLERATE_DESC= Audio rate conversion via libsamplerate
Lines 115-123 Link Here
115	NAS_IMPLIES= SDL_AUDIO	115	NAS_IMPLIES= SDL_AUDIO
116	OSS_CONFIGURE_ENABLE= oss	116	OSS_CONFIGURE_ENABLE= oss
117	OSS_IMPLIES= SDL_AUDIO	117	OSS_IMPLIES= SDL_AUDIO
118	PIPEWARE_CONFIGURE_ENABLE= pipewire pipewire-shared	118	PIPEWIRE_CONFIGURE_ENABLE= pipewire pipewire-shared
119	PIPEWARE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire	119	PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire
120	PIPEWARE_IMPLIES= SDL_AUDIO	120	PIPEWIRE_IMPLIES= SDL_AUDIO
121	PTHREADS_CONFIGURE_ENABLE= pthreads pthread-sem	121	PTHREADS_CONFIGURE_ENABLE= pthreads pthread-sem
122	PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio pulseaudio-shared	122	PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio pulseaudio-shared
123	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	123	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio

Lines 1-12 Link Here

(-)devel/sdl20/files/patch-noegl (-12 lines)
1	--- src/video/kmsdrm/SDL_kmsdrmvideo.c.orig
2	+++ src/video/kmsdrm/SDL_kmsdrmvideo.c
3	@@ -1407,7 +1407,9 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window)
4	uint32_t surface_flags = GBM_BO_USE_SCANOUT \| GBM_BO_USE_RENDERING;
5	uint32_t width, height;
6
7	+#if SDL_VIDEO_OPENGL_EGL
8	EGLContext egl_context;
9	+#endif
10
11	int ret = 0;
12

Lines 1-35 Link Here

(-)devel/sdl20/files/patch-wayland-1.20 (-35 lines)
1	https://github.com/libsdl-org/sdl/commit/e2ade2bfc46d
2
3	ld: error: undefined symbol: wl_proxy_marshal_flags
4	>>> referenced by SDL_waylanddatamanager.c
5	>>> build/.libs/SDL_waylanddatamanager.o:(Wayland_data_source_destroy)
6	>>> referenced by SDL_waylanddatamanager.c
7	>>> build/.libs/SDL_waylanddatamanager.o:(Wayland_data_offer_receive)
8	>>> referenced by SDL_waylanddatamanager.c
9	>>> build/.libs/SDL_waylanddatamanager.o:(Wayland_data_offer_destroy)
10	>>> referenced 109 more times
11
12	--- src/video/wayland/SDL_waylanddyn.h.orig 2020-03-11 01:36:18 UTC
13	+++ src/video/wayland/SDL_waylanddyn.h
14	@@ -75,6 +75,8 @@ void SDL_WAYLAND_UnloadSymbols(void);
15	#define wl_proxy_create (*WAYLAND_wl_proxy_create)
16	#define wl_proxy_destroy (*WAYLAND_wl_proxy_destroy)
17	#define wl_proxy_marshal (*WAYLAND_wl_proxy_marshal)
18	+#define wl_proxy_marshal_flags (*WAYLAND_wl_proxy_marshal_flags)
19	+#define wl_proxy_marshal_array_flags (*WAYLAND_wl_proxy_marshal_array_flags)
20	#define wl_proxy_set_user_data (*WAYLAND_wl_proxy_set_user_data)
21	#define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data)
22	#define wl_proxy_get_version (*WAYLAND_wl_proxy_get_version)
23	--- src/video/wayland/SDL_waylandsym.h.orig 2020-03-11 01:36:18 UTC
24	+++ src/video/wayland/SDL_waylandsym.h
25	@@ -71,6 +71,10 @@ SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_co
26	SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10)
27	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, ...))
28
29	+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_20)
30	+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, ...))
31	+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))
32	+
33	SDL_WAYLAND_INTERFACE(wl_seat_interface)
34	SDL_WAYLAND_INTERFACE(wl_surface_interface)
35	SDL_WAYLAND_INTERFACE(wl_shm_pool_interface)