Attachment 150715 Details for Bug 196092 – Patch update for graphics/mesa-demos to v8.2.0

Patch update for graphics/mesa-demos to v8.2.0

update_mesa-demos-8.2.0.txt (text/plain), 5.38 KB, created by hardy.schumacher on 2014-12-18 12:08:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: hardy.schumacher

Created: 2014-12-18 12:08:01 UTC

Size: 5.38 KB

patch

obsolete

>diff -ruN /usr/ports/graphics/mesa-demos/Makefile ./mesa-demos/Makefile
>--- /usr/ports/graphics/mesa-demos/Makefile	2014-09-17 20:08:18.000000000 +0200
>+++ ./mesa-demos/Makefile	2014-12-18 12:59:15.000000000 +0100
>@@ -2,11 +2,9 @@
> # $FreeBSD: head/graphics/mesa-demos/Makefile 367888 2014-09-10 20:50:31Z gerald $
> 
> PORTNAME=	mesa-demos
>-PORTVERSION=	8.1.0
>-PORTREVISION=	2
>+PORTVERSION=	8.2.0
> CATEGORIES=	graphics
> MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/demos/${PORTVERSION}/
>-DISTFILES=	mesa-demos-${PORTVERSION}${EXTRACT_SUFX}
> 
> MAINTAINER=	x11@FreeBSD.org
> COMMENT=	OpenGL demos distributed with Mesa
>diff -ruN /usr/ports/graphics/mesa-demos/distinfo ./mesa-demos/distinfo
>--- /usr/ports/graphics/mesa-demos/distinfo	2014-02-01 17:58:53.000000000 +0100
>+++ ./mesa-demos/distinfo	2014-12-18 12:16:09.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (mesa-demos-8.1.0.tar.bz2) = 9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828
>-SIZE (mesa-demos-8.1.0.tar.bz2) = 10045237
>+SHA256 (mesa-demos-8.2.0.tar.bz2) = e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92
>+SIZE (mesa-demos-8.2.0.tar.bz2) = 10071635
>diff -ruN /usr/ports/graphics/mesa-demos/files/patch-src-glsl-Makefile.am ./mesa-demos/files/patch-src-glsl-Makefile.am
>--- /usr/ports/graphics/mesa-demos/files/patch-src-glsl-Makefile.am	2013-03-16 18:48:24.000000000 +0100
>+++ ./mesa-demos/files/patch-src-glsl-Makefile.am	2014-12-18 12:34:42.000000000 +0100
>@@ -1,6 +1,6 @@
>---- src/glsl/Makefile.am.orig	2012-12-15 08:17:06.000000000 +0100
>-+++ src/glsl/Makefile.am	2013-03-08 14:03:15.236159234 +0100
>-@@ -34,7 +34,7 @@
>+--- src/glsl/Makefile.am.orig	2014-12-18 12:24:07.000000000 +0100
>++++ src/glsl/Makefile.am	2014-12-18 12:25:33.000000000 +0100
>+@@ -38,7 +38,7 @@
>  bin_PROGRAMS = \
>  	array \
>          bezier \
>@@ -9,7 +9,7 @@
>  	brick \
>  	bump \
>  	blinking-teapot \
>-@@ -76,7 +76,7 @@
>+@@ -83,7 +83,7 @@
>  samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY
>  
>  array_LDADD = ../util/libutil.la
>diff -ruN /usr/ports/graphics/mesa-demos/files/patch-src-glsl-Makefile.in ./mesa-demos/files/patch-src-glsl-Makefile.in
>--- /usr/ports/graphics/mesa-demos/files/patch-src-glsl-Makefile.in	2013-03-16 18:48:24.000000000 +0100
>+++ ./mesa-demos/files/patch-src-glsl-Makefile.in	2014-12-18 12:34:57.000000000 +0100
>@@ -1,6 +1,6 @@
>---- src/glsl/Makefile.in.orig	2013-02-24 12:12:04.000000000 +0100
>-+++ src/glsl/Makefile.in	2013-03-08 14:06:19.689158671 +0100
>-@@ -75,7 +75,7 @@
>+--- src/glsl/Makefile.in.orig	2014-12-18 12:24:17.000000000 +0100
>++++ src/glsl/Makefile.in	2014-12-18 12:31:23.000000000 +0100
>+@@ -103,7 +103,7 @@
>  build_triplet = @build@
>  host_triplet = @host@
>  @HAVE_GLUT_TRUE@bin_PROGRAMS = array$(EXEEXT) bezier$(EXEEXT) \
>@@ -9,7 +9,7 @@
>  @HAVE_GLUT_TRUE@	blinking-teapot$(EXEEXT) convolutions$(EXEEXT) \
>  @HAVE_GLUT_TRUE@	deriv$(EXEEXT) fragcoord$(EXEEXT) \
>  @HAVE_GLUT_TRUE@	fsraytrace$(EXEEXT) \
>-@@ -120,9 +120,9 @@
>+@@ -149,9 +149,9 @@
>  bezier_SOURCES = bezier.c
>  bezier_OBJECTS = bezier.$(OBJEXT)
>  bezier_DEPENDENCIES = ../util/libutil.la
>@@ -22,7 +22,7 @@
>  blinking_teapot_SOURCES = blinking-teapot.c
>  blinking_teapot_OBJECTS = blinking-teapot.$(OBJEXT)
>  blinking_teapot_DEPENDENCIES = ../util/libutil.la
>-@@ -460,7 +460,7 @@
>+@@ -535,7 +535,7 @@
>  samplers_array_SOURCES = samplers.c
>  samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY
>  array_LDADD = ../util/libutil.la
>@@ -31,16 +31,16 @@
>  bezier_LDADD = ../util/libutil.la
>  brick_LDADD = ../util/libutil.la
>  bump_LDADD = ../util/libutil.la
>-@@ -602,9 +602,9 @@
>- bezier$(EXEEXT): $(bezier_OBJECTS) $(bezier_DEPENDENCIES) $(EXTRA_bezier_DEPENDENCIES) 
>+@@ -684,9 +684,9 @@
>  	@rm -f bezier$(EXEEXT)
>  	$(AM_V_CCLD)$(LINK) $(bezier_OBJECTS) $(bezier_LDADD) $(LIBS)
>+ 
> -bitmap$(EXEEXT): $(bitmap_OBJECTS) $(bitmap_DEPENDENCIES) $(EXTRA_bitmap_DEPENDENCIES) 
> -	@rm -f bitmap$(EXEEXT)
> -	$(AM_V_CCLD)$(LINK) $(bitmap_OBJECTS) $(bitmap_LDADD) $(LIBS)
> +bitmap_demo$(EXEEXT): $(bitmap_demo_OBJECTS) $(bitmap_demo_DEPENDENCIES) $(EXTRA_bitmap_demo_DEPENDENCIES) 
> +	@rm -f bitmap_demo$(EXEEXT)
> +	$(AM_V_CCLD)$(LINK) $(bitmap_demo_OBJECTS) $(bitmap_demo_LDADD) $(LIBS)
>+ 
>  blinking-teapot$(EXEEXT): $(blinking_teapot_OBJECTS) $(blinking_teapot_DEPENDENCIES) $(EXTRA_blinking_teapot_DEPENDENCIES) 
>  	@rm -f blinking-teapot$(EXEEXT)
>- 	$(AM_V_CCLD)$(LINK) $(blinking_teapot_OBJECTS) $(blinking_teapot_LDADD) $(LIBS)
>diff -ruN /usr/ports/graphics/mesa-demos/files/patch-src-xdemos-glxpixmap.c ./mesa-demos/files/patch-src-xdemos-glxpixmap.c
>--- /usr/ports/graphics/mesa-demos/files/patch-src-xdemos-glxpixmap.c	2013-03-16 18:48:24.000000000 +0100
>+++ ./mesa-demos/files/patch-src-xdemos-glxpixmap.c	2014-12-18 12:37:49.000000000 +0100
>@@ -1,5 +1,5 @@
>---- src/xdemos/glxpixmap.c.orig	Fri Apr  6 22:29:09 2007
>-+++ src/xdemos/glxpixmap.c	Fri Apr  6 22:38:33 2007
>+--- src/xdemos/glxpixmap.c.orig	2014-12-18 12:35:41.000000000 +0100
>++++ src/xdemos/glxpixmap.c	2014-12-18 12:36:50.000000000 +0100
> @@ -105,7 +105,7 @@
>      *   to render correctly.  This is because Mesa allows RGB rendering
>      *   into any kind of visual, not just TrueColor or DirectColor.
>@@ -8,4 +8,4 @@
> +#if defined(GLX_MESA_pixmap_colormap) && !defined(WITH_NVIDIA_GL)
>     if (strstr(glXQueryExtensionsString(dpy, 0), "GLX_MESA_pixmap_colormap")) {
>        /* stand-alone Mesa, specify the colormap */
>-       glxpm = glXCreateGLXPixmapMESA( dpy, visinfo, pm, attr.colormap );
>+       PFNGLXCREATEGLXPIXMAPMESAPROC glXCreateGLXPixmapMESA_func =

Actions: View

Attachments on bug 196092: 150715