svn commit: r462715 - in head/graphics/mesa-demos: . files
Jan Beich
jbeich at FreeBSD.org
Fri Feb 23 19:02:44 UTC 2018
Author: jbeich
Date: Fri Feb 23 19:02:43 2018
New Revision: 462715
URL: https://svnweb.freebsd.org/changeset/ports/462715
Log:
graphics/mesa-demos: update to 8.4.0
Changes: https://lists.freedesktop.org/archives/mesa-announce/2018-February/000402.html
Added:
head/graphics/mesa-demos/files/patch-src_tests_texdown.c (contents, props changed)
Modified:
head/graphics/mesa-demos/Makefile (contents, props changed)
head/graphics/mesa-demos/distinfo (contents, props changed)
head/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am (contents, props changed)
head/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in (contents, props changed)
head/graphics/mesa-demos/pkg-plist (contents, props changed)
Modified: head/graphics/mesa-demos/Makefile
==============================================================================
--- head/graphics/mesa-demos/Makefile Fri Feb 23 18:52:41 2018 (r462714)
+++ head/graphics/mesa-demos/Makefile Fri Feb 23 19:02:43 2018 (r462715)
@@ -2,10 +2,9 @@
# $FreeBSD$
PORTNAME= mesa-demos
-PORTVERSION= 8.3.0
-PORTREVISION= 3
+PORTVERSION= 8.4.0
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/demos/${PORTVERSION}/
+MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/demos/ #${PORTVERSION}/
MAINTAINER= x11 at FreeBSD.org
COMMENT= OpenGL demos distributed with Mesa
@@ -15,12 +14,9 @@ LICENSE= MIT
LIB_DEPENDS= libdrm.so:graphics/libdrm
GNU_CONFIGURE= yes
-USES= gmake pkgconfig tar:bzip2
+USES= gmake localbase pkgconfig tar:bzip2
USE_GL= egl gbm gl glesv2 glew glu glut
USE_XORG= dri2proto glproto x11 xdamage xext xfixes xi xxf86vm
-
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS+=--disable-osmesa --disable-vg --disable-wayland \
--with-system-data-files
Modified: head/graphics/mesa-demos/distinfo
==============================================================================
--- head/graphics/mesa-demos/distinfo Fri Feb 23 18:52:41 2018 (r462714)
+++ head/graphics/mesa-demos/distinfo Fri Feb 23 19:02:43 2018 (r462715)
@@ -1,2 +1,3 @@
-SHA256 (mesa-demos-8.3.0.tar.bz2) = c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b3e0bef
-SIZE (mesa-demos-8.3.0.tar.bz2) = 10044647
+TIMESTAMP = 1519375835
+SHA256 (mesa-demos-8.4.0.tar.bz2) = 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d
+SIZE (mesa-demos-8.4.0.tar.bz2) = 10073259
Modified: head/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am
==============================================================================
--- head/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am Fri Feb 23 18:52:41 2018 (r462714)
+++ head/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am Fri Feb 23 19:02:43 2018 (r462715)
@@ -1,13 +1,14 @@
# Install the EGL demos
#
---- src/egl/opengl/Makefile.am.orig 2015-12-09 21:04:02 UTC
+--- src/egl/opengl/Makefile.am.orig 2018-02-23 08:50:21 UTC
+++ src/egl/opengl/Makefile.am
-@@ -50,7 +50,7 @@ endif
- endif
+@@ -57,8 +57,7 @@ endif
if HAVE_EGL
+ bin_PROGRAMS = \
+- eglinfo
-noinst_PROGRAMS = \
-+bin_PROGRAMS = \
- eglinfo \
++ eglinfo \
peglgears \
$(EGL_DRM_DEMOS) \
+ $(EGL_X11_DEMOS) \
Modified: head/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in
==============================================================================
--- head/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in Fri Feb 23 18:52:41 2018 (r462714)
+++ head/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in Fri Feb 23 19:02:43 2018 (r462715)
@@ -1,137 +1,79 @@
# Install the EGL demos
#
---- src/egl/opengl/Makefile.in.orig 2015-12-09 21:24:01 UTC
+--- src/egl/opengl/Makefile.in.orig 2018-02-23 08:50:29 UTC
+++ src/egl/opengl/Makefile.in
-@@ -115,7 +115,7 @@ PRE_UNINSTALL = :
+@@ -115,9 +115,8 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-- at HAVE_EGL_TRUE@noinst_PROGRAMS = eglinfo$(EXEEXT) peglgears$(EXEEXT) \
+- at HAVE_EGL_TRUE@bin_PROGRAMS = eglinfo$(EXEEXT)
+- at HAVE_EGL_TRUE@noinst_PROGRAMS = peglgears$(EXEEXT) $(am__EXEEXT_1) \
+- at HAVE_EGL_TRUE@ $(am__EXEEXT_2) $(am__EXEEXT_3)
+ at HAVE_EGL_TRUE@bin_PROGRAMS = eglinfo$(EXEEXT) peglgears$(EXEEXT) \
- @HAVE_EGL_TRUE@ $(am__EXEEXT_1) $(am__EXEEXT_2)
++ at HAVE_EGL_TRUE@ $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3)
subdir = src/egl/opengl
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -133,7 +133,8 @@ CONFIG_CLEAN_VPATH_FILES =
+ am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
+@@ -130,14 +129,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)"
+ @HAVE_DRM_TRUE@@HAVE_GBM_TRUE at am__EXEEXT_1 = eglkms$(EXEEXT)
@HAVE_X11_TRUE at am__EXEEXT_2 = eglgears_x11$(EXEEXT) \
@HAVE_X11_TRUE@ egltri_x11$(EXEEXT) xeglgears$(EXEEXT) \
@HAVE_X11_TRUE@ xeglthreads$(EXEEXT)
--PROGRAMS = $(noinst_PROGRAMS)
+ @HAVE_WAYLAND_TRUE at am__EXEEXT_3 = eglgears_wayland$(EXEEXT) \
+ @HAVE_WAYLAND_TRUE@ egltri_wayland$(EXEEXT)
+-PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
- am_eglgears_x11_OBJECTS = eglgears.$(OBJEXT)
- eglgears_x11_OBJECTS = $(am_eglgears_x11_OBJECTS)
- eglgears_x11_DEPENDENCIES = ../eglut/libeglut_x11.la
-@@ -389,7 +390,6 @@ pdfdir = @pdfdir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
- psdir = @psdir@
--runstatedir = @runstatedir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- srcdir = @srcdir@
-@@ -461,9 +461,49 @@ $(top_srcdir)/configure: $(am__configur
- $(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- $(am__aclocal_m4_deps):
-+install-binPROGRAMS: $(bin_PROGRAMS)
-+ @$(NORMAL_INSTALL)
-+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-+ if test -n "$$list"; then \
-+ echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-+ $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-+ fi; \
-+ for p in $$list; do echo "$$p $$p"; done | \
-+ sed 's/$(EXEEXT)$$//' | \
-+ while read p p1; do if test -f $$p \
-+ || test -f $$p1 \
-+ ; then echo "$$p"; echo "$$p"; else :; fi; \
-+ done | \
-+ sed -e 'p;s,.*/,,;n;h' \
-+ -e 's|.*|.|' \
-+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-+ sed 'N;N;N;s,\n, ,g' | \
-+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
-+ else { print "f", $$3 "/" $$4, $$1; } } \
-+ END { for (d in files) print "f", d, files[d] }' | \
-+ while read type dir files; do \
-+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-+ test -z "$$files" || { \
-+ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-+ $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-+ } \
-+ ; done
+ am_eglgears_wayland_OBJECTS = eglgears.$(OBJEXT)
+ eglgears_wayland_OBJECTS = $(am_eglgears_wayland_OBJECTS)
+ eglgears_wayland_DEPENDENCIES = ../eglut/libeglut_wayland.la
+@@ -532,15 +531,6 @@ clean-binPROGRAMS:
+ echo " rm -f" $$list; \
+ rm -f $$list
-clean-noinstPROGRAMS:
- @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
-+uninstall-binPROGRAMS:
-+ @$(NORMAL_UNINSTALL)
-+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-+ files=`for p in $$list; do echo "$$p"; done | \
-+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-+ -e 's/$$/$(EXEEXT)/' \
-+ `; \
-+ test -n "$$list" || exit 0; \
-+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
-+
-+clean-binPROGRAMS:
-+ @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
- echo " rm -f" $$list; \
- rm -f $$list || exit $$?; \
- test -n "$(EXEEXT)" || exit 0; \
-@@ -640,6 +680,9 @@ check-am: all-am
- check: check-am
- all-am: Makefile $(PROGRAMS)
- installdirs:
-+ for dir in "$(DESTDIR)$(bindir)"; do \
-+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+ done
- install: install-am
- install-exec: install-exec-am
- install-data: install-data-am
-@@ -672,8 +715,7 @@ maintainer-clean-generic:
+- echo " rm -f" $$list; \
+- rm -f $$list || exit $$?; \
+- test -n "$(EXEEXT)" || exit 0; \
+- list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+- echo " rm -f" $$list; \
+- rm -f $$list
+-
+ eglgears_wayland$(EXEEXT): $(eglgears_wayland_OBJECTS) $(eglgears_wayland_DEPENDENCIES) $(EXTRA_eglgears_wayland_DEPENDENCIES)
+ @rm -f eglgears_wayland$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(eglgears_wayland_OBJECTS) $(eglgears_wayland_LDADD) $(LIBS)
+@@ -753,8 +743,7 @@ maintainer-clean-generic:
@echo "it deletes files that may require special tools to rebuild."
clean: clean-am
--clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-- mostlyclean-am
+-clean-am: clean-binPROGRAMS clean-generic clean-libtool \
+- clean-noinstPROGRAMS mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
-@@ -699,7 +741,7 @@ install-dvi: install-dvi-am
-
- install-dvi-am:
-
--install-exec-am:
-+install-exec-am: install-binPROGRAMS
-
- install-html: install-html-am
-
-@@ -739,23 +781,23 @@ ps: ps-am
-
- ps-am:
-
--uninstall-am:
-+uninstall-am: uninstall-binPROGRAMS
-
+@@ -825,16 +814,15 @@ uninstall-am: uninstall-binPROGRAMS
.MAKE: install-am install-strip
--.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-- clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \
-- ctags-am distclean distclean-compile distclean-generic \
-+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
-+ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
-+ ctags ctags-am distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
-- html-am info info-am install install-am install-data \
+ .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+- clean-binPROGRAMS clean-generic clean-libtool \
+- clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-binPROGRAMS install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
++ clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
++ ctags ctags-am distclean distclean-compile distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-binPROGRAMS \
+ install-data install-data-am install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
@@ -140,8 +82,4 @@
+ installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- tags tags-am uninstall uninstall-am
-+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
-
- .PRECIOUS: Makefile
-
+ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
Added: head/graphics/mesa-demos/files/patch-src_tests_texdown.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/mesa-demos/files/patch-src_tests_texdown.c Fri Feb 23 19:02:43 2018 (r462715)
@@ -0,0 +1,14 @@
+# aligned_alloc() is in <stdlib.h>, so only _aligned_malloc() needs <malloc.h>
+#
+--- src/tests/texdown.c.orig 2018-02-23 08:50:21 UTC
++++ src/tests/texdown.c
+@@ -34,7 +34,9 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef _WIN32
+ #include <malloc.h>
++#endif
+ #include <math.h>
+ #include <GL/glew.h>
+ #include "glut_wrap.h"
Modified: head/graphics/mesa-demos/pkg-plist
==============================================================================
--- head/graphics/mesa-demos/pkg-plist Fri Feb 23 18:52:41 2018 (r462714)
+++ head/graphics/mesa-demos/pkg-plist Fri Feb 23 19:02:43 2018 (r462715)
@@ -76,6 +76,7 @@ bin/geom-stipple-lines
bin/geom-wide-lines
bin/glinfo
bin/gloss
+bin/glsl-compile-time
bin/glslstateschange
bin/glsync
bin/gltestperf
More information about the svn-ports-head
mailing list