Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-21 10:02:51 +0100
committerErich Eckner <git@eckner.net>2019-01-21 10:02:51 +0100
commit43a901ea68bafb0dfe1818553ad131e3e36de1c4 (patch)
treec292cb29a42400ebeb55014172b902dc2727518a
parent54d673f3676d18dc1310d17d4f6cdadd2418d7c8 (diff)
parent1ef3db3df26dd0f4b688aefeb7347cb88b931fa4 (diff)
Merge branch 'master' into i486
-rw-r--r--core/gpgme/PKGBUILD10
-rw-r--r--core/openssl/PKGBUILD1
-rw-r--r--extra/mesa/PKGBUILD33
-rw-r--r--extra/nasm/PKGBUILD7
-rw-r--r--extra/nvidia-390xx-utils/PKGBUILD2
5 files changed, 52 insertions, 1 deletions
diff --git a/core/gpgme/PKGBUILD b/core/gpgme/PKGBUILD
index f35e9323..121220d1 100644
--- a/core/gpgme/PKGBUILD
+++ b/core/gpgme/PKGBUILD
@@ -1,3 +1,13 @@
+eval "$(
+ declare -f package_python-gpgme package_python2-gpgme qgpgme | \
+ sed '
+ /^\s*{\s*$/ a arch=('"$(
+ printf '%s\n' "${arch[@]}" | \
+ grep -vxF 'i486' | \
+ tr '\n' ' '
+ )"')
+ '
+)"
# i486-specific
if [ "${CARCH}" = "i486" ]; then
# we only build the library
diff --git a/core/openssl/PKGBUILD b/core/openssl/PKGBUILD
index 4446cbc6..1e6e1b30 100644
--- a/core/openssl/PKGBUILD
+++ b/core/openssl/PKGBUILD
@@ -3,6 +3,7 @@ eval "$(
declare -f build | \
sed '
s@linux-x86_64@linux-generic32@
+ s@ enable-ec_nistp_64_gcc_128 @ @
'
)"
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 380cad2f..df6a511e 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -12,3 +12,36 @@ eval "$(
s@_install fakeinstall/usr/lib/libswrAVX.*@#\0@g
'
)"
+
+# do not build/package vulkan on i486
+# do not build i915,i965 on i486
+if [ "$CARCH" = 'i486' ]; then
+ eval "$(
+ declare -f build | \
+ sed '
+ s/\(-D vulkan-drivers=\)\S\+ /\1 /
+ s/\(-D dri-drivers=\(\S\+,\)\?\)i915,/\1/
+ s/\(-D dri-drivers=\(\S\+,\)\?\)i965,/\1/
+ '
+ declare -f package_mesa | \
+ sed '
+ \,rm .*/vulkan;,d
+ '
+ )"
+ pkgname=(
+ $(
+ printf '%s\n' "${pkgname[@]}" | \
+ grep -v '^vulkan-'
+ )
+ )
+fi
+eval "$(
+ declare -f package_vulkan-intel package_vulkan-radeon | \
+ sed '
+ /^\s*{\s*$/ a arch=('"$(
+ printf '%s\n' "${arch[@]}" | \
+ grep -vxF 'i486' | \
+ tr '\n' ' '
+ )"')
+ '
+)"
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
index 220091bd..36e81008 100644
--- a/extra/nasm/PKGBUILD
+++ b/extra/nasm/PKGBUILD
@@ -10,4 +10,11 @@ prepare() {
if [ "${CARCH}" = "i486" ]; then
# remove ttf-liberation (X packages missing for installing the font)
makedepends=(${makedepends[@]//ttf-liberation/})
+
+ eval "$(
+ declare -f build | \
+ sed "
+ /make .*doc/d
+ "
+ )"
fi
diff --git a/extra/nvidia-390xx-utils/PKGBUILD b/extra/nvidia-390xx-utils/PKGBUILD
index 811ef880..ade92d7c 100644
--- a/extra/nvidia-390xx-utils/PKGBUILD
+++ b/extra/nvidia-390xx-utils/PKGBUILD
@@ -8,7 +8,7 @@ for ((i=${#source[@]}; i>0; i--)); do
fi
done
source[${i}]="http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
-sha512sums[${i}]='470e1e71079f4838bc842c2779f7c32c26c37ff30a0d3719d9e534ff0b71775fdf40446766c06505bffc404bfd6871e4f101de4727380418dda0d084e5637bf8'
+sha512sums[${i}]='18c5ef058098c0f055bada06888ee07da4d1455d90d393357483c289eab27969d49a593318d28e535941e7ebacde33e349f3a1cb2f7c627366ba5c6b7835ccbd'
eval "$(
declare -f package_nvidia-390xx-utils | \