Attachment 221227 Details for Bug 252371 – update to 2.0.14, add EVDEV option

[patch] update to 2.0.14, add EVDEV option

sdl20.diff (text/plain), 5.59 KB, created by Vladimir Druzenko on 2021-01-03 07:03:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2021-01-03 07:03:21 UTC

Size: 5.59 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}
>@@ -53,14 +52,14 @@
> 
> MAKE_ENV=	V=1
> 
>-OPTIONS_DEFINE=		ALSA ASM DLOPEN HIDAPI JACK NAS OSS	\
>+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 OSS PTHREADS SDL_ATOMIC SDL_AUDIO	\
>+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	\
>@@ -73,6 +72,7 @@
> 
> 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
>@@ -104,6 +104,9 @@
> 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
>@@ -279,8 +282,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