mesa: bump version.

remove upstreamed patchset.
This commit is contained in:
Jerome Duval
2017-04-19 22:12:07 +02:00
parent f416b60602
commit f1638771f9
2 changed files with 2 additions and 51 deletions

View File

@@ -6,10 +6,9 @@ providing 3D rendering to Haiku applications."
HOMEPAGE="http://www.mesa3d.org/"
COPYRIGHT="1999-2017 Brian Paul"
LICENSE="MIT"
REVISION="2"
REVISION="1"
SOURCE_URI="https://mesa.freedesktop.org/archive/mesa-${portVersion}.tar.xz"
CHECKSUM_SHA256="ca646f5075a002d60ef9123c8a4331cede155c01712ef945a65c59a5e69fe7ed"
PATCHES="mesa-$portVersion.patchset"
CHECKSUM_SHA256="1269dc8545a193932a0779b2db5bce9be4a5f6813b98c38b93b372be8362a346"
ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
SECONDARY_ARCHITECTURES="x86"

View File

@@ -1,48 +0,0 @@
From 60ca041bf3060a3c342f0b11498f9e0f615339ee Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 19 Nov 2016 10:30:12 +0000
Subject: Haiku patch
diff --git a/src/gallium/auxiliary/util/u_debug.h b/src/gallium/auxiliary/util/u_debug.h
index 7da7f53..236be36 100644
--- a/src/gallium/auxiliary/util/u_debug.h
+++ b/src/gallium/auxiliary/util/u_debug.h
@@ -38,14 +38,13 @@
#ifndef U_DEBUG_H_
#define U_DEBUG_H_
+#include "os/os_misc.h"
#if defined(PIPE_OS_HAIKU)
/* Haiku provides debug_printf in libroot with OS.h */
#include <OS.h>
#endif
-#include "os/os_misc.h"
-
#include "pipe/p_format.h"
#include "pipe/p_defines.h"
diff --git a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
index 89dd547..be73b29 100644
--- a/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
+++ b/src/gallium/winsys/sw/hgl/hgl_sw_winsys.c
@@ -105,8 +105,12 @@ hgl_winsys_convert_cs(enum pipe_format format)
static struct sw_displaytarget*
hgl_winsys_displaytarget_create(struct sw_winsys* winsys,
- unsigned textureUsage, enum pipe_format format, unsigned width,
- unsigned height, unsigned alignment, unsigned* stride)
+ unsigned tex_usage,
+ enum pipe_format format,
+ unsigned width, unsigned height,
+ unsigned alignment,
+ const void *front_private,
+ unsigned *stride)
{
struct haiku_displaytarget* haikuDisplayTarget
= CALLOC_STRUCT(haiku_displaytarget);
--
2.2.2