forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

temp/mesa-grate: removed (!648)

Browse source 
This depends on non-existing package py2-mako, and therefore blocks
building the binary repository.

Related: #370
This commit is contained in:
Oliver Smith 2019-09-25 20:45:07 +02:00
parent 1573a80619
commit e09aa15c08
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
17 changed files with 6 additions and 10026 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
device/device-ouya-ouya/APKBUILD
View file

@ -2,7 +2,7 @@
pkgname=device-ouya-ouya
pkgver=1
pkgdesc="Ouya"
pkgrel=10
pkgrel=11
url="https://postmarketos.org"
arch="armv7"
license="MIT"
@ -10,15 +10,7 @@ options="!check !archcheck"
depends="
libdrm-grate
libvdpau-tegra
mesa-grate
mesa-grate-dri-swrast
mesa-grate-dri-tegra
mesa-grate-egl
mesa-grate-gbm
mesa-grate-gl
mesa-grate-glapi
mesa-grate-gles
mesa-grate-osmesa
mesa-dri-swrast
mkbootimg
postmarketos-base
xf86-video-opentegra

12
device/device-samsung-i927/APKBUILD
View file

@ -2,7 +2,7 @@
pkgname="device-samsung-i927"
pkgdesc="Samsung Captivate Glide"
pkgver=0.3
pkgrel=0
pkgrel=1
url="https://postmarketos.org"
license="MIT"
arch="armv7"
@ -14,15 +14,7 @@ depends="postmarketos-base
setxkbmap
pm-utils
libdrm-grate
mesa-grate
mesa-grate-gl
mesa-grate-gles
mesa-grate-egl
mesa-grate-gbm
mesa-grate-glapi
mesa-grate-osmesa
mesa-grate-dri-swrast
mesa-grate-dri-tegra
mesa-dri-swrast
xf86-video-opentegra
mesa-demos
libvdpau-tegra"

12
device/device-samsung-p4wifi/APKBUILD
View file

@ -2,7 +2,7 @@
pkgname="device-samsung-p4wifi"
pkgdesc="Galaxy Tab 10.1"
pkgver=0.3
pkgrel=3
pkgrel=4
url="https://postmarketos.org"
license="MIT"
arch="armv7"
@ -12,15 +12,7 @@ depends="postmarketos-base
mkbootimg
alsa-utils
libdrm-grate
mesa-grate
mesa-grate-gl
mesa-grate-gles
mesa-grate-egl
mesa-grate-gbm
mesa-grate-glapi
mesa-grate-osmesa
mesa-grate-dri-swrast
mesa-grate-dri-tegra
mesa-dri-swrast
xf86-video-opentegra
libvdpau-tegra"
makedepends="devicepkg-dev"

34
temp/mesa-grate/0001-Revert-autotools-add-tegra-header-files.patch
View file

@ -1,34 +0,0 @@
From d77ebe888da75586b6c1eba163010e45479f4942 Mon Sep 17 00:00:00 2001
From: ryang <decatf@gmail.com>
Date: Thu, 9 Aug 2018 18:31:52 -0400
Subject: [PATCH 1/5] Revert "autotools: add tegra header files"
This reverts commit d39e828c82d0d6bf6d92044daaddf7318a6d73a1.
---
Makefile.am | 1 -
src/gallium/winsys/tegra/drm/Makefile.sources | 1 -
2 files changed, 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 86d7e7f..9afb3d4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,6 @@ noinst_HEADERS = \
include/drm-uapi/drm_fourcc.h \
include/drm-uapi/drm_mode.h \
include/drm-uapi/i915_drm.h \
- include/drm-uapi/tegra_drm.h \
include/drm-uapi/vc4_drm.h \
include/D3D9 \
include/GL/wglext.h \
diff --git a/src/gallium/winsys/tegra/drm/Makefile.sources b/src/gallium/winsys/tegra/drm/Makefile.sources
index 29a0edc..fe0d5c4 100644
--- a/src/gallium/winsys/tegra/drm/Makefile.sources
+++ b/src/gallium/winsys/tegra/drm/Makefile.sources
@@ -1,3 +1,2 @@
C_SOURCES := \
- tegra_drm_public.h \
tegra_drm_winsys.c
--
2.7.4

