removed 2 patches that have been upstreamed
This commit is contained in:
parent
cc57668b64
commit
b62f5a0d72
8
.SRCINFO
8
.SRCINFO
@ -1,7 +1,7 @@
|
||||
pkgbase = mesa-git
|
||||
pkgdesc = an open-source implementation of the OpenGL specification, git version
|
||||
pkgver = 18.1.0_devel.100598.411aa8c322
|
||||
pkgrel = 1
|
||||
pkgver = 18.1.0_devel.100651.e96e6f60f7
|
||||
pkgrel = 2
|
||||
url = http://mesa3d.sourceforge.net
|
||||
arch = x86_64
|
||||
license = custom
|
||||
@ -49,12 +49,8 @@ pkgbase = mesa-git
|
||||
conflicts = mesa-vdpau
|
||||
source = mesa::git://anongit.freedesktop.org/mesa/mesa
|
||||
source = LICENSE
|
||||
source = glvnd-fix-gl-dot-pc.patch
|
||||
source = r600-bug#105262-copy-over-the-export-mask.patch
|
||||
sha512sums = SKIP
|
||||
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
|
||||
sha512sums = 75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028
|
||||
sha512sums = 07cec26e158b4d5e01714cfa20a95df24dd004546cfc6ed8300c483e386e641c6842f3d85b66f3291ad88b57990723f29714b181f6c3e6abb0e5cebe231fef7f
|
||||
|
||||
pkgname = mesa-git
|
||||
|
||||
|
26
PKGBUILD
26
PKGBUILD
@ -12,36 +12,30 @@
|
||||
pkgbase=mesa-git
|
||||
pkgname=('mesa-git')
|
||||
pkgdesc="an open-source implementation of the OpenGL specification, git version"
|
||||
pkgver=17.4.0_devel.98979.adfb9c5c7b
|
||||
pkgrel=1
|
||||
pkgver=18.1.0_devel.100651.e96e6f60f7
|
||||
pkgrel=2
|
||||
arch=('x86_64')
|
||||
makedepends=('git' 'python2-mako' 'llvm-svn' 'libclc' 'clang-svn' 'glproto'
|
||||
'dri2proto' 'dri3proto' 'presentproto' 'libxml2' 'libx11'
|
||||
'libvdpau' 'libva' 'elfutils' 'libomxil-bellagio'
|
||||
makedepends=('git' 'python2-mako' 'llvm-svn' 'libclc' 'clang-svn' 'xorgproto'
|
||||
'libxml2' 'libx11' 'libvdpau' 'libva' 'elfutils' 'libomxil-bellagio'
|
||||
'ocl-icd' 'vulkan-icd-loader' 'libgcrypt' 'wayland-protocols')
|
||||
depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
|
||||
'libomxil-bellagio' 'llvm-libs-svn' 'libunwind' 'libglvnd')
|
||||
optdepends=('opengl-man-pages: for the OpenGL API man pages')
|
||||
provides=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-libgl' 'vulkan-driver' 'opencl-driver' 'opengl-driver' 'libtxc_dxtn')
|
||||
conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa-libgl' 'libtxc_dxtn')
|
||||
provides=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'vulkan-driver' 'opencl-driver' 'opengl-driver')
|
||||
conflicts=('mesa' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau')
|
||||
url="http://mesa3d.sourceforge.net"
|
||||
license=('custom')
|
||||
source=('mesa::git://anongit.freedesktop.org/mesa/mesa'
|
||||
'LICENSE'
|
||||
'glvnd-fix-gl-dot-pc.patch'
|
||||
)
|
||||
# 5dd385f378a7e264f79ce2004aef815b3d9e3388
|
||||
# 5b14e06d8b42e2b08ebc52b6c314ef8647d87a1f
|
||||
sha512sums=('SKIP'
|
||||
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
|
||||
'75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028')
|
||||
'25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
|
||||
|
||||
prepare() {
|
||||
cd mesa
|
||||
|
||||
# glvnd support patches - from Fedora
|
||||
# non-upstreamed ones
|
||||
patch -Np1 -i ../glvnd-fix-gl-dot-pc.patch
|
||||
autoreconf -fi
|
||||
|
||||
autoreconf -vfi
|
||||
}
|
||||
|
||||
pkgver() {
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in
|
||||
--- mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.000000000 -0500
|
||||
+++ mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400
|
||||
@@ -7,7 +7,7 @@ Name: gl
|
||||
Description: Mesa OpenGL library
|
||||
Requires.private: @GL_PC_REQ_PRIV@
|
||||
Version: @PACKAGE_VERSION@
|
||||
-Libs: -L${libdir} -l@GL_LIB@
|
||||
+Libs: -L${libdir} -lGL
|
||||
Libs.private: @GL_PC_LIB_PRIV@
|
||||
Cflags: -I${includedir} @GL_PC_CFLAGS@
|
||||
glx_tls: @GLX_TLS@
|
@ -1,12 +0,0 @@
|
||||
diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c
|
||||
index 7f6da1a3ed..923817119f 100644
|
||||
--- a/src/gallium/drivers/r600/r600_state.c
|
||||
+++ b/src/gallium/drivers/r600/r600_state.c
|
||||
@@ -2525,6 +2525,7 @@ void r600_update_ps_state(struct pipe_context *ctx, struct r600_pipe_shader *sha
|
||||
}
|
||||
|
||||
shader->nr_ps_color_outputs = num_cout;
|
||||
+ shader->ps_color_export_mask = rshader->ps_color_export_mask;
|
||||
|
||||
spi_ps_in_control_0 = S_0286CC_NUM_INTERP(rshader->ninput) |
|
||||
S_0286CC_PERSP_GRADIENT_ENA(1)|
|
Loading…
Reference in New Issue
Block a user