diff options
| author |   Viorel Munteanu <ceamac@gentoo.org> | 2024-12-26 10:20:18 +0200 |
|---|---|---|
| committer | Viorel Munteanu <ceamac@gentoo.org> | 2024-12-26 11:49:40 +0200 |
| commit | 81b8172ea1d134d41913d0c28413bd8633c4b22e (patch) | |
| tree | a3cc35207516b34de91f0ae77496ce61fbaac51e /app-misc/fastfetch | |
| parent | app-misc/fastfetch: drop 2.32.1 (diff) | |
| download | gentoo-81b8172ea1d134d41913d0c28413bd8633c4b22e.tar.gz gentoo-81b8172ea1d134d41913d0c28413bd8633c4b22e.tar.bz2 gentoo-81b8172ea1d134d41913d0c28413bd8633c4b22e.zip | |
app-misc/fastfetch: sync live ebuilds
Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
Diffstat (limited to 'app-misc/fastfetch')
| -rw-r--r-- | app-misc/fastfetch/fastfetch-0.1.9999.ebuild | 27 | ||||
| -rw-r--r-- | app-misc/fastfetch/fastfetch-0.2.9999.ebuild | 27 |
2 files changed, 42 insertions, 12 deletions
diff --git a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild index 6186f29ea3dc..3a36d05b4aad 100644 --- a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild +++ b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild @@ -29,7 +29,6 @@ RDEPEND=" >=dev-libs/yyjson-0.10.0 sys-apps/hwdata sys-libs/zlib - X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) ddcutil? ( app-misc/ddcutil:= ) @@ -41,7 +40,10 @@ RDEPEND=" ) imagemagick? ( media-gfx/imagemagick:= ) opencl? ( virtual/opencl ) - opengl? ( media-libs/libglvnd[X] ) + opengl? ( + media-libs/libglvnd[X?] + X? ( x11-libs/libX11 ) + ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-libs/libpulse ) sqlite? ( dev-db/sqlite:3 ) @@ -56,15 +58,24 @@ RDEPEND=" " DEPEND=" ${RDEPEND} + opengl? ( X? ( x11-base/xorg-proto ) ) + xcb? ( x11-base/xorg-proto ) + xrandr? ( x11-base/xorg-proto ) vulkan? ( dev-util/vulkan-headers ) " BDEPEND="virtual/pkgconfig" REQUIRED_USE=" - xrandr? ( X ) chafa? ( imagemagick ) " +pkg_pretend() { + if use X && ! use opengl; then + einfo 'USE="X" adds GLX support for USE="opengl"' + einfo 'This build with USE="X -opengl" will not include any extra X support.' + fi +} + src_configure() { local fastfetch_enable_imagemagick7=no local fastfetch_enable_imagemagick6=no @@ -73,12 +84,18 @@ src_configure() { fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no) fi + local glx=no + if use opengl && use X; then + glx=yes + fi + local mycmakeargs=( -DENABLE_RPM=no -DENABLE_ZLIB=yes -DENABLE_SYSTEM_YYJSON=yes -DIS_MUSL=$(usex elibc_musl) -DINSTALL_LICENSE=no + -DBUILD_FLASHFETCH=no -DENABLE_CHAFA=$(usex chafa) -DENABLE_DBUS=$(usex dbus) @@ -88,7 +105,7 @@ src_configure() { -DENABLE_ELF=$(usex elf) -DENABLE_EGL=$(usex opengl) -DENABLE_GIO=$(usex gnome) - -DENABLE_GLX=$(usex opengl) + -DENABLE_GLX=${glx} -DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6} -DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7} -DENABLE_OPENCL=$(usex opencl) @@ -97,8 +114,6 @@ src_configure() { -DENABLE_SQLITE3=$(usex sqlite) -DENABLE_VULKAN=$(usex vulkan) -DENABLE_WAYLAND=$(usex wayland) - -DENABLE_X11=$(usex X) - -DENABLE_XCB=$(usex xcb) -DENABLE_XCB_RANDR=$(usex xcb) -DENABLE_XFCONF=$(usex xfce) -DENABLE_XRANDR=$(usex xrandr) diff --git a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild index 6186f29ea3dc..3a36d05b4aad 100644 --- a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild +++ b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild @@ -29,7 +29,6 @@ RDEPEND=" >=dev-libs/yyjson-0.10.0 sys-apps/hwdata sys-libs/zlib - X? ( x11-libs/libX11 ) chafa? ( media-gfx/chafa ) dbus? ( sys-apps/dbus ) ddcutil? ( app-misc/ddcutil:= ) @@ -41,7 +40,10 @@ RDEPEND=" ) imagemagick? ( media-gfx/imagemagick:= ) opencl? ( virtual/opencl ) - opengl? ( media-libs/libglvnd[X] ) + opengl? ( + media-libs/libglvnd[X?] + X? ( x11-libs/libX11 ) + ) osmesa? ( media-libs/mesa[osmesa] ) pulseaudio? ( media-libs/libpulse ) sqlite? ( dev-db/sqlite:3 ) @@ -56,15 +58,24 @@ RDEPEND=" " DEPEND=" ${RDEPEND} + opengl? ( X? ( x11-base/xorg-proto ) ) + xcb? ( x11-base/xorg-proto ) + xrandr? ( x11-base/xorg-proto ) vulkan? ( dev-util/vulkan-headers ) " BDEPEND="virtual/pkgconfig" REQUIRED_USE=" - xrandr? ( X ) chafa? ( imagemagick ) " +pkg_pretend() { + if use X && ! use opengl; then + einfo 'USE="X" adds GLX support for USE="opengl"' + einfo 'This build with USE="X -opengl" will not include any extra X support.' + fi +} + src_configure() { local fastfetch_enable_imagemagick7=no local fastfetch_enable_imagemagick6=no @@ -73,12 +84,18 @@ src_configure() { fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no) fi + local glx=no + if use opengl && use X; then + glx=yes + fi + local mycmakeargs=( -DENABLE_RPM=no -DENABLE_ZLIB=yes -DENABLE_SYSTEM_YYJSON=yes -DIS_MUSL=$(usex elibc_musl) -DINSTALL_LICENSE=no + -DBUILD_FLASHFETCH=no -DENABLE_CHAFA=$(usex chafa) -DENABLE_DBUS=$(usex dbus) @@ -88,7 +105,7 @@ src_configure() { -DENABLE_ELF=$(usex elf) -DENABLE_EGL=$(usex opengl) -DENABLE_GIO=$(usex gnome) - -DENABLE_GLX=$(usex opengl) + -DENABLE_GLX=${glx} -DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6} -DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7} -DENABLE_OPENCL=$(usex opencl) @@ -97,8 +114,6 @@ src_configure() { -DENABLE_SQLITE3=$(usex sqlite) -DENABLE_VULKAN=$(usex vulkan) -DENABLE_WAYLAND=$(usex wayland) - -DENABLE_X11=$(usex X) - -DENABLE_XCB=$(usex xcb) -DENABLE_XCB_RANDR=$(usex xcb) -DENABLE_XFCONF=$(usex xfce) -DENABLE_XRANDR=$(usex xrandr) |