40
temp/mesa-grate/0001-meson-Add-glx-tls-option.patch
View file

@ -1,40 +0,0 @@
From 63a084c6c2b63cdfb577dfffe6432c91d145daf5 Mon Sep 17 00:00:00 2001
From: Robert Yang <decatf@gmail.com>
Date: Fri, 11 Jan 2019 14:26:55 -0500
Subject: [PATCH] meson: Add glx-tls option
---
meson.build | 5 ++++-
meson_options.txt | 6 ++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 0ecd14cc5c6..4014ac28948 100644
--- a/meson.build
+++ b/meson.build
@@ -340,7 +340,10 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless)
endif
endif
-pre_args += '-DGLX_USE_TLS'
+if get_option('glx-tls') != false
+ pre_args += '-DGLX_USE_TLS'
+endif
+
if with_glx != 'disabled'
if not (with_platform_x11 and with_any_opengl)
if with_glx == 'auto'
diff --git a/meson_options.txt b/meson_options.txt
index a573290b774..e1304293065 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -286,3 +286,9 @@ option(
value : '',
description : 'Comma delimited list of tools to build. choices : freedreno,glsl,intel,nir,nouveau or all'
)
+option(
+ 'glx-tls',
+ type : 'boolean',
+ value : true,
+ description : 'Enable TLS support in GLX'
+)

22
temp/mesa-grate/0001-meson-correct-gallium-grate-variable.patch
View file

@ -1,22 +0,0 @@
From 195b1850c7071de835c73de668a0437085db48d4 Mon Sep 17 00:00:00 2001
From: Robert Yang <decatf@gmail.com>
Date: Fri, 11 Jan 2019 14:26:35 -0500
Subject: [PATCH] meson: correct gallium grate variable
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 8b796ba79c3..1ad8eafb117 100644
--- a/meson.build
+++ b/meson.build
@@ -1049,7 +1049,7 @@ _libdrm_checks = [
['nouveau', (with_gallium_nouveau or with_dri_nouveau)],
['etnaviv', with_gallium_etnaviv],
['freedreno', with_gallium_freedreno],
- ['tegra', with_gallium_tegra],
+ ['tegra', with_gallium_grate],
]
# Loop over the enables versions and get the highest libdrm requirement for all

27
temp/mesa-grate/0002-Revert-autotools-Add-tegra-to-AM_DISTCHECK_CONFIGURE.patch
View file

@ -1,27 +0,0 @@
From 790445a72c4975abaed359822dad066f9af87907 Mon Sep 17 00:00:00 2001
From: ryang <decatf@gmail.com>
Date: Thu, 9 Aug 2018 18:31:57 -0400
Subject: [PATCH 2/5] Revert "autotools: Add tegra to
AM_DISTCHECK_CONFIGURE_FLAGS"
This reverts commit 6d4d46bca9c58c81c1af98a5bd4909d91558fef4.
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 9afb3d4..993cb12 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = \
--enable-libunwind \
--with-platforms=x11,wayland,drm,surfaceless \
--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast \
- --with-gallium-drivers=i915,nouveau,r300,pl111,r600,radeonsi,freedreno,svga,swrast,vc4,tegra,virgl,swr,etnaviv,imx \
+ --with-gallium-drivers=i915,nouveau,r300,pl111,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,swr,etnaviv,imx \
--with-vulkan-drivers=intel,radeon
ACLOCAL_AMFLAGS = -I m4
--
2.7.4

58
temp/mesa-grate/0003-Revert-drm-uapi-bump-headers.patch
View file

