diff --git a/devel/libgusb/Makefile b/devel/libgusb/Makefile index e04e7fc4a3b3..1b7096c444a3 100644 --- a/devel/libgusb/Makefile +++ b/devel/libgusb/Makefile @@ -1,34 +1,35 @@ PORTNAME= libgusb DISTVERSION= 0.4.9 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://github.com/hughsie/${PORTNAME}/releases/download/${DISTVERSION}/ MAINTAINER= gnome@FreeBSD.org COMMENT= GUsb is a GObject wrapper for libusb1 WWW= https://github.com/hughsie/libgusb LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${PY_SETUPTOOLS} LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib TEST_DEPENDS= hwdata>0:misc/hwdata USES= gnome meson pkgconfig python:build tar:xz USE_GNOME= glib20 introspection:build OPTIONS_DEFINE= DOCS VAPI OPTIONS_DEFAULT= DOCS VAPI OPTIONS_SUB= yes MESON_ARGS= -Dumockdev=disabled \ - -Dusb_ids=${LOCALBASE}/share/hwdata/hwdata/usb.ids + -Dusb_ids=${LOCALBASE}/share/hwdata/usb.ids DOCS_BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc \ ${PYTHON_PKGNAMEPREFIX}gi-docgen>=0:textproc/py-gi-docgen@${PY_FLAVOR} DOCS_MESON_TRUE= docs VAPI_USES= vala:build VAPI_MESON_TRUE= vapi .include diff --git a/sysutils/fastfetch/Makefile b/sysutils/fastfetch/Makefile index 6001a0fb198e..e257fb266d35 100644 --- a/sysutils/fastfetch/Makefile +++ b/sysutils/fastfetch/Makefile @@ -1,84 +1,85 @@ PORTNAME= fastfetch DISTVERSION= 2.30.1 +PORTREVISION= 1 CATEGORIES= sysutils MAINTAINER= pkubaj@FreeBSD.org COMMENT= Like neofetch, but much faster because written in C WWW= https://github.com/fastfetch-cli/fastfetch LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libyyjson.so:devel/yyjson RUN_DEPENDS= hwdata>0:misc/hwdata USES= cmake:testing localbase:ldflags pkgconfig USE_GITHUB= yes GH_ACCOUNT= fastfetch-cli OPTIONS_DEFINE= VULKAN WAYLAND XCB LIBDRM GIO DCONF DBUS XFCONF SQLITE3 \ IMAGEMAGICK CHAFA GLX OSMESA OPENCL OPTIONS_DEFAULT=VULKAN WAYLAND XCB LIBDRM GIO DCONF DBUS XFCONF SQLITE3 \ IMAGEMAGICK CHAFA GLX OSMESA OPENCL DCONF_DESC= Needed for values that are only stored in DConf + Fallback for GSettings CHAFA_DESC= Image output as ascii art LIBDRM_DESC= Enable display server detection via libdrm OSMESA_DESC= Enable osmesa support VULKAN_DESC= Vulkan module & fallback for GPU output XCB_DESC= Needed for display and WM detection in X11 XFCONF_DESC= Needed for XFWM theme and XFCE Terminal font VULKAN_CMAKE_BOOL= ENABLE_VULKAN VULKAN_BUILD_DEPENDS= ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers WAYLAND_CMAKE_BOOL= ENABLE_WAYLAND WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/lib/libwayland-server.so:graphics/wayland XCB_CMAKE_BOOL= ENABLE_XCB ENABLE_XCB_RANDR XCB_BUILD_DEPENDS= ${LOCALBASE}/lib/libxcb-randr.so:x11/libxcb LIBDRM_CMAKE_BOOL= ENABLE_DRM LIBDRM_BUILD_DEPENDS= ${LOCALBASE}/lib/libdrm.so:graphics/libdrm GIO_CMAKE_BOOL= ENABLE_GIO GIO_BUILD_DEPENDS= ${LOCALBASE}/lib/libgio-2.0.so:devel/glib20 DBUS_CMAKE_BOOL= ENABLE_DBUS DBUS_BUILD_DEPENDS= ${LOCALBASE}/lib/libdbus-1.so:devel/dbus DCONF_CMAKE_BOOL= ENABLE_DCONF DCONF_BUILD_DEPENDS= ${LOCALBASE}/lib/libdconf.so:devel/dconf XFCONF_CMAKE_BOOL= ENABLE_XFCONF XFCONF_BUILD_DEPENDS= ${LOCALBASE}/lib/libxfconf-0.so:x11/xfce4-conf SQLITE3_CMAKE_BOOL= ENABLE_SQLITE3 SQLITE3_BUILD_DEPENDS= ${LOCALBASE}/lib/libsqlite3.so:databases/sqlite3 IMAGEMAGICK_CMAKE_BOOL= ENABLE_IMAGEMAGICK7 IMAGEMAGICK_USES= magick:7,build CHAFA_IMPLIES= IMAGEMAGICK CHAFA_CMAKE_BOOL= ENABLE_CHAFA CHAFA_BUILD_DEPENDS= ${LOCALBASE}/lib/libchafa.so:graphics/chafa GLX_CMAKE_BOOL= ENABLE_GLX GLX_BUILD_DEPENDS= ${LOCALBASE}/lib/libGLX.so:graphics/libglvnd OSMESA_CMAKE_BOOL= ENABLE_OSMESA OSMESA_BUILD_DEPENDS= ${LOCALBASE}/lib/libOSMesa.so:graphics/libosmesa OPENCL_CMAKE_BOOL= ENABLE_OPENCL OPENCL_BUILD_DEPENDS= ${LOCALBASE}/lib/libOpenCL.so:devel/ocl-icd \ ${LOCALBASE}/include/CL/cl.h:devel/opencl CMAKE_ARGS= -DTARGET_DIR_ETC:STRING="${LOCALBASE}/etc" \ -DENABLE_SYSTEM_YYJSON:BOOL=ON CMAKE_TESTING_ON= BUILD_TESTS .include diff --git a/sysutils/fastfetch/files/patch-src_detection_gpu_gpu__pci.c b/sysutils/fastfetch/files/patch-src_detection_gpu_gpu__pci.c new file mode 100644 index 000000000000..55b2d45de381 --- /dev/null +++ b/sysutils/fastfetch/files/patch-src_detection_gpu_gpu__pci.c @@ -0,0 +1,11 @@ +--- src/detection/gpu/gpu_pci.c.orig 2024-11-18 06:57:05 UTC ++++ src/detection/gpu/gpu_pci.c +@@ -39,7 +39,7 @@ static const FFstrbuf* loadPciIds() + } + #elif __FreeBSD__ + // https://github.com/freebsd/freebsd-src/blob/main/usr.sbin/pciconf/pathnames.h +- ffReadFileBuffer(_PATH_LOCALBASE "/share/pciids/pci.ids", &pciids); ++ ffReadFileBuffer(_PATH_LOCALBASE "/share/hwdata/pci.ids", &pciids); + if (pciids.length == 0) + ffReadFileBuffer(FASTFETCH_TARGET_DIR_USR "/share/pciids/pci.ids", &pciids); + #elif __sun diff --git a/sysutils/libdisplay-info/Makefile b/sysutils/libdisplay-info/Makefile index 7f5ef1e5e179..653129c41145 100644 --- a/sysutils/libdisplay-info/Makefile +++ b/sysutils/libdisplay-info/Makefile @@ -1,29 +1,30 @@ PORTNAME= libdisplay-info DISTVERSION= 0.2.0 +PORTREVISON= 1 CATEGORIES= sysutils MAINTAINER= jbeich@FreeBSD.org COMMENT= EDID and DisplayID library WWW= https://gitlab.freedesktop.org/emersion/libdisplay-info LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= hwdata>0:misc/hwdata TEST_DEPENDS= edid-decode:sysutils/edid-decode USES= compiler:c11 meson pkgconfig python:build shebangfix USE_GITLAB= yes GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= emersion SHEBANG_FILES= tool/*.py PLIST_SUB= VERSION=${DISTVERSION:C/-.*//} pre-test: @if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \ ${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \ ${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure"; \ ${TOUCH} ${WRKDIR}/.meson_build_tests; \ fi .include diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index 038b1859a1d1..21767d578599 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,80 +1,80 @@ PORTNAME= gamescope DISTVERSION= 3.13.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= a618ea074660.patch:-p1 # https://github.com/ValveSoftware/gamescope/issues/120 PATCHFILES+= 4a067fb4ebe2.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/678 PATCHFILES+= 243582c0c762.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/1057 PATCHFILES+= 4a4fb1b53133.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/1296 PATCHFILES+= a9199c2097ff.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/1323 MAINTAINER= jbeich@FreeBSD.org COMMENT= SteamOS session compositing window manager WWW= https://github.com/ValveSoftware/gamescope LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ glslangValidator:graphics/glslang \ vulkan-headers>0:graphics/vulkan-headers \ wayland-protocols>=1.17:graphics/wayland-protocols \ glm>0:math/glm \ hwdata>0:misc/hwdata LIB_DEPENDS= libdrm.so:graphics/libdrm \ libliftoff.so:graphics/libliftoff \ libvulkan.so:graphics/vulkan-loader \ libwayland-server.so:graphics/wayland \ libdisplay-info.so:sysutils/libdisplay-info \ libwlroots.so:x11-toolkits/wlroots017 \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= hwdata>0:misc/hwdata USES= cmake:indirect compiler:c++11-lib meson pkgconfig sdl xorg USE_GITHUB= yes USE_SDL= sdl2 USE_XORG= x11 xcb xcomposite xdamage xext xfixes xmu xrender xres xtst xxf86vm GH_ACCOUNT= ValveSoftware GH_TUPLE= nothings:stb:5736b15:stb/subprojects/stb \ KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-316-gd790ced:spirv_headers/thirdparty/SPIRV-Headers \ Joshua-Ashton:reshade:v4.4.2-2572-g9fdbea68:reshade/src/reshade \ Joshua-Ashton:vkroots:d5ef31a:vkroots/subprojects/vkroots MESON_ARGS= --force-fallback-for= # allow system wlroots + libliftoff MESON_ARGS+= -Dbenchmark=disabled # gamescope_color_microbench isn't installed MESON_ARGS+= -Denable_openvr_support=false # https://github.com/ValveSoftware/openvr/pull/564 MESON_ARCH_FAMILY= ${ARCH:S/amd/x86_/:S/i3/x/:C/v[67]//:S/power/p/:S/le$//} PLIST_FILES= bin/${PORTNAME} \ lib/libVkLayer_FROG_${PORTNAME}_wsi_${MESON_ARCH_FAMILY}.so \ share/vulkan/implicit_layer.d/VkLayer_FROG_${PORTNAME}_wsi.${MESON_ARCH_FAMILY}.json CXXFLAGS+= -DGLM_ENABLE_EXPERIMENTAL # GLM_GTX_string_cast is an experimental extension # https://github.com/freebsd/drm-kmod/issues/271 PORTSCOUT= ignore:1 OPTIONS_DEFINE= PIPEWIRE OPTIONS_DEFAULT=PIPEWIRE PIPEWIRE_DESC= Screen capture via PipeWire PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire PIPEWIRE_MESON_ENABLED= pipewire post-extract: # Merge patch_directory for subprojects without meson.build @(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..) .if defined(PATCHFILES) && ${PATCHFILES:M4a067fb4ebe2*} # Pretend to be a regular file for vendor patch to apply as is @${RMDIR} ${WRKSRC}/subprojects/wlroots @${ECHO_CMD} "Subproject commit 1712a7d27444d62f8da8eeedf0840b386a810e96" \ >${WRKSRC}/subprojects/wlroots .endif .ifdef GH_TUPLE post-configure: @${REINPLACE_CMD} 's/meson install/& \ --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja .endif .include diff --git a/x11-wm/plasma5-kwin/Makefile b/x11-wm/plasma5-kwin/Makefile index ff6e7b6f9088..08c9b23c1c36 100644 --- a/x11-wm/plasma5-kwin/Makefile +++ b/x11-wm/plasma5-kwin/Makefile @@ -1,70 +1,70 @@ PORTNAME= kwin DISTVERSION= ${KDE_PLASMA_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-wm kde kde-plasma MAINTAINER= kde@FreeBSD.org COMMENT= Plasma5 window manager WWW= https://www.kde.org/plasma-desktop LICENSE= GPLv2 LIB_DEPENDS= libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy \ libepoll-shim.so:devel/libepoll-shim \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libinput.so:x11/libinput \ libudev.so:devel/libudev-devd \ liblcms2.so:graphics/lcms2 \ libwayland-cursor.so:graphics/wayland \ libxcb-cursor.so:x11/xcb-util-cursor \ libxcb-icccm.so:x11/xcb-util-wm \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxkbcommon.so:x11/libxkbcommon \ libxcvt.so:x11/libxcvt BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ Xwayland:x11-servers/xwayland \ wayland-protocols>0:graphics/wayland-protocols \ hwdata>0:misc/hwdata RUN_DEPENDS= Xwayland:x11-servers/xwayland \ hwdata>0:misc/hwdata USES= cmake compiler:c++11-lib gettext gl gnome kde:5 pkgconfig qt:5 \ shebangfix tar:xz xorg \ python:run USE_GL= egl gbm USE_GNOME= glib20 USE_KDE= activities attica auth breeze codecs config configwidgets \ coreaddons crash dbusaddons decoration globalaccel i18n \ idletime init itemviews kcmutils kdeclarative kscreenlocker \ kwayland-integration newstuff notifications package \ plasma-framework runner service wayland widgetsaddons \ windowsystem xmlgui \ doctools:build ecm:build plasma-wayland-protocols:build USE_LDCONFIG= yes USE_QT= concurrent core dbus declarative gui network uiplugin uitools \ widgets x11extras xml \ buildtools:build qmake:build testlib:build \ multimedia:run quickcontrols2:run virtualkeyboard:run USE_XORG= ice sm x11 xcb xext xi SHEBANG_FILES= kconf_update/*.py \ kconf_update/*.pl \ src/effects/strip-effect-metadata.py OPTIONS_DEFINE= PIPEWIRE OPTIONS_DEFAULT= PIPEWIRE PIPEWIRE_DESC= Required for Wayland screencasting PIPEWIRE_LIB_DEPENDS= libpipewire-0.3.so:multimedia/pipewire PIPEWIRE_CMAKE_BOOL= KWIN_BUILD_PIPEWIRE # A (hopefully) temporary workaround for # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2026 post-patch: ${FIND} ${WRKSRC}/src/effects -name metadata.json -exec \ ${REINPLACE_CMD} -E \ 's|https://files.kde.org/plasma/kwin/effect-videos/([a-z_]+)\.ogv|https://arrowd.name/kwin-effect-videos/\1\.webm|' \ {} \; .include diff --git a/x11-wm/plasma5-kwin/files/patch-cmake_modules_Findhwdata.cmake b/x11-wm/plasma5-kwin/files/patch-cmake_modules_Findhwdata.cmake index 1e09fac7a31c..d191ae3a79c7 100644 --- a/x11-wm/plasma5-kwin/files/patch-cmake_modules_Findhwdata.cmake +++ b/x11-wm/plasma5-kwin/files/patch-cmake_modules_Findhwdata.cmake @@ -1,13 +1,13 @@ --- cmake/modules/Findhwdata.cmake.orig 2023-02-21 19:51:03 UTC +++ cmake/modules/Findhwdata.cmake @@ -10,8 +10,8 @@ if (UNIX AND NOT APPLE) # SPDX-License-Identifier: BSD-3-Clause if (UNIX AND NOT APPLE) - find_path(hwdata_DIR NAMES hwdata/pnp.ids HINTS /usr/share ENV XDG_DATA_DIRS) - find_file(hwdata_PNPIDS_FILE NAMES hwdata/pnp.ids HINTS /usr/share) -+ find_path(hwdata_DIR NAMES hwdata/pnp.ids HINTS ${CMAKE_INSTALL_PREFIX}/share/hwdata /usr/share ENV XDG_DATA_DIRS) -+ find_file(hwdata_PNPIDS_FILE NAMES hwdata/pnp.ids HINTS ${CMAKE_INSTALL_PREFIX}/share/hwdata /usr/share) ++ find_path(hwdata_DIR NAMES hwdata/pnp.ids HINTS ${CMAKE_INSTALL_PREFIX}/share /usr/share ENV XDG_DATA_DIRS) ++ find_file(hwdata_PNPIDS_FILE NAMES hwdata/pnp.ids HINTS ${CMAKE_INSTALL_PREFIX}/share /usr/share) if (NOT hwdata_DIR OR NOT hwdata_PNPIDS_FILE) set(hwdata_FOUND FALSE) else() diff --git a/x11-wm/plasma6-kwin/Makefile b/x11-wm/plasma6-kwin/Makefile index e549c740311e..2584734b0adc 100644 --- a/x11-wm/plasma6-kwin/Makefile +++ b/x11-wm/plasma6-kwin/Makefile @@ -1,49 +1,50 @@ PORTNAME= kwin DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11-wm kde kde-plasma COMMENT= Easy to use, but flexible, X Window Manager and Wayland Compositor MAINTAINER= kde@FreeBSD.org BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ hwdata>0:misc/hwdata \ wayland-protocols>0:graphics/wayland-protocols \ Xwayland:x11-servers/xwayland LIB_DEPENDS= libdisplay-info.so:sysutils/libdisplay-info \ libdrm.so:graphics/libdrm \ libepoxy.so:graphics/libepoxy \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libinput.so:x11/libinput \ liblcms2.so:graphics/lcms2 \ libpipewire-0.3.so:multimedia/pipewire \ libqaccessibilityclient-qt6.so:accessibility/libqaccessibilityclient@qt6 \ libudev.so:devel/libudev-devd \ libwayland-client.so:graphics/wayland \ libxcb-cursor.so:x11/xcb-util-cursor \ libxcb-icccm.so:x11/xcb-util-wm \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcvt.so:x11/libxcvt \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= hwdata>0:misc/hwdata \ Xwayland:x11-servers/xwayland CONFLICTS_INSTALL= theseus-ship # bin/kwin_wayland USES= cmake gettext gl kde:6 pkgconfig python qt:6 shebangfix tar:xz \ xorg USE_GL= egl gbm gl opengl USE_KDE= activities attica auth breeze colorscheme config \ configwidgets coreaddons crash dbusaddons decoration \ globalaccel globalacceld guiaddons i18n idletime kcmutils \ kdeclarative kpipewire kscreenlocker libplasma newstuff \ notifications package runner service svg wayland widgetsaddons \ windowsystem xmlgui \ ecm:build plasma-wayland-protocols:build USE_QT= base declarative multimedia sensors tools wayland USE_XORG= ice sm x11 xcb xext xi BINARY_ALIAS= python3=${PYTHON_CMD} SHEBANG_FILES= src/plugins/strip-effect-metadata.py .include diff --git a/x11-wm/plasma6-kwin/files/patch-cmake_modules_Findhwdata.cmake b/x11-wm/plasma6-kwin/files/patch-cmake_modules_Findhwdata.cmake index 1e09fac7a31c..d191ae3a79c7 100644 --- a/x11-wm/plasma6-kwin/files/patch-cmake_modules_Findhwdata.cmake +++ b/x11-wm/plasma6-kwin/files/patch-cmake_modules_Findhwdata.cmake @@ -1,13 +1,13 @@ --- cmake/modules/Findhwdata.cmake.orig 2023-02-21 19:51:03 UTC +++ cmake/modules/Findhwdata.cmake @@ -10,8 +10,8 @@ if (UNIX AND NOT APPLE) # SPDX-License-Identifier: BSD-3-Clause if (UNIX AND NOT APPLE) - find_path(hwdata_DIR NAMES hwdata/pnp.ids HINTS /usr/share ENV XDG_DATA_DIRS) - find_file(hwdata_PNPIDS_FILE NAMES hwdata/pnp.ids HINTS /usr/share) -+ find_path(hwdata_DIR NAMES hwdata/pnp.ids HINTS ${CMAKE_INSTALL_PREFIX}/share/hwdata /usr/share ENV XDG_DATA_DIRS) -+ find_file(hwdata_PNPIDS_FILE NAMES hwdata/pnp.ids HINTS ${CMAKE_INSTALL_PREFIX}/share/hwdata /usr/share) ++ find_path(hwdata_DIR NAMES hwdata/pnp.ids HINTS ${CMAKE_INSTALL_PREFIX}/share /usr/share ENV XDG_DATA_DIRS) ++ find_file(hwdata_PNPIDS_FILE NAMES hwdata/pnp.ids HINTS ${CMAKE_INSTALL_PREFIX}/share /usr/share) if (NOT hwdata_DIR OR NOT hwdata_PNPIDS_FILE) set(hwdata_FOUND FALSE) else()