Date: Tue, 16 Jun 2020 15:38:29 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r539358 - in head: graphics/libosmesa graphics/libxatracker graphics/mesa-dri graphics/mesa-dri/files graphics/mesa-libs lang/clover Message-ID: <202006161538.05GFcUWI072384@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Tue Jun 16 15:38:29 2020 New Revision: 539358 URL: https://svnweb.freebsd.org/changeset/ports/539358 Log: graphics/mesa: Fix minor issues from meson switch Fix a couple of minor issues with mesa related ports after the switch to meson. Define _GNU_SOURCE when building on FreeBSD. This fixes blur effects in Plasma 5 and issues with the SDDM greeter. This fix was originally applied in r516100 but got lost in the switch to meson. [1] Properly detect sys/sysctl.h on FreeBSD. On FreeBSD sys/sysctl.h needs sys/types.h as well, patch the meson build script to take this into account. Fix a broken sed command to properly set ${LOCALBASE}/etc and ${LOCALBASE}/share/ as appropriate. Bump portrevision of all mesa related ports. PR: 247138 [1] Reported by: Roman [1] Reviewed by: manu Tested by: Roman, Serge Volkov Differential Revision: https://reviews.freebsd.org/D25265 Modified: head/graphics/libosmesa/Makefile head/graphics/libxatracker/Makefile head/graphics/mesa-dri/Makefile head/graphics/mesa-dri/Makefile.targets head/graphics/mesa-dri/files/patch-meson.build head/graphics/mesa-libs/Makefile head/lang/clover/Makefile Modified: head/graphics/libosmesa/Makefile ============================================================================== --- head/graphics/libosmesa/Makefile Tue Jun 16 15:37:32 2020 (r539357) +++ head/graphics/libosmesa/Makefile Tue Jun 16 15:38:29 2020 (r539358) @@ -3,6 +3,7 @@ PORTNAME= libosmesa PORTVERSION= ${MESAVERSION} +PORTREVISION= 1 CATEGORIES= graphics COMMENT= Off-Screen Mesa implementation of the OpenGL API Modified: head/graphics/libxatracker/Makefile ============================================================================== --- head/graphics/libxatracker/Makefile Tue Jun 16 15:37:32 2020 (r539357) +++ head/graphics/libxatracker/Makefile Tue Jun 16 15:38:29 2020 (r539358) @@ -3,7 +3,7 @@ PORTNAME= libxatracker PORTVERSION= ${MESAVERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics COMMENT= Mesa XA state tracker Modified: head/graphics/mesa-dri/Makefile ============================================================================== --- head/graphics/mesa-dri/Makefile Tue Jun 16 15:37:32 2020 (r539357) +++ head/graphics/mesa-dri/Makefile Tue Jun 16 15:38:29 2020 (r539358) @@ -3,7 +3,7 @@ PORTNAME= mesa-dri PORTVERSION= ${MESAVERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for DRI2+ Modified: head/graphics/mesa-dri/Makefile.targets ============================================================================== --- head/graphics/mesa-dri/Makefile.targets Tue Jun 16 15:37:32 2020 (r539357) +++ head/graphics/mesa-dri/Makefile.targets Tue Jun 16 15:38:29 2020 (r539358) @@ -8,5 +8,6 @@ pre-configure: 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 Modified: head/graphics/mesa-dri/files/patch-meson.build ============================================================================== --- head/graphics/mesa-dri/files/patch-meson.build Tue Jun 16 15:37:32 2020 (r539357) +++ head/graphics/mesa-dri/files/patch-meson.build Tue Jun 16 15:38:29 2020 (r539358) @@ -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 Modified: head/graphics/mesa-libs/Makefile ============================================================================== --- head/graphics/mesa-libs/Makefile Tue Jun 16 15:37:32 2020 (r539357) +++ head/graphics/mesa-libs/Makefile Tue Jun 16 15:38:29 2020 (r539358) @@ -3,7 +3,7 @@ PORTNAME= mesa-libs PORTVERSION= ${MESAVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics COMMENT= OpenGL libraries that support GLX and EGL clients Modified: head/lang/clover/Makefile ============================================================================== --- head/lang/clover/Makefile Tue Jun 16 15:37:32 2020 (r539357) +++ head/lang/clover/Makefile Tue Jun 16 15:38:29 2020 (r539358) @@ -2,6 +2,7 @@ PORTNAME= clover PORTVERSION= ${MESAVERSION} +PORTREVISION= 1 CATEGORIES= lang COMMENT= Mesa OpenCL implementation for AMD GPUs
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006161538.05GFcUWI072384>