diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile index 1bed87600e15..d962a34339b6 100644 --- a/graphics/mesa-demos/Makefile +++ b/graphics/mesa-demos/Makefile @@ -1,35 +1,33 @@ PORTNAME= mesa-demos PORTVERSION= 8.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/demos/ #${PORTVERSION}/ MAINTAINER= x11@FreeBSD.org COMMENT= OpenGL demos distributed with Mesa WWW= https://www.mesa3d.org/ LICENSE= MIT -LIB_DEPENDS= libdrm.so:graphics/libdrm - CONFLICTS_INSTALL= glx-utils USES= gmake gl localbase pkgconfig tar:bzip2 xorg GNU_CONFIGURE= yes -USE_GL= egl gbm gl glesv2 glew glu glut +USE_GL= egl gl glesv2 glew glu glut USE_XORG= xorgproto x11 xdamage xext xfixes xi xxf86vm CONFIGURE_ARGS+=--disable-gles1 --disable-osmesa --disable-vg --disable-wayland \ --with-system-data-files .include .if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 )) CFLAGS+= -Wno-error=incompatible-function-pointer-types .endif post-stage: # bitmap program conflicts with x11/bitmap ${MV} ${STAGEDIR}/${PREFIX}/bin/bitmap ${STAGEDIR}/${PREFIX}/bin/bitmap_demo .include diff --git a/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am b/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am deleted file mode 100644 index 94408f88dfed..000000000000 --- a/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -# Install the EGL demos -# ---- src/egl/opengl/Makefile.am.orig 2018-02-23 08:50:21 UTC -+++ src/egl/opengl/Makefile.am -@@ -57,8 +57,7 @@ endif - - if HAVE_EGL - bin_PROGRAMS = \ -- eglinfo --noinst_PROGRAMS = \ -+ eglinfo \ - peglgears \ - $(EGL_DRM_DEMOS) \ - $(EGL_X11_DEMOS) \ diff --git a/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in b/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in deleted file mode 100644 index 202ea5332b18..000000000000 --- a/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in +++ /dev/null @@ -1,85 +0,0 @@ -# Install the EGL demos -# ---- src/egl/opengl/Makefile.in.orig 2018-02-23 08:50:29 UTC -+++ src/egl/opengl/Makefile.in -@@ -115,9 +115,8 @@ PRE_UNINSTALL = : - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --@HAVE_EGL_TRUE@bin_PROGRAMS = eglinfo$(EXEEXT) --@HAVE_EGL_TRUE@noinst_PROGRAMS = peglgears$(EXEEXT) $(am__EXEEXT_1) \ --@HAVE_EGL_TRUE@ $(am__EXEEXT_2) $(am__EXEEXT_3) -+@HAVE_EGL_TRUE@bin_PROGRAMS = eglinfo$(EXEEXT) peglgears$(EXEEXT) \ -+@HAVE_EGL_TRUE@ $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) - subdir = src/egl/opengl - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - 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@am__EXEEXT_1 = eglkms$(EXEEXT) - @HAVE_X11_TRUE@am__EXEEXT_2 = eglgears_x11$(EXEEXT) \ - @HAVE_X11_TRUE@ egltri_x11$(EXEEXT) xeglgears$(EXEEXT) \ - @HAVE_X11_TRUE@ xeglthreads$(EXEEXT) - @HAVE_WAYLAND_TRUE@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_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; \ -- 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-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) -@@ -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-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 \ -+ 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 \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-binPROGRAMS diff --git a/graphics/mesa-demos/pkg-plist b/graphics/mesa-demos/pkg-plist index a84e898909cc..71ae5ad1813a 100644 --- a/graphics/mesa-demos/pkg-plist +++ b/graphics/mesa-demos/pkg-plist @@ -1,331 +1,325 @@ bin/arbfplight bin/arbfslight bin/arbocclude bin/arbocclude2 bin/array bin/bezier bin/bitmap_demo bin/blinking-teapot bin/bounce bin/brick bin/bump bin/clear-color bin/clear-fbo bin/clear-fbo-scissor bin/clear-fbo-tex bin/clear-random bin/clear-repeat bin/clear-scissor bin/clear-undefined bin/clearspd bin/convolutions bin/copypix bin/copytex bin/createwin bin/cubemap bin/cuberender bin/deriv bin/dinoshade bin/dissolve bin/dlist-begin-call-end bin/dlist-dangling bin/dlist-degenerate bin/dlist-edgeflag bin/dlist-edgeflag-dangling bin/dlist-flat-tri bin/dlist-mat-tri bin/dlist-recursive-call bin/dlist-tri-flat-tri bin/dlist-tri-mat-tri bin/draw2arrays bin/drawarrays bin/drawelements bin/drawelements-large bin/drawoverhead bin/drawpix bin/drawrange -bin/eglgears_x11 bin/eglinfo -bin/eglkms -bin/egltri_x11 bin/engine bin/es2_info bin/es2gears_x11 bin/es2tri bin/fbo_firecube bin/fbobind bin/fbotexture bin/fill bin/fire bin/flat-clip bin/fogcoord bin/fplight bin/fragcoord bin/fs-tri bin/fslight bin/fsraytrace bin/gamma bin/gearbox bin/gears bin/geartrain bin/genmipmap bin/geom-outlining-130 bin/geom-outlining-150 bin/geom-sprites bin/geom-stipple-lines bin/geom-wide-lines bin/glinfo bin/gloss bin/glsl-compile-time bin/glslstateschange bin/glsync bin/gltestperf bin/glthreads bin/glxcontexts bin/glxdemo bin/glxgears bin/glxgears_fbconfig bin/glxgears_pixmap bin/glxheads bin/glxinfo bin/glxpbdemo bin/glxpixmap bin/glxsnoop bin/glxswapcontrol bin/gs-tri bin/gsraytrace bin/identity bin/ipers bin/isosurf bin/line bin/line-clip bin/line-cull bin/line-flat bin/line-smooth bin/line-stipple-wide bin/line-userclip bin/line-userclip-clip bin/line-userclip-nop bin/line-userclip-nop-clip bin/line-wide bin/line-xor bin/lineloop bin/lineloop-clip bin/lineloop-elts bin/linestrip bin/linestrip-clip bin/linestrip-flat-stipple bin/linestrip-stipple bin/linestrip-stipple-wide bin/linktest bin/lodbias bin/long-fixed-func bin/mandelbrot bin/manywin bin/morph3d bin/multiarb bin/multictx bin/multinoise bin/multitex bin/noise bin/noise2 bin/offset bin/overlay bin/paltex bin/pbdemo bin/pbinfo -bin/peglgears bin/pgon-mode bin/pixeltest bin/point bin/point-clip bin/point-param bin/point-sprite bin/point-wide bin/point-wide-smooth bin/pointblast bin/pointcoord bin/points bin/poly bin/poly-flat bin/poly-flat-clip bin/poly-flat-unfilled-clip bin/poly-unfilled bin/projtex bin/quad bin/quad-clip bin/quad-clip-all-vertices bin/quad-clip-nearplane bin/quad-degenerate bin/quad-flat bin/quad-offset-factor bin/quad-offset-unfilled bin/quad-offset-units bin/quad-tex-2d bin/quad-tex-3d bin/quad-tex-alpha bin/quad-tex-pbo bin/quad-tex-sub bin/quad-unfilled bin/quad-unfilled-clip bin/quad-unfilled-stipple bin/quads bin/quadstrip bin/quadstrip-clip bin/quadstrip-cont bin/quadstrip-flat bin/ray bin/readpix bin/readpixels bin/reflect bin/renormal bin/samplers bin/samplers_array bin/shadow_sampler bin/shadowtex bin/shape bin/sharedtex bin/sharedtex_mt bin/shtest bin/simplex-noise bin/singlebuffer bin/skinning bin/spectex bin/spriteblast bin/stex3d bin/sub-tex bin/swapbuffers bin/teapot bin/terrain bin/tessdemo bin/tex-quads bin/texaaline bin/texcyl bin/texdemo1 bin/texenv bin/teximage bin/texture_from_pixmap bin/textures bin/toyball bin/tri bin/tri-2101010 bin/tri-2101010-dlist bin/tri-alpha bin/tri-alpha-tex bin/tri-array-interleaved bin/tri-blend bin/tri-blend-color bin/tri-blend-max bin/tri-blend-min bin/tri-blend-revsub bin/tri-blend-sub bin/tri-clear bin/tri-clip bin/tri-cull bin/tri-cull-both bin/tri-dlist bin/tri-edgeflag bin/tri-edgeflag-array bin/tri-edgeflag-pv bin/tri-fbo bin/tri-fbo-tex bin/tri-fbo-tex-mip bin/tri-flat bin/tri-flat-clip bin/tri-fog bin/tri-fp bin/tri-fp-const-imm bin/tri-lit bin/tri-lit-material bin/tri-logicop-none bin/tri-logicop-xor bin/tri-mask-tri bin/tri-multitex-vbo bin/tri-orig bin/tri-point-line-clipped bin/tri-query bin/tri-repeat bin/tri-rotate bin/tri-scissor-tri bin/tri-square bin/tri-stencil bin/tri-stipple bin/tri-tex bin/tri-tex-1d bin/tri-tex-3d bin/tri-tex-stipple bin/tri-tri bin/tri-unfilled bin/tri-unfilled-clip bin/tri-unfilled-edgeflag bin/tri-unfilled-fog bin/tri-unfilled-point bin/tri-unfilled-smooth bin/tri-unfilled-tri bin/tri-unfilled-tri-lit bin/tri-unfilled-userclip bin/tri-unfilled-userclip-stip bin/tri-userclip bin/tri-viewport bin/tri-z bin/tri-z-9 bin/tri-z-clip bin/tri-z-eq bin/trifan bin/trifan-flat bin/trifan-flat-clip bin/trifan-flat-unfilled-clip bin/trifan-unfilled bin/trirast bin/trispd bin/tristrip bin/tristrip-clip bin/tristrip-flat bin/tunnel bin/tunnel2 bin/twoside bin/vao_demo bin/vbo bin/vbo-drawarrays bin/vbo-drawarrays-2101010 bin/vbo-drawelements bin/vbo-drawrange bin/vbo-noninterleaved bin/vbo-tri bin/vert-or-frag-only bin/vert-tex bin/vertexrate bin/vp-array bin/vp-array-hf bin/vp-array-int bin/vp-clip bin/vp-line-clip bin/vp-tri bin/vp-tri-cb bin/vp-tri-cb-pos bin/vp-tri-cb-tex bin/vp-tri-imm bin/vp-tri-invariant bin/vp-tri-swap bin/vp-tri-tex bin/vp-unfilled bin/vsraytrace bin/wincopy bin/winpos -bin/xeglgears -bin/xeglthreads bin/xfont bin/xrotfontdemo %%DATADIR%%/arch.rgb %%DATADIR%%/bw.rgb %%DATADIR%%/geartrain.dat %%DATADIR%%/girl.rgb %%DATADIR%%/girl2.rgb %%DATADIR%%/isosurf.dat %%DATADIR%%/reflect.rgb %%DATADIR%%/s128.rgb %%DATADIR%%/terrain.dat %%DATADIR%%/tile.rgb %%DATADIR%%/tree2.rgba %%DATADIR%%/tree3.rgb %%DATADIR%%/wrs_logo.rgb