sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 01:26:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

misc/hwdata: adjust consumers to search data in canonical place

Browse source 
Sponsored by:	Future Crew, LLC
This commit is contained in:
Dima Panov 2024-11-25 10:54:30 +03:00
parent 7cc60aed51
commit a3c47a2833
No known key found for this signature in database
GPG key ID: FB8BA09DD5398F29
9 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/libgusb/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= libgusb PORTNAME= libgusb
DISTVERSION= 0.4.9 DISTVERSION= 0.4.9
PORTREVISION= 1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= https://github.com/hughsie/${PORTNAME}/releases/download/${DISTVERSION}/ MASTER_SITES= https://github.com/hughsie/${PORTNAME}/releases/download/${DISTVERSION}/
@ -22,7 +23,7 @@ OPTIONS_DEFAULT= DOCS VAPI
OPTIONS_SUB= yes OPTIONS_SUB= yes
MESON_ARGS= -Dumockdev=disabled \ 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 \ DOCS_BUILD_DEPENDS= gtk-doc>0:textproc/gtk-doc \
${PYTHON_PKGNAMEPREFIX}gi-docgen>=0:textproc/py-gi-docgen@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}gi-docgen>=0:textproc/py-gi-docgen@${PY_FLAVOR}

1
sysutils/fastfetch/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= fastfetch PORTNAME= fastfetch
DISTVERSION= 2.30.1 DISTVERSION= 2.30.1
PORTREVISION= 1
CATEGORIES= sysutils CATEGORIES= sysutils
MAINTAINER= pkubaj@FreeBSD.org MAINTAINER= pkubaj@FreeBSD.org

11
sysutils/fastfetch/files/patch-src_detection_gpu_gpu__pci.c Normal file
View file

@ -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

1
sysutils/libdisplay-info/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= libdisplay-info PORTNAME= libdisplay-info
DISTVERSION= 0.2.0 DISTVERSION= 0.2.0
PORTREVISON= 1
CATEGORIES= sysutils CATEGORIES= sysutils
MAINTAINER= jbeich@FreeBSD.org MAINTAINER= jbeich@FreeBSD.org

2
x11-wm/gamescope/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= gamescope PORTNAME= gamescope
DISTVERSION= 3.13.8 DISTVERSION= 3.13.8
PORTREVISION= 5 PORTREVISION= 6
CATEGORIES= x11-wm wayland CATEGORIES= x11-wm wayland
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/

2
x11-wm/plasma5-kwin/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= kwin PORTNAME= kwin
DISTVERSION= ${KDE_PLASMA_VERSION} DISTVERSION= ${KDE_PLASMA_VERSION}
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= x11-wm kde kde-plasma CATEGORIES= x11-wm kde kde-plasma
MAINTAINER= kde@FreeBSD.org MAINTAINER= kde@FreeBSD.org

4
x11-wm/plasma5-kwin/files/patch-cmake_modules_Findhwdata.cmake
View file

@ -6,8 +6,8 @@
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
- find_path(hwdata_DIR NAMES hwdata/pnp.ids HINTS /usr/share ENV XDG_DATA_DIRS) - 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_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_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/hwdata /usr/share) + 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) if (NOT hwdata_DIR OR NOT hwdata_PNPIDS_FILE)
set(hwdata_FOUND FALSE) set(hwdata_FOUND FALSE)
else() else()

1
x11-wm/plasma6-kwin/Makefile
View file

@ -1,5 +1,6 @@
PORTNAME= kwin PORTNAME= kwin
DISTVERSION= ${KDE_PLASMA_VERSION} DISTVERSION= ${KDE_PLASMA_VERSION}
PORTREVISION= 1
CATEGORIES= x11-wm kde kde-plasma CATEGORIES= x11-wm kde kde-plasma
COMMENT= Easy to use, but flexible, X Window Manager and Wayland Compositor COMMENT= Easy to use, but flexible, X Window Manager and Wayland Compositor

4
x11-wm/plasma6-kwin/files/patch-cmake_modules_Findhwdata.cmake
View file

@ -6,8 +6,8 @@
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
- find_path(hwdata_DIR NAMES hwdata/pnp.ids HINTS /usr/share ENV XDG_DATA_DIRS) - 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_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_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/hwdata /usr/share) + 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) if (NOT hwdata_DIR OR NOT hwdata_PNPIDS_FILE)
set(hwdata_FOUND FALSE) set(hwdata_FOUND FALSE)
else() else()