millerson.name/gentoo
2
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-09 00:07:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI 2025-11-10 16:30:46 +00:00
commit 550df54683
No known key found for this signature in database
GPG Key ID: 7C2AC09CD98F2EDF
5 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app-misc/fastfetch/fastfetch-0.1.9999.ebuild
View File

@ -20,13 +20,13 @@ fi
LICENSE="MIT"
SLOT="0"
IUSE="X chafa dbus ddcutil drm elf gnome imagemagick opencl opengl pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
IUSE="X chafa dbus ddcutil drm elf gnome imagemagick opencl opengl pulseaudio sqlite test vulkan wayland xcb xrandr"
RESTRICT="!test? ( test )"
# note - qa-vdb will always report errors because fastfetch loads the libs dynamically
# make sure to crank yyjson minimum version to match bundled version
RDEPEND="
>=dev-libs/yyjson-0.11.1
>=dev-libs/yyjson-0.12.0
sys-apps/hwdata
virtual/zlib:=
chafa? ( media-gfx/chafa )
@ -52,7 +52,6 @@ RDEPEND="
)
wayland? ( dev-libs/wayland )
xcb? ( x11-libs/libxcb )
xfce? ( xfce-base/xfconf )
xrandr? ( x11-libs/libXrandr )
"
DEPEND="
@ -113,7 +112,6 @@ src_configure() {
-DENABLE_VULKAN=$(usex vulkan)
-DENABLE_WAYLAND=$(usex wayland)
-DENABLE_XCB_RANDR=$(usex xcb)
-DENABLE_XFCONF=$(usex xfce)
-DENABLE_XRANDR=$(usex xrandr)
-DBUILD_TESTS=$(usex test)
)

6
app-misc/fastfetch/fastfetch-0.2.9999.ebuild
View File

@ -20,13 +20,13 @@ fi
LICENSE="MIT"
SLOT="0"
IUSE="X chafa dbus ddcutil drm elf gnome imagemagick opencl opengl pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
IUSE="X chafa dbus ddcutil drm elf gnome imagemagick opencl opengl pulseaudio sqlite test vulkan wayland xcb xrandr"
RESTRICT="!test? ( test )"
# note - qa-vdb will always report errors because fastfetch loads the libs dynamically
# make sure to crank yyjson minimum version to match bundled version
RDEPEND="
>=dev-libs/yyjson-0.11.1
>=dev-libs/yyjson-0.12.0
sys-apps/hwdata
virtual/zlib:=
chafa? ( media-gfx/chafa )
@ -52,7 +52,6 @@ RDEPEND="
)
wayland? ( dev-libs/wayland )
xcb? ( x11-libs/libxcb )
xfce? ( xfce-base/xfconf )
xrandr? ( x11-libs/libXrandr )
"
DEPEND="
@ -113,7 +112,6 @@ src_configure() {
-DENABLE_VULKAN=$(usex vulkan)
-DENABLE_WAYLAND=$(usex wayland)
-DENABLE_XCB_RANDR=$(usex xcb)
-DENABLE_XFCONF=$(usex xfce)
-DENABLE_XRANDR=$(usex xrandr)
-DBUILD_TESTS=$(usex test)
)

1
app-misc/fastfetch/metadata.xml
View File

@ -17,7 +17,6 @@
<flag name="drm">Enables support for X.org's <pkg>x11-libs/libdrm</pkg></flag>
<flag name="elf">Use libelf to extract strings from binaries</flag>
<flag name="vulkan">Enables reading GPU via <pkg>media-libs/vulkan-loader</pkg></flag>
<flag name="xfce">Enables support for XFCE config</flag>
<flag name="xrandr">Enables support for Xrandr</flag>
</use>
<longdescription>

32
net-misc/tigervnc/files/tigervnc-1.15.90-disable-server-and-pam.patch
View File

@ -38,19 +38,39 @@ Do not define _FORTIFY_SOURCE, it is already defined in Gentoo.
find_package(PAM REQUIRED)
endif()
@@ -391,7 +391,7 @@ if(UNIX AND NOT APPLE)
@@ -391,21 +391,9 @@ if(UNIX AND NOT APPLE)
endif()
# check for libraries needed for wayland support
-if(UNIX AND NOT APPLE)
+if(BUILD_SERVER AND UNIX AND NOT APPLE)
trioption(ENABLE_WAYLAND "Enable wayland support")
if(ENABLE_WAYLAND STREQUAL "AUTO")
find_package(GLib)
@@ -423,6 +423,8 @@ if(UNIX AND NOT APPLE)
set(ENABLE_WAYLAND 0)
message(WARNING "GLib, Gio, Gobject, PipeWire, Uuid, WaylandClient or Xkbcommon NOT found. w0vncserver disabled.")
- if(ENABLE_WAYLAND STREQUAL "AUTO")
- find_package(GLib)
- find_package(Gio)
- find_package(Gobject)
-
- # Portals specific
- find_package(PipeWire)
- find_package(Uuid)
-
- # wlroots specific
- find_package(WaylandClient)
- find_package(Xkbcommon)
- else()
+ if(ENABLE_WAYLAND)
find_package(GLib REQUIRED)
find_package(Gio REQUIRED)
find_package(Gobject REQUIRED)
@@ -418,11 +406,8 @@ if(UNIX AND NOT APPLE)
find_package(WaylandClient REQUIRED)
find_package(Xkbcommon REQUIRED)
endif()
- if(NOT GLIB_FOUND OR NOT GIO_FOUND OR NOT GOBJECT_FOUND OR NOT PIPEWIRE_FOUND
- OR NOT UUID_FOUND OR NOT WAYLANDCLIENT_FOUND OR NOT XKBCOMMON_FOUND)
- set(ENABLE_WAYLAND 0)
- message(WARNING "GLib, Gio, Gobject, PipeWire, Uuid, WaylandClient or Xkbcommon NOT found. w0vncserver disabled.")
- endif()
+else()
+ set(ENABLE_WAYLAND 0)
endif()

4
net-misc/tigervnc/tigervnc-1.15.90.ebuild → net-misc/tigervnc/tigervnc-1.15.90-r1.ebuild
View File

@ -38,7 +38,7 @@ COMMON_DEPEND="
dev-libs/gmp:=
dev-libs/nettle:=
media-libs/libjpeg-turbo:=
virtual/zlib
virtual/zlib:=
x11-libs/libX11
x11-libs/libXext
x11-libs/libXrandr
@ -79,7 +79,7 @@ COMMON_DEPEND="
)
viewer? (
media-video/ffmpeg:=
<x11-libs/fltk-1.4:1=
<x11-libs/fltk-1.4:1
x11-libs/libXi
x11-libs/libXrender
!net-misc/turbovnc[viewer]