[arch-commits] Commit in mesa-demos/trunk (2 files)
Date: Sunday, August 17, 2014 @ 14:17:23 Author: lcarlier Revision: 220156 upgpkg: mesa-demos 8.2.0-2 fix FS#41533 Modified: mesa-demos/trunk/PKGBUILD Deleted: mesa-demos/trunk/drawtex-resolve-glDrawTexfOES-extension-function.patch + PKGBUILD |5 drawtex-resolve-glDrawTexfOES-extension-function.patch | 94 --- 2 files changed, 3 insertions(+), 96 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-08-17 12:14:39 UTC (rev 220155) +++ PKGBUILD2014-08-17 12:17:23 UTC (rev 220156) @@ -4,7 +4,7 @@ pkgname='mesa-demos' pkgver=8.2.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="Mesa demos and tools" url="http://mesa3d.sourceforge.net"; @@ -17,7 +17,8 @@ build() { cd mesa-demos-${pkgver} - ./configure --prefix=/usr + ./configure --prefix=/usr \ +--with-system-data-files=/usr/share/mesa-demos make } Deleted: drawtex-resolve-glDrawTexfOES-extension-function.patch === --- drawtex-resolve-glDrawTexfOES-extension-function.patch 2014-08-17 12:14:39 UTC (rev 220155) +++ drawtex-resolve-glDrawTexfOES-extension-function.patch 2014-08-17 12:17:23 UTC (rev 220156) @@ -1,94 +0,0 @@ -From 9c326a34e088971a3c11b2e5289cd1a8e4d439df Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tapani=20P=C3=A4lli?= -Date: Wed, 30 Apr 2014 14:05:11 +0300 -Subject: [PATCH] drawtex: resolve glDrawTexfOES extension function -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78101 -Signed-off-by: Tapani Pälli -Reviewed-by: Brian Paul -Reviewed-by: Ian Romanick - src/egl/opengles1/drawtex.c | 10 +- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/egl/opengles1/drawtex.c b/src/egl/opengles1/drawtex.c -index 524f931..1ba8ac7 100644 a/src/egl/opengles1/drawtex.c -+++ b/src/egl/opengles1/drawtex.c -@@ -25,13 +25,14 @@ static GLfloat width = 200, height = 200; - static GLboolean animate = GL_FALSE; - static int win; - -+static PFNGLDRAWTEXFOESPROC glDrawTexfOES_func = NULL; - - static void - draw(void) - { -glClear(GL_COLOR_BUFFER_BIT); - -- glDrawTexfOES(view_posx, view_posy, 0.0, width, height); -+ glDrawTexfOES_func(view_posx, view_posy, 0.0, width, height); - } - - -@@ -128,6 +129,13 @@ init(void) - exit(1); -} - -+ glDrawTexfOES_func = eglGetProcAddress("glDrawTexfOES"); -+ -+ if (!glDrawTexfOES_func) { -+ fprintf(stderr, "Sorry, failed to resolve glDrawTexfOES function\n"); -+ exit(1); -+ } -+ -glClearColor(0.4, 0.4, 0.4, 0.0); - -make_smile_texture(); --- -1.9.2 - -From 6ad8820c457845300806a2f9469599460ca96af9 Mon Sep 17 00:00:00 2001 -From: Stefan Dirsch -Date: Thu, 8 May 2014 11:48:44 +0200 -Subject: [PATCH] drawtex: fixed compiler warnings related to use of - eglGetProcAddress -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add proper include and cast in order to fix compiler -warnings related to the use of eglGetProcAddress. - -Reviewed-By: Tapani Pälli - src/egl/opengles1/drawtex.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/egl/opengles1/drawtex.c b/src/egl/opengles1/drawtex.c -index 1ba8ac7..dc1de13 100644 a/src/egl/opengles1/drawtex.c -+++ b/src/egl/opengles1/drawtex.c -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #include "eglut.h" - -@@ -129,7 +130,7 @@ init(void) - exit(1); -} - -- glDrawTexfOES_func = eglGetProcAddress("glDrawTexfOES"); -+ glDrawTexfOES_func = (PFNGLDRAWTEXFOESPROC) eglGetProcAddress("glDrawTexfOES"); - -if (!glDrawTexfOES_func) { - fprintf(stderr, "Sorry, failed to resolve glDrawTexfOES function\n"); --- -1.9.2 -
[arch-commits] Commit in mesa-demos/trunk (2 files)
Date: Monday, May 19, 2014 @ 14:03:07 Author: lcarlier Revision: 213124 upgpkg: mesa-demos 8.1.0-2 fix building with mesa-10.2 (FS#40435) Added: mesa-demos/trunk/drawtex-resolve-glDrawTexfOES-extension-function.patch Modified: mesa-demos/trunk/PKGBUILD + PKGBUILD | 14 +- drawtex-resolve-glDrawTexfOES-extension-function.patch | 94 +++ 2 files changed, 105 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-05-19 02:58:52 UTC (rev 213123) +++ PKGBUILD2014-05-19 12:03:07 UTC (rev 213124) @@ -4,7 +4,7 @@ pkgname='mesa-demos' pkgver=8.1.0 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') pkgdesc="Mesa demos and tools" url="http://mesa3d.sourceforge.net"; @@ -11,10 +11,18 @@ license=('custom') depends=('libgl' 'glew') source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2"; -'LICENSE') +'LICENSE' +drawtex-resolve-glDrawTexfOES-extension-function.patch) sha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828' -'7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2') +'7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' +'963b3e45b2eccafea50fdab4f2fac17bd308f4c15522c00d4787b50ebb25423a') +prepare() { + cd "${srcdir}/mesa-demos-${pkgver}" + # merged upstream + patch -Np1 -i ../drawtex-resolve-glDrawTexfOES-extension-function.patch +} + build() { cd "${srcdir}/mesa-demos-${pkgver}" ./configure --prefix=/usr Added: drawtex-resolve-glDrawTexfOES-extension-function.patch === --- drawtex-resolve-glDrawTexfOES-extension-function.patch (rev 0) +++ drawtex-resolve-glDrawTexfOES-extension-function.patch 2014-05-19 12:03:07 UTC (rev 213124) @@ -0,0 +1,94 @@ +From 9c326a34e088971a3c11b2e5289cd1a8e4d439df Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tapani=20P=C3=A4lli?= +Date: Wed, 30 Apr 2014 14:05:11 +0300 +Subject: [PATCH] drawtex: resolve glDrawTexfOES extension function +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=78101 +Signed-off-by: Tapani Pälli +Reviewed-by: Brian Paul +Reviewed-by: Ian Romanick +--- + src/egl/opengles1/drawtex.c | 10 +- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/egl/opengles1/drawtex.c b/src/egl/opengles1/drawtex.c +index 524f931..1ba8ac7 100644 +--- a/src/egl/opengles1/drawtex.c b/src/egl/opengles1/drawtex.c +@@ -25,13 +25,14 @@ static GLfloat width = 200, height = 200; + static GLboolean animate = GL_FALSE; + static int win; + ++static PFNGLDRAWTEXFOESPROC glDrawTexfOES_func = NULL; + + static void + draw(void) + { +glClear(GL_COLOR_BUFFER_BIT); + +- glDrawTexfOES(view_posx, view_posy, 0.0, width, height); ++ glDrawTexfOES_func(view_posx, view_posy, 0.0, width, height); + } + + +@@ -128,6 +129,13 @@ init(void) + exit(1); +} + ++ glDrawTexfOES_func = eglGetProcAddress("glDrawTexfOES"); ++ ++ if (!glDrawTexfOES_func) { ++ fprintf(stderr, "Sorry, failed to resolve glDrawTexfOES function\n"); ++ exit(1); ++ } ++ +glClearColor(0.4, 0.4, 0.4, 0.0); + +make_smile_texture(); +-- +1.9.2 + +From 6ad8820c457845300806a2f9469599460ca96af9 Mon Sep 17 00:00:00 2001 +From: Stefan Dirsch +Date: Thu, 8 May 2014 11:48:44 +0200 +Subject: [PATCH] drawtex: fixed compiler warnings related to use of + eglGetProcAddress +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add proper include and cast in order to fix compiler +warnings related to the use of eglGetProcAddress. + +Reviewed-By: Tapani Pälli +--- + src/egl/opengles1/drawtex.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/egl/opengles1/drawtex.c b/src/egl/opengles1/drawtex.c +index 1ba8ac7..dc1de13 100644 +--- a/src/egl/opengles1/drawtex.c b/src/egl/opengles1/drawtex.c +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #include "eglut.h" + +@@ -129,7 +130,7 @@ init(void) + exit(1); +} + +- glDrawTexfOES_func = eglGetProcAddress("glDrawTexfOES"); ++ glDrawTexfOES_func = (PFNGLDRAWTEXFOESPROC) eglGetProcAddress("glDrawTexfOES"); + +if (!glDrawTexfOES_func) { + fprintf(stderr, "Sorry, failed to resolve glDrawTexfOES function\n"); +-- +1.9.2 +