Attachment #221227 for bug #252371




# $FreeBSD: head/devel/sdl20/Makefile 551250 2020-10-03 02:21:47Z pkubaj $

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


MAKE_ENV=	V=1

OPTIONS_DEFINE=		ALSA ASM DLOPEN EVDEV HIDAPI JACK NAS OSS	\
			PULSEAUDIO SAMPLERATE 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 UDEV VIDEO_KMSDRM VIDEO_OPENGL	\
			VIDEO_OPENGLES2 VIDEO_WAYLAND VIDEO_X11
OPTIONS_DEFAULT=	ASM DLOPEN EVDEV 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	\


ALSA_DESC=		Audio output via the ALSA audio architecture
DLOPEN_DESC=		Use dlopen for loading 3rd party libraries
EVDEV_DESC=		Use evdev for gamepad/joystick input
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

ASM_CONFIGURE_ENABLE=		assembly
DLOPEN_CONFIGURE_ENABLE=	sdl-dlopen
DLOPEN_CONFIGURE_OFF=		--disable-video-vulkan
EVDEV_CONFIGURE_ENABLE=		events
EVDEV_BUILD_DEPENDS=		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
EVDEV_IMPLIES=			SDL_JOYSTICK
HIDAPI_CONFIGURE_ENABLE=	hidapi
HIDAPI_IMPLIES=			SDL_JOYSTICK
PTHREADS_CONFIGURE_ENABLE=	pthreads pthread-sem

.endif

post-patch:
	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/configure
		-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

Lines 1-3 Link Here

(-)devel/sdl20/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1583890578	1	TIMESTAMP = 1609652899
2	SHA256 (SDL2-2.0.12.tar.gz) = 349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863	2	SHA256 (SDL2-2.0.14.tar.gz) = d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
3	SIZE (SDL2-2.0.12.tar.gz) = 5720162	3	SIZE (SDL2-2.0.14.tar.gz) = 6089974




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




--- src/cpuinfo/SDL_cpuinfo.c.orig	2020-03-11 01:36:18 UTC
+++ src/cpuinfo/SDL_cpuinfo.c
@@ -49,7 +49,7 @@
 #endif
 #if defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))
 #include <sys/sysctl.h>         /* For AltiVec check */
-#elif defined(__OpenBSD__) && defined(__powerpc__)
+#elif (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__powerpc__)
 #include <sys/param.h>
 #include <sys/sysctl.h> /* For AltiVec check */
 #include <machine/cpu.h>
