Attachment 221746 Details for Bug 252371 – update to 2.0.14 and refactoring of the options (v4)

[patch] update to 2.0.14 and refactoring of the options (v4)

sdl20_v4.diff (text/plain), 13.33 KB, created by Vladimir Druzenko on 2021-01-19 17:01:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2021-01-19 17:01:36 UTC

Size: 13.33 KB

patch

obsolete

>diff -urN devel/sdl20.orig/Makefile devel/sdl20/Makefile
>--- devel/sdl20.orig/Makefile
>+++ devel/sdl20/Makefile
>@@ -1,8 +1,7 @@
> # $FreeBSD: head/devel/sdl20/Makefile 551250 2020-10-03 02:21:47Z pkubaj $
> 
> PORTNAME=	sdl2
>-PORTVERSION=	2.0.12
>-PORTREVISION=	3
>+DISTVERSION=	2.0.14
> CATEGORIES=	devel
> MASTER_SITES=	https://www.libsdl.org/release/
> DISTNAME=	SDL2-${PORTVERSION}
>@@ -23,8 +22,8 @@
> 			--enable-dummyaudio \
> 			--enable-video-dummy \
> 			--disable-dbus \
>-			--disable-input-tslib \
>-			--disable-rpath
>+			--disable-rpath \
>+			--disable-esd --disable-esd-shared
> .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx}
> CONFIGURE_ARGS+=	--enable-mmx
> .else
>@@ -53,19 +52,19 @@
> 
> MAKE_ENV=	V=1
> 
>-OPTIONS_DEFINE=		ALSA ASM DLOPEN 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_DEFINE=		ALSA ASM DLOPEN HIDAPI JACK NAS OSS 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_OPENGLES2	\
>+			VIDEO_VULKAN VIDEO_WAYLAND 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_OPENGLES2 VIDEO_WAYLAND	\
>-			VIDEO_X11
>+			VIDEO_OPENGL VIDEO_OPENGLES2 VIDEO_VULKAN	\
>+			VIDEO_WAYLAND VIDEO_X11
> OPTIONS_DEFINE_powerpc=	ALTIVEC
> OPTIONS_DEFINE_powerpc64=	ALTIVEC
> OPTIONS_DEFAULT_powerpc=	ALTIVEC
>@@ -77,8 +76,8 @@
> 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
>+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
>@@ -97,16 +96,31 @@
> VIDEO_KMSDRM_DESC=	KMSDRM display support
> VIDEO_OPENGL_DESC=	OpenGL 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
> DLOPEN_CONFIGURE_ENABLE=	sdl-dlopen
>-DLOPEN_CONFIGURE_OFF=		--disable-video-vulkan
>+DLOPEN_IMPLIES=			SDL_LOADSO
> 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
> 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
>@@ -116,15 +130,52 @@
> 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_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_ON=		--enable-video-kmsdrm --enable-kmsdrm-shared
>+#VIDEO_KMSDRM_OFF=		--disable-video-kmsdrm --disable-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=gl
>+VIDEO_OPENGL_IMPLIES=		SDL_VIDEO
>+VIDEO_OPENGLES2_CONFIGURE_ENABLE=video-opengles video-opengles2
>+VIDEO_OPENGLES2_USES=		gl
>+VIDEO_OPENGLES2_USE=		GL=egl,glesv2
>+VIDEO_OPENGLES2_IMPLIES=	SDL_VIDEO
>+VIDEO_VULKAN_CONFIGURE_ENABLE=	video-vulkan
>+VIDEO_VULKAN_IMPLIES=		DLOPEN SDL_LOADSO SDL_VIDEO
>+VIDEO_WAYLAND_CONFIGURE_ENABLE=	video-wayland wayland-shared
>+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-xinerama \
>+				video-x11-xinput \
>+				video-x11-xrandr \
>+				video-x11-scrnsaver \
>+				video-x11-xshape \
>+				video-x11-vm
>+VIDEO_X11_USES=			xorg
>+VIDEO_X11_USE=			XORG=xinerama,xcursor,xi,xrandr,xscrnsaver,xxf86vm,xext
>+VIDEO_X11_IMPLIES=		SDL_VIDEO
> 
> .include <bsd.port.options.mk>
> 
>@@ -134,144 +185,6 @@
> CFLAGS+=	-B${LOCALBASE}/bin -no-integrated-as
> .endif
> 
>-.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
>-
>-CONFIGURE_ARGS+=	--disable-esd --disable-esd-shared
>-
>-.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
>-USE_GL+=		gbm
>-.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
>-USES+=			gl
>-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
>-USES+=		xorg
>-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
>-
>-.if ${PORT_OPTIONS:MVIDEO_OPENGLES2}
>-.if !${PORT_OPTIONS:MSDL_VIDEO}
>-IGNORE=	option VIDEO_OPENGLES2 requires SDL_VIDEO
>-.endif
>-CONFIGURE_ARGS+=	--enable-video-opengles \
>-			--enable-video-opengles2
>-USE_GL+=		egl glesv2
>-.else
>-CONFIGURE_ARGS+=	--disable-video-opengles \
>-			--disable-video-opengles2
>-.endif
>-
>-.if ${PORT_OPTIONS:MVIDEO_WAYLAND}
>-.if !${PORT_OPTIONS:MSDL_VIDEO}
>-IGNORE=	option VIDEO_WAYLAND requires SDL_VIDEO
>-.endif
>-.if !${PORT_OPTIONS:MVIDEO_OPENGLES2}
>-IGNORE=	option VIDEO_WAYLAND requires VIDEO_OPENGLES2
>-.endif
>-CONFIGURE_ARGS+=	--enable-video-wayland \
>-			--enable-wayland-shared
>-BUILD_DEPENDS+=		wayland-protocols>0:graphics/wayland-protocols \
>-			${LOCALBASE}/include/linux/input.h:devel/evdev-proto
>-LIB_DEPENDS+=		libwayland-egl.so:graphics/wayland \
>-			libxkbcommon.so:x11/libxkbcommon
>-.else
>-CONFIGURE_ARGS+=	--disable-video-wayland \
>-			--disable-wayland-shared
>-.endif
>-
> .include <bsd.port.pre.mk>
> 
> .if !empty(ICONV_LIB)
>@@ -279,8 +192,7 @@
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e '/ CheckInputEvents$$/d' \
>-		-e 's/-liconv/${ICONV_LIB}/g' ${WRKSRC}/configure
>+	@${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
>diff -urN devel/sdl20.orig/distinfo devel/sdl20/distinfo
>--- devel/sdl20.orig/distinfo
>+++ devel/sdl20/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1583890578
>-SHA256 (SDL2-2.0.12.tar.gz) = 349268f695c02efbc9b9148a70b85e58cefbbf704abd3e91be654db7f1e2c863
>-SIZE (SDL2-2.0.12.tar.gz) = 5720162
>+TIMESTAMP = 1609652899
>+SHA256 (SDL2-2.0.14.tar.gz) = d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc
>+SIZE (SDL2-2.0.14.tar.gz) = 6089974
>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 +1,12 @@
>---- src/video/kmsdrm/SDL_kmsdrmvideo.c.orig	2020-03-11 01:36:18 UTC
>+--- src/video/kmsdrm/SDL_kmsdrmvideo.c.orig
> +++ src/video/kmsdrm/SDL_kmsdrmvideo.c
>-@@ -391,7 +391,9 @@ KMSDRM_CreateSurfaces(_THIS, SDL_Window * window)
>-     Uint32 height = dispdata->mode.vdisplay;
>-     Uint32 surface_fmt = GBM_FORMAT_XRGB8888;
>-     Uint32 surface_flags = GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING;
>+@@ -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
>  
>-     if (!KMSDRM_gbm_device_is_format_supported(viddata->gbm, surface_fmt, surface_flags)) {
>-         SDL_LogWarn(SDL_LOG_CATEGORY_VIDEO, "GBM surface format not supported. Trying anyway.");
>+     int ret = 0;
>+ 
>diff -urN devel/sdl20.orig/files/patch-src_cpuinfo_SDL__cpuinfo.c devel/sdl20/files/patch-src_cpuinfo_SDL__cpuinfo.c
>--- devel/sdl20.orig/files/patch-src_cpuinfo_SDL__cpuinfo.c
>+++ devel/sdl20/files/patch-src_cpuinfo_SDL__cpuinfo.c
>@@ -1,24 +0,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
>diff -urN devel/sdl20.orig/pkg-plist devel/sdl20/pkg-plist
>--- devel/sdl20.orig/pkg-plist
>+++ devel/sdl20/pkg-plist
>@@ -21,10 +21,12 @@
> 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
>@@ -76,7 +78,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.12.0
>+lib/libSDL2-2.0.so.0.14.0
> lib/libSDL2.a
> lib/libSDL2.so
> lib/libSDL2_test.a

Actions: View | Diff

Attachments on bug 252371: 221227 | 221245 | 221249 | 221746 | 221747 | 221841 | 227097 | 227643 | 228136 | 229869 | 230314 | 230432