[Midnightbsd-cvs] mports [24937] trunk/graphics: update libdrm
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Feb 9 12:34:09 EST 2019
Revision: 24937
http://svnweb.midnightbsd.org/mports/?rev=24937
Author: laffer1
Date: 2019-02-09 12:34:08 -0500 (Sat, 09 Feb 2019)
Log Message:
-----------
update libdrm
Modified Paths:
--------------
trunk/graphics/libGLw/Makefile
trunk/graphics/libdrm/Makefile
trunk/graphics/libdrm/distinfo
trunk/graphics/libdrm/files/patch-xf86drm.c
trunk/graphics/mesa-demos/Makefile
trunk/graphics/mesa-demos/distinfo
trunk/graphics/mesa-demos/files/patch-src-glsl-Makefile.am
trunk/graphics/mesa-demos/files/patch-src-glsl-Makefile.in
trunk/graphics/mesa-demos/pkg-plist
Added Paths:
-----------
trunk/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am
trunk/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in
trunk/graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c
trunk/graphics/mesa-demos/files/patch-src_egl_opengles2_es2gears.c
trunk/graphics/mesa-demos/files/patch-src_tests_texdown.c
Removed Paths:
-------------
trunk/graphics/libdrm/files/Makefile.am
trunk/graphics/libdrm/files/configure.ac
trunk/graphics/libdrm/files/patch-Makefile.in
trunk/graphics/libdrm/files/patch-config.h.in
trunk/graphics/libdrm/files/patch-configure
Modified: trunk/graphics/libGLw/Makefile
===================================================================
--- trunk/graphics/libGLw/Makefile 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/libGLw/Makefile 2019-02-09 17:34:08 UTC (rev 24937)
@@ -2,7 +2,7 @@
PORTNAME= libGLw
PORTVERSION= 8.0.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/glw/
DISTNAME= glw-${PORTVERSION}
Modified: trunk/graphics/libdrm/Makefile
===================================================================
--- trunk/graphics/libdrm/Makefile 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/libdrm/Makefile 2019-02-09 17:34:08 UTC (rev 24937)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= libdrm
-PORTVERSION= 2.4.92
+PORTVERSION= 2.4.93
PORTEPOCH= 1
CATEGORIES= graphics x11
MASTER_SITES= http://dri.freedesktop.org/libdrm/
Modified: trunk/graphics/libdrm/distinfo
===================================================================
--- trunk/graphics/libdrm/distinfo 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/libdrm/distinfo 2019-02-09 17:34:08 UTC (rev 24937)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535758662
-SHA256 (libdrm-2.4.92.tar.bz2) = e9e48fdb4de139dc4d9880aa1473158a16ff6aff63d14341367bd30a51ff39fa
-SIZE (libdrm-2.4.92.tar.bz2) = 821789
+TIMESTAMP = 1533240104
+SHA256 (libdrm-2.4.93.tar.bz2) = 6e84d1dc9548a76f20b59a85cf80a0b230cd8196084f5243469d9e65354fcd3c
+SIZE (libdrm-2.4.93.tar.bz2) = 826579
Deleted: trunk/graphics/libdrm/files/Makefile.am
===================================================================
--- trunk/graphics/libdrm/files/Makefile.am 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/libdrm/files/Makefile.am 2019-02-09 17:34:08 UTC (rev 24937)
@@ -1,14 +0,0 @@
---- Makefile.am.orig 2016-12-13 03:45:20.000000000 +0100
-+++ Makefile.am 2017-01-30 14:02:04.821902000 +0100
-@@ -115,9 +115,9 @@
- libdrm_la_LTLIBRARIES = libdrm.la
- libdrm_ladir = $(libdir)
- libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined
--libdrm_la_LIBADD = @CLOCK_LIB@ -lm
-+libdrm_la_LIBADD = @CLOCK_LIB@ -lm @LIBDEVQ_LIBS@
-
--libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm
-+libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm @LIBDEVQ_CFLAGS@
- AM_CFLAGS = \
- $(WARN_CFLAGS) \
- $(VALGRIND_CFLAGS)
Deleted: trunk/graphics/libdrm/files/configure.ac
===================================================================
--- trunk/graphics/libdrm/files/configure.ac 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/libdrm/files/configure.ac 2019-02-09 17:34:08 UTC (rev 24937)
@@ -1,39 +0,0 @@
---- configure.ac.orig 2017-01-28 02:15:16.000000000 +0100
-+++ configure.ac 2017-01-30 14:00:14.452530000 +0100
-@@ -72,6 +72,11 @@
- [Enable support for using udev instead of mknod (default: disabled)])],
- [UDEV=$enableval], [UDEV=no])
-
-+AC_ARG_ENABLE([devq],
-+ [AS_HELP_STRING([--enable-devq],
-+ [Enable support for using devq for device detection (default: disabled)])],
-+ [DEVQ=$enableval], [DEVQ=no])
-+
- AC_ARG_ENABLE(libkms,
- AS_HELP_STRING([--disable-libkms],
- [Disable KMS mm abstraction library (default: auto, enabled on supported platforms)]),
-@@ -322,6 +327,10 @@
- AC_DEFINE(UDEV, 1, [Have UDEV support])
- fi
-
-+if test "x$DEVQ" = xyes; then
-+ AC_DEFINE(DEVQ, 1, [Have DEVQ support])
-+fi
-+
- AC_CANONICAL_HOST
- if test "x$LIBKMS" = xauto ; then
- case $host_os in
-@@ -451,6 +460,13 @@
- AC_MSG_RESULT([$CAIRO])
- AM_CONDITIONAL(HAVE_CAIRO, [test "x$CAIRO" = xyes])
-
-+# For FreeBSD support
-+PKG_CHECK_MODULES([LIBDEVQ], [libdevq-1.0 >= 0.0.4], [HAVE_LIBDEVQ=yes], [HAVE_LIBDEVQ=no])
-+if test "x$HAVE_LIBDEVQ" = xyes; then
-+ AC_DEFINE(HAVE_LIBDEVQ, 1, [Have libdevq support])
-+fi
-+AM_CONDITIONAL(HAVE_LIBDEVQ, [test "x$HAVE_LIBDEVQ" = xyes])
-+
- # xsltproc for docbook manpages
- AC_ARG_ENABLE([manpages],
- AS_HELP_STRING([--enable-manpages], [enable manpages @<:@default=auto@:>@]),
Deleted: trunk/graphics/libdrm/files/patch-Makefile.in
===================================================================
--- trunk/graphics/libdrm/files/patch-Makefile.in 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/libdrm/files/patch-Makefile.in 2019-02-09 17:34:08 UTC (rev 24937)
@@ -1,13 +0,0 @@
---- Makefile.in.orig 2017-01-28 02:00:33 UTC
-+++ Makefile.in
-@@ -562,8 +562,8 @@ SUBDIRS = \
- libdrm_la_LTLIBRARIES = libdrm.la
- libdrm_ladir = $(libdir)
- libdrm_la_LDFLAGS = -version-number 2:4:0 -no-undefined
--libdrm_la_LIBADD = @CLOCK_LIB@ -lm
--libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm
-+libdrm_la_LIBADD = @CLOCK_LIB@ -lm @LIBDEVQ_LIBS@
-+libdrm_la_CPPFLAGS = -I$(top_srcdir)/include/drm @LIBDEVQ_CFLAGS@
- AM_CFLAGS = \
- $(WARN_CFLAGS) \
- $(VALGRIND_CFLAGS)
Deleted: trunk/graphics/libdrm/files/patch-config.h.in
===================================================================
--- trunk/graphics/libdrm/files/patch-config.h.in 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/libdrm/files/patch-config.h.in 2019-02-09 17:34:08 UTC (rev 24937)
@@ -1,22 +0,0 @@
---- config.h.in.orig 2017-01-28 02:00:33 UTC
-+++ config.h.in
-@@ -8,6 +8,9 @@
- /* Define to 1 if using `alloca.c'. */
- #undef C_ALLOCA
-
-+/* Have DEVQ support */
-+#undef DEVQ
-+
- /* Define to 1 if you have `alloca', as a function or macro. */
- #undef HAVE_ALLOCA
-
-@@ -51,6 +54,9 @@
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
-
-+/* Have libdevq support */
-+#undef HAVE_LIBDEVQ
-+
- /* Enable if your compiler supports the Intel __sync_* atomic primitives */
- #undef HAVE_LIBDRM_ATOMIC_PRIMITIVES
-
Deleted: trunk/graphics/libdrm/files/patch-configure
===================================================================
--- trunk/graphics/libdrm/files/patch-configure 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/libdrm/files/patch-configure 2019-02-09 17:34:08 UTC (rev 24937)
@@ -1,182 +0,0 @@
---- configure.orig 2017-01-30 19:04:05 UTC
-+++ configure
-@@ -646,6 +646,10 @@ HAVE_MANPAGES_STYLESHEET_TRUE
- MANPAGES_STYLESHEET
- BUILD_MANPAGES_FALSE
- BUILD_MANPAGES_TRUE
-+HAVE_LIBDEVQ_FALSE
-+HAVE_LIBDEVQ_TRUE
-+LIBDEVQ_LIBS
-+LIBDEVQ_CFLAGS
- HAVE_CAIRO_FALSE
- HAVE_CAIRO_TRUE
- CAIRO_LIBS
-@@ -838,6 +842,7 @@ with_gnu_ld
- with_sysroot
- enable_libtool_lock
- enable_udev
-+enable_devq
- enable_libkms
- enable_intel
- enable_radeon
-@@ -877,6 +882,8 @@ CUNIT_CFLAGS
- CUNIT_LIBS
- CAIRO_CFLAGS
- CAIRO_LIBS
-+LIBDEVQ_CFLAGS
-+LIBDEVQ_LIBS
- VALGRIND_CFLAGS
- VALGRIND_LIBS'
-
-@@ -1511,6 +1518,8 @@ Optional Features:
- --disable-libtool-lock avoid locking (might break parallel builds)
- --enable-udev Enable support for using udev instead of mknod
- (default: disabled)
-+ --enable-devq Enable support for using devq for device detection
-+ (default: disabled)
- --disable-libkms Disable KMS mm abstraction library (default: auto,
- enabled on supported platforms)
- --disable-intel Enable support for intel's KMS API (default: auto,
-@@ -1586,6 +1595,10 @@ Some influential environment variables:
- CAIRO_CFLAGS
- C compiler flags for CAIRO, overriding pkg-config
- CAIRO_LIBS linker flags for CAIRO, overriding pkg-config
-+ LIBDEVQ_CFLAGS
-+ C compiler flags for LIBDEVQ, overriding pkg-config
-+ LIBDEVQ_LIBS
-+ linker flags for LIBDEVQ, overriding pkg-config
- VALGRIND_CFLAGS
- C compiler flags for VALGRIND, overriding pkg-config
- VALGRIND_LIBS
-@@ -13217,6 +13230,14 @@ else
- fi
-
-
-+# Check whether --enable-devq was given.
-+if test "${enable_devq+set}" = set; then :
-+ enableval=$enable_devq; DEVQ=$enableval
-+else
-+ DEVQ=no
-+fi
-+
-+
- # Check whether --enable-libkms was given.
- if test "${enable_libkms+set}" = set; then :
- enableval=$enable_libkms; LIBKMS=$enableval
-@@ -13873,6 +13894,12 @@ $as_echo "#define UDEV 1" >>confdefs.h
-
- fi
-
-+if test "x$DEVQ" = xyes; then
-+
-+$as_echo "#define DEVQ 1" >>confdefs.h
-+
-+fi
-+
-
- if test "x$LIBKMS" = xauto ; then
- case $host_os in
-@@ -14331,6 +14358,92 @@ else
- fi
-
-
-+# For FreeBSD support
-+
-+pkg_failed=no
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5
-+$as_echo_n "checking for LIBDEVQ... " >&6; }
-+
-+if test -n "$LIBDEVQ_CFLAGS"; then
-+ pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0 >= 0.0.4\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= 0.0.4") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_LIBDEVQ_CFLAGS=`$PKG_CONFIG --cflags "libdevq-1.0 >= 0.0.4" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+if test -n "$LIBDEVQ_LIBS"; then
-+ pkg_cv_LIBDEVQ_LIBS="$LIBDEVQ_LIBS"
-+ elif test -n "$PKG_CONFIG"; then
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0 >= 0.0.4\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= 0.0.4") 2>&5
-+ ac_status=$?
-+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+ test $ac_status = 0; }; then
-+ pkg_cv_LIBDEVQ_LIBS=`$PKG_CONFIG --libs "libdevq-1.0 >= 0.0.4" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes
-+else
-+ pkg_failed=yes
-+fi
-+ else
-+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
-+ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdevq-1.0 >= 0.0.4" 2>&1`
-+ else
-+ LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdevq-1.0 >= 0.0.4" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$LIBDEVQ_PKG_ERRORS" >&5
-+
-+ HAVE_LIBDEVQ=no
-+elif test $pkg_failed = untried; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ HAVE_LIBDEVQ=no
-+else
-+ LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS
-+ LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ HAVE_LIBDEVQ=yes
-+fi
-+if test "x$HAVE_LIBDEVQ" = xyes; then
-+
-+$as_echo "#define HAVE_LIBDEVQ 1" >>confdefs.h
-+
-+fi
-+ if test "x$HAVE_LIBDEVQ" = xyes; then
-+ HAVE_LIBDEVQ_TRUE=
-+ HAVE_LIBDEVQ_FALSE='#'
-+else
-+ HAVE_LIBDEVQ_TRUE='#'
-+ HAVE_LIBDEVQ_FALSE=
-+fi
-+
-+
- # xsltproc for docbook manpages
- # Check whether --enable-manpages was given.
- if test "${enable_manpages+set}" = set; then :
-@@ -14737,6 +14850,10 @@ if test -z "${HAVE_CAIRO_TRUE}" && test
- as_fn_error $? "conditional \"HAVE_CAIRO\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${HAVE_LIBDEVQ_TRUE}" && test -z "${HAVE_LIBDEVQ_FALSE}"; then
-+ as_fn_error $? "conditional \"HAVE_LIBDEVQ\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${BUILD_MANPAGES_TRUE}" && test -z "${BUILD_MANPAGES_FALSE}"; then
- as_fn_error $? "conditional \"BUILD_MANPAGES\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
Modified: trunk/graphics/libdrm/files/patch-xf86drm.c
===================================================================
--- trunk/graphics/libdrm/files/patch-xf86drm.c 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/libdrm/files/patch-xf86drm.c 2019-02-09 17:34:08 UTC (rev 24937)
@@ -1,4 +1,4 @@
---- xf86drm.c.orig 2018-05-13 08:59:08 UTC
+--- xf86drm.c.orig 2018-08-02 20:12:58 UTC
+++ xf86drm.c
@@ -46,6 +46,9 @@
#include <signal.h>
@@ -219,7 +219,7 @@
+#else
sprintf(buf, dev_name, DRM_DIR_NAME, minor);
+#endif
- if ((fd = open(buf, O_RDWR, 0)) >= 0)
+ if ((fd = open(buf, O_RDWR | O_CLOEXEC, 0)) >= 0)
return fd;
return -errno;
@@ -514,51 +580,6 @@ int drmAvailable(void)
@@ -345,9 +345,9 @@
const char *name = drmGetMinorName(type);
int len;
char dev_name[64], buf[64];
-@@ -2856,13 +2885,35 @@ static char *drmGetMinorNameForFD(int fd, int type)
- }
- }
+@@ -2858,13 +2887,35 @@ static char *drmGetMinorNameForFD(int fd, int type)
+
+ closedir(sysdir);
return NULL;
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+ const char *dev_name = drmGetDeviceName(type);
@@ -384,7 +384,7 @@
if (fstat(fd, &sbuf))
return NULL;
-@@ -2872,20 +2923,6 @@ static char *drmGetMinorNameForFD(int fd, int type)
+@@ -2874,20 +2925,6 @@ static char *drmGetMinorNameForFD(int fd, int type)
if (maj != DRM_MAJOR || !S_ISCHR(sbuf.st_mode))
return NULL;
@@ -405,8 +405,8 @@
base = drmGetMinorBase(type);
if (base < 0)
return NULL;
-@@ -2982,7 +3019,7 @@ static int drmParseSubsystemType(int maj, int min)
- return DRM_BUS_HOST1X;
+@@ -2990,7 +3027,7 @@ static int drmParseSubsystemType(int maj, int min)
+ return DRM_BUS_VIRTIO;
return -EINVAL;
-#elif defined(__OpenBSD__)
@@ -414,8 +414,8 @@
return DRM_BUS_PCI;
#else
#warning "Missing implementation of drmParseSubsystemType"
-@@ -2990,7 +3027,8 @@ static int drmParseSubsystemType(int maj, int min)
- #endif
+@@ -3014,7 +3051,8 @@ get_real_pci_path(int maj, int min, char *real_path)
+ return real_path;
}
-static int drmParsePciBusInfo(int maj, int min, drmPciBusInfoPtr info)
@@ -424,7 +424,7 @@
{
#ifdef __linux__
unsigned int domain, bus, dev, func;
-@@ -3039,6 +3077,60 @@ static int drmParsePciBusInfo(int maj, int min, drmPci
+@@ -3064,6 +3102,60 @@ static int drmParsePciBusInfo(int maj, int min, drmPci
info->func = pinfo.func;
return 0;
@@ -485,7 +485,7 @@
#else
#warning "Missing implementation of drmParsePciBusInfo"
return -EINVAL;
-@@ -3073,32 +3165,6 @@ int drmDevicesEqual(drmDevicePtr a, drmDevicePtr b)
+@@ -3098,32 +3190,6 @@ int drmDevicesEqual(drmDevicePtr a, drmDevicePtr b)
return 0;
}
@@ -518,7 +518,7 @@
#ifdef __linux__
static int parse_separate_sysfs_files(int maj, int min,
drmPciDeviceInfoPtr device,
-@@ -3168,6 +3234,7 @@ static int parse_config_sysfs_file(int maj, int min,
+@@ -3198,6 +3264,7 @@ static int parse_config_sysfs_file(int maj, int min,
#endif
static int drmParsePciDeviceInfo(int maj, int min,
@@ -526,7 +526,7 @@
drmPciDeviceInfoPtr device,
uint32_t flags)
{
-@@ -3204,6 +3271,43 @@ static int drmParsePciDeviceInfo(int maj, int min,
+@@ -3234,6 +3301,43 @@ static int drmParsePciDeviceInfo(int maj, int min,
device->subdevice_id = pinfo.subdevice_id;
return 0;
@@ -570,7 +570,7 @@
#else
#warning "Missing implementation of drmParsePciDeviceInfo"
return -EINVAL;
-@@ -3284,7 +3388,7 @@ static drmDevicePtr drmDeviceAlloc(unsigned int type,
+@@ -3314,7 +3418,7 @@ static drmDevicePtr drmDeviceAlloc(unsigned int type,
unsigned int i;
char *ptr;
@@ -579,7 +579,7 @@
extra = DRM_NODE_MAX * (sizeof(void *) + max_node_length);
size = sizeof(*device) + extra + bus_size + device_size;
-@@ -3330,7 +3434,7 @@ static int drmProcessPciDevice(drmDevicePtr *device,
+@@ -3360,7 +3464,7 @@ static int drmProcessPciDevice(drmDevicePtr *device,
dev->businfo.pci = (drmPciBusInfoPtr)addr;
@@ -588,7 +588,7 @@
if (ret)
goto free_device;
-@@ -3339,7 +3443,7 @@ static int drmProcessPciDevice(drmDevicePtr *device,
+@@ -3369,7 +3473,7 @@ static int drmProcessPciDevice(drmDevicePtr *device,
addr += sizeof(drmPciBusInfo);
dev->deviceinfo.pci = (drmPciDeviceInfoPtr)addr;
@@ -597,7 +597,35 @@
if (ret)
goto free_device;
}
-@@ -3689,7 +3793,7 @@ static void drmFoldDuplicatedDevices(drmDevicePtr loca
+@@ -3709,8 +3813,8 @@ process_device(drmDevicePtr *device, const char *d_nam
+ int req_subsystem_type,
+ bool fetch_deviceinfo, uint32_t flags)
+ {
+- struct stat sbuf;
+- char node[PATH_MAX + 1];
++ stat_t sbuf;
++ char node[DRM_NODE_NAME_MAX];
+ int node_type, subsystem_type;
+ unsigned int maj, min;
+
+@@ -3718,14 +3822,14 @@ process_device(drmDevicePtr *device, const char *d_nam
+ if (node_type < 0)
+ return -1;
+
+- snprintf(node, PATH_MAX, "%s/%s", DRM_DIR_NAME, d_name);
++ snprintf(node, sizeof(node), "%s/%s", DRM_DIR_NAME, d_name);
+ if (stat(node, &sbuf))
+ return -1;
+
+ maj = major(sbuf.st_rdev);
+ min = minor(sbuf.st_rdev);
+
+- if (maj != DRM_MAJOR || !S_ISCHR(sbuf.st_mode))
++ if (DRM_MAJOR && maj != DRM_MAJOR || !S_ISCHR(sbuf.st_mode))
+ return -1;
+
+ subsystem_type = drmParseSubsystemType(maj, min);
+@@ -3766,7 +3870,7 @@ static void drmFoldDuplicatedDevices(drmDevicePtr loca
local_devices[i]->available_nodes |= local_devices[j]->available_nodes;
node_type = log2(local_devices[j]->available_nodes);
memcpy(local_devices[i]->nodes[node_type],
@@ -606,7 +634,7 @@
drmFreeDevice(&local_devices[j]);
}
}
-@@ -3707,7 +3811,7 @@ drm_device_validate_flags(uint32_t flags)
+@@ -3806,7 +3910,7 @@ drm_device_has_rdev(drmDevicePtr device, dev_t find_rd
* Get information about the opened drm device
*
* \param fd file descriptor of the drm device
@@ -615,7 +643,7 @@
* \param device the address of a drmDevicePtr where the information
* will be allocated in stored
*
-@@ -3725,8 +3829,8 @@ int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr
+@@ -3824,8 +3928,8 @@ int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr
* Avoid stat'ing all of /dev needlessly by implementing this custom path.
*/
drmDevicePtr d;
@@ -626,7 +654,7 @@
const char *dev_name;
int node_type, subsystem_type;
int maj, min, n, ret, base;
-@@ -3747,26 +3851,16 @@ int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr
+@@ -3846,26 +3950,16 @@ int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr
if (node_type == -1)
return -ENODEV;
@@ -657,18 +685,7 @@
return -errno;
if (stat(node, &sbuf))
return -EINVAL;
-@@ -3787,8 +3881,8 @@ int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr
- drmDevicePtr d;
- DIR *sysdir;
- struct dirent *dent;
-- struct stat sbuf;
-- char node[PATH_MAX + 1];
-+ stat_t sbuf;
-+ char node[DRM_NODE_NAME_MAX];
- int node_type, subsystem_type;
- int maj, min;
- int ret, i, node_count;
-@@ -3808,7 +3902,7 @@ int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr
+@@ -3905,7 +3999,7 @@ int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr
maj = major(sbuf.st_rdev);
min = minor(sbuf.st_rdev);
@@ -677,24 +694,7 @@
return -EINVAL;
subsystem_type = drmParseSubsystemType(maj, min);
-@@ -3829,14 +3923,14 @@ int drmGetDevice2(int fd, uint32_t flags, drmDevicePtr
- if (node_type < 0)
- continue;
-
-- snprintf(node, PATH_MAX, "%s/%s", DRM_DIR_NAME, dent->d_name);
-+ snprintf(node, sizeof(node), "%s/%s", DRM_DIR_NAME, dent->d_name);
- if (stat(node, &sbuf))
- continue;
-
- maj = major(sbuf.st_rdev);
- min = minor(sbuf.st_rdev);
-
-- if (maj != DRM_MAJOR || !S_ISCHR(sbuf.st_mode))
-+ if ((DRM_MAJOR && maj != DRM_MAJOR) || !S_ISCHR(sbuf.st_mode))
- continue;
-
- if (drmParseSubsystemType(maj, min) != subsystem_type)
-@@ -3934,7 +4028,7 @@ int drmGetDevice(int fd, drmDevicePtr *device)
+@@ -3971,7 +4065,7 @@ int drmGetDevice(int fd, drmDevicePtr *device)
/**
* Get drm devices on the system
*
@@ -703,35 +703,7 @@
* \param devices the array of devices with drmDevicePtr elements
* can be NULL to get the device number first
* \param max_devices the maximum number of devices for the array
-@@ -3953,8 +4047,8 @@ int drmGetDevices2(uint32_t flags, drmDevicePtr device
- drmDevicePtr device;
- DIR *sysdir;
- struct dirent *dent;
-- struct stat sbuf;
-- char node[PATH_MAX + 1];
-+ stat_t sbuf;
-+ char node[DRM_NODE_NAME_MAX];
- int node_type, subsystem_type;
- int maj, min;
- int ret, i, node_count, device_count;
-@@ -3979,14 +4073,14 @@ int drmGetDevices2(uint32_t flags, drmDevicePtr device
- if (node_type < 0)
- continue;
-
-- snprintf(node, PATH_MAX, "%s/%s", DRM_DIR_NAME, dent->d_name);
-+ snprintf(node, sizeof(node), "%s/%s", DRM_DIR_NAME, dent->d_name);
- if (stat(node, &sbuf))
- continue;
-
- maj = major(sbuf.st_rdev);
- min = minor(sbuf.st_rdev);
-
-- if (maj != DRM_MAJOR || !S_ISCHR(sbuf.st_mode))
-+ if ((DRM_MAJOR && maj != DRM_MAJOR) || !S_ISCHR(sbuf.st_mode))
- continue;
-
- subsystem_type = drmParseSubsystemType(maj, min);
-@@ -4094,7 +4188,7 @@ int drmGetDevices(drmDevicePtr devices[], int max_devi
+@@ -4055,7 +4149,7 @@ int drmGetDevices(drmDevicePtr devices[], int max_devi
char *drmGetDeviceNameFromFd2(int fd)
{
#ifdef __linux__
@@ -740,7 +712,7 @@
char path[PATH_MAX + 1], *value;
unsigned int maj, min;
-@@ -4117,9 +4211,26 @@ char *drmGetDeviceNameFromFd2(int fd)
+@@ -4078,9 +4172,26 @@ char *drmGetDeviceNameFromFd2(int fd)
free(value);
return strdup(path);
@@ -769,7 +741,7 @@
const char *dev_name;
int node_type;
int maj, min, n, base;
-@@ -4137,26 +4248,16 @@ char *drmGetDeviceNameFromFd2(int fd)
+@@ -4098,26 +4209,16 @@ char *drmGetDeviceNameFromFd2(int fd)
if (node_type == -1)
return NULL;
Modified: trunk/graphics/mesa-demos/Makefile
===================================================================
--- trunk/graphics/mesa-demos/Makefile 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/mesa-demos/Makefile 2019-02-09 17:34:08 UTC (rev 24937)
@@ -1,24 +1,23 @@
# $MidnightBSD$
PORTNAME= mesa-demos
-PORTVERSION= 8.2.0
+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= ports at MidnightBSD.org
COMMENT= OpenGL demos distributed with Mesa
-LICENSE= agg
+LICENSE= mit
+
+LIB_DEPENDS= libdrm.so:graphics/libdrm
+
GNU_CONFIGURE= yes
-USES= gmake pkgconfig tar:bzip2
-USE_GL= glew glu glut
-USE_XORG= dri2proto glproto x11 xdamage xext xfixes xi xxf86vm
+USES= gmake localbase pkgconfig tar:bzip2
+USE_GL= egl gbm gl glesv2 glew glu glut
+USE_XORG= xorgproto x11 xdamage xext xfixes xi xxf86vm
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-CONFIGURE_ARGS+=--disable-egl --disable-gbm --disable-gles2 \
- --disable-osmesa --disable-vg --disable-wayland \
+CONFIGURE_ARGS+=--disable-osmesa --disable-vg --disable-wayland \
--with-system-data-files
.include <bsd.port.mk>
Modified: trunk/graphics/mesa-demos/distinfo
===================================================================
--- trunk/graphics/mesa-demos/distinfo 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/mesa-demos/distinfo 2019-02-09 17:34:08 UTC (rev 24937)
@@ -1,2 +1,3 @@
-SHA256 (mesa-demos-8.2.0.tar.bz2) = e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92
-SIZE (mesa-demos-8.2.0.tar.bz2) = 10071635
+TIMESTAMP = 1519375835
+SHA256 (mesa-demos-8.4.0.tar.bz2) = 01e99c94a0184e63e796728af89bfac559795fb2a0d6f506fa900455ca5fff7d
+SIZE (mesa-demos-8.4.0.tar.bz2) = 10073259
Modified: trunk/graphics/mesa-demos/files/patch-src-glsl-Makefile.am
===================================================================
--- trunk/graphics/mesa-demos/files/patch-src-glsl-Makefile.am 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/mesa-demos/files/patch-src-glsl-Makefile.am 2019-02-09 17:34:08 UTC (rev 24937)
@@ -1,6 +1,8 @@
---- 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 @@
+# 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 \
@@ -9,7 +11,7 @@
brick \
bump \
blinking-teapot \
-@@ -76,7 +76,7 @@
+@@ -83,7 +83,7 @@ samplers_array_SOURCES = samplers.c
samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY
array_LDADD = ../util/libutil.la
Modified: trunk/graphics/mesa-demos/files/patch-src-glsl-Makefile.in
===================================================================
--- trunk/graphics/mesa-demos/files/patch-src-glsl-Makefile.in 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/mesa-demos/files/patch-src-glsl-Makefile.in 2019-02-09 17:34:08 UTC (rev 24937)
@@ -1,6 +1,8 @@
---- src/glsl/Makefile.in.orig 2014-07-05 05:13:28.000000000 -0400
-+++ src/glsl/Makefile.in 2015-04-17 16:41:57.556848000 -0400
-@@ -103,7 +103,7 @@
+# Prevent conflict with x11/bitmap
+#
+--- src/glsl/Makefile.in.orig 2015-12-09 21:24:01 UTC
++++ src/glsl/Makefile.in
+@@ -113,7 +113,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@HAVE_GLUT_TRUE at bin_PROGRAMS = array$(EXEEXT) bezier$(EXEEXT) \
@@ -9,7 +11,7 @@
@HAVE_GLUT_TRUE@ blinking-teapot$(EXEEXT) convolutions$(EXEEXT) \
@HAVE_GLUT_TRUE@ deriv$(EXEEXT) fragcoord$(EXEEXT) \
@HAVE_GLUT_TRUE@ fsraytrace$(EXEEXT) \
-@@ -149,9 +149,9 @@
+@@ -158,9 +158,9 @@ am__v_lt_1 =
bezier_SOURCES = bezier.c
bezier_OBJECTS = bezier.$(OBJEXT)
bezier_DEPENDENCIES = ../util/libutil.la
@@ -22,7 +24,7 @@
blinking_teapot_SOURCES = blinking-teapot.c
blinking_teapot_OBJECTS = blinking-teapot.$(OBJEXT)
blinking_teapot_DEPENDENCIES = ../util/libutil.la
-@@ -535,7 +535,7 @@
+@@ -546,7 +546,7 @@ gsraytrace_SOURCES = gsraytrace.cpp
samplers_array_SOURCES = samplers.c
samplers_array_CFLAGS = $(AM_CFLAGS) -DSAMPLERS_ARRAY
array_LDADD = ../util/libutil.la
@@ -31,7 +33,7 @@
bezier_LDADD = ../util/libutil.la
brick_LDADD = ../util/libutil.la
bump_LDADD = ../util/libutil.la
-@@ -684,9 +684,9 @@
+@@ -694,9 +694,9 @@ bezier$(EXEEXT): $(bezier_OBJECTS) $(bez
@rm -f bezier$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(bezier_OBJECTS) $(bezier_LDADD) $(LIBS)
Added: trunk/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am
===================================================================
--- trunk/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am (rev 0)
+++ trunk/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am 2019-02-09 17:34:08 UTC (rev 24937)
@@ -0,0 +1,14 @@
+# 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) \
Property changes on: trunk/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.am
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in
===================================================================
--- trunk/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in (rev 0)
+++ trunk/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in 2019-02-09 17:34:08 UTC (rev 24937)
@@ -0,0 +1,85 @@
+# 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@
+- 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) \
++ at 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 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)
+ @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_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
Property changes on: trunk/graphics/mesa-demos/files/patch-src_egl_opengl_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c
===================================================================
--- trunk/graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c (rev 0)
+++ trunk/graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c 2019-02-09 17:34:08 UTC (rev 24937)
@@ -0,0 +1,16 @@
+# 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;
+ }
+
Property changes on: trunk/graphics/mesa-demos/files/patch-src_egl_opengl_eglkms.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-demos/files/patch-src_egl_opengles2_es2gears.c
===================================================================
--- trunk/graphics/mesa-demos/files/patch-src_egl_opengles2_es2gears.c (rev 0)
+++ trunk/graphics/mesa-demos/files/patch-src_egl_opengles2_es2gears.c 2019-02-09 17:34:08 UTC (rev 24937)
@@ -0,0 +1,17 @@
+# 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]);
Property changes on: trunk/graphics/mesa-demos/files/patch-src_egl_opengles2_es2gears.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-demos/files/patch-src_tests_texdown.c
===================================================================
--- trunk/graphics/mesa-demos/files/patch-src_tests_texdown.c (rev 0)
+++ trunk/graphics/mesa-demos/files/patch-src_tests_texdown.c 2019-02-09 17:34:08 UTC (rev 24937)
@@ -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"
Property changes on: trunk/graphics/mesa-demos/files/patch-src_tests_texdown.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/mesa-demos/pkg-plist
===================================================================
--- trunk/graphics/mesa-demos/pkg-plist 2019-02-09 17:33:42 UTC (rev 24936)
+++ trunk/graphics/mesa-demos/pkg-plist 2019-02-09 17:34:08 UTC (rev 24937)
@@ -21,7 +21,6 @@
bin/convolutions
bin/copypix
bin/copytex
-bin/corender
bin/createwin
bin/cubemap
bin/cuberender
@@ -45,7 +44,14 @@
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
@@ -70,6 +76,7 @@
bin/geom-wide-lines
bin/glinfo
bin/gloss
+bin/glsl-compile-time
bin/glslstateschange
bin/glsync
bin/gltestperf
@@ -127,6 +134,7 @@
bin/paltex
bin/pbdemo
bin/pbinfo
+bin/peglgears
bin/pgon-mode
bin/pixeltest
bin/point
@@ -245,6 +253,7 @@
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
@@ -303,6 +312,8 @@
bin/vsraytrace
bin/wincopy
bin/winpos
+bin/xeglgears
+bin/xeglthreads
bin/xfont
bin/xrotfontdemo
%%DATADIR%%/arch.rgb
More information about the Midnightbsd-cvs
mailing list