@ -1,58 +0,0 @@
From 90b7852c0f8ef37d5d3918db0a889dcb2aeda930 Mon Sep 17 00:00:00 2001
From: ryang <decatf@gmail.com>
Date: Thu, 9 Aug 2018 18:34:27 -0400
Subject: [PATCH 3/5] Revert "drm-uapi: bump headers"
This reverts commit 5d3e74a5a539559612d41432e9cef8d1b2ce0638.
---
include/drm-uapi/tegra_drm.h | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/include/drm-uapi/tegra_drm.h b/include/drm-uapi/tegra_drm.h
index 12f9bf8..910cbe0 100644
--- a/include/drm-uapi/tegra_drm.h
+++ b/include/drm-uapi/tegra_drm.h
@@ -117,6 +117,20 @@ struct drm_tegra_waitchk {
__u32 thresh;
};
+#define DRM_TEGRA_FENCE_WAIT (1 << 0)
+#define DRM_TEGRA_FENCE_EMIT (1 << 1)
+#define DRM_TEGRA_FENCE_FD (1 << 2)
+#define DRM_TEGRA_FENCE_FLAGS (DRM_TEGRA_FENCE_WAIT | \
+ DRM_TEGRA_FENCE_EMIT | \
+ DRM_TEGRA_FENCE_FD)
+
+struct drm_tegra_fence {
+ __u32 handle;
+ __u32 flags;
+};
+
+#define DRM_TEGRA_SUBMIT_FLAGS 0
+
struct drm_tegra_submit {
__u64 context;
__u32 num_syncpts;
@@ -129,9 +143,11 @@ struct drm_tegra_submit {
__u64 cmdbufs;
__u64 relocs;
__u64 waitchks;
- __u32 fence; /* Return value */
+ __u32 flags;
+ __u32 num_fences;
+ __u64 fences;
- __u32 reserved[5]; /* future expansion */
+ __u32 reserved[2]; /* future expansion */
};
#define DRM_TEGRA_GEM_TILING_MODE_PITCH 0
@@ -206,4 +222,4 @@ struct drm_tegra_gem_get_flags {
}
#endif
-#endif
+#endif /* _TEGRA_DRM_H_ */
--
2.7.4

3101
temp/mesa-grate/0004-Revert-tegra-Initial-support.patch
View file

File diff suppressed because it is too large Load diff

6242
temp/mesa-grate/0005-grate-driver.patch
View file

File diff suppressed because it is too large Load diff

341
temp/mesa-grate/APKBUILD
View file

@ -1,341 +0,0 @@
# Forked from Alpine, so we can build it with Grate support
pkgname=mesa-grate
pkgver=18.1.0
pkgrel=3
pkgdesc="Mesa DRI OpenGL library"
url="https://www.mesa3d.org"
arch="armhf armv7"
license="MIT SGI-B-2.0 BSL-1.0"
subpackages="
$pkgname-dev
$pkgname-dri-swrast:_dri
$pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles
$pkgname-osmesa $pkgname-gbm
"
_llvmver=5
depends="ldpath libdrm-grate"
depends_dev="
libdrm-grate-dev
libxext-dev
libxdamage-dev
libxcb-dev
libxshmfence-dev
"
makedepends="
$depends_dev
bison
eudev-dev
expat-dev
flex
elfutils-libelf
libtool
libxfixes-dev
libva-dev
libvdpau-dev
libx11-dev
libxxf86vm-dev
libxt-dev
libxvmc-dev
meson
py2-mako
python2
talloc-dev
wayland-dev
wayland-protocols
xorgproto
zlib-dev
"
install="$pkgname.post-install $pkgname.pre-deinstall"
source="
https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz
glx_ro_text_segm.patch
musl-fix-includes.patch
drmdeps.patch
0001-Revert-autotools-add-tegra-header-files.patch
0002-Revert-autotools-Add-tegra-to-AM_DISTCHECK_CONFIGURE.patch
0003-Revert-drm-uapi-bump-headers.patch
0004-Revert-tegra-Initial-support.patch
0005-grate-driver.patch
0001-meson-Add-glx-tls-option.patch
0001-meson-correct-gallium-grate-variable.patch
adjust-cache-deflate-buffer.patch
"
replaces="mesa mesa-dricore"
_prefix=/usr
_dri_driverdir=${_prefix}/lib/xorg/modules/dri/grate
_dri_drivers=""
_gallium_drivers="swrast"
_vulkan_drivers=""
_arch_opts=
case "$CARCH" in
x86*)
_dri_drivers="${_dri_drivers},i915,i965"
_gallium_drivers="${_gallium_drivers},svga"
_vulkan_drivers="$_vulkan_drivers,intel"
subpackages="$subpackages \
$pkgname-dri-intel:_dri \
$pkgname-dri-vmwgfx:_dri \
$pkgname-vulkan-intel:_vulkan"
_arch_opts="-Ddri3=true"
case "$CARCH" in
x86)
_arch_opts="$_arch_opts -Dglx-rts=true -Dasm=false";;
esac
;;
armhf|armv7|aarch64)
_gallium_drivers="${_gallium_drivers},grate"
subpackages="$subpackages $pkgname-dri-tegra:_dri"
;;
esac
builddir="$srcdir/mesa-$pkgver"
prepare() {
cd "$builddir"
default_prepare
}
build() {
cd "$builddir"
export PKG_CONFIG_PATH="/usr/lib/pkgconfig/libdrm-grate:${PKG_CONFIG_PATH}"
export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700"
meson build \
-Dbuild=$CBUILD \
-Dhost=$CHOST \
-Dprefix=$_prefix \
-Dsysconfdir=/etc \
-Ddri-drivers-path=${_dri_driverdir} \
-Ddri-search-path=${_dri_driverdir} \
-Dgallium-drivers=${_gallium_drivers} \
-Ddri-drivers=${_dri_drivers} \
-Dvulkan-drivers=${_vulkan_drivers} \
-Dplatforms=x11,drm \
-Dllvm=false \
-Dshared-glapi=true \
-Dgbm=true \
-Ddri=true \
-Dglx=auto \
-Dosmesa=gallium \
-Dgles1=true \
-Dgles2=true \
-Degl=true \
-Dtexture-float=true \
-Dgallium-xa=false \
-Dgallium-vdpau=false \
-Dgallium-va=false \
-Dgallium-xvmc=false \
-Dgallium-nine=false \
-Dglx-tls=false \
$_arch_opts
ninja -C build/
}
package() {
cd "$builddir"
DESTDIR="$pkgdir" ninja -C build/ install
# provided by wayland
# rm -v "$pkgdir"/usr/lib/libwayland-egl.so*
# rm -v "$pkgdir"/usr/lib/pkgconfig/wayland-egl.pc
}
egl() {
pkgdesc="Mesa libEGL runtime libraries"
replaces="mesa"
install -d "$subpkgdir"/usr/lib/mesa-grate/
mv "$pkgdir"/usr/lib/libEGL.so* "$subpkgdir"/usr/lib/mesa-grate/
}
gl() {
pkgdesc="Mesa libGL runtime libraries"
replaces="mesa"
install -d "$subpkgdir"/usr/lib/mesa-grate/
mv "$pkgdir"/usr/lib/libGL.so* "$subpkgdir"/usr/lib/mesa-grate/
}
glapi() {
pkgdesc="Mesa shared glapi"
replaces="$pkgname-gles"
install -d "$subpkgdir"/usr/lib/mesa-grate/
mv "$pkgdir"/usr/lib/libglapi.so.* "$subpkgdir"/usr/lib/mesa-grate/
}
gles() {
pkgdesc="Mesa libGLESv2 runtime libraries"
replaces="mesa"
install -d "$subpkgdir"/usr/lib/mesa-grate/
mv "$pkgdir"/usr/lib/libGLES*.so* "$subpkgdir"/usr/lib/mesa-grate/
}
xatracker() {
pkgdesc="Mesa XA state tracker for vmware"
install -d "$subpkgdir"/usr/lib/mesa-grate/
mv "$pkgdir"/usr/lib/libxatracker*.so.* "$subpkgdir"/usr/lib/mesa-grate/
}
osmesa() {
pkgdesc="Mesa offscreen rendering libraries"
install -d "$subpkgdir"/usr/lib/mesa-grate/
mv "$pkgdir"/usr/lib/libOSMesa.so.* "$subpkgdir"/usr/lib/mesa-grate/
}
gbm() {
pkgdesc="Mesa gbm library"
replaces="mesa"
install -d "$subpkgdir"/usr/lib/mesa-grate/
mv "$pkgdir"/usr/lib/libgbm.so.* "$subpkgdir"/usr/lib/mesa-grate/
}
_mv_dri() {
install -d "$subpkgdir"${_dri_driverdir}
while [ $# -gt 0 ]; do
mv "$pkgdir"${_dri_driverdir}/${1}.so \
"$subpkgdir"${_dri_driverdir}/
shift
done
}
_mv_vdpau() {
local i
install -d "$subpkgdir"/usr/lib/mesa-grate/vdpau
for i in "$@"; do
mv "$pkgdir"/usr/lib/vdpau/libvdpau_$i.* \
"$subpkgdir"/usr/lib/mesa-grate/vdpau/
done
}
_mv_gpipe() {
return 0
# http://cgit.freedesktop.org/mesa/mesa/commit/?id=44ec468e8033553c26a112cebba41c343db00eb1
# https://code.google.com/p/chromium/issues/detail?id=412089
# local i
# install -d "$subpkgdir"/usr/lib/mesa-grate/gallium-pipe
# for i in "$@"; do
# mv "$pkgdir"/usr/lib/gallium-pipe/pipe_$i.* \
# "$subpkgdir"/usr/lib/mesa-grate/gallium-pipe/
# done
}
_mv_vulkan() {
local i
install -d "$subpkgdir"/usr/lib/mesa-grate/
install -d "$subpkgdir"/usr/share/mesa-grate/vulkan/icd.d
for i in "$@"; do
mv "$pkgdir"/usr/lib/libvulkan_${i}.so "$subpkgdir"/usr/lib/mesa-grate/
mv "$pkgdir"/usr/share/mesa-grate/vulkan/icd.d/${i}* "$subpkgdir"/usr/share/mesa-grate/vulkan/icd.d/
done
}
_mv_va() {
local i
install -d "$subpkgdir"/usr/lib/mesa-grate/dri
for i in "$@"; do
mv "$pkgdir"/usr/lib/dri/${i}_drv_video.so \
"$subpkgdir"/usr/lib/mesa-grate/dri/
done
}
_dri() {
local n=${subpkgname##*-dri-}
pkgdesc="Mesa DRI driver for $n"
case $n in
ati)
_mv_dri radeon_dri r200_dri r300_dri r600_dri \
&& _mv_vdpau r300 r600 \
&& _mv_gpipe r300 r600 \
&& _mv_va r600
;;
intel)
_mv_dri i915_dri i965_dri
;;
nouveau)
_mv_dri nouveau_dri nouveau_vieux_dri \
&& _mv_vdpau nouveau \
&& _mv_gpipe nouveau \
&& _mv_va nouveau
;;
freedreno)
_mv_dri msm_dri kgsl_dri
;;
swrast)
_mv_dri swrast_dri kms_swrast_dri && _mv_gpipe swrast
;;
tegra)
_mv_dri tegra_dri
ln -s "${_dri_driverdir}/tegra_dri.so" \
"${subpkgdir}${_prefix}/lib/xorg/modules/dri/tegra_dri.so"
;;
vc4)
_mv_dri vc4_dri
;;
vmwgfx)
_mv_dri vmwgfx_dri && _mv_gpipe vmwgfx
;;
virtio)
_mv_dri virtio_gpu_dri
;;
esac
}
_vulkan() {
local n=${subpkgname##*-vulkan-}
pkgdesc="Mesa Vulkan API driver for $n"
case $n in
ati)
_mv_vulkan radeon ;;
intel)
_mv_vulkan intel ;;
esac
}
dev() {
default_dev
cd "$subpkgdir"/usr/lib
install -d mesa-grate/
mv lib*.so mesa-grate/
install -d pkgconfig/mesa-grate/
mv pkgconfig/*.pc pkgconfig/mesa-grate
# Move headers (to /usr/include/mesa-grate)
cd "$subpkgdir"/usr
mv include include_
mkdir include
mv include_ include/mesa-grate
# Redirect pkgconfig to alternate lib/header directory
local pc
cd "$subpkgdir"/usr/lib/pkgconfig/mesa-grate
for pc in *; do
sed -i "s./include$./include/mesa-grate.g" $pc
sed -i "s./lib$./lib/mesa-grate.g" $pc
done
}
sha512sums="8b26af2df8b94373cbc339521974cd568c1d4ff4204986ee7b439e4cf3ebe14d822ea081a7769b68eca9263b7bc6dbca01836b8bb0d6495d2e2614c4e3d601ad mesa-18.1.0.tar.xz
8a434ffefdc6ce924d613727a8649b9a77ad9f0ed0674c9cfb8f6ff0fec483f9318e681254535b62c957db1d0432f96427f917e2f139f4c65ef761bffb528255 glx_ro_text_segm.patch
2c9cb0fa890d29e4140d956ee52a74b4522e29e44fadfc2dd144e581c2701a1d8842ab5c8ff0b68e14b2242e2812a9d4ac0aed1c3314a2143333bc37f2323b58 musl-fix-includes.patch
3409483217dbec732286e628e268e1e8cd392b7e8efb13c7651b38e6563aa5a4988279efb029096dcd092ebe7a92eece103014ed420d2b242eab8d0237f056fd drmdeps.patch
d046ef1fec03648349ec321e93dd6f1718d84de6c080216f7158e1c918058307abcc6866af31a2be0aea1afb0d6f5863cf247638cc2ec93c37d885b1b0c1d728 0001-Revert-autotools-add-tegra-header-files.patch
ba0d498779302e01c36abfcf9eacf187e87063ca4ab4a2ac0fed63c331f765c254cd92a43fd4fde9c5a86235d8a8c766b4bbfe0e240df884522dc99dc4d3625a 0002-Revert-autotools-Add-tegra-to-AM_DISTCHECK_CONFIGURE.patch
498b9286bffc55e5fae6fa5e1459977c3b3ac1b85202975ae8555c3c551bef634f631ece083dc55e16cd8aac536aa82563760cb53c744cfe63f7b431c538df77 0003-Revert-drm-uapi-bump-headers.patch
01feb831b3227ff06feebee2a5f5a408a7d3710031853644b72d0dc32dfa139396553972435d1b9f3448f7589de782586f227e2ae8b239a47ddfd1b56d9cd1e9 0004-Revert-tegra-Initial-support.patch
ecdd537af62ea8e9d4e6361eafbfc09d315b9084af5af48d761e1713500e08ff965fa62f4a52aea9bd6ab98a3179fa7e4c9a31a647cbe503e820f525e33fd4d2 0005-grate-driver.patch
05e7ce9f69b9fe2d1691b40a7ec93e05de9043a7953bdd7189c5f90b406f4b72e6aaa1aaba3fa7cb53de5c8943bffaaa49df0a354f7e8ba4be725bf6b8da143a 0001-meson-Add-glx-tls-option.patch
2e1d5fcf239b7f7a8fc5e8f64819079c4b7ad8d2f83c033faffa2226b53bd16fb8db39fa67f9f0e7b81650749306a796e6db75237ad597c56575df9feca12e06 0001-meson-correct-gallium-grate-variable.patch
cdf22d2da3328e116c379264886bd01fd3ad5cc45fe03dc6fd97bdc4794502598ee195c0b9d975fa264d6ac31c6fa108c0535c91800ecf4fcabfd308e53074cc adjust-cache-deflate-buffer.patch"

16
temp/mesa-grate/adjust-cache-deflate-buffer.patch
View file

@ -1,16 +0,0 @@
diff -ru mesa-18.1.7.orig/src/util/disk_cache.c mesa-18.1.7/src/util/disk_cache.c
--- mesa-18.1.7.orig/src/util/disk_cache.c 2018-08-24 19:25:19.000000000 +0300
+++ mesa-18.1.7/src/util/disk_cache.c 2018-12-14 13:59:15.433631846 +0200
@@ -721,8 +721,11 @@
/* From the zlib docs:
* "If the memory is available, buffers sizes on the order of 128K or 256K
* bytes should be used."
+ *
+ * But that is performance optimization for large files. To keep stack usage
+ * in sensible amount (wrt. musl default stack) we use smaller stack on Alpine.
*/
-#define BUFSIZE 256 * 1024
+#define BUFSIZE 4 * 1024
/**
* Compresses cache entry in memory and writes it to disk. Returns the size

41
temp/mesa-grate/drmdeps.patch
View file

@ -1,41 +0,0 @@
--- a/src/gallium/winsys/radeon/drm/Makefile.am
+++ b/src/gallium/winsys/radeon/drm/Makefile.am
@@ -7,4 +7,6 @@
noinst_LTLIBRARIES = libradeonwinsys.la
+libradeonwinsys_la_LIBADD = -ldrm_radeon
+
libradeonwinsys_la_SOURCES = $(C_SOURCES)
--- a/src/gallium/winsys/radeon/drm/Makefile.in
+++ b/src/gallium/winsys/radeon/drm/Makefile.in
@@ -119,7 +119,7 @@
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
-libradeonwinsys_la_LIBADD =
+libradeonwinsys_la_LIBADD = -ldrm_radeon
am__objects_1 = radeon_drm_bo.lo radeon_drm_cs.lo \
radeon_drm_surface.lo radeon_drm_winsys.lo
am_libradeonwinsys_la_OBJECTS = $(am__objects_1)
--- a/src/gallium/winsys/amdgpu/drm/Makefile.am
+++ b/src/gallium/winsys/amdgpu/drm/Makefile.am
@@ -11,6 +11,6 @@
noinst_LTLIBRARIES = libamdgpuwinsys.la
libamdgpuwinsys_la_LIBADD = \
- $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la
+ $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la -ldrm_amdgpu
libamdgpuwinsys_la_SOURCES = $(C_SOURCES)
--- a/src/gallium/winsys/amdgpu/drm/Makefile.in
+++ b/src/gallium/winsys/amdgpu/drm/Makefile.in
@@ -572,7 +572,7 @@
AM_CXXFLAGS = $(AM_CFLAGS)
noinst_LTLIBRARIES = libamdgpuwinsys.la
libamdgpuwinsys_la_LIBADD = \
- $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la
+ $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la -ldrm_amdgpu
libamdgpuwinsys_la_SOURCES = $(C_SOURCES)
all: all-am

28
temp/mesa-grate/glx_ro_text_segm.patch
View file

@ -1,28 +0,0 @@
2011-02-09 Jeremy Huddleston <jeremyhu@freedesktop.org
#240956
* configure.ac add support to enable readonly test segment on x86
--- a/configure.ac
+++ b/configure.ac
@@ -539,6 +539,20 @@
AM_CONDITIONAL(BUILD_SHARED, test "x$enable_shared" = xyes)
+
+dnl readonly text segment on x86 hardened platforms
+AC_ARG_ENABLE([glx_rts],
+ [AS_HELP_STRING([--enable-glx-rts],
+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])],
+ [enable_glx_rts="$enableval"],
+ [enable_glx_rts=no])
+if test "x$enable_glx_rts" = xyes; then
+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT"
+else
+ enable_glx_rts=no
+fi
+
+
dnl
dnl other compiler options
dnl

2
temp/mesa-grate/mesa-grate.post-install
View file

@ -1,2 +0,0 @@
#!/bin/sh
ldpath add "/usr/lib/mesa-grate"

2
temp/mesa-grate/mesa-grate.pre-deinstall
View file

@ -1,2 +0,0 @@
#!/bin/sh
ldpath remove "/usr/lib/mesa-grate"

42
temp/mesa-grate/musl-fix-includes.patch
View file

@ -1,42 +0,0 @@
--- a/src/util/rand_xor.c
+++ b/src/util/rand_xor.c
@@ -24,6 +24,8 @@
#if defined(__linux__)
#include <sys/file.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#else
--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig
+++ ./src/gallium/winsys/svga/drm/vmw_screen.h
@@ -34,7 +34,7 @@
#ifndef VMW_SCREEN_H_
#define VMW_SCREEN_H_
-
+#include <sys/stat.h>
#include "pipe/p_compiler.h"
#include "pipe/p_state.h"
--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h
+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h
@@ -37,6 +37,7 @@
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
+#include <time.h>
#include "util/u_atomic.h"
#include "util/list.h"
--- a/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
+++ b/src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h
@@ -32,6 +32,7 @@
#include "ac_gpu_info.h"
#include "addrlib/addrinterface.h"
#include <amdgpu.h>
+#include <pthread.h>
#include "util/list.h"
struct radv_amdgpu_winsys {