Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -15174,3 +15174,4 @@ net/kblog||2020-08-13|No longer shipped www/html|www/html3|2020-08-13|python3-compatible version is named html3 audio/py-hsaudiotag|audio/py-hsaudiotag3k|2020-08-13|python3-compatible version is named hsaudiotag3k +graphics/mesa-demos|graphics/mesa-demos-misc|2020-08-15|Moved during split of port Index: emulators/playonbsd/Makefile =================================================================== --- emulators/playonbsd/Makefile +++ emulators/playonbsd/Makefile @@ -3,7 +3,7 @@ PORTNAME= playonbsd PORTVERSION= 4.2.10 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= emulators games MAINTAINER= se@FreeBSD.org @@ -18,7 +18,7 @@ RUN_DEPENDS= 7z:archivers/p7zip \ bash:shells/bash \ - glxinfo:graphics/mesa-demos \ + glxinfo:graphics/mesa-demos-glx \ gpg:security/gnupg \ gsed:textproc/gsed \ sudo:security/sudo \ Index: games/homura/Makefile =================================================================== --- games/homura/Makefile +++ games/homura/Makefile @@ -3,6 +3,7 @@ PORTNAME= homura PORTVERSION= 5.1 +PORTREVISION= 1 CATEGORIES= games MAINTAINER= Alexander88207@protonmail.com @@ -21,7 +22,7 @@ webfonts>=0:x11-fonts/webfonts \ winetricks:emulators/winetricks \ vulkaninfo:devel/vulkan-tools \ - glxinfo:graphics/mesa-demos + glxinfo:graphics/mesa-demos-glx USE_GITLAB= yes GL_ACCOUNT= Alexander88207 Index: graphics/Makefile =================================================================== --- graphics/Makefile +++ graphics/Makefile @@ -534,7 +534,9 @@ SUBDIR += mapyrus SUBDIR += megapov SUBDIR += meh - SUBDIR += mesa-demos + SUBDIR += mesa-demos-egl + SUBDIR += mesa-demos-glx + SUBDIR += mesa-demos-misc SUBDIR += mesa-devel SUBDIR += mesa-dri SUBDIR += mesa-libs Index: graphics/mesa-demos-egl/Makefile =================================================================== --- /dev/null +++ graphics/mesa-demos-egl/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +PORTREVISION= 0 +COMMENT= EGL Utils from Mesa + +MASTERDIR= ${.CURDIR}/../../graphics/mesa-demos-misc +_VARIANT= egl + +.include "${MASTERDIR}/Makefile" Index: graphics/mesa-demos-egl/distinfo =================================================================== --- graphics/mesa-demos-egl/distinfo +++ graphics/mesa-demos-egl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519375835 +TIMESTAMP = 1597490463 SHA256 (mesa-demos-8.4.0.tar.bz2) = 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d SIZE (mesa-demos-8.4.0.tar.bz2) = 10073259 Index: graphics/mesa-demos-glx/Makefile =================================================================== --- /dev/null +++ graphics/mesa-demos-glx/Makefile @@ -0,0 +1,9 @@ +# $FreeBSD$ + +PORTREVISION= 0 +COMMENT= GLX Utils from Mesa + +MASTERDIR= ${.CURDIR}/../../graphics/mesa-demos-misc +_VARIANT= glx + +.include "${MASTERDIR}/Makefile" Index: graphics/mesa-demos-glx/distinfo =================================================================== --- graphics/mesa-demos-glx/distinfo +++ graphics/mesa-demos-glx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1519375835 +TIMESTAMP = 1597490463 SHA256 (mesa-demos-8.4.0.tar.bz2) = 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d SIZE (mesa-demos-8.4.0.tar.bz2) = 10073259 Index: graphics/mesa-demos-misc/Makefile =================================================================== --- graphics/mesa-demos-misc/Makefile +++ graphics/mesa-demos-misc/Makefile @@ -3,7 +3,8 @@ PORTNAME= mesa-demos PORTVERSION= 8.4.0 -PORTREVISION= 2 +PORTREVISION?= 2 +PKGNAMESUFFIX= -${_VARIANT} CATEGORIES= graphics MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/demos/ #${PORTVERSION}/ @@ -21,5 +22,8 @@ CONFIGURE_ARGS+=--disable-gles1 --disable-osmesa --disable-vg --disable-wayland \ --with-system-data-files +_VARIANT?= misc +PLIST= ${MASTERDIR}/pkg-plist.${_VARIANT} +MAKE_ENV+= MESA_DEMO=${_VARIANT} .include Index: graphics/mesa-demos-misc/files/patch-src-glsl-Makefile.in =================================================================== --- graphics/mesa-demos-misc/files/patch-src-glsl-Makefile.in +++ graphics/mesa-demos-misc/files/patch-src-glsl-Makefile.in @@ -1,6 +1,6 @@ # Prevent conflict with x11/bitmap # ---- src/glsl/Makefile.in.orig 2015-12-09 21:24:01 UTC +--- src/glsl/Makefile.in.orig 2018-02-23 08:50:29 UTC +++ src/glsl/Makefile.in @@ -113,7 +113,7 @@ POST_UNINSTALL = : build_triplet = @build@ @@ -24,7 +24,7 @@ blinking_teapot_SOURCES = blinking-teapot.c blinking_teapot_OBJECTS = blinking-teapot.$(OBJEXT) blinking_teapot_DEPENDENCIES = ../util/libutil.la -@@ -546,7 +546,7 @@ gsraytrace_SOURCES = gsraytrace.cpp +@@ -547,7 +547,7 @@ gsraytrace_SOURCES = gsraytrace.cpp samplers_array_SOURCES = samplers.c samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY array_LDADD = ../util/libutil.la @@ -33,7 +33,7 @@ bezier_LDADD = ../util/libutil.la brick_LDADD = ../util/libutil.la bump_LDADD = ../util/libutil.la -@@ -694,9 +694,9 @@ bezier$(EXEEXT): $(bezier_OBJECTS) $(bez +@@ -695,9 +695,9 @@ bezier$(EXEEXT): $(bezier_OBJECTS) $(bezier_DEPENDENCI @rm -f bezier$(EXEEXT) $(AM_V_CCLD)$(LINK) $(bezier_OBJECTS) $(bezier_LDADD) $(LIBS) Index: graphics/mesa-demos-misc/files/patch-src_Makefile.in =================================================================== --- /dev/null +++ graphics/mesa-demos-misc/files/patch-src_Makefile.in @@ -0,0 +1,31 @@ +--- src/Makefile.in.orig 2018-02-23 08:50:28 UTC ++++ src/Makefile.in +@@ -363,11 +363,11 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = \ +- util \ ++SUBDIRS_common = \ ++ util ++SUBDIRS_misc = \ + data \ + demos \ +- egl \ + fp \ + fpglsl \ + glsl \ +@@ -384,8 +384,12 @@ SUBDIRS = \ + trivial \ + vp \ + vpglsl \ +- wgl \ ++ wgl ++SUBDIRS_egl = \ ++ egl ++SUBDIRS_glx = \ + xdemos ++SUBDIRS= $(SUBDIRS_common) $(SUBDIRS_$(MESA_DEMO)) + + all: all-recursive + Index: graphics/mesa-demos-misc/pkg-plist.egl =================================================================== --- /dev/null +++ graphics/mesa-demos-misc/pkg-plist.egl @@ -0,0 +1,10 @@ +bin/eglgears_x11 +bin/eglinfo +bin/eglkms +bin/egltri_x11 +bin/es2_info +bin/es2gears_x11 +bin/es2tri +bin/peglgears +bin/xeglgears +bin/xeglthreads Index: graphics/mesa-demos-misc/pkg-plist.glx =================================================================== --- /dev/null +++ graphics/mesa-demos-misc/pkg-plist.glx @@ -0,0 +1,26 @@ +bin/glsync +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/manywin +bin/multictx +bin/offset +bin/overlay +bin/pbdemo +bin/pbinfo +bin/shape +bin/sharedtex +bin/sharedtex_mt +bin/texture_from_pixmap +bin/wincopy +bin/xfont +bin/xrotfontdemo Index: graphics/mesa-demos-misc/pkg-plist.misc =================================================================== --- graphics/mesa-demos-misc/pkg-plist.misc +++ graphics/mesa-demos-misc/pkg-plist.misc @@ -44,14 +44,7 @@ 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 @@ -78,20 +71,7 @@ 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 @@ -121,20 +101,13 @@ 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 @@ -183,9 +156,6 @@ bin/samplers_array bin/shadow_sampler bin/shadowtex -bin/shape -bin/sharedtex -bin/sharedtex_mt bin/shtest bin/simplex-noise bin/singlebuffer @@ -204,7 +174,6 @@ bin/texdemo1 bin/texenv bin/teximage -bin/texture_from_pixmap bin/textures bin/toyball bin/tri @@ -310,12 +279,7 @@ 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 Index: =================================================================== --- /dev/null +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1519375835 -SHA256 (mesa-demos-8.4.0.tar.bz2) = 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d -SIZE (mesa-demos-8.4.0.tar.bz2) = 10073259 Index: graphics/mesa-demos/files/patch-src-glsl-Makefile.am =================================================================== --- /dev/null +++ graphics/mesa-demos/files/patch-src-glsl-Makefile.am @@ -1,22 +0,0 @@ -# Prevent conflict with x11/bitmap -# ---- src/glsl/Makefile.am.orig 2014-03-22 12:59:24 UTC -+++ src/glsl/Makefile.am -@@ -38,7 +38,7 @@ if HAVE_GLUT - bin_PROGRAMS = \ - array \ - bezier \ -- bitmap \ -+ bitmap-demo \ - brick \ - bump \ - blinking-teapot \ -@@ -83,7 +83,7 @@ samplers_array_SOURCES = samplers.c - samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY - - array_LDADD = ../util/libutil.la --bitmap_LDADD = ../util/libutil.la -+bitmap_demo_LDADD = ../util/libutil.la - bezier_LDADD = ../util/libutil.la - brick_LDADD = ../util/libutil.la - bump_LDADD = ../util/libutil.la Index: graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am =================================================================== --- /dev/null +++ graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am @@ -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) \ Index: graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in =================================================================== --- /dev/null +++ graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in @@ -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 Index: graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c =================================================================== --- /dev/null +++ graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c @@ -1,16 +0,0 @@ -# Fix an uninitialized variable in a particular execution path -# -# While it would be better design to initialize the error value -# at the start, it is set in every other error path so the least -# intrusive correction is to set it in the one missed path. -# ---- src/egl/opengl/eglkms.c.orig 2012-08-28 14:31:17 UTC -+++ src/egl/opengl/eglkms.c -@@ -212,6 +212,7 @@ int main(int argc, char *argv[]) - - if (!eglChooseConfig(dpy, attribs, &config, 1, &n) || n != 1) { - fprintf(stderr, "failed to choose argb config\n"); -+ ret = -1; - goto egl_terminate; - } - Index: graphics/mesa-demos/files/patch-src_egl_opengles2_es2gears.c =================================================================== --- /dev/null +++ graphics/mesa-demos/files/patch-src_egl_opengles2_es2gears.c @@ -1,17 +0,0 @@ -# Provide a fallback for missing sincos() -# ---- src/egl/opengles2/es2gears.c.orig 2012-06-25 15:34:58 UTC -+++ src/egl/opengles2/es2gears.c -@@ -168,6 +168,12 @@ create_gear(GLfloat inner_radius, GLfloa - gear->vertices = calloc(VERTICES_PER_TOOTH * teeth, sizeof(*gear->vertices)); - v = gear->vertices; - -+#ifndef sincos -+#define sincos(__x, _s, _c) do { \ -+ float _x = (__x); *(_s) = sin(_x); *(_c) = cos(_x); \ -+} while(0) -+#endif -+ - for (i = 0; i < teeth; i++) { - /* Calculate needed sin/cos for varius angles */ - sincos(i * 2.0 * M_PI / teeth, &s[0], &c[0]); Index: graphics/mesa-demos/files/patch-src_tests_texdown.c =================================================================== --- /dev/null +++ graphics/mesa-demos/files/patch-src_tests_texdown.c @@ -1,14 +0,0 @@ -# aligned_alloc() is in , so only _aligned_malloc() needs -# ---- src/tests/texdown.c.orig 2018-02-23 08:50:21 UTC -+++ src/tests/texdown.c -@@ -34,7 +34,9 @@ - - #include - #include -+#ifdef _WIN32 - #include -+#endif - #include - #include - #include "glut_wrap.h" Index: graphics/mesa-demos/pkg-descr =================================================================== --- /dev/null +++ graphics/mesa-demos/pkg-descr @@ -1,5 +0,0 @@ -Mesa demos is a collections of demos and test programs to demonstrate various -aspects of the mesa and OpenGL libraries. -It is part of the mesa software suite. - -WWW: https://www.mesa3d.org/ Index: x11-wm/compiz/Makefile =================================================================== --- x11-wm/compiz/Makefile +++ x11-wm/compiz/Makefile @@ -2,7 +2,7 @@ PORTNAME= compiz PORTVERSION= 0.8.8 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11-wm MASTER_SITES= https://BSDforge.com/projects/source/x11-wm/compiz/ @@ -20,7 +20,7 @@ libgtop-2.0.so:devel/libgtop \ libpng.so:graphics/png \ libstartup-notification-1.so:x11/startup-notification -RUN_DEPENDS= glxinfo:graphics/mesa-demos \ +RUN_DEPENDS= glxinfo:graphics/mesa-demos-glx \ ${RUN_DEPENDS_${ARCH}} RUN_DEPENDS_amd64= nvidia-settings:x11/nvidia-settings RUN_DEPENDS_i386= nvidia-settings:x11/nvidia-settings