Skip to content

Commit

Permalink
gamemode: update to 1.8.1.
Browse files Browse the repository at this point in the history
Closes: #48972 [via git-merge-pr]
  • Loading branch information
Daniel Martinez authored and abenson committed Jun 5, 2024
1 parent 34d5c57 commit 9b9624a
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 41 deletions.
10 changes: 0 additions & 10 deletions srcpkgs/gamemode/patches/001-fix-musl.patch

This file was deleted.

23 changes: 0 additions & 23 deletions srcpkgs/gamemode/patches/glibc-2.36.patch

This file was deleted.

28 changes: 28 additions & 0 deletions srcpkgs/gamemode/patches/musl-basename.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
commit 7b2e2589c00c02ada1eb2e7289679da83954cec3
Author: Daniel Martinez <[email protected]>
Date: Tue Feb 27 10:57:15 2024 -0500

use posix basename to fix build on musl

glibc provides a nonstandard basename implementation,
this can be overriden and posix basename can be used
by includeing libgen.h, however musl only has posix
basename, and must always include libgen.h

In this particular case, it doesn't appear that using
the posix version of basename will cause any issues,
as it is simply being used to match a hardcoded config
file name.

diff --git a/daemon/gamemode-config.c b/daemon/gamemode-config.c
index 92f5406..a63459c 100644
--- a/daemon/gamemode-config.c
+++ b/daemon/gamemode-config.c
@@ -41,6 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
#include <ini.h>

#include <dirent.h>
+#include <libgen.h>
#include <math.h>
#include <pthread.h>
#include <pwd.h>
32 changes: 32 additions & 0 deletions srcpkgs/gamemode/patches/musl-shed.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From 4a82094c9822a989722acf30fff9679a9ad1a311 Mon Sep 17 00:00:00 2001
From: Kostadin Shishmanov <[email protected]>
Date: Sat, 30 Dec 2023 22:47:38 +0200
Subject: [PATCH] Fix build with musl

Fixes the following build failure:
In file included from ../common/common-cpu.c:32:
../common/common-cpu.h:44:9: error: unknown type name 'cpu_set_t'
44 | cpu_set_t *online;
| ^~~~~~~~~
../common/common-cpu.h:45:9: error: unknown type name 'cpu_set_t'
45 | cpu_set_t *to_keep;
| ^~~~~~~~~

Signed-off-by: Kostadin Shishmanov <[email protected]>
---
common/common-cpu.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/common/common-cpu.h b/common/common-cpu.h
index 3c8df27c..ccc8ed44 100644
--- a/common/common-cpu.h
+++ b/common/common-cpu.h
@@ -31,6 +31,8 @@ POSSIBILITY OF SUCH DAMAGE.

#pragma once

+#define _GNU_SOURCE
+
#include <sched.h>
#include <stdlib.h>

15 changes: 7 additions & 8 deletions srcpkgs/gamemode/template
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Template file for 'gamemode'
pkgname=gamemode
version=1.7
version=1.8.1
revision=1
build_style=meson
configure_args="-Dwith-sd-bus-provider=elogind -Dwith-pam-group=gamemode"
configure_args="-Dwith-sd-bus-provider=elogind -Dwith-privileged-group=gamemode"
hostmakedepends="pkg-config"
makedepends="inih-devel dbus-devel elogind-devel"
depends="lib${pkgname}>=${version}_${revision}"
short_desc="Optimise Linux system performance on demand"
maintainer="Orphaned <[email protected]>"
license="BSD-3-Clause"
homepage="https://github.com/FeralInteractive/gamemode"
changelog="https://raw.githubusercontent.com/FeralInteractive/gamemode/master/CHANGELOG.md"
changelog="https://raw.githubusercontent.com/FeralInteractive/gamemode/${version}/CHANGELOG.md"
distfiles="https://github.com/FeralInteractive/gamemode/archive/${version}.tar.gz"
checksum=8a1718c657cb1d3c8269edfd397faf3cb41fccd885198ef0225bf8f82217c42f
checksum=c52af84f41f5a867f66a817472e9d784d137702233f01d2cd3d96488458b2f0d
shlib_requires="libgamemode.so.0 libgamemodeauto.so.0"
system_groups=gamemode

post_install() {
Expand All @@ -25,17 +25,16 @@ post_install() {
libgamemode_package() {
short_desc+=" - shared libraries"
pkg_install() {
# For compatibility reasons, all shlibs should go in libgamemode
vmove "usr/lib/*.so*"
vmove "usr/lib/*.so.*"
}
}

libgamemode-devel_package() {
short_desc+=" - development files"
depends="lib${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove "usr/lib/*.so"
vmove usr/lib/pkgconfig
vmove "usr/lib/*.a"
vmove usr/include
}
}

0 comments on commit 9b9624a

Please sign in to comment.