From nobody Mon Nov 25 07:55:24 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XxdKm5L7Yz5fR3g; Mon, 25 Nov 2024 07:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XxdKm2zTPz4PQb; Mon, 25 Nov 2024 07:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732521324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FkTz1qbmcaS4sWeK34IYYmzdgQ+YHqm90lnTD6IjaSY=; b=hSSLD+0nOPcd75J9YU8pSVO3a5Bfs1bghFmOcOFVME7kv/64dfWEEnm6+Z2LaeAaxyvBk0 e2KJiHRLiyl+1sugIux7Osj1poyTAx7jUG+JDqGmLTOHFLVt7LcbyBQr5cZhyP6LuU9V5o KXfGOJE6bbxNKQbsyjAhQ5Qvjd4Vi0pFywIwemw1L8L5ktCI++70DzojWeQyryDmZcYzou e5601Zhk/BXulO61ZhpVJlh9YviUNhPsNSCAzu7q9CzuvVm9zO3HsF0mbyq+MFe8bbh5iq rGSpE5nLaowTHyVq4D2PobmQARow2L3puDDpsa3SrVHQClfFIaITN7tOUjy0zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732521324; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FkTz1qbmcaS4sWeK34IYYmzdgQ+YHqm90lnTD6IjaSY=; b=LdNA4OoQmgsdlZn29tCy2k/lLuajHODc/ciWlyVXtquLFOfWaDvklDP1OCgQLpfCnfX6im xPpSN1Xi6Pvh273Yhrs5OOpeW4y+CYD+Tb7dLszXpVIvNA9Xr+CLmtILyUSWTVUCvj8Q9k c4Q8pHBUV8Joay/WTFAkcvBkpn1GsS5TnGFkIRk+rJmxGVzLj23TtZXWuKdl5pjp53O5hj iDrWoQnAPdjA9YrAtifl7iVeDoCnqvpwn8BxHvwnoNr4uRzPwXps3/DN8m0DTHpvBxUcRe yIsD5vKeZpcUn54qycYIjuSEKLykkYfmjM4wsQ116qXRy8hKyHAPMvkZaPYnAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732521324; a=rsa-sha256; cv=none; b=QXM10DGFjxWEYqy7TDIRZVXlXMZBejDQGNtYfs5hyfkMKFgl7UnTGaN/DLczBpFOB0fUgI 3BbH3slV5L0EH7Yqs/kHHovPJ1G9nfhe9A7+lmREQQ7cf3Jvku+njQ+CkvG32p99mwjULq WmVjtYeQfLwjFNOv+lXFJhqNePo1uYEeK7WncV+7rYtLCG63uYd/kq1wsJjOqDWPuygGY3 NW9a8FIpB5df1gEcVN1X7brrDr+u9LSVZ+lwRyvdXk1YnCwMZ+BWOI/9SOkOWSF44Gcjri h9aAr5ObUzvrL10yBv53L9nmSkdWifsWO8j2W1pYVLUcqVXso9AnGo1rdEEOig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XxdKm2blHzWn1; Mon, 25 Nov 2024 07:55:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AP7tOXH031137; Mon, 25 Nov 2024 07:55:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AP7tOeP031134; Mon, 25 Nov 2024 07:55:24 GMT (envelope-from git) Date: Mon, 25 Nov 2024 07:55:24 GMT Message-Id: <202411250755.4AP7tOeP031134@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: a3c47a2833b2 - main - misc/hwdata: adjust consumers to search data in canonical place List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3c47a2833b2046ef4eec4d3b78ea374dcc8a6f5 Auto-Submitted: auto-generated The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a3c47a2833b2046ef4eec4d3b78ea374dcc8a6f5 commit a3c47a2833b2046ef4eec4d3b78ea374dcc8a6f5 Author: Dima Panov AuthorDate: 2024-11-25 07:54:30 +0000 Commit: Dima Panov 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()