@@ -314,9 +314,11 @@ CPU_haveAltiVec(void)
 {
     volatile int altivec = 0;
 #ifndef SDL_CPUINFO_DISABLED
-#if (defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))) || (defined(__OpenBSD__) && defined(__powerpc__))
+#if (defined(__MACOSX__) && (defined(__ppc__) || defined(__ppc64__))) || (defined(__OpenBSD__) && defined(__powerpc__)) || (defined(__FreeBSD__) && defined(__powerpc__))
 #ifdef __OpenBSD__
     int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
+#elif __FreeBSD__
+    int selectors[2] = { CTL_HW, PPC_FEATURE_HAS_ALTIVEC };
 #else
     int selectors[2] = { CTL_HW, HW_VECTORUNIT };
 #endif




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

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.14.0
lib/libSDL2.a
lib/libSDL2.so
lib/libSDL2_test.a

Return to bug 252371

Lines 1-8 Link Here

(-)devel/sdl20/Makefile (-6 / +8 lines)
1	# $FreeBSD: head/devel/sdl20/Makefile 551250 2020-10-03 02:21:47Z pkubaj $	1	# $FreeBSD: head/devel/sdl20/Makefile 551250 2020-10-03 02:21:47Z pkubaj $
2		2
3	PORTNAME= sdl2	3	PORTNAME= sdl2
4	PORTVERSION= 2.0.12	4	DISTVERSION= 2.0.14
5	PORTREVISION= 3
6	CATEGORIES= devel	5	CATEGORIES= devel
7	MASTER_SITES= https://www.libsdl.org/release/	6	MASTER_SITES= https://www.libsdl.org/release/
8	DISTNAME= SDL2-${PORTVERSION}	7	DISTNAME= SDL2-${PORTVERSION}
Lines 53-66 Link Here
53		52
54	MAKE_ENV= V=1	53	MAKE_ENV= V=1
55		54
56	OPTIONS_DEFINE= ALSA ASM DLOPEN HIDAPI JACK NAS OSS \	55	OPTIONS_DEFINE= ALSA ASM DLOPEN EVDEV HIDAPI JACK NAS OSS \
57	PULSEAUDIO SAMPLERATE SNDIO PTHREADS \	56	PULSEAUDIO SAMPLERATE SNDIO PTHREADS \
58	SDL_ATOMIC SDL_AUDIO SDL_CPUINFO SDL_EVENTS \	57	SDL_ATOMIC SDL_AUDIO SDL_CPUINFO SDL_EVENTS \
59	SDL_FILE SDL_HAPTIC SDL_JOYSTICK SDL_LOADSO \	58	SDL_FILE SDL_HAPTIC SDL_JOYSTICK SDL_LOADSO \
60	SDL_POWER SDL_RENDER SDL_THREADS SDL_TIMERS \	59	SDL_POWER SDL_RENDER SDL_THREADS SDL_TIMERS \
61	SDL_VIDEO UDEV VIDEO_KMSDRM VIDEO_OPENGL \	60	SDL_VIDEO UDEV VIDEO_KMSDRM VIDEO_OPENGL \
62	VIDEO_OPENGLES2 VIDEO_WAYLAND VIDEO_X11	61	VIDEO_OPENGLES2 VIDEO_WAYLAND VIDEO_X11
63	OPTIONS_DEFAULT= ASM DLOPEN OSS PTHREADS SDL_ATOMIC SDL_AUDIO \	62	OPTIONS_DEFAULT= ASM DLOPEN EVDEV OSS PTHREADS SDL_ATOMIC SDL_AUDIO \
64	SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \	63	SDL_CPUINFO SDL_EVENTS SDL_FILE SDL_HAPTIC \
65	SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \	64	SDL_JOYSTICK SDL_LOADSO SDL_POWER SDL_RENDER \
66	SDL_THREADS SDL_TIMERS SDL_VIDEO VIDEO_KMSDRM \	65	SDL_THREADS SDL_TIMERS SDL_VIDEO VIDEO_KMSDRM \
Lines 73-78 Link Here
73		72
74	ALSA_DESC= Audio output via the ALSA audio architecture	73	ALSA_DESC= Audio output via the ALSA audio architecture
75	DLOPEN_DESC= Use dlopen for loading 3rd party libraries	74	DLOPEN_DESC= Use dlopen for loading 3rd party libraries
		75	EVDEV_DESC= Use evdev for gamepad/joystick input
76	HIDAPI_DESC= Use HIDAPI for low level joystick drivers	76	HIDAPI_DESC= Use HIDAPI for low level joystick drivers
77	JACK_DESC= Audio output via the JackD sound server	77	JACK_DESC= Audio output via the JackD sound server
78	NAS_DESC= Audio output via the Network Audio System	78	NAS_DESC= Audio output via the Network Audio System
Lines 104-109 Link Here
104	ASM_CONFIGURE_ENABLE= assembly	104	ASM_CONFIGURE_ENABLE= assembly
105	DLOPEN_CONFIGURE_ENABLE= sdl-dlopen	105	DLOPEN_CONFIGURE_ENABLE= sdl-dlopen
106	DLOPEN_CONFIGURE_OFF= --disable-video-vulkan	106	DLOPEN_CONFIGURE_OFF= --disable-video-vulkan
		107	EVDEV_CONFIGURE_ENABLE= events
		108	EVDEV_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto
		109	EVDEV_IMPLIES= SDL_JOYSTICK
107	HIDAPI_CONFIGURE_ENABLE= hidapi	110	HIDAPI_CONFIGURE_ENABLE= hidapi
108	HIDAPI_IMPLIES= SDL_JOYSTICK	111	HIDAPI_IMPLIES= SDL_JOYSTICK
109	PTHREADS_CONFIGURE_ENABLE= pthreads pthread-sem	112	PTHREADS_CONFIGURE_ENABLE= pthreads pthread-sem
Lines 279-286 Link Here
279	.endif	282	.endif
280		283
281	post-patch:	284	post-patch:
282	@${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' \	285	@${REINPLACE_CMD} -e 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/configure
283	-e 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/configure
284	# Clang does not provide _m_prefetch	286	# Clang does not provide _m_prefetch
285	@${REINPLACE_CMD} 's/_m_prefetch/__builtin_prefetch/' \	287	@${REINPLACE_CMD} 's/_m_prefetch/__builtin_prefetch/' \
286	${WRKSRC}/configure ${WRKSRC}/src/video/SDL_blit_A.c	288	${WRKSRC}/configure ${WRKSRC}/src/video/SDL_blit_A.c

Lines 1-12 Link Here

(-)devel/sdl20/files/patch-noegl (-7 / +7 lines)
1	--- src/video/kmsdrm/SDL_kmsdrmvideo.c.orig 2020-03-11 01:36:18 UTC	1	--- src/video/kmsdrm/SDL_kmsdrmvideo.c.orig
2	+++ src/video/kmsdrm/SDL_kmsdrmvideo.c	2	+++ src/video/kmsdrm/SDL_kmsdrmvideo.c
3	@@ -391,7 +391,9 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window)	3	@@ -1407,7 +1407,9 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window)
4	Uint32 height = dispdata->mode.vdisplay;	4	uint32_t surface_flags = GBM_BO_USE_SCANOUT \| GBM_BO_USE_RENDERING;
5	Uint32 surface_fmt = GBM_FORMAT_XRGB8888;	5	uint32_t width, height;
6	Uint32 surface_flags = GBM_BO_USE_SCANOUT \| GBM_BO_USE_RENDERING;	6
7	+#if SDL_VIDEO_OPENGL_EGL	7	+#if SDL_VIDEO_OPENGL_EGL
8	EGLContext egl_context;	8	EGLContext egl_context;
9	+#endif	9	+#endif
10		10
11	if (!KMSDRM_gbm_device_is_format_supported(viddata->gbm, surface_fmt, surface_flags)) {	11	int ret = 0;
12	SDL_LogWarn(SDL_LOG_CATEGORY_VIDEO, "GBM surface format not supported. Trying anyway.");	12

Lines 1-24 Link Here

(-)devel/sdl20/files/patch-src_cpuinfo_SDL__cpuinfo.c (-24 lines)
1	--- src/cpuinfo/SDL_cpuinfo.c.orig 2020-03-11 01:36:18 UTC
2	+++ src/cpuinfo/SDL_cpuinfo.c
3	@@ -49,7 +49,7 @@
4	#endif
5	#if defined(__MACOSX__) && (defined(__ppc__) \|\| defined(__ppc64__))
6	#include <sys/sysctl.h> /* For AltiVec check */
7	-#elif defined(__OpenBSD__) && defined(__powerpc__)
8	+#elif (defined(__OpenBSD__) \|\| defined(__FreeBSD__)) && defined(__powerpc__)
9	#include <sys/param.h>
10	#include <sys/sysctl.h> /* For AltiVec check */
11	#include <machine/cpu.h>
12	@@ -314,9 +314,11 @@ CPU_haveAltiVec(void)
13	{
14	volatile int altivec = 0;
15	#ifndef SDL_CPUINFO_DISABLED
16	-#if (defined(__MACOSX__) && (defined(__ppc__) \|\| defined(__ppc64__))) \|\| (defined(__OpenBSD__) && defined(__powerpc__))
17	+#if (defined(__MACOSX__) && (defined(__ppc__) \|\| defined(__ppc64__))) \|\| (defined(__OpenBSD__) && defined(__powerpc__)) \|\| (defined(__FreeBSD__) && defined(__powerpc__))
18	#ifdef __OpenBSD__
19	int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC };
20	+#elif __FreeBSD__
21	+ int selectors[2] = { CTL_HW, PPC_FEATURE_HAS_ALTIVEC };
22	#else
23	int selectors[2] = { CTL_HW, HW_VECTORUNIT };
24	#endif

Lines 21-30 Link Here

(-)devel/sdl20/pkg-plist (-1 / +3 lines)
21	include/SDL2/SDL_keyboard.h	21	include/SDL2/SDL_keyboard.h
22	include/SDL2/SDL_keycode.h	22	include/SDL2/SDL_keycode.h
23	include/SDL2/SDL_loadso.h	23	include/SDL2/SDL_loadso.h
		24	include/SDL2/SDL_locale.h
24	include/SDL2/SDL_log.h	25	include/SDL2/SDL_log.h
25	include/SDL2/SDL_main.h	26	include/SDL2/SDL_main.h
26	include/SDL2/SDL_messagebox.h	27	include/SDL2/SDL_messagebox.h
27	include/SDL2/SDL_metal.h	28	include/SDL2/SDL_metal.h
		29	include/SDL2/SDL_misc.h
28	include/SDL2/SDL_mouse.h	30	include/SDL2/SDL_mouse.h
29	include/SDL2/SDL_mutex.h	31	include/SDL2/SDL_mutex.h
30	include/SDL2/SDL_name.h	32	include/SDL2/SDL_name.h
Lines 76-82 Link Here
76	lib/cmake/SDL2/sdl2-config-version.cmake	78	lib/cmake/SDL2/sdl2-config-version.cmake
77	lib/cmake/SDL2/sdl2-config.cmake	79	lib/cmake/SDL2/sdl2-config.cmake
78	lib/libSDL2-2.0.so.0	80	lib/libSDL2-2.0.so.0
79	lib/libSDL2-2.0.so.0.12.0	81	lib/libSDL2-2.0.so.0.14.0
80	lib/libSDL2.a	82	lib/libSDL2.a
81	lib/libSDL2.so	83	lib/libSDL2.so
82	lib/libSDL2_test.a	84	lib/libSDL2_test.a