Commit 69b97679 authored by Taner Tas's avatar Taner Tas Committed by Leonardo Arena

main/mesa: Upgrade to 18.2.8

* Compiles without drmdeps.patch on x86_64. Patch dropped.
* Wayland libs are no longer part of mesa.
* Update musl patchset.
parent dd08a265
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mesa
pkgver=18.1.7
pkgrel=1
pkgver=18.2.8
pkgrel=0
pkgdesc="Mesa DRI OpenGL library"
url="https://www.mesa3d.org"
arch="all"
......@@ -40,9 +40,10 @@ makedepends="
libva-dev
libvdpau-dev
libx11-dev
libxxf86vm-dev
libxrandr-dev
libxt-dev
libxvmc-dev
libxxf86vm-dev
llvm$_llvmver-dev
makedepend
py-mako
......@@ -59,7 +60,6 @@ source="
adjust-cache-deflate-buffer.patch
glx_ro_text_segm.patch
musl-fix-includes.patch
drmdeps.patch
"
replaces="mesa-dricore"
......@@ -138,10 +138,6 @@ build() {
package() {
cd "$builddir"
make DESTDIR="$pkgdir" install
# provided by wayland
rm -v "$pkgdir"/usr/lib/libwayland-egl.so*
rm -v "$pkgdir"/usr/lib/pkgconfig/wayland-egl.pc
}
egl() {
......@@ -297,8 +293,7 @@ _vulkan() {
_mv_vulkan intel ;;
esac
}
sha512sums="697c4f441ae52bc867d9d73b103094a29102168c248a502c4ea0fc48f51bcb86b2e741da39e882f24131326d460cdb1416415604c6994d1b8c09fb8a153a5c77 mesa-18.1.7.tar.xz
sha512sums="04d5ada9ba3acea853def3ebcbb53ee76936a4cd4229ae753d2ce1b5cf543bea1e5764f2ef2b19735d47d041ba6b0582841bc89e2c9331fdfbd89386f599a1f7 mesa-18.2.8.tar.xz
cdf22d2da3328e116c379264886bd01fd3ad5cc45fe03dc6fd97bdc4794502598ee195c0b9d975fa264d6ac31c6fa108c0535c91800ecf4fcabfd308e53074cc adjust-cache-deflate-buffer.patch
8a434ffefdc6ce924d613727a8649b9a77ad9f0ed0674c9cfb8f6ff0fec483f9318e681254535b62c957db1d0432f96427f917e2f139f4c65ef761bffb528255 glx_ro_text_segm.patch
2c9cb0fa890d29e4140d956ee52a74b4522e29e44fadfc2dd144e581c2701a1d8842ab5c8ff0b68e14b2242e2812a9d4ac0aed1c3314a2143333bc37f2323b58 musl-fix-includes.patch
3409483217dbec732286e628e268e1e8cd392b7e8efb13c7651b38e6563aa5a4988279efb029096dcd092ebe7a92eece103014ed420d2b242eab8d0237f056fd drmdeps.patch"
cf849044d6cc7d2af4ff015208fb09d70bf9660538699797da21bda2ecb7c1892d312af83d05116afd826708d9caafb1d05a13f09139c558aea6fee931e3eee7 musl-fix-includes.patch"
--- 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
......@@ -19,24 +19,3 @@
+#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 {
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment