summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLili12282024-04-27 11:08:59 +0200
committerLili12282024-04-27 11:08:59 +0200
commit6b4be02cab5ad24361fb91bd9ed86e2b29376216 (patch)
treebd1bd33d24c6e9327c67c1e734a06522824b890c
parentcdd14cb74a83fad1195f0d0e6796343673f3961e (diff)
downloadaur-6b4be02cab5ad24361fb91bd9ed86e2b29376216.tar.gz
Satisfy GNU_PROPERTY_X86_FEATURE_1_SHSTK in namcap
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ec31ba251299..596ded882b73 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,13 @@
pkgbase = 86box-git
pkgdesc = An emulator for classic IBM PC clones
- pkgver = 4.1.1.r3.g53503cb84
+ pkgver = 4.1.1.r294.g048bb2966
pkgrel = 1
url = https://86box.net/
arch = pentium4
arch = x86_64
arch = armv7h
arch = aarch64
- license = GPL2
+ license = GPL-2.0-or-later
makedepends = git
makedepends = cmake>=3.21
makedepends = extra-cmake-modules
diff --git a/PKGBUILD b/PKGBUILD
index db841035d848..1d36b5cb45e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
# Maintainer: Lili1228 <aur at lili dot lgbt>
pkgname=86box-git
-pkgver=4.1.1.r3.g53503cb84
+pkgver=4.1.1.r294.g048bb2966
pkgrel=1
pkgdesc='An emulator for classic IBM PC clones'
arch=('pentium4' 'x86_64' 'armv7h' 'aarch64')
url='https://86box.net/'
-license=('GPL2')
+license=('GPL-2.0-or-later')
depends=('fluidsynth' 'hicolor-icon-theme' 'libslirp' 'openal' 'qt6-base' 'rtmidi' 'sdl2' # explicit
'freetype2' 'gcc-libs' 'glib2' 'glibc' 'libevdev' 'libglvnd' 'libpng' 'libx11' 'libxcb' 'libxext' 'libxi' 'libxkbcommon-x11' 'libxkbcommon' 'wayland' 'zlib') # implicit
makedepends=('git' 'cmake>=3.21' 'extra-cmake-modules' 'ninja' 'qt6-tools' 'vde2') # vulkan-headers on qt5
@@ -32,7 +32,7 @@ build() {
arm7h) _NDR=on; _TOOLCHAIN=cmake/flags-gcc-armv7.cmake ;;
aarch64) _NDR=on; _TOOLCHAIN=cmake/flags-gcc-aarch64.cmake ;;
esac
- LDFLAGS='-z now' cmake -S"${pkgname}" -Bbuild --preset regular --toolchain "$_TOOLCHAIN" -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT6=on -DNEW_DYNAREC="$_NDR"
+ LDFLAGS='-z now -z shstk' cmake -S"${pkgname}" -Bbuild --preset regular --toolchain "$_TOOLCHAIN" -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT6=on -DNEW_DYNAREC="$_NDR"
cmake --build build
}