Page MenuHomeFreeBSD
Files F142450488

D25265.diff
No OneTemporary
Actions

D25265.diff
View Options

Index: head/graphics/libosmesa/Makefile
===================================================================
--- head/graphics/libosmesa/Makefile
+++ head/graphics/libosmesa/Makefile
@@ -3,6 +3,7 @@
PORTNAME= libosmesa
PORTVERSION= ${MESAVERSION}
+PORTREVISION= 1
CATEGORIES= graphics
COMMENT= Off-Screen Mesa implementation of the OpenGL API
Index: head/graphics/libxatracker/Makefile
===================================================================
--- head/graphics/libxatracker/Makefile
+++ head/graphics/libxatracker/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxatracker
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
COMMENT= Mesa XA state tracker
Index: head/graphics/mesa-dri/Makefile
===================================================================
--- head/graphics/mesa-dri/Makefile
+++ head/graphics/mesa-dri/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mesa-dri
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics
COMMENT= OpenGL hardware acceleration drivers for DRI2+
Index: head/graphics/mesa-dri/Makefile.targets
===================================================================
--- head/graphics/mesa-dri/Makefile.targets
+++ head/graphics/mesa-dri/Makefile.targets
@@ -8,5 +8,6 @@
post-patch:
- @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
+ ${REINPLACE_CMD} -e '/SYSCONFDIR/ s|/etc|${PREFIX}/etc|g' \
+ -e '/DATADIR/ s|/usr/share|${PREFIX}/share|g' \
${WRKSRC}/src/util/xmlconfig.c
Index: head/graphics/mesa-dri/files/patch-meson.build
===================================================================
--- head/graphics/mesa-dri/files/patch-meson.build
+++ head/graphics/mesa-dri/files/patch-meson.build
@@ -3,7 +3,11 @@
on some platform, but for now simply comment it here.
See https://github.com/dumbbell/test-tls-initial-exec for more info
- Add dependency on libxv for xvmc, this is fixed in later mesa version.
---- meson.build.orig 2020-06-05 18:23:59 UTC
+- Define _GNU_SOURCE on FreeBSD, adapted from
+ https://gitlab.freedesktop.org/mesa/mesa/commit/b4f508ab5990
+- sys/sysctl.h needs sys/types.h to be properly detected, adapted from
+ https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5462/diffs
+--- meson.build.orig 2020-06-14 07:52:34 UTC
+++ meson.build
@@ -25,7 +25,7 @@ project(
[find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py']
@@ -33,3 +37,28 @@
endif
xvmc_drivers_path = get_option('xvmc-libs-path')
+@@ -792,7 +793,7 @@ if cc.compiles('int foo(void) __attribute__((__noretur
+ endif
+
+ # TODO: this is very incomplete
+-if ['linux', 'cygwin', 'gnu'].contains(host_machine.system())
++if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd'].contains(host_machine.system())
+ pre_args += '-D_GNU_SOURCE'
+ endif
+
+@@ -977,7 +978,14 @@ elif cc.has_header_symbol('sys/mkdev.h', 'major')
+ pre_args += '-DMAJOR_IN_MKDEV'
+ endif
+
+-foreach h : ['xlocale.h', 'sys/sysctl.h', 'linux/futex.h', 'endian.h', 'dlfcn.h']
++if not ['linux'].contains(host_machine.system())
++ # Deprecated on Linux and requires <sys/types.h> on FreeBSD and OpenBSD
++ if cc.check_header('sys/sysctl.h', prefix : '#include <sys/types.h>')
++ pre_args += '-DHAVE_SYS_SYSCTL_H'
++ endif
++endif
++
++foreach h : ['xlocale.h', 'linux/futex.h', 'endian.h', 'dlfcn.h']
+ if cc.compiles('#include <@0@>'.format(h), name : '@0@'.format(h))
+ pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
+ endif
Index: head/graphics/mesa-libs/Makefile
===================================================================
--- head/graphics/mesa-libs/Makefile
+++ head/graphics/mesa-libs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mesa-libs
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
COMMENT= OpenGL libraries that support GLX and EGL clients
Index: head/lang/clover/Makefile
===================================================================
--- head/lang/clover/Makefile
+++ head/lang/clover/Makefile
@@ -2,6 +2,7 @@
PORTNAME= clover
PORTVERSION= ${MESAVERSION}
+PORTREVISION= 1
CATEGORIES= lang
COMMENT= Mesa OpenCL implementation for AMD GPUs

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 21, 2:23 AM (4 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27786828
Default Alt Text
D25265.diff (4 KB)

Event Timeline