Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (0713f3aabdaf5e6cb4ca679a63f0d59adde4367d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (0713f3aabdaf5e6cb4ca679a63f0d59adde4367d)
  • Date: Fri, 3 Aug 2018 07:19:19 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

ChangeLog |
4
devel/qxmledit/DETAILS |
4
devel/qxmledit/HISTORY |
3
graphics-libs/mesa/BUILD |
19 +
graphics-libs/mesa/CONFIGURE |
84 +++++++
graphics-libs/mesa/CONFLICTS |
1
graphics-libs/mesa/DEPENDS |
53 ++++
graphics-libs/mesa/DETAILS |
32 ++
graphics-libs/mesa/HISTORY |
8
graphics-libs/mesa/NOTES |
4
graphics-libs/mesa/PRE_BUILD |
3
graphics-libs/mesa/PRE_SUB_DEPENDS |
13 +
graphics-libs/mesa/PROVIDES |
2
graphics-libs/mesa/SUB_DEPENDS |
14 +
graphics-libs/mesa/patches/0001-smgl-fixes.patch |
108 ++++++++++
graphics-libs/mesa/patches/0002-install-GL-headers-in-.mesa.patch |
36 +++
graphics-libs/mesa/patches/0003-install-libGL-to-lib-.mesa.patch |
37 +++
graphics-libs/mesa/patches/0004-install-libEGL.so-into-lib-.mesa.patch |
24 ++
18 files changed, 447 insertions(+), 2 deletions(-)

New commits:
commit 0713f3aabdaf5e6cb4ca679a63f0d59adde4367d
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mesa-18.2.0-rc1

commit 470e58de2da8fb72ebee4255e60d8c2b8b119144
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qxmledit: => 0.9.11

diff --git a/ChangeLog b/ChangeLog
index 4abeea7..602eb5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-08-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * graphics-libs/mesa: added
+ rewritten spell for mesa, using meson build ststem - much faster
build
+
2018-07-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* science/qmapshack: new spell, a map visualization and trip planning
tool

diff --git a/devel/qxmledit/DETAILS b/devel/qxmledit/DETAILS
index 902a4bb..807a8b5 100755
--- a/devel/qxmledit/DETAILS
+++ b/devel/qxmledit/DETAILS
@@ -1,6 +1,6 @@
SPELL=qxmledit
- VERSION=0.9.10
-
SOURCE_HASH=sha512:ac96b086e9bcb6140c66521c71a303a12ab806b133fc769472e23e6b473cb5f6d6dc85cac990b6c0182a1f98201a84835042f7fdfc1843c00bd98b445e47ff35
+ VERSION=0.9.11
+
SOURCE_HASH=sha512:63353ff30f646f5addbe3f698f54eca4d925c672ef0cd3f6eef7310ce0dc417e2f77a2ba06c75f9b50945d47d6895c740a65b1942f9128c19ac005b8141b0e77
SOURCE=$SPELL-$VERSION-src.tgz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://qxmledit.org
diff --git a/devel/qxmledit/HISTORY b/devel/qxmledit/HISTORY
index 82ce218..dc9efa2 100644
--- a/devel/qxmledit/HISTORY
+++ b/devel/qxmledit/HISTORY
@@ -1,3 +1,6 @@
+2018-08-01 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 0.9.11
+
2018-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.9.10

diff --git a/graphics-libs/mesa/BUILD b/graphics-libs/mesa/BUILD
new file mode 100755
index 0000000..c0a0058
--- /dev/null
+++ b/graphics-libs/mesa/BUILD
@@ -0,0 +1,19 @@
+#LDFLAGS='' &&
+#CXXFLAGS='' &&
+local vulkan=${MESA_VULKAN//none} &&
+local gallium=${MESA_GALLIUM//none} &&
+local dri=${MESA_DRI//none} &&
+OPTS+=" dri-drivers=${dri// /,} \
+ gallium-drivers=${gallium// /,} \
+ vulkan-drivers=${vulkan// /,} \
+ osmesa=${MESA_OSMESA// /,} \
+ platforms=${MESA_EGL// /,} \
+ glx=${MESA_GLX// /,} \
+ tools=${MESA_TOOLS// /,} \
+ swr-arches=${MESA_ARCH// /,} \
+ $MESA_GLES1 $MESA_GLES2" &&
+echo "OPTS=$OPTS" &&
+
+#PREFIX=/opt/mesa &&
+PREFIX=/usr &&
+default_build
diff --git a/graphics-libs/mesa/CONFIGURE b/graphics-libs/mesa/CONFIGURE
new file mode 100755
index 0000000..0d7c8be
--- /dev/null
+++ b/graphics-libs/mesa/CONFIGURE
@@ -0,0 +1,84 @@
+persistent_remove MESALIB_OPTS
+persistent_remove MESALIB_VULKAN
+persistent_remove MESALIB_BUILD
+persistent_remove MESALIB_GALLIUM
+persistent_remove MESALIB_DRIVERS
+
+. $GRIMOIRE/config_query_multi.function &&
+. $GRIMOIRE/MESON_CONFIGURE &&
+
+config_query_multi MESA_GLX "glx build types, recommend dri" dri xlib
gallium-xlib &&
+config_query_multi MESA_EGL "window systems to support,recommend x11+drm"
x11 drm surfaceless wayland &&
+config_query_multi MESA_OSMESA "Build OSmesa - not usually needed, except by
swrast " none classic gallium
+
+
+config_query_multi MESA_DRM "which libdrm hardware" AMD INTEL NOUVEAU RADEON
&&
+# only suggest drivers for specified hardware
+local AVAILABLE_DRIVERS="swrast"
+local AVAILABLE_GALLIUM="svga swrast virgl"
+local AVAILABLE_VULKAN=""
+if list_find "$MESA_DRM" AMD;then
+ AVAILABLE_VULKAN+=" amd"
+fi &&
+if list_find "$MESA_DRM" RADEON;then
+ AVAILABLE_DRIVERS+=" r100 r200"
+ AVAILABLE_GALLIUM+=" r300 r600 radeonsi"
+fi &&
+if list_find "$MESA_DRM" INTEL;then
+ AVAILABLE_DRIVERS+=" i915 i965"
+ AVAILABLE_GALLIUM+=" i915"
+ AVAILABLE_VULKAN+=" intel"
+fi &&
+if list_find "$MESA_DRM" NOUVEAU;then
+ AVAILABLE_DRIVERS+=" nouveau"
+ AVAILABLE_GALLIUM+=" nouveau"
+fi &&
+
+
+if list_find "$MESA_GLX" dri;then
+ config_query_multi MESA_DRI \
+ "Which drivers would you like to build?" \
+ all $AVAILABLE_DRIVERS &&
+
+ if list_find "$MESA_DRI" all; then
+ MESA_DRI="$AVAILABLE_DRIVERS"
+ fi
+fi &&
+# Gallium support
+
+config_query_multi MESA_GALLIUM \
+ "which gallium (accellerated) drivers" \
+ none all $AVAILABLE_GALLIUM &&
+if list_find "$MESA_GALLIUM" all;then
+ MESA_GALLIUM="$AVAILABLE_GALLIUM"
+fi &&
+if list_find "$MESA_GALLIUM" swrast;then
+ list_remove MESA_DRI swrast
+fi &&
+
+if list_find "$MESA_OSMESA" classic;then
+# force this option
+ list_add MESA_DRI swrast
+ list_remove MESA_DRI none
+ list_remove MESA_GALLIUM swrast
+fi &&
+
+if list_find "$MESA_OSMESA" gallium;then
+# force this option
+ list_add MESA_GALLIUM swrast
+ list_remove MESA_GALLIUM none
+ list_remove MESA_DRI swrast
+fi &&
+
+# Vulkan support
+config_query_multi MESA_VULKAN \
+ "which Vulkan drivers to build" \
+ none all $AVAILABLE_VULKAN &&
+if list_find "$MESA_VULKAN" all; then
+ MESA_VULKAN="$AVAILABLE_VULKAN"
+fi &&
+config_query_option MESA_GLES1 "support GLES1 - embedded systems" n
gles1=true gles1=false &&
+config_query_option MESA_GLES2 "support GLES2/3 - embedded systems" n
gles2=true gles2=false &&
+config_query_multi MESA_TOOLS "which tools to build" glsl intel nir nouveau
&&
+config_query_multi MESA_ARCH "which arch" avx avx2 knl skx &&
+config_query_multi MESA_OMX "OMax support" auto disabled tizonia bellagio
diff --git a/graphics-libs/mesa/CONFLICTS b/graphics-libs/mesa/CONFLICTS
new file mode 100755
index 0000000..3455744
--- /dev/null
+++ b/graphics-libs/mesa/CONFLICTS
@@ -0,0 +1 @@
+conflicts mesalib n
diff --git a/graphics-libs/mesa/DEPENDS b/graphics-libs/mesa/DEPENDS
new file mode 100755
index 0000000..11e1c2c
--- /dev/null
+++ b/graphics-libs/mesa/DEPENDS
@@ -0,0 +1,53 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
+depends meson &&
+depends ninja-build-system &&
+depends python3 &&
+#depends smgl-gl_select &&
+depends -sub "CXX" gcc &&
+depends bison &&
+depends flex &&
+depends gettext &&
+depends -sub "$MESA_DRM" libdrm &&
+depends util-macros &&
+depends expat &&
+depends libxdamage &&
+depends libx11 &&
+depends xorgproto &&
+depends libxshmfence &&
+
+depends nettle &&
+depends zlib &&
+
+if (list_find "${MESA_GALLIUM}" "radeonsi") ||
+ (list_find "$MESA_VULKAN" amd); then
+ depends -sub AMD llvm &&
+ depends LIBELF &&
+ depends mako &&
+ depends python
+else
+ optional_depends llvm 'llvm=true' 'llvm=false' 'LLVM support'
+fi &&
+#fi &&
+
+if list_find "$MESA_GLX" dri;then
+ depends libxext &&
+ depends libxxf86vm &&
+ depends libxdamage &&
+ depends libxfixes &&
+ depends libxcb &&
+ depends expat
+fi &&
+if list_find "$MESA_EGL" wayland;then
+ depends wayland &&
+ depends wayland-protocols
+fi &&
+optional_depends libvdpau 'gallium-vdpau=true' 'gallium-vdpau=false'
'gallium vdpau state tracker' &&
+optional_depends libxvmc 'gallium-xvmc=true' 'gallium-xvmc=false'
'gallium xvmc state tracker(obsolete)' &&
+optional_depends libva 'gallium-va=true' 'gallium-va=false'
'gallium va state tracker' &&
+#optional_depends libomxil 'gallium-omx=bellagio' 'gallium-omx=disabled'
'gallium omx bellagio state tracker' &&
+#optional_depends tizonia 'gallium-omx=tizonia' 'gallium-omx=disabled'
'gallium omx state tracker' &&
+#optional_depends libxa '' '' 'gallium xa state tracker' &&
+optional_depends lm_sensors "lmsensors=true" "lmsensors=false" "HUD Sensor
support" &&
+optional_depends valgrind "valgrind=true" "valgrind=false" "debugging" &&
+optional_depends libunwind "libunwind=true" "libunwind=false" "for
stack-traces" &&
+optional_depends libselinux "selinux=true" "selinux=false" "SELinux-aware
Mesa"
diff --git a/graphics-libs/mesa/DETAILS b/graphics-libs/mesa/DETAILS
new file mode 100755
index 0000000..0cd2f35
--- /dev/null
+++ b/graphics-libs/mesa/DETAILS
@@ -0,0 +1,32 @@
+source $GRIMOIRE/MESON_FUNCTIONS
+ SPELL=mesa
+ VERSION=18.2.0-rc1
+ SOURCE=mesa-$VERSION.tar.xz
+ SOURCE_URL[0]="https://mesa.freedesktop.org/archive/${SOURCE}";
+ SOURCE2=$SOURCE.sig
+ SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
+ SOURCE_GPG=freedesktop.gpg:$SOURCE.sig:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesa-${VERSION}
+ LICENSE[0]=GPL
+ WEB_SITE=https://www.mesa3d.org/
+ KEYWORDS="graphics libs"
+ ENTERED=20171020
+ SHORT="Mesa implementation of the OpenGL(TM) API"
+cat << EOF
+this is a complete rewrite of the original mesalib spell, using the meson
+build system
+
+The Mesa project began as an open-source implementation of the OpenGL
specification - a
+system for rendering interactive 3D graphics.
+
+Over the years the project has grown to implement more graphics APIs,
including OpenGL
+ES (versions 1, 2, 3), OpenCL, OpenMAX, VDPAU, VA API, XvMC and Vulkan.
+
+A variety of device drivers allows the Mesa libraries to be used in many
different
+environments ranging from software emulation to complete hardware
acceleration for
+modern GPUs.
+
+Mesa ties into several other open-source projects: the Direct Rendering
Infrastructure
+and X.org to provide OpenGL support on Linux, FreeBSD and other operating
systems.
+EOF
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
new file mode 100644
index 0000000..2560e25
--- /dev/null
+++ b/graphics-libs/mesa/HISTORY
@@ -0,0 +1,8 @@
+2018-08-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 18.02.0-rc1
+ * DETAILS: add gpg checking
+
+2017-10-20 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 17.3.x
+ spell created, using meson build system
+
diff --git a/graphics-libs/mesa/NOTES b/graphics-libs/mesa/NOTES
new file mode 100644
index 0000000..f66ab0d
--- /dev/null
+++ b/graphics-libs/mesa/NOTES
@@ -0,0 +1,4 @@
+it sometimes happens that existing mesa shader caches are not compatible
with the
+new version of mesa.
+This usually shows itself with a blank screen when starting X.
+Try removing ~/.cache/mesa_shader_cache/* , both for root and any other
users.
diff --git a/graphics-libs/mesa/PRE_BUILD b/graphics-libs/mesa/PRE_BUILD
new file mode 100755
index 0000000..922c0ab
--- /dev/null
+++ b/graphics-libs/mesa/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/graphics-libs/mesa/PRE_SUB_DEPENDS
b/graphics-libs/mesa/PRE_SUB_DEPENDS
new file mode 100755
index 0000000..01e6590
--- /dev/null
+++ b/graphics-libs/mesa/PRE_SUB_DEPENDS
@@ -0,0 +1,13 @@
+case $THIS_SUB_DEPENDS in
+ DRI)
+ if list_find "$MESA_GLX" dri;then
+ return 0
+ fi
+ ;;
+ GLES2)
+ if [[ "$MESA_GLES2" == "gles2=true" ]];then
+ return 0
+ fi
+ ;;
+esac
+return 1
diff --git a/graphics-libs/mesa/PROVIDES b/graphics-libs/mesa/PROVIDES
new file mode 100755
index 0000000..45eb22c
--- /dev/null
+++ b/graphics-libs/mesa/PROVIDES
@@ -0,0 +1,2 @@
+OPENGL
+MESA
diff --git a/graphics-libs/mesa/SUB_DEPENDS b/graphics-libs/mesa/SUB_DEPENDS
new file mode 100755
index 0000000..ba221c6
--- /dev/null
+++ b/graphics-libs/mesa/SUB_DEPENDS
@@ -0,0 +1,14 @@
+case $THIS_SUB_DEPENDS in
+ DRI)
+ if ! list_find "$MESA_GLX" dri;then
+ list_add MESA_GLX dri
+ fi
+ ;;
+ GLES2)
+ if [[ "$MESA_GLES2" == "gles2=false" ]];then
+ MESA_GLES="gles2=true"
+ fi
+ ;;
+ *) echo "Unknown sub_depends $THIS_SUB_DEPENDS!"; return 1 ;;
+esac
+return 0
diff --git a/graphics-libs/mesa/patches/0001-smgl-fixes.patch
b/graphics-libs/mesa/patches/0001-smgl-fixes.patch
new file mode 100644
index 0000000..436bf69
--- /dev/null
+++ b/graphics-libs/mesa/patches/0001-smgl-fixes.patch
@@ -0,0 +1,108 @@
+From 0266415f8382a7e080896ba814d44718cf2cc264 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Mon, 22 May 2017 13:46:44 +0200
+Subject: [PATCH 1/4] smgl fixes
+
+---
+ src/Makefile.am | 6 +++---
+ src/egl/Makefile.am | 6 ++++--
+ src/glx/Makefile.am | 3 ++-
+ src/mapi/Makefile.am | 6 ++++--
+ 4 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index fd5ae44550..0003325953 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -31,7 +31,7 @@ EXTRA_DIST = git_sha1.h.in meson.build
+ SUBDIRS = . gtest util mapi/glapi/gen mapi
+
+ if HAVE_OPENGL
+-gldir = $(includedir)/GL
++gldir = $(includedir)/GL/.mesa
+ gl_HEADERS = \
+ $(top_srcdir)/include/GL/gl.h \
+ $(top_srcdir)/include/GL/glext.h \
+@@ -40,7 +40,7 @@ gl_HEADERS = \
+ endif
+
+ if HAVE_GLX
+-glxdir = $(includedir)/GL
++glxdir = $(includedir)/GL/.mesa
+ glx_HEADERS = \
+ $(top_srcdir)/include/GL/glx.h \
+ $(top_srcdir)/include/GL/glxext.h \
+@@ -50,7 +50,7 @@ pkgconfig_DATA = mesa/gl.pc
+ endif
+
+ if HAVE_COMMON_OSMESA
+-osmesadir = $(includedir)/GL
++osmesadir = $(includedir)/GL/.mesa
+ osmesa_HEADERS = $(top_srcdir)/include/GL/osmesa.h
+ endif
+
+diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
+index 086a4a1e63..5c0268c672 100644
+--- a/src/egl/Makefile.am
++++ b/src/egl/Makefile.am
+@@ -165,7 +165,8 @@ AM_CFLAGS += \
+ vendorjsondir = @LIBGLVND_DATADIR@/glvnd/egl_vendor.d
+ vendorjson_DATA = main/50_mesa.json
+
+-lib_LTLIBRARIES = libEGL_mesa.la
++egllibdir = ${libdir}/.mesa
++egllib_LTLIBRARIES = libEGL_mesa.la
+ libEGL_mesa_la_SOURCES = \
+ main/eglglvnd.c \
+ main/egldispatchstubs.h \
+@@ -184,7 +185,8 @@ libEGL_mesa_la_LDFLAGS = \
+
+ else # USE_LIBGLVND
+
+-lib_LTLIBRARIES = libEGL.la
++egllibdir = ${libdir}/.mesa
++egllib_LTLIBRARIES = libEGL.la
+ libEGL_la_SOURCES =
+ libEGL_la_LIBADD = \
+ libEGL_common.la \
+diff --git a/src/glx/Makefile.am b/src/glx/Makefile.am
+index 5233257fb4..7700ef8c7d 100644
+--- a/src/glx/Makefile.am
++++ b/src/glx/Makefile.am
+@@ -50,7 +50,8 @@ AM_CFLAGS = \
+ $(GLPROTO_CFLAGS) \
+ $(X11_INCLUDES)
+
+-lib_LTLIBRARIES = lib@GL_LIB@.la
++gldir = ${libdir}/.mesa
++gl_LTLIBRARIES = lib@GL_LIB@.la
+
+ noinst_LTLIBRARIES = libglx.la
+
+diff --git a/src/mapi/Makefile.am b/src/mapi/Makefile.am
+index 3da1a193d2..be473fe7cb 100644
+--- a/src/mapi/Makefile.am
++++ b/src/mapi/Makefile.am
+@@ -178,7 +178,8 @@ GLES_include_HEADERS = \
+ $(top_srcdir)/include/GLES/glext.h \
+ $(top_srcdir)/include/GLES/glplatform.h
+
+-lib_LTLIBRARIES += es1api/libGLESv1_CM.la
++glesdir = ${libdir}/.mesa
++gles_LTLIBRARIES = es1api/libGLESv1_CM.la
+
+ es1api_libGLESv1_CM_la_SOURCES = entry.c es1api/glapi_mapi_tmp.h
+ es1api_libGLESv1_CM_la_CFLAGS = \
+@@ -223,7 +224,8 @@ GLES3_include_HEADERS = \
+ $(top_srcdir)/include/GLES3/gl3ext.h \
+ $(top_srcdir)/include/GLES3/gl3platform.h
+
+-lib_LTLIBRARIES += es2api/libGLESv2.la
++gles2dir = ${libdir}/.mesa
++gles2_LTLIBRARIES = es2api/libGLESv2.la
+
+ es2api_libGLESv2_la_SOURCES = entry.c es2api/glapi_mapi_tmp.h
+ es2api_libGLESv2_la_CFLAGS = \
+--
+2.17.0
+
diff --git
a/graphics-libs/mesa/patches/0002-install-GL-headers-in-.mesa.patch
b/graphics-libs/mesa/patches/0002-install-GL-headers-in-.mesa.patch
new file mode 100644
index 0000000..40a621e
--- /dev/null
+++ b/graphics-libs/mesa/patches/0002-install-GL-headers-in-.mesa.patch
@@ -0,0 +1,36 @@
+From e3e4b146cd9f75cb05a49f6c58418dee9db16ccf Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Wed, 18 Oct 2017 20:30:00 +0200
+Subject: [PATCH 2/4] install GL headers in .mesa
+
+---
+ include/meson.build | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/meson.build b/include/meson.build
+index b4555eabbf..25d575b1be 100644
+--- a/include/meson.build
++++ b/include/meson.build
+@@ -50,16 +50,16 @@ endif
+ if with_opengl
+ install_headers(
+ 'GL/gl.h', 'GL/glext.h', 'GL/glcorearb.h', 'GL/gl_mangle.h',
+- subdir : 'GL',
++ subdir : 'GL/.mesa',
+ )
+ endif
+
+ if with_glx != 'disabled'
+- install_headers('GL/glx.h', 'GL/glxext.h', 'GL/glx_mangle.h', subdir :
'GL')
++ install_headers('GL/glx.h', 'GL/glxext.h', 'GL/glx_mangle.h', subdir :
'GL/.mesa')
+ endif
+
+ if with_osmesa != 'none'
+- install_headers('GL/osmesa.h', subdir : 'GL')
++ install_headers('GL/osmesa.h', subdir : 'GL/.mesa')
+ endif
+
+ if with_egl
+--
+2.17.0
+
diff --git a/graphics-libs/mesa/patches/0003-install-libGL-to-lib-.mesa.patch
b/graphics-libs/mesa/patches/0003-install-libGL-to-lib-.mesa.patch
new file mode 100644
index 0000000..ef8c98e
--- /dev/null
+++ b/graphics-libs/mesa/patches/0003-install-libGL-to-lib-.mesa.patch
@@ -0,0 +1,37 @@
+From 51c38ee51acafc3fad35264d72bff4b4eeaa4fb2 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Wed, 18 Oct 2017 21:38:29 +0200
+Subject: [PATCH 3/4] install libGL to lib/.mesa
+
+---
+ src/glx/meson.build | 1 +
+ src/mapi/es2api/meson.build | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/glx/meson.build b/src/glx/meson.build
+index dd8ba60ad8..5a2b9dbbc9 100644
+--- a/src/glx/meson.build
++++ b/src/glx/meson.build
+@@ -172,6 +172,7 @@ if with_glx == 'dri'
+ ],
+ version : gl_lib_version,
+ install : true,
++ install_dir : 'lib/.mesa'
+ )
+ endif
+
+diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
+index da5198ed6e..ad0142e864 100644
+--- a/src/mapi/es2api/meson.build
++++ b/src/mapi/es2api/meson.build
+@@ -40,6 +40,7 @@ libgles2 = shared_library(
+ dependencies : [dep_thread, dep_libdrm, dep_m, dep_dl],
+ version : '2.0.0',
+ install : true,
++ install_dir : 'lib/.mesa'
+ )
+
+ pkg.generate(
+--
+2.17.0
+
diff --git
a/graphics-libs/mesa/patches/0004-install-libEGL.so-into-lib-.mesa.patch
b/graphics-libs/mesa/patches/0004-install-libEGL.so-into-lib-.mesa.patch
new file mode 100644
index 0000000..66a01c6
--- /dev/null
+++ b/graphics-libs/mesa/patches/0004-install-libEGL.so-into-lib-.mesa.patch
@@ -0,0 +1,24 @@
+From f275e6addfa71b085e1585ca20e33bc74f3e19ae Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Tue, 7 Nov 2017 10:16:06 +0100
+Subject: [PATCH 4/4] install libEGL.so* into lib/.mesa
+
+---
+ src/egl/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/egl/meson.build b/src/egl/meson.build
+index 6537e4bdee..61173d6ba0 100644
+--- a/src/egl/meson.build
++++ b/src/egl/meson.build
+@@ -175,6 +175,7 @@ libegl = shared_library(
+ dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread],
+ install : true,
+ version : egl_lib_version,
++ install_dir : 'lib/.mesa',
+ )
+
+ # If using glvnd the pkg-config header should not point to EGL_mesa, it
should
+--
+2.17.0
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (0713f3aabdaf5e6cb4ca679a63f0d59adde4367d), Treeve Jelbert, 08/03/2018

Archive powered by MHonArc 2.6.24.

Top of Page