summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorLW-archlinux2018-03-06 13:45:12 +0100
committerLW-archlinux2018-03-06 13:45:12 +0100
commit016adce1bfdb701fc29b453b85a4a371d9a681ce (patch)
treefaddb13396d2797b7fb4424213c090a80030f1ff
parent1cb44e9d06582fbb7379c594b62dd6f8183ddb33 (diff)
downloadaur-016adce1bfdb701fc29b453b85a4a371d9a681ce.tar.gz
switched to using xorgproto, also removed a patch
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD12
-rw-r--r--glvnd-fix-gl-dot-pc.patch12
3 files changed, 6 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a4042b44ad9..015f57d1f67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = lib32-mesa-git
pkgdesc = an open-source implementation of the OpenGL specification, git version
- pkgver = 17.4.0_devel.98979.adfb9c5c7b
+ pkgver = 18.1.0_devel.100651.e96e6f60f7
pkgrel = 1
url = http://mesa3d.sourceforge.net
arch = x86_64
@@ -8,10 +8,7 @@ pkgbase = lib32-mesa-git
makedepends = python2-mako
makedepends = lib32-libxml2
makedepends = lib32-libx11
- makedepends = glproto
- makedepends = dri2proto
- makedepends = dri3proto
- makedepends = presentproto
+ makedepends = xorgproto
makedepends = lib32-gcc-libs
makedepends = lib32-libvdpau
makedepends = lib32-libelf
@@ -53,10 +50,8 @@ pkgbase = lib32-mesa-git
conflicts = lib32-libtxc_dxtn
source = mesa::git://anongit.freedesktop.org/mesa/mesa
source = LICENSE
- source = glvnd-fix-gl-dot-pc.patch
sha512sums = SKIP
sha512sums = 25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2
- sha512sums = 75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028
pkgname = lib32-mesa-git
diff --git a/PKGBUILD b/PKGBUILD
index 656bc30c2c0..951d5665dbc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,10 +12,10 @@
pkgbase=lib32-mesa-git
pkgname=('lib32-mesa-git')
pkgdesc="an open-source implementation of the OpenGL specification, git version"
-pkgver=17.4.0_devel.98979.adfb9c5c7b
+pkgver=18.1.0_devel.100651.e96e6f60f7
pkgrel=1
arch=('x86_64')
-makedepends=('python2-mako' 'lib32-libxml2' 'lib32-libx11' 'glproto' 'dri2proto' 'dri3proto' 'presentproto'
+makedepends=('python2-mako' 'lib32-libxml2' 'lib32-libx11' 'xorgproto'
'lib32-gcc-libs' 'lib32-libvdpau' 'lib32-libelf' 'lib32-llvm-svn' 'git' 'lib32-libgcrypt' 'lib32-systemd'
'mesa-git' 'lib32-llvm-libs-svn' 'lib32-libglvnd' 'wayland-protocols')
depends=('mesa-git' 'lib32-gcc-libs' 'lib32-libdrm' 'lib32-wayland' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-elfutils'
@@ -27,17 +27,13 @@ url="http://mesa3d.sourceforge.net"
license=('custom')
source=('mesa::git://anongit.freedesktop.org/mesa/mesa'
'LICENSE'
- 'glvnd-fix-gl-dot-pc.patch'
)
sha512sums=('SKIP'
- '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
- '75849eca72ca9d01c648d5ea4f6371f1b8737ca35b14be179e14c73cc51dca0739c333343cdc228a6d464135f4791bcdc21734e2debecd29d57023c8c088b028')
+ '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
prepare() {
cd mesa
-
- patch -Np1 -i ../glvnd-fix-gl-dot-pc.patch
autoreconf -fi
}
@@ -58,7 +54,7 @@ build () {
--libdir=/usr/lib32 \
--prefix=/usr \
--sysconfdir=/etc \
- --with-gallium-drivers=i915,r300,r600,radeonsi,nouveau,svga,swrast,virgl \
+ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \
--with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
--with-platforms=x11,drm,wayland \
--with-vulkan-drivers=intel,radeon \
diff --git a/glvnd-fix-gl-dot-pc.patch b/glvnd-fix-gl-dot-pc.patch
deleted file mode 100644
index 68118f45efe..00000000000
--- a/glvnd-fix-gl-dot-pc.patch
+++ /dev/null
@@ -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@