Hello community, here is the log from the commit of package Mesa-demo for openSUSE:Factory checked in at 2014-05-10 08:32:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Mesa-demo (Old) and /work/SRC/openSUSE:Factory/.Mesa-demo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Mesa-demo" Changes: -------- --- /work/SRC/openSUSE:Factory/Mesa-demo/Mesa-demo.changes 2013-06-19 14:51:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.Mesa-demo.new/Mesa-demo.changes 2014-05-10 08:32:31.000000000 +0200 @@ -1,0 +2,9 @@ +Thu May 8 08:11:00 UTC 2014 - [email protected] + +- U_drawtex-resolve-glDrawTexfOES-extension-function.patch + * drawtex: resolve glDrawTexfOES extension function; fixes build + with latest Mesa 10.2-rc1 (fdo#78101) +- u_drawtex-fixed-compiler-warnings-related-to-use-of-eg.patch + * fixes fatal compiler warnings + +------------------------------------------------------------------- New: ---- U_drawtex-resolve-glDrawTexfOES-extension-function.patch u_drawtex-fixed-compiler-warnings-related-to-use-of-eg.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Mesa-demo.spec ++++++ --- /var/tmp/diff_new_pack.XchsP8/_old 2014-05-10 08:32:32.000000000 +0200 +++ /var/tmp/diff_new_pack.XchsP8/_new 2014-05-10 08:32:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package Mesa-demo # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,8 @@ Source: mesa-demos-%{version}.tar.bz2 # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch0: u_mesa-demos_missing-libs.diff +Patch1: U_drawtex-resolve-glDrawTexfOES-extension-function.patch +Patch2: u_drawtex-fixed-compiler-warnings-related-to-use-of-eg.patch BuildRequires: autoconf >= 2.59 BuildRequires: automake BuildRequires: freeglut-devel @@ -79,6 +81,8 @@ %prep %setup -qn mesa-demos-%{version} -b0 %patch0 -p0 +%patch1 -p1 +%patch2 -p1 %build autoreconf -fi ++++++ U_drawtex-resolve-glDrawTexfOES-extension-function.patch ++++++ >From 9c326a34e088971a3c11b2e5289cd1a8e4d439df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <[email protected]> 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 <[email protected]> Reviewed-by: Brian Paul <[email protected]> Reviewed-by: Ian Romanick <[email protected]> --- 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.8.4.5 ++++++ u_drawtex-fixed-compiler-warnings-related-to-use-of-eg.patch ++++++ >From b303015d99633845cf5b4eff2d1c2980e5d24fd8 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch <[email protected]> Date: Thu, 8 May 2014 11:48:44 +0200 Subject: [PATCH] drawtex: fixed compiler warnings related to use of eglGetProcAddress Add proper <EGL/egl.h> include and cast in order to fix compiler warnings related to the use of eglGetProcAddress. --- 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 <string.h> #include <GLES/gl.h> #include <GLES/glext.h> +#include <EGL/egl.h> #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.8.4.5 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
