Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ed91355ec92e3f8939a5721213eae983b0056c15)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ed91355ec92e3f8939a5721213eae983b0056c15)
  • Date: Fri, 25 Dec 2020 16:49:23 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

graphics-libs/mesa/0001-install-GL-headers-in-.mesa.patch
| 82 ++++++++++
graphics-libs/mesa/HISTORY
| 6
graphics-libs/mesa/PRE_BUILD
| 7
graphics-libs/mesa/patches/0001-install-GL-headers-in-.mesa.patch
| 82 ----------

graphics-libs/mesa/patches/0001-meson-add-missing-dependency-on-generated-git_sha1.h.patch
| 58 +++++++
5 files changed, 150 insertions(+), 85 deletions(-)

New commits:
commit ed91355ec92e3f8939a5721213eae983b0056c15
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mesa: Build fix for missing header deps

Several places are missing a depedency on the git_sha1.h header,
which causes build failures; the added patch solves these issues.

commit 1f987e1165e951ea1f366ff3cd3730fc026970ab
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

mesa: Apply the smgl-gl_select patch directly

apply_patch_dir is reserved for compulsory patches until
some selection support is added.

diff --git a/graphics-libs/mesa/0001-install-GL-headers-in-.mesa.patch
b/graphics-libs/mesa/0001-install-GL-headers-in-.mesa.patch
new file mode 100644
index 0000000..6b55897
--- /dev/null
+++ b/graphics-libs/mesa/0001-install-GL-headers-in-.mesa.patch
@@ -0,0 +1,82 @@
+From 98dcbe27df0636c5df2623be1c950a43f9f05a9d Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sun, 5 Jan 2020 22:33:25 +0100
+Subject: [PATCH] install GL headers in .mesa install libGL to lib/.mesa
+
+---
+ include/meson.build | 6 +++---
+ src/egl/meson.build | 1 +
+ src/glx/meson.build | 1 +
+ src/mapi/es2api/meson.build | 1 +
+ 4 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/include/meson.build b/include/meson.build
+index a64d937..23751c7 100644
+--- a/include/meson.build
++++ b/include/meson.build
+@@ -59,7 +59,7 @@ if not glvnd_has_headers_and_pc_files
+ 'GL/gl.h',
+ 'GL/glcorearb.h',
+ 'GL/glext.h',
+- subdir : 'GL',
++ subdir : 'GL/.mesa',
+ )
+ endif
+
+@@ -67,7 +67,7 @@ if not glvnd_has_headers_and_pc_files
+ install_headers(
+ 'GL/glx.h',
+ 'GL/glxext.h',
+- subdir : 'GL')
++ subdir : 'GL/.mesa')
+ endif
+
+ if with_egl
+@@ -90,7 +90,7 @@ if with_egl
+ endif
+
+ if with_osmesa != 'none'
+- install_headers('GL/osmesa.h', subdir : 'GL')
++ install_headers('GL/osmesa.h', subdir : 'GL/.mesa')
+ endif
+
+ if with_dri
+diff --git a/src/egl/meson.build b/src/egl/meson.build
+index dfc78ac..6c2eb18 100644
+--- a/src/egl/meson.build
++++ b/src/egl/meson.build
+@@ -172,6 +172,7 @@ libegl = shared_library(
+ dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread,
idep_mesautil],
+ 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
+diff --git a/src/glx/meson.build b/src/glx/meson.build
+index 85f2697..6f0ebab 100644
+--- a/src/glx/meson.build
++++ b/src/glx/meson.build
+@@ -167,6 +167,7 @@ libgl = shared_library(
+ ],
+ version : gl_lib_version,
+ install : true,
++ install_dir : 'lib/.mesa',
+ )
+
+ if with_tests
+diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
+index cb7bd41..37525b1 100644
+--- a/src/mapi/es2api/meson.build
++++ b/src/mapi/es2api/meson.build
+@@ -51,6 +51,7 @@ libgles2 = shared_library(
+ version : '2.0.0',
+ name_prefix : 'lib',
+ install : true,
++ install_dir : 'lib/.mesa',
+ )
+
+ pkg.generate(
+--
+2.24.1
+
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index d3611a4..9f7350c 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,9 @@
+2020-12-25 Ismael Luceno <ismael AT iodev.co.uk>
+ * PRE_BUILD: removed apply_patch_dir for the smgl-gl_select patch
+ * 0001-install-GL-headers-in-.mesa.patch: moved from patches/
+ *
patches/0001-meson-add-missing-dependency-on-generated-git_sha1.h.patch,
+ PRE_BUILD: Added build fix for missing header depedencies
+
2020-12-23 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Marked intel-ui as non-portable
* DEPENDS: Added check for libglvnd >= 1.3.2
diff --git a/graphics-libs/mesa/PRE_BUILD b/graphics-libs/mesa/PRE_BUILD
index c4a78a9..4d2feef 100755
--- a/graphics-libs/mesa/PRE_BUILD
+++ b/graphics-libs/mesa/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if is_depends_enabled "${SPELL}" smgl-gl_select; then
- apply_patch_dir patches
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+if is_depends_enabled "$SPELL" smgl-gl_select; then
+ patch -fp1 -i "$SPELL_DIRECTORY"/0001-install-GL-headers-in-.mesa.patch
fi
diff --git
a/graphics-libs/mesa/patches/0001-install-GL-headers-in-.mesa.patch
b/graphics-libs/mesa/patches/0001-install-GL-headers-in-.mesa.patch
deleted file mode 100644
index 6b55897..0000000
--- a/graphics-libs/mesa/patches/0001-install-GL-headers-in-.mesa.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 98dcbe27df0636c5df2623be1c950a43f9f05a9d Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Sun, 5 Jan 2020 22:33:25 +0100
-Subject: [PATCH] install GL headers in .mesa install libGL to lib/.mesa
-
----
- include/meson.build | 6 +++---
- src/egl/meson.build | 1 +
- src/glx/meson.build | 1 +
- src/mapi/es2api/meson.build | 1 +
- 4 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/include/meson.build b/include/meson.build
-index a64d937..23751c7 100644
---- a/include/meson.build
-+++ b/include/meson.build
-@@ -59,7 +59,7 @@ if not glvnd_has_headers_and_pc_files
- 'GL/gl.h',
- 'GL/glcorearb.h',
- 'GL/glext.h',
-- subdir : 'GL',
-+ subdir : 'GL/.mesa',
- )
- endif
-
-@@ -67,7 +67,7 @@ if not glvnd_has_headers_and_pc_files
- install_headers(
- 'GL/glx.h',
- 'GL/glxext.h',
-- subdir : 'GL')
-+ subdir : 'GL/.mesa')
- endif
-
- if with_egl
-@@ -90,7 +90,7 @@ if with_egl
- endif
-
- if with_osmesa != 'none'
-- install_headers('GL/osmesa.h', subdir : 'GL')
-+ install_headers('GL/osmesa.h', subdir : 'GL/.mesa')
- endif
-
- if with_dri
-diff --git a/src/egl/meson.build b/src/egl/meson.build
-index dfc78ac..6c2eb18 100644
---- a/src/egl/meson.build
-+++ b/src/egl/meson.build
-@@ -172,6 +172,7 @@ libegl = shared_library(
- dependencies : [deps_for_egl, dep_dl, dep_libdrm, dep_clock, dep_thread,
idep_mesautil],
- 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
-diff --git a/src/glx/meson.build b/src/glx/meson.build
-index 85f2697..6f0ebab 100644
---- a/src/glx/meson.build
-+++ b/src/glx/meson.build
-@@ -167,6 +167,7 @@ libgl = shared_library(
- ],
- version : gl_lib_version,
- install : true,
-+ install_dir : 'lib/.mesa',
- )
-
- if with_tests
-diff --git a/src/mapi/es2api/meson.build b/src/mapi/es2api/meson.build
-index cb7bd41..37525b1 100644
---- a/src/mapi/es2api/meson.build
-+++ b/src/mapi/es2api/meson.build
-@@ -51,6 +51,7 @@ libgles2 = shared_library(
- version : '2.0.0',
- name_prefix : 'lib',
- install : true,
-+ install_dir : 'lib/.mesa',
- )
-
- pkg.generate(
---
-2.24.1
-
diff --git
a/graphics-libs/mesa/patches/0001-meson-add-missing-dependency-on-generated-git_sha1.h.patch

b/graphics-libs/mesa/patches/0001-meson-add-missing-dependency-on-generated-git_sha1.h.patch
new file mode 100644
index 0000000..68196e2
--- /dev/null
+++
b/graphics-libs/mesa/patches/0001-meson-add-missing-dependency-on-generated-git_sha1.h.patch
@@ -0,0 +1,58 @@
+From 434da21a7c81acbe03f0e1621e80904313c0b05c Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney AT mforney.org>
+Date: Wed, 16 Dec 2020 00:48:25 -0800
+Subject: [PATCH] meson: add missing dependency on generated git_sha1.h
+
+Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin AT intel.com>
+Reviewed-by: Eric Anholt <eric AT anholt.net>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8121>
+Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
+---
+ src/freedreno/common/meson.build | 1 +
+ src/gallium/frontends/lavapipe/meson.build | 2 +-
+ src/intel/common/meson.build | 4 ++--
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/freedreno/common/meson.build
b/src/freedreno/common/meson.build
+index 2da6c1eacf8d..30ef23043a7e 100644
+--- a/src/freedreno/common/meson.build
++++ b/src/freedreno/common/meson.build
+@@ -27,6 +27,7 @@ libfreedreno_common = static_library(
+ 'freedreno_uuid.c',
+ 'freedreno_uuid.h',
+ 'freedreno_guardband.h',
++ sha1_h,
+ ],
+ include_directories : [inc_freedreno, inc_include, inc_src, inc_gallium],
+ c_args : [no_override_init_args],
+diff --git a/src/gallium/frontends/lavapipe/meson.build
b/src/gallium/frontends/lavapipe/meson.build
+index 972735fcff9c..94c68d14d232 100644
+--- a/src/gallium/frontends/lavapipe/meson.build
++++ b/src/gallium/frontends/lavapipe/meson.build
+@@ -57,7 +57,7 @@ endif
+
+ liblavapipe_st = static_library(
+ 'lavapipe_st',
+- [liblvp_files, lvp_entrypoints, lvp_extensions_c ],
++ [liblvp_files, lvp_entrypoints, lvp_extensions_c, sha1_h],
+ link_with : [ libvulkan_wsi ],
+ c_args : [ lvp_flags ],
+ gnu_symbol_visibility : 'hidden',
+diff --git a/src/intel/common/meson.build b/src/intel/common/meson.build
+index 2586b4cf9565..53c458f447d9 100644
+--- a/src/intel/common/meson.build
++++ b/src/intel/common/meson.build
+@@ -42,8 +42,8 @@ files_libintel_common = files(
+ )
+
+ libintel_common = static_library(
+- ['intel_common', genX_xml_h],
+- files_libintel_common,
++ 'intel_common',
++ [files_libintel_common, genX_xml_h, sha1_h],
+ include_directories : [inc_include, inc_src, inc_mapi, inc_mesa,
inc_gallium, inc_intel],
+ c_args : [no_override_init_args],
+ gnu_symbol_visibility : 'hidden',
+--
+2.29.2
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (ed91355ec92e3f8939a5721213eae983b0056c15), Ismael Luceno, 12/25/2020

Archive powered by MHonArc 2.6.24.

Top of Page