From nobody Wed Jan 12 16:06:55 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 054DC196534D; Wed, 12 Jan 2022 16:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JYsrb3Mc6z3rrY; Wed, 12 Jan 2022 16:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3050F7F82; Wed, 12 Jan 2022 16:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20CG6trX078469; Wed, 12 Jan 2022 16:06:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20CG6tLM078468; Wed, 12 Jan 2022 16:06:55 GMT (envelope-from git) Date: Wed, 12 Jan 2022 16:06:55 GMT Message-Id: <202201121606.20CG6tLM078468@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 9a1f3d324fec - main - devel/sdl20: options cleanup List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a1f3d324fec6474be7c3bb607c2c7a69dd6bb77 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642003615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LewjznYiFRozukGU9xNEuZTbNHWFsHITpSt6nnFcaoM=; b=XEmJD/RpjnxmUQ+c/bAjH9Op2bJamKk5cbCs8+SI1dvPvxe/ZF3X7oYKXX4PepaEuPYdum gyvQFiZLjmVyyFilhWwkCNXInekqlYq7mcZW6XlDM+GAkf/7V5yIs0u9uKdFYieDtKql5x bH00cDe6Iu7Igrtdw6Y214EEunjU/tlv5Kg2JaOzPYEH2+HEsYVGBWlz/DaHSOw0OOFUin T4Orx0Z0uToJ0gZC0KxnSBspUfxgU/1vzJsoQRLIVXvldrxsff43VpaZmopOv8zi+v6SQg k4UxSkFcy0Wr/3GtbGdqKvy6XNf0MjTlODic3q4EWDY2KDZ8mSk3dJmF3KguVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642003615; a=rsa-sha256; cv=none; b=tR12qI7PfyfjS6GkQLLqRL2G70GXnYVD4rwL8wTFkqP/wlMWCTdpRQ9iIIJD48yx8QBmyG yJL3HcM3PLafa4/fyVVuvozyTGo149OhPQTVRwCK14991kGR7k1YuoEYb/CBh0HiOgz+dN MmEVcW7fxhtPiqDxUDTAL/nXXdDtMzm4mIqpyLMjXNuQgtQ5LIGyphjaBj84NpvpxAaP1C Utp25gVYpG2XgPEHY01P38jDYvNfIRg78KcYYpeRmlzeS9JRzLjb7lv1XJstFTytsRxN9l TRo1R8DxDRBtZLLcIrmnAxTdMZsiK9taJjxJy8Ucn3pnhNZSvUBWhprjOFLAEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=9a1f3d324fec6474be7c3bb607c2c7a69dd6bb77 commit 9a1f3d324fec6474be7c3bb607c2c7a69dd6bb77 Author: Dmitry Marakasov AuthorDate: 2022-01-12 15:51:16 +0000 Commit: Dmitry Marakasov 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