main/mesa-demos: upgrade to 8.1.0

4 files changed, 5 insertions, 71 deletions

diff --git a/main/mesa-demos/APKBUILD b/main/mesa-demos/APKBUILD
index 5f703e205..ef871587c 100644
--- a/main/mesa-demos/APKBUILD
+++ b/main/mesa-demos/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa-demos
-pkgver=8.0.1
-pkgrel=6
+pkgver=8.1.0
+pkgrel=0
 pkgdesc="Mesa demos and utils"
 url="http://mesa3d.sourceforge.net"
 arch="all"
@@ -13,9 +13,6 @@ makedepends="$depends_dev mesa-dev glew-dev glu-dev automake autoconf libtool"
 install=""
 subpackages=
 source="ftp://ftp.freedesktop.org/pub/mesa/demos/$pkgver/$pkgname-$pkgver.tar.bz2
-	sincos.patch
-	mesa-demos-gles.patch
-	link.patch
 	"
 
 _builddir="$srcdir/$pkgname-$pkgver"
@@ -41,7 +38,6 @@ package() {
         make -j1 DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="320c2a4b6edc6faba35d9cb1e2a30bf4  mesa-demos-8.0.1.tar.bz2
-75be22556a657f0a157028233832d167  sincos.patch
-dc89e44fed4a6c9d0ac3d8b88ddead91  mesa-demos-gles.patch
-502885b11980be71712f6a33bfd1508d  link.patch"
+md5sums="9df33ba69a26bbfbc7c8148602e59542  mesa-demos-8.1.0.tar.bz2"
+sha256sums="9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828  mesa-demos-8.1.0.tar.bz2"
+sha512sums="4832690cd7fb7bb4caccde039cb68baf9213e102ca9212541da499941879b719c1a7ee4038b3e0fde42a92bd6589a90b8ec842982aba81ff507e6ea55054a9ed  mesa-demos-8.1.0.tar.bz2"
diff --git a/main/mesa-demos/link.patch b/main/mesa-demos/link.patch
deleted file mode 100644
index f19b6bbc9..000000000
--- a/main/mesa-demos/link.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./src/egl/opengl/Makefile.in.orig
-+++ ./src/egl/opengl/Makefile.in
-@@ -111,10 +111,10 @@
- peglgears_LDADD = $(LDADD)
- xeglgears_SOURCES = xeglgears.c
- xeglgears_OBJECTS = xeglgears.$(OBJEXT)
--xeglgears_LDADD = $(LDADD)
-+xeglgears_LDADD = $(LDADD) $(X11_LIBS)
- xeglthreads_SOURCES = xeglthreads.c
- xeglthreads_OBJECTS = xeglthreads.$(OBJEXT)
--xeglthreads_LDADD = $(LDADD)
-+xeglthreads_LDADD = $(LDADD) $(X11_LIBS) -lpthread
- DEFAULT_INCLUDES = -I.@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
diff --git a/main/mesa-demos/mesa-demos-gles.patch b/main/mesa-demos/mesa-demos-gles.patch
deleted file mode 100644
index 20d443066..000000000
--- a/main/mesa-demos/mesa-demos-gles.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/egl/opengles2/es2_info.c b/src/egl/opengles2/es2_info.c
-index 93816b5..647d634 100644
---- a/src/egl/opengles2/es2_info.c
-+++ b/src/egl/opengles2/es2_info.c
-@@ -18,8 +18,8 @@
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
- #include <X11/keysym.h>
--#include <GLES/gl.h>
--#include <GLES/glext.h>
-+#include <GLES2/gl2.h>
-+#include <GLES2/gl2ext.h>
- #include <EGL/egl.h>
- 
- 
diff --git a/main/mesa-demos/sincos.patch b/main/mesa-demos/sincos.patch
deleted file mode 100644
index 38da0285d..000000000
--- a/main/mesa-demos/sincos.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- ./src/egl/opengles2/es2gears.c.orig
-+++ ./src/egl/opengles2/es2gears.c
-@@ -109,13 +109,15 @@
-    c[4] = 1;
-    v = gear->vertices;
-    for (i = 0; i < teeth; i++) {
-+      GLint j;
-       s[0] = s[4];
-       c[0] = c[4];
--      sincos(i * 2.0 * M_PI / teeth + da, &s[1], &c[1]);
--      sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
--      sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
--      sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
- 
-+      for (j=1; j <=4; j++) {
-+         s[j] = sin(i * 2.0 * M_PI / teeth + da * j);
-+         c[j] = cos(i * 2.0 * M_PI / teeth + da * j);
-+      }
-+
-       normal[0] = 0.0;
-       normal[1] = 0.0;
-       normal[2] = 1.0;
-@@ -199,7 +201,8 @@
- {
-    double s, c;
- 
--   sincos(angle, &s, &c);
-+   s = sin(angle);
-+   c = cos(angle);
-    GLfloat r[16] = {
-       x * x * (1 - c) + c,     y * x * (1 - c) + z * s, x * z * (1 - c) - y * s, 0,
-       x * y * (1 - c) - z * s, y * y * (1 - c) + c,     y * z * (1 - c) + x * s, 0,