git: 9a1f3d324fec - main - devel/sdl20: options cleanup

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Dmitry Marakasov <amdmi3_at_FreeBSD.org>
Date: Wed, 12 Jan 2022 16:06:55 UTC
The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9a1f3d324fec6474be7c3bb607c2c7a69dd6bb77

commit 9a1f3d324fec6474be7c3bb607c2c7a69dd6bb77
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-01-12 15:51:16 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-01-12 16:04:20 +0000

    devel/sdl20: options cleanup
    
    Options cleanup pass 2:
    - Remove prefix for video options
    - Remove leftover from nonexistion option VIDEO_OPENGLES
---
 devel/sdl20/Makefile | 77 +++++++++++++++++++++++++---------------------------
 1 file changed, 37 insertions(+), 40 deletions(-)

diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile
index 45a608e662f6..1e58c8ea3c3a 100644
--- a/devel/sdl20/Makefile
+++ b/devel/sdl20/Makefile
@@ -53,9 +53,8 @@ MAKE_ENV=	V=1
 OPTIONS_DEFINE=		ASM HIDAPI PTHREADS SAMPLERATE UDEV
 OPTIONS_GROUP=		AUDIO VIDEO SUBSYSTEM
 OPTIONS_GROUP_AUDIO=	ALSA JACK NAS OSS PIPEWIRE PULSEAUDIO SNDIO
-OPTIONS_GROUP_VIDEO=	VIDEO_KMSDRM VIDEO_OPENGL VIDEO_OPENGLES1 	\
-			VIDEO_OPENGLES2 VIDEO_VULKAN VIDEO_WAYLAND 	\
-			VIDEO_X11
+OPTIONS_GROUP_VIDEO=	KMSDRM OPENGL OPENGLES1 OPENGLES2 VULKAN 	\
+			WAYLAND X11
 OPTIONS_GROUP_SUBSYSTEM=SDL_ATOMIC SDL_AUDIO SDL_CPUINFO SDL_EVENTS 	\
 			SDL_FILE SDL_HAPTIC SDL_JOYSTICK SDL_LOADSO	\
 			SDL_POWER SDL_RENDER SDL_THREADS SDL_TIMERS	\
@@ -63,9 +62,8 @@ OPTIONS_GROUP_SUBSYSTEM=SDL_ATOMIC SDL_AUDIO SDL_CPUINFO SDL_EVENTS 	\
 OPTIONS_DEFAULT=	ASM 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_OPENGLES1 VIDEO_OPENGLES2	\
-			VIDEO_VULKAN VIDEO_WAYLAND VIDEO_X11
+			SDL_THREADS SDL_TIMERS SDL_VIDEO KMSDRM	OPENGL 	\
+			OPENGLES1 OPENGLES2 VULKAN WAYLAND X11
 OPTIONS_DEFINE_powerpc=	ALTIVEC
 OPTIONS_DEFINE_powerpc64=	ALTIVEC
 OPTIONS_DEFAULT_powerpc=	ALTIVEC
@@ -92,13 +90,13 @@ SDL_THREADS_DESC=	Enable the SDL Threads subsystem
 SDL_TIMERS_DESC=	Enable the SDL Timers subsystem
 SDL_VIDEO_DESC=		Enable the SDL Video subsystem
 UDEV_DESC=		Use udev for input device detection
-VIDEO_KMSDRM_DESC=	KMSDRM display support
-VIDEO_OPENGL_DESC=	OpenGL rendering support
-VIDEO_OPENGLES1_DESC=	OpenGL ES 1.x 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
+KMSDRM_DESC=		KMSDRM display support
+OPENGL_DESC=		OpenGL rendering support
+OPENGLES1_DESC=		OpenGL ES 1.x rendering support
+OPENGLES2_DESC=		OpenGL ES 2.x rendering support
+VULKAN_DESC=		Vulkan rendering support
+WAYLAND_DESC=		Wayland display support
+X11_DESC=		X11 display support
 
 ALTIVEC_CONFIGURE_ENABLE=	altivec
 ALSA_CONFIGURE_ENABLE=		alsa alsa-shared
@@ -145,32 +143,31 @@ 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_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=opengl
-VIDEO_OPENGL_IMPLIES=		SDL_VIDEO
-VIDEO_OPENGLES_CONFIGURE_ENABLE=video-opengles
-VIDEO_OPENGLES1_CONFIGURE_ENABLE=video-opengles1
-VIDEO_OPENGLES1_USES=		gl
-VIDEO_OPENGLES1_USE=		GL=egl,glesv1
-VIDEO_OPENGLES1_IMPLIES=	SDL_VIDEO VIDEO_OPENGLES
-VIDEO_OPENGLES2_CONFIGURE_ENABLE=video-opengles2
-VIDEO_OPENGLES2_USES=		gl
-VIDEO_OPENGLES2_USE=		GL=egl,glesv2
-VIDEO_OPENGLES2_IMPLIES=	SDL_VIDEO VIDEO_OPENGLES
-VIDEO_VULKAN_CONFIGURE_ENABLE=	video-vulkan
-VIDEO_VULKAN_IMPLIES=		SDL_LOADSO SDL_VIDEO
-VIDEO_WAYLAND_CONFIGURE_ENABLE=	video-wayland wayland-shared video-wayland-qt-touch
-VIDEO_WAYLAND_BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols \
+KMSDRM_CONFIGURE_ENABLE=	video-kmsdrm kmsdrm-shared
+KMSDRM_USES=			gl
+KMSDRM_USE=	 		GL=gbm
+KMSDRM_IMPLIES=			SDL_VIDEO
+OPENGL_CONFIGURE_ENABLE=	video-opengl
+OPENGL_USES=			gl
+OPENGL_USE=			GL=opengl
+OPENGL_IMPLIES=			SDL_VIDEO
+OPENGLES1_CONFIGURE_ENABLE=	video-opengles1
+OPENGLES1_USES=			gl
+OPENGLES1_USE=			GL=egl,glesv1
+OPENGLES1_IMPLIES=		SDL_VIDEO OPENGLES
+OPENGLES2_CONFIGURE_ENABLE=	video-opengles2
+OPENGLES2_USES=			gl
+OPENGLES2_USE=			GL=egl,glesv2
+OPENGLES2_IMPLIES=		SDL_VIDEO OPENGLES
+VULKAN_CONFIGURE_ENABLE=	video-vulkan
+VULKAN_IMPLIES=			SDL_LOADSO SDL_VIDEO
+WAYLAND_CONFIGURE_ENABLE=	video-wayland wayland-shared video-wayland-qt-touch
+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 \
+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 \
+WAYLAND_IMPLIES=		SDL_VIDEO OPENGLES2
+X11_CONFIGURE_ENABLE=		video-x11 x11-shared \
 				video-x11-xcursor \
 				video-x11-xdbe \
 				video-x11-xinerama \
@@ -180,9 +177,9 @@ VIDEO_X11_CONFIGURE_ENABLE=	video-x11 x11-shared \
 				video-x11-scrnsaver \
 				video-x11-xshape \
 				video-x11-vm
-VIDEO_X11_USES=			xorg
-VIDEO_X11_USE=			XORG=xcursor,xext,xinerama,xi,xfixes,xrandr,xscrnsaver,xxf86vm
-VIDEO_X11_IMPLIES=		SDL_VIDEO
+X11_USES=			xorg
+X11_USE=			XORG=xcursor,xext,xinerama,xi,xfixes,xrandr,xscrnsaver,xxf86vm
+X11_IMPLIES=			SDL_VIDEO
 
 .include <bsd.port.options.mk>