From 3bedfc98327332d2feea49f9dd1894eb2fff65d1 Mon Sep 17 00:00:00 2001 From: SovietReimu1228 Date: Sat, 22 Apr 2023 23:28:41 +0900 Subject: [PATCH] fix pkgbuild --- .SRCINFO | 4 ++-- PKGBUILD | 28 ++++++++++++++++++---------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e5b904a..5c474f3 100755 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,14 +1,14 @@ pkgbase = directx-headers-git pkgdesc = DirectX headers for using D3D12 - pkgver = r178.3b0d6f5 + pkgver = r181.34c9866 pkgrel = 1 url = https://github.com/microsoft/DirectX-Headers arch = x86_64 license = MIT makedepends = meson + makedepends = git provides = directx-headers conflicts = directx-headers - options = !lto source = DirectX-Headers::git+https://github.com/microsoft/DirectX-Headers.git sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 84f61a0..5285774 100755 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,31 +2,39 @@ pkgname=directx-headers-git pkgdesc="DirectX headers for using D3D12" -pkgver=r178.3b0d6f5 +pkgver=r181.34c9866 pkgrel=1 arch=('x86_64') -makedepends=('meson') +makedepends=('meson' 'git') provides=('directx-headers') conflicts=('directx-headers') url="https://github.com/microsoft/DirectX-Headers" license=('MIT') source=('DirectX-Headers::git+https://github.com/microsoft/DirectX-Headers.git') sha256sums=('SKIP') -options=(!lto) pkgver() { - cd DirectX-Headers - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + cd DirectX-Headers + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } build() { - arch-meson DirectX-Headers build \ - -Dbuild-test=false - ninja -C build + meson setup DirectX-Headers build \ + --prefix /usr \ + --libexecdir lib \ + --sbindir bin \ + --buildtype plain \ + --auto-features enabled \ + --wrap-mode nodownload \ + -D b_lto=false \ + -D b_pie=true \ + -D build-test=false + + meson configure --no-pager build } package() { - DESTDIR="$pkgdir" meson install -C build + DESTDIR="$pkgdir" meson install -C build - install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" DirectX-Headers/LICENSE + install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" DirectX-Headers/LICENSE }