diff --git a/srcpkgs/libGL/patches/configure.ac.patch b/srcpkgs/libGL/patches/configure.ac.patch deleted file mode 100644 index 68c55514737..00000000000 --- a/srcpkgs/libGL/patches/configure.ac.patch +++ /dev/null @@ -1,26 +0,0 @@ -- remove libpthread stubs -- detect static_assert() correctly for musl - ---- configure.ac.orig 2016-11-01 14:39:59.000000000 +0100 -+++ configure.ac 2016-11-04 13:07:05.317813259 +0100 -@@ -828,7 +828,7 @@ - - dnl pthread-stubs is mandatory on targets where it exists - case "$host_os" in --cygwin* ) -+cygwin* | linux* ) - pthread_stubs_possible="no" - ;; - * ) -@@ -1919,6 +1919,11 @@ - fi - AM_CONDITIONAL(HAVE_ST_NINE, test "x$enable_nine" = xyes) - -+AC_CHECK_DECL(static_assert, [], -+ [AC_DEFINE(static_assert(...), [/* */], [noop static_assert() replacement]), -+ AC_MSG_RESULT([no])], -+ [[#include ]]) -+ - dnl - dnl OpenCL configuration - dnl diff --git a/srcpkgs/libGL/patches/musl.patch b/srcpkgs/libGL/patches/musl.patch index eb85a109cfa..8cce8e742ab 100644 --- a/srcpkgs/libGL/patches/musl.patch +++ b/srcpkgs/libGL/patches/musl.patch @@ -20,3 +20,17 @@ #define MAXTHREADS 1 struct threadpool { +--- src/util/rand_xor.c.orig 2017-05-10 20:12:01.842040501 +0200 ++++ src/util/rand_xor.c 2017-05-10 20:13:30.818969670 +0200 +@@ -23,8 +23,11 @@ + */ + + #if defined(__linux__) ++#include + #include ++#include + #include ++#include + #else + #include + #endif diff --git a/srcpkgs/libGL/template b/srcpkgs/libGL/template index e8b23f18e81..5aa658d2f23 100644 --- a/srcpkgs/libGL/template +++ b/srcpkgs/libGL/template @@ -1,7 +1,7 @@ # Template build file for 'libGL'. pkgname=libGL -version=17.0.5 -revision=2 +version=17.1.0 +revision=1 wrksrc="mesa-${version}" build_style=gnu-configure configure_args="--enable-shared-glapi --enable-gbm @@ -13,7 +13,7 @@ maintainer="Juan RP " homepage="http://www.mesa3d.org/" license="MIT, LGPL-2.1" distfiles="https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" -checksum=668efa445d2f57a26e5c096b1965a685733a3b57d9c736f9d6460263847f9bfe +checksum=cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17 hostmakedepends=" automake libtool flex pkg-config llvm python-Mako libxml2-python $(vopt_if wayland wayland-devel)"