From 1a4a858cb660890838d7122b3094b92945b5f858 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 10 Mar 2013 06:04:58 +0100 Subject: [PATCH] mesa-demos: update to 8.1.0. --- .../mesa-demos-8.0.1-missing_headers.patch | 44 ------------------- .../mesa-demos/patches/missing_symbols.patch | 15 ------- srcpkgs/mesa-demos/template | 14 +++--- 3 files changed, 8 insertions(+), 65 deletions(-) delete mode 100644 srcpkgs/mesa-demos/patches/mesa-demos-8.0.1-missing_headers.patch delete mode 100644 srcpkgs/mesa-demos/patches/missing_symbols.patch diff --git a/srcpkgs/mesa-demos/patches/mesa-demos-8.0.1-missing_headers.patch b/srcpkgs/mesa-demos/patches/mesa-demos-8.0.1-missing_headers.patch deleted file mode 100644 index 8084056885a..00000000000 --- a/srcpkgs/mesa-demos/patches/mesa-demos-8.0.1-missing_headers.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Nru mesa-demos-8.0.1.orig//src/egl/openvg/lion-render.h mesa-demos-8.0.1/src/egl/openvg/lion-render.h ---- src/egl/openvg/lion-render.h 1970-01-01 01:00:00.000000000 +0100 -+++ src/egl/openvg/lion-render.h 2011-07-18 17:20:37.000000000 +0200 -@@ -0,0 +1,16 @@ -+#ifndef LION_RENDER_H -+#define LION_RENDER_H -+ -+#include -+ -+#define LION_SIZE 132 -+struct lion { -+ VGPath paths[LION_SIZE]; -+ VGPaint fills[LION_SIZE]; -+}; -+ -+struct lion *lion_create(void); -+void lion_render(struct lion *l); -+void lion_destroy(struct lion *l); -+ -+#endif -diff -Nru mesa-demos-8.0.1.orig//src/egl/openvg/trivial/eglcommon.h mesa-demos-8.0.1/src/egl/openvg/trivial/eglcommon.h ---- src/egl/openvg/trivial/eglcommon.h 1970-01-01 01:00:00.000000000 +0100 -+++ src/egl/openvg/trivial/eglcommon.h 2011-07-18 17:20:21.921788794 +0200 -@@ -0,0 +1,20 @@ -+#ifndef EGLCOMMON_H -+#define EGLCOMMON_H -+ -+typedef void (*init_func)(); -+typedef void (*reshape_func)(int, int); -+typedef void (*draw_func)(); -+typedef int (*key_func)(unsigned key); -+ -+ -+void set_window_size(int width, int height); -+int window_width(void); -+int window_height(void); -+ -+int run(int argc, char **argv, -+ init_func init, -+ reshape_func resh, -+ draw_func draw, -+ key_func key); -+ -+#endif diff --git a/srcpkgs/mesa-demos/patches/missing_symbols.patch b/srcpkgs/mesa-demos/patches/missing_symbols.patch deleted file mode 100644 index 50ff90a72ce..00000000000 --- a/srcpkgs/mesa-demos/patches/missing_symbols.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/egl/opengl/Makefile.in.orig 2012-02-09 16:52:51.621534418 +0100 -+++ src/egl/opengl/Makefile.in 2012-02-09 16:53:23.244536622 +0100 -@@ -111,10 +111,10 @@ peglgears_OBJECTS = peglgears.$(OBJEXT) - peglgears_LDADD = $(LDADD) - xeglgears_SOURCES = xeglgears.c - xeglgears_OBJECTS = xeglgears.$(OBJEXT) --xeglgears_LDADD = $(LDADD) -+xeglgears_LDADD = $(LDADD) -lX11 - xeglthreads_SOURCES = xeglthreads.c - xeglthreads_OBJECTS = xeglthreads.$(OBJEXT) --xeglthreads_LDADD = $(LDADD) -+xeglthreads_LDADD = $(LDADD) -lX11 -lpthread - DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles diff --git a/srcpkgs/mesa-demos/template b/srcpkgs/mesa-demos/template index 618fc45af53..aad316151b1 100644 --- a/srcpkgs/mesa-demos/template +++ b/srcpkgs/mesa-demos/template @@ -1,17 +1,19 @@ # Template build file for 'MesaLib'. pkgname=mesa-demos -version=8.0.1 -revision=3 -distfiles="ftp://ftp.freedesktop.org/pub/mesa/demos/$version/$pkgname-$version.tar.bz2" +version=8.1.0 +revision=1 build_style=gnu-configure -makedepends="pkg-config libX11-devel libXext-devel MesaLib-devel glew-devel" +makedepends="pkg-config libX11-devel libXext-devel MesaLib-devel glu-devel + glew-devel freetype-devel" short_desc="Mesa 3D demos and tools" maintainer="Juan RP " -checksum=4bc7f2b20d17e3eebfec288f2367a435cd2db71fc5ac9ece2c14827e290d77d1 +homepage="http://www.mesa3d.org" +license="MIT" +distfiles="ftp://ftp.freedesktop.org/pub/mesa/demos/$version/$pkgname-$version.tar.bz2" +checksum=9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828 long_desc=" MesaLib is a 3-D graphics library with an API which is very similar to that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax or state machine, it is being used with authorization from Silicon Graphics, Inc. However, the author makes no claim that Mesa is in any way a compatible replacement for OpenGL or associated with Silicon Graphics, Inc." -