chore: sync AUR packages
This commit is contained in:
1 parent
82c90022b7
commit
f886efebe5
84 files changed
+242
-183
No files matched your search
@@ -1,4 +1,4 @@
|
||||
{
|
||||
"source": "aur",
|
||||
"upstream_commit": "bbd56b3001bd99b609eeac3f86ebcf67a32e3442"
|
||||
"upstream_commit": "ee0535dd5327fdb915d95591791a72031970b252"
|
||||
}
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
diff --git a/cmake/dependencies/glad.cmake b/cmake/dependencies/glad.cmake
|
||||
--- a/cmake/dependencies/glad.cmake
|
||||
+++ b/cmake/dependencies/glad.cmake
|
||||
@@ -21,8 +21,8 @@ include_guard(GLOBAL)
|
||||
#
|
||||
# GLAD_SKIP_PIP_INSTALL is a hard override for environments where pip cannot run
|
||||
# at all (e.g. Flatpak, Homebrew). When OFF (the default) the code below checks
|
||||
-# whether jinja2+setuptools are importable and pip-installs them if they are not.
|
||||
-# When ON the caller is responsible for supplying a Python that already has jinja2,
|
||||
+# whether jinja2 is importable and pip-installs it if it is not. When ON the caller
|
||||
+# is responsible for supplying a Python that already has jinja2,
|
||||
# typically via -DPython_EXECUTABLE=/path/to/venv/python.
|
||||
option(GLAD_SKIP_PIP_INSTALL
|
||||
"Hard-skip pip install of jinja2 even if it is not importable. \
|
||||
@@ -105,11 +105,11 @@ add_subdirectory("${CMAKE_SOURCE_DIR}/third-party/glad/cmake" glad2-cmake)
|
||||
unset(CMAKE_POLICY_VERSION_MINIMUM)
|
||||
|
||||
if(NOT GLAD_SKIP_PIP_INSTALL)
|
||||
- # Check whether jinja2 and pkg_resources (setuptools) are already importable.
|
||||
- # pkg_resources is provided by setuptools, which is no longer bundled with Python 3.12+
|
||||
- # on several distros (Debian Trixie, Arch Linux, COPR, FreeBSD, etc.).
|
||||
+ # Check whether jinja2 is already importable. Supported Python versions use
|
||||
+ # importlib.metadata and importlib.resources in glad, so setuptools' legacy
|
||||
+ # pkg_resources module is not required by the generator.
|
||||
execute_process(
|
||||
- COMMAND "${Python_EXECUTABLE}" -c "import jinja2; import pkg_resources"
|
||||
+ COMMAND "${Python_EXECUTABLE}" -c "import jinja2"
|
||||
RESULT_VARIABLE _glad_deps_import_result
|
||||
OUTPUT_QUIET
|
||||
ERROR_QUIET
|
||||
@@ -117,7 +117,7 @@ if(NOT GLAD_SKIP_PIP_INSTALL)
|
||||
)
|
||||
|
||||
if(NOT _glad_deps_import_result EQUAL 0)
|
||||
- message(STATUS "glad: jinja2 or setuptools not found in ${Python_EXECUTABLE}, installing via pip...")
|
||||
+ message(STATUS "glad: jinja2 not found in ${Python_EXECUTABLE}, installing via pip...")
|
||||
|
||||
# Some system Python installations (e.g. FreeBSD ports) ship without pip.
|
||||
# Try to bootstrap it via ensurepip before falling back to the pip install.
|
||||
@@ -149,12 +149,11 @@ if(NOT GLAD_SKIP_PIP_INSTALL)
|
||||
COMMAND "${Python_EXECUTABLE}" -m pip install
|
||||
--upgrade
|
||||
--requirement "${CMAKE_SOURCE_DIR}/third-party/glad/requirements.txt"
|
||||
- "setuptools<81"
|
||||
--quiet
|
||||
COMMAND_ERROR_IS_FATAL ANY
|
||||
)
|
||||
else()
|
||||
- message(STATUS "glad: jinja2 and setuptools already available in ${Python_EXECUTABLE}, skipping pip install")
|
||||
+ message(STATUS "glad: jinja2 already available in ${Python_EXECUTABLE}, skipping pip install")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
pkgname='sunshine'
|
||||
pkgver=2026.516.143833
|
||||
pkgrel=1
|
||||
pkgrel=3
|
||||
pkgdesc="Self-hosted game stream host for Moonlight"
|
||||
arch=('x86_64' 'aarch64')
|
||||
url=https://app.lizardbyte.dev/Sunshine
|
||||
@@ -65,7 +65,6 @@ makedepends=(
|
||||
'nodejs'
|
||||
'npm'
|
||||
'python-jinja' # required by the glad OpenGL/EGL loader generator
|
||||
'python-setuptools' # required for glad OpenGL/EGL loader generated, v2.0.0
|
||||
'shaderc'
|
||||
)
|
||||
|
||||
@@ -80,8 +79,14 @@ optdepends=(
|
||||
provides=()
|
||||
conflicts=()
|
||||
|
||||
source=("$pkgname::git+https://github.com/LizardByte/Sunshine.git#commit=${_commit}")
|
||||
sha256sums=('SKIP')
|
||||
source=(
|
||||
"$pkgname::git+https://github.com/LizardByte/Sunshine.git#commit=${_commit}"
|
||||
'2026.516.143833-060b6b07-remove-setuptools-from-glad-dependencies.patch'
|
||||
)
|
||||
sha256sums=(
|
||||
'SKIP'
|
||||
'06a78d624975887541e2b0013b3085e798195e334fdb05d35caf4bbad818ddde'
|
||||
)
|
||||
|
||||
# Options Handling
|
||||
if [[ "${_use_cuda::1}" == "d" ]] && pacman -Qi cuda &> /dev/null; then
|
||||
@@ -116,6 +121,9 @@ fi
|
||||
prepare() {
|
||||
cd "$pkgname"
|
||||
git submodule update --recursive --init
|
||||
|
||||
# Backport https://github.com/LizardByte/Sunshine/commit/060b6b07d376e9ef4c4ce4a5c6d648d08fe0eab9
|
||||
patch -Np1 -i "${srcdir}/2026.516.143833-060b6b07-remove-setuptools-from-glad-dependencies.patch"
|
||||
}
|
||||
|
||||
build() {
|
||||
@@ -167,9 +175,13 @@ build() {
|
||||
_cmake_options+=(-DBUILD_TESTS=OFF)
|
||||
fi
|
||||
|
||||
if [[ -z "${GITHUB_ACTIONS}" ]]; then
|
||||
_appstreamcli_arguments=(--no-net)
|
||||
fi
|
||||
|
||||
cmake "${_cmake_options[@]}"
|
||||
|
||||
appstreamcli validate "build/dev.lizardbyte.app.Sunshine.metainfo.xml"
|
||||
appstreamcli validate "${_appstreamcli_arguments[@]}" "build/dev.lizardbyte.app.Sunshine.metainfo.xml"
|
||||
appstream-util validate "build/dev.lizardbyte.app.Sunshine.metainfo.xml"
|
||||
desktop-file-validate "build/dev.lizardbyte.app.Sunshine.desktop"
|
||||
desktop-file-validate "build/dev.lizardbyte.app.Sunshine.terminal.desktop"
|
||||
|
||||
Reference in new issue
Block a user