pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/MesaLib18 MesaLib18: set correct CONFIGURE_AR...
details: https://anonhg.NetBSD.org/pkgsrc/rev/926626c2bbaf
branches: trunk
changeset: 328345:926626c2bbaf
user: tnn <tnn%pkgsrc.org@localhost>
date: Sat Jan 19 17:47:51 2019 +0000
description:
MesaLib18: set correct CONFIGURE_ARGS for dri-less build
Also fix some SunOS build issues.
diffstat:
graphics/MesaLib18/Makefile | 4 +-
graphics/MesaLib18/PLIST | 4 +-
graphics/MesaLib18/distinfo | 4 +-
graphics/MesaLib18/options.mk | 23 ++++-----
graphics/MesaLib18/patches/patch-src_amd_common_ac__debug.c | 19 ++++++++
graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c | 22 +++++++++
6 files changed, 58 insertions(+), 18 deletions(-)
diffs (174 lines):
diff -r 20363d6463de -r 926626c2bbaf graphics/MesaLib18/Makefile
--- a/graphics/MesaLib18/Makefile Sat Jan 19 15:33:56 2019 +0000
+++ b/graphics/MesaLib18/Makefile Sat Jan 19 17:47:51 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2019/01/18 14:43:59 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2019/01/19 17:47:51 tnn Exp $
DISTNAME= mesa-18.3.2
PKGNAME= ${DISTNAME:S/mesa/MesaLib/}
@@ -103,7 +103,7 @@
OWN_DIRS+= ${DRIRC_DIR}
INSTALLATION_DIRS+= ${EGDIR}
CONF_FILES+= ${EGDIR}/00-mesa-defaults.conf \
- ${DRIRC_DIR}/00-mesa-defaults.conf
+ ${DRIRC_DIR}/00-mesa-defaults.conf
post-install:
${INSTALL_DATA} ${WRKSRC}/src/util/00-mesa-defaults.conf ${DESTDIR}${EGDIR}
diff -r 20363d6463de -r 926626c2bbaf graphics/MesaLib18/PLIST
--- a/graphics/MesaLib18/PLIST Sat Jan 19 15:33:56 2019 +0000
+++ b/graphics/MesaLib18/PLIST Sat Jan 19 17:47:51 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2019/01/18 14:43:59 tnn Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/01/19 17:47:51 tnn Exp $
${PLIST.dri}include/EGL/egl.h
${PLIST.dri}include/EGL/eglext.h
${PLIST.dri}include/EGL/eglextchromium.h
@@ -25,7 +25,7 @@
${PLIST.glesv2}include/GLES3/gl32.h
${PLIST.glesv2}include/GLES3/gl3ext.h
${PLIST.glesv2}include/GLES3/gl3platform.h
-${PLIST.dri}include/KHR/khrplatform.h
+include/KHR/khrplatform.h
${PLIST.gbm}include/gbm.h
${PLIST.vulkan}include/vulkan/vulkan_intel.h
${PLIST.xatracker}include/xa_composite.h
diff -r 20363d6463de -r 926626c2bbaf graphics/MesaLib18/distinfo
--- a/graphics/MesaLib18/distinfo Sat Jan 19 15:33:56 2019 +0000
+++ b/graphics/MesaLib18/distinfo Sat Jan 19 17:47:51 2019 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2019/01/18 13:32:47 tnn Exp $
+$NetBSD: distinfo,v 1.9 2019/01/19 17:47:51 tnn Exp $
SHA1 (mesa-18.3.2.tar.xz) = 8775d7bfac7e07141ac4299888d426d5550949f7
RMD160 (mesa-18.3.2.tar.xz) = d3662f72a39d009adb21a70bd7b49c28960c0d5c
@@ -6,6 +6,7 @@
Size (mesa-18.3.2.tar.xz) = 11868440 bytes
SHA1 (patch-configure.ac) = 355b04270d2036fa879215d3f58278d5d32d22da
SHA1 (patch-include_GL_internal_dri__interface.h) = 146d2f3f3e50fc1947e8941301d9cf9d90a035e2
+SHA1 (patch-src_amd_common_ac__debug.c) = eb73957adc7ed81db99d4edbc507b05231fda218
SHA1 (patch-src_amd_vulkan_winsys_amdgpu_radv__amdgpu__cs.c) = 1fe81a7b16e36dc9125400c20543271216a33a45
SHA1 (patch-src_compiler_builtin__type__macros.h) = 857bca0c0f55ec8d7a20b3807c7a5d7bd06bdfbf
SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4
@@ -18,6 +19,7 @@
SHA1 (patch-src_gallium_auxiliary_util_u__helpers.c) = 636fb98c4cbf70a5d8a6d94c24e75d2b05968b3c
SHA1 (patch-src_gallium_drivers_nouveau_nouveau__vp3__video.c) = 04f95784c3270c9bb7e95377982e217962481525
SHA1 (patch-src_gallium_drivers_nouveau_nv50_nv84__video.c) = 1b4239fe053523835ecac006894bdb0cde0ee626
+SHA1 (patch-src_gallium_drivers_radeonsi_si__state__shaders.c) = d3d01523413506b7d02b0ec1a9b290af2a91dc32
SHA1 (patch-src_gallium_drivers_vc4_vc4__bufmgr.c) = 1d591d346486fdf58893f69ab92a272e6a31a987
SHA1 (patch-src_gallium_include_pipe_p__config.h) = f4e38eac66167b619c30076bb0144dd716310967
SHA1 (patch-src_gallium_state__trackers_clover_llvm_invocation.cpp) = 3053db09fbfffffd82e232b60b244a0a80c8f181
diff -r 20363d6463de -r 926626c2bbaf graphics/MesaLib18/options.mk
--- a/graphics/MesaLib18/options.mk Sat Jan 19 15:33:56 2019 +0000
+++ b/graphics/MesaLib18/options.mk Sat Jan 19 17:47:51 2019 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.6 2019/01/18 19:35:30 tnn Exp $
+# $NetBSD: options.mk,v 1.7 2019/01/19 17:47:51 tnn Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
PKG_SUPPORTED_OPTIONS= llvm dri
PKG_SUGGESTED_OPTIONS=
-PKG_SUPPORTED_OPTIONS+= dri3 glx-tls xvmc debug
+PKG_SUPPORTED_OPTIONS+= glx-tls xvmc debug
PKG_SUPPORTED_OPTIONS+= vdpau vaapi
PKG_SUPPORTED_OPTIONS+= osmesa
PKG_SUPPORTED_OPTIONS+= glesv1 glesv2
@@ -32,9 +32,7 @@
${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \
${OPSYS} == "SunOS" || ${OPSYS} == "NetBSD" || \
${OPSYS} == "Darwin"
-# Having DRI3 compiled in by default doesn't hurt, the X server
-# will only use it if it is supported at run time.
-PKG_SUGGESTED_OPTIONS+= dri dri3
+PKG_SUGGESTED_OPTIONS+= dri
.endif
@@ -70,13 +68,10 @@
.if !empty(PKG_OPTIONS:Mdri)
CONFIGURE_ARGS+= --enable-dri
-CONFIGURE_ARGS+= --enable-egl
-
-.if !empty(PKG_OPTIONS:Mdri3)
+# Having DRI3 and egl compiled in by default doesn't hurt, the X server
+# will only use it if it is supported at run time.
CONFIGURE_ARGS+= --enable-dri3
-.else # !dri3
-CONFIGURE_ARGS+= --disable-dri3
-.endif # dri3
+CONFIGURE_ARGS+= --enable-egl
.if ${OPSYS} != "Darwin"
CONFIGURE_ARGS+= --enable-gbm
@@ -156,8 +151,7 @@
.if !empty(PKG_OPTIONS:Mvulkan)
VULKAN_DRIVERS+= intel
VULKAN_DRIVERS+= radeon
-PLIST.intel_vulkan= yes
-PLIST.radeon_vulkan= yes
+PLIST.vulkan= yes
.endif
# ARM drivers
@@ -284,6 +278,9 @@
CONFIGURE_ARGS+= --disable-gles1
CONFIGURE_ARGS+= --disable-gles2
CONFIGURE_ARGS+= --enable-xlib-glx
+CONFIGURE_ARGS+= --with-platforms=x11
+# XXX configure looks for expat but doesn't actually need it in non-dri case
+CONFIGURE_ENV+= EXPAT_CFLAGS=" " EXPAT_LIBS=" "
.if !empty(PKG_OPTIONS:Mllvm)
PKG_FAIL_REASON+= "The llvm PKG_OPTION must also be disabled when dri is disabled"
.endif
diff -r 20363d6463de -r 926626c2bbaf graphics/MesaLib18/patches/patch-src_amd_common_ac__debug.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib18/patches/patch-src_amd_common_ac__debug.c Sat Jan 19 17:47:51 2019 +0000
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_amd_common_ac__debug.c,v 1.1 2019/01/19 17:47:51 tnn Exp $
+
+#if'out some debug code on SunOS. There is no open_memstream(3)
+
+--- src/amd/common/ac_debug.c.orig 2019-01-17 11:26:22.000000000 +0000
++++ src/amd/common/ac_debug.c
+@@ -571,10 +571,12 @@ void ac_parse_ib_chunk(FILE *f, uint32_t
+
+ char *out;
+ size_t outsize;
++#if !defined(__sun)
+ FILE *memf = open_memstream(&out, &outsize);
+ ib.f = memf;
+ ac_do_parse_ib(memf, &ib);
+ fclose(memf);
++#endif
+
+ if (out) {
+ format_ib_output(f, out);
diff -r 20363d6463de -r 926626c2bbaf graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/MesaLib18/patches/patch-src_gallium_drivers_radeonsi_si__state__shaders.c Sat Jan 19 17:47:51 2019 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_gallium_drivers_radeonsi_si__state__shaders.c,v 1.1 2019/01/19 17:47:51 tnn Exp $
+
+#if'out some debug code on SunOS. There is no open_memstream(3)
+
+--- src/gallium/drivers/radeonsi/si_state_shaders.c.orig 2019-01-17 11:26:22.000000000 +0000
++++ src/gallium/drivers/radeonsi/si_state_shaders.c
+@@ -1721,6 +1721,7 @@ static void si_build_shader_variant(stru
+ }
+
+ if (shader->compiler_ctx_state.is_debug_context) {
++#if !defined(__sun)
+ FILE *f = open_memstream(&shader->shader_log,
+ &shader->shader_log_size);
+ if (f) {
+@@ -1728,6 +1729,7 @@ static void si_build_shader_variant(stru
+ fclose(f);
+ }
+ }
++#endif
+
+ si_shader_init_pm4_state(sscreen, shader);
+ }
Home |
Main Index |
Thread Index |
Old Index