gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

Merge updates from master

Browse Source
This commit is contained in:
Repository mirror & CI
2025-08-20 22:36:35 +00:00
parent 941b039180 3496df638f
commit 03cbb4f595
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eclass/multilib.eclass
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# @ECLASS: multilib.eclass
@@ -552,10 +552,10 @@ multilib_toolchain_setup() {
export STRIP="$(tc-getSTRIP)" # Avoid 'strip', use '${CHOST}-strip'
export CHOST=$(get_abi_CHOST $1)
export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig
export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig
export PKG_CONFIG_SYSTEM_INCLUDE_PATH=${EPREFIX}/usr/include
export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir)
export PKG_CONFIG_LIBDIR=${ESYSROOT}/usr/$(get_libdir)/pkgconfig
export PKG_CONFIG_PATH=${ESYSROOT}/usr/share/pkgconfig
export PKG_CONFIG_SYSTEM_INCLUDE_PATH=${ESYSROOT}/usr/include
export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${ESYSROOT}/$(get_libdir):${ESYSROOT}/usr/$(get_libdir)
fi
}

19
gui-wm/gamescope/files/gamescope-libdisplay-info-0.3.0.patch Normal file
View File

@@ -0,0 +1,19 @@
From 13e56464c86c6abb0c6a2c2785d473c6528a6488 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <chewi@gentoo.org>
Date: Fri, 15 Aug 2025 23:17:59 +0100
Subject: [PATCH] subprojects: Bump libdisplay-info to 0.3.0
--- a/src/meson.build
+++ b/src/meson.build
@@ -33,7 +33,7 @@ wlroots_dep = dependency(
displayinfo_dep = dependency(
'libdisplay-info',
- version: ['>= 0.0.0', '< 0.3.0'],
+ version: ['>= 0.0.0', '< 0.4.0'],
fallback: ['libdisplay-info', 'di_dep'],
default_options: ['default_library=static'],
)
--
2.50.1

3
gui-wm/gamescope/gamescope-3.16.15.ebuild → gui-wm/gamescope/gamescope-3.16.15-r1.ebuild
View File

@@ -43,7 +43,7 @@ RDEPEND="
>=dev-libs/libinput-1.14.0:=
>=dev-libs/wayland-1.23.1
gui-libs/libdecor
<media-libs/libdisplay-info-0.3:=
<media-libs/libdisplay-info-0.4:=
media-libs/vulkan-loader
sys-apps/hwdata
sys-libs/libcap
@@ -97,6 +97,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-deprecated-stb.patch
"${FILESDIR}"/${PN}-subprojects.patch
"${FILESDIR}"/${PN}-libdisplay-info-0.3.0.patch
)
FILECAPS=(