git: a3c47a2833b2 - main - misc/hwdata: adjust consumers to search data in canonical place
Date: Mon, 25 Nov 2024 07:55:24 UTC
The branch main has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a3c47a2833b2046ef4eec4d3b78ea374dcc8a6f5
commit a3c47a2833b2046ef4eec4d3b78ea374dcc8a6f5
Author: Dima Panov <fluffy@FreeBSD.org>
AuthorDate: 2024-11-25 07:54:30 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
CommitDate: 2024-11-25 07:54:30 +0000
misc/hwdata: adjust consumers to search data in canonical place
Sponsored by: Future Crew, LLC
---
devel/libgusb/Makefile | 3 ++-
sysutils/fastfetch/Makefile | 1 +
sysutils/fastfetch/files/patch-src_detection_gpu_gpu__pci.c | 11 +++++++++++
sysutils/libdisplay-info/Makefile | 1 +
x11-wm/gamescope/Makefile | 2 +-
x11-wm/plasma5-kwin/Makefile | 2 +-
.../plasma5-kwin/files/patch-cmake_modules_Findhwdata.cmake | 4 ++--
x11-wm/plasma6-kwin/Makefile | 1 +
.../plasma6-kwin/files/patch-cmake_modules_Findhwdata.cmake | 4 ++--
9 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/devel/libgusb/Makefile b/devel/libgusb/Makefile
index e04e7fc4a3b3..1b7096c444a3 100644
--- a/devel/libgusb/Makefile
+++ b/devel/libgusb/Makefile
@@ -1,5 +1,6 @@
PORTNAME= libgusb
DISTVERSION= 0.4.9
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= https://github.com/hughsie/${PORTNAME}/releases/download/${DISTVERSION}/
@@ -22,7 +23,7 @@ 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}
diff --git a/sysutils/fastfetch/Makefile b/sysutils/fastfetch/Makefile
index 6001a0fb198e..e257fb266d35 100644
--- a/sysutils/fastfetch/Makefile
+++ b/sysutils/fastfetch/Makefile
@@ -1,5 +1,6 @@
PORTNAME= fastfetch
DISTVERSION= 2.30.1
+PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= pkubaj@FreeBSD.org
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,5 +1,6 @@
PORTNAME= libdisplay-info
DISTVERSION= 0.2.0
+PORTREVISON= 1
CATEGORIES= sysutils
MAINTAINER= jbeich@FreeBSD.org
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,6 +1,6 @@
PORTNAME= gamescope
DISTVERSION= 3.13.8
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= x11-wm wayland
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
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,6 +1,6 @@
PORTNAME= kwin
DISTVERSION= ${KDE_PLASMA_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-wm kde kde-plasma
MAINTAINER= kde@FreeBSD.org
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
@@ -6,8 +6,8 @@
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,5 +1,6 @@
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
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
@@ -6,8 +6,8 @@
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()