Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Apr 2024 16:59:01 GMT
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 218f4cff4785 - main - devel/sdl20: refactor options (sort and remove redundant DESCs)
Message-ID:  <202404151659.43FGx1ra056999@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=218f4cff478575e8ae77193d39c871426f2438af

commit 218f4cff478575e8ae77193d39c871426f2438af
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2024-04-15 16:13:18 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2024-04-15 16:58:53 +0000

    devel/sdl20: refactor options (sort and remove redundant DESCs)
    
    PR:             278353
    Submitted by:   diizzy
---
 devel/sdl20/Makefile | 83 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 31 deletions(-)

diff --git a/devel/sdl20/Makefile b/devel/sdl20/Makefile
index 63236ad63e10..32a5956c3f0f 100644
--- a/devel/sdl20/Makefile
+++ b/devel/sdl20/Makefile
@@ -67,71 +67,100 @@ AUDIO_DESC=		Audio drivers
 VIDEO_DESC=		Video drivers
 
 CSD_DESC=		Client-side decorations for Wayland via libdecor
-JOYSTICK_DESC=		Joystick and haptic support
+FCITX_DESC=		fcitx support
 HIDAPI_DESC=		Use HIDAPI for low level joystick drivers
-PTHREADS_DESC=		Use POSIX threads for multi-threading
-UDEV_DESC=		Use udev for input device detection
+IBUS_DESC=		IBus support
+JOYSTICK_DESC=		Joystick and haptic 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
+PTHREADS_DESC=		Use POSIX threads for multi-threading
+UDEV_DESC=		Use udev for input device detection
 VULKAN_DESC=		Vulkan rendering support
-WAYLAND_DESC=		Wayland display support
-X11_DESC=		X11 display support
-IBUS_DESC=		IBus support
-FCITX_DESC=		fcitx support
 
-ALTIVEC_CONFIGURE_ENABLE=	altivec
 ALSA_CONFIGURE_ENABLE=		alsa alsa-shared
 ALSA_LIB_DEPENDS=		libasound.so:audio/alsa-lib
+
+ALTIVEC_CONFIGURE_ENABLE=	altivec
+
 ASM_CONFIGURE_ENABLE=		assembly
+
 CSD_CONFIGURE_ENABLE=		libdecor libdecor-shared
 CSD_LIB_DEPENDS=		libdecor-0.so:x11-toolkits/libdecor
 CSD_IMPLIES=			WAYLAND
+
+DBUS_LIB_DEPENDS=		libdbus-1.so:devel/dbus
+DBUS_CONFIGURE_ENABLE=		dbus
+
+FCITX_LIB_DEPENDS=		libfcitx-config.so:chinese/fcitx
+FCITX_CONFIGURE_ENABLE=		fcitx
+FCITX_IMPLIES=			DBUS
+
 HIDAPI_CONFIGURE_ENABLE=	hidapi
 HIDAPI_IMPLIES=			JOYSTICK
+
+IBUS_LIB_DEPENDS=		libibus-1.0.so:textproc/ibus
+IBUS_CONFIGURE_ENABLE=		ibus
+IBUS_IMPLIES=			DBUS
+
 JACK_CONFIGURE_ENABLE=		jack jack-shared
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
+
 JOYSTICK_CONFIGURE_ENABLE=	joystick haptic
 JOYSTICK_BUILD_DEPENDS=		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 JOYSTICK_LIB_DEPENDS=		libinotify.so:devel/libinotify
+
+KMSDRM_CONFIGURE_ENABLE=	video-kmsdrm kmsdrm-shared
+KMSDRM_USES=			gl
+KMSDRM_USE=	 		GL=gbm
+
 NAS_CONFIGURE_ENABLE=		nas nas-shared
 NAS_LIB_DEPENDS=		libaudio.so:audio/nas
+
+OPENGL_CONFIGURE_ENABLE=	video-opengl
+OPENGL_USES=			gl
+OPENGL_USE=			GL=opengl
+
+OPENGLES1_CONFIGURE_ENABLE=	video-opengles1
+OPENGLES1_USES=			gl
+OPENGLES1_USE=			GL=egl,glesv1
+OPENGLES1_IMPLIES=		OPENGLES
+
+OPENGLES2_CONFIGURE_ENABLE=	video-opengles2
+OPENGLES2_USES=			gl
+OPENGLES2_USE=			GL=egl,glesv2
+OPENGLES2_IMPLIES=		OPENGLES
+
 OSS_CONFIGURE_ENABLE=		oss
+
 PIPEWIRE_CONFIGURE_ENABLE=	pipewire pipewire-shared
 PIPEWIRE_LIB_DEPENDS=		libpipewire-0.3.so:multimedia/pipewire
+
 PTHREADS_CONFIGURE_ENABLE=	pthreads pthread-sem
+
 PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio pulseaudio-shared
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
+
 SAMPLERATE_CONFIGURE_ENABLE=	libsamplerate libsamplerate-shared
 SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:audio/libsamplerate
+
 SNDIO_CONFIGURE_ENABLE=		sndio sndio-shared
 SNDIO_LIB_DEPENDS=		libsndio.so:audio/sndio
+
 UDEV_CONFIGURE_ENABLE=		libudev
 UDEV_LIB_DEPENDS=		libudev.so:devel/libudev-devd
 UDEV_BUILD_DEPENDS=		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
-KMSDRM_CONFIGURE_ENABLE=	video-kmsdrm kmsdrm-shared
-KMSDRM_USES=			gl
-KMSDRM_USE=	 		GL=gbm
-OPENGL_CONFIGURE_ENABLE=	video-opengl
-OPENGL_USES=			gl
-OPENGL_USE=			GL=opengl
-OPENGLES1_CONFIGURE_ENABLE=	video-opengles1
-OPENGLES1_USES=			gl
-OPENGLES1_USE=			GL=egl,glesv1
-OPENGLES1_IMPLIES=		OPENGLES
-OPENGLES2_CONFIGURE_ENABLE=	video-opengles2
-OPENGLES2_USES=			gl
-OPENGLES2_USE=			GL=egl,glesv2
-OPENGLES2_IMPLIES=		OPENGLES
+
 VULKAN_CONFIGURE_ENABLE=	video-vulkan
 VULKAN_LIB_DEPENDS=		libvulkan.so:graphics/vulkan-loader
+
 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
 WAYLAND_LIB_DEPENDS=		libwayland-egl.so:graphics/wayland \
 				libxkbcommon.so:x11/libxkbcommon
 WAYLAND_IMPLIES=		OPENGLES2
+
 X11_CONFIGURE_ENABLE=		video-x11 x11-shared \
 				video-x11-xcursor \
 				video-x11-xdbe \
@@ -142,14 +171,6 @@ X11_CONFIGURE_ENABLE=		video-x11 x11-shared \
 				video-x11-xshape
 X11_USES=			xorg
 X11_USE=			XORG=xcursor,xext,xi,xfixes,xrandr,xscrnsaver
-DBUS_LIB_DEPENDS=		libdbus-1.so:devel/dbus
-DBUS_CONFIGURE_ENABLE=		dbus
-FCITX_LIB_DEPENDS=		libfcitx-config.so:chinese/fcitx
-FCITX_CONFIGURE_ENABLE=		fcitx
-FCITX_IMPLIES=			DBUS
-IBUS_LIB_DEPENDS=		libibus-1.0.so:textproc/ibus
-IBUS_CONFIGURE_ENABLE=		ibus
-IBUS_IMPLIES=			DBUS
 
 .include <bsd.port.options.mk>
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404151659.43FGx1ra056999>