Skip to Content.
Sympa Menu

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

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 (4dc9435bb1d5eb286db81d7b23717abda6fe9a76)
  • Date: Wed, 13 Mar 2019 19:52:37 +0000

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

ChangeLog |
3
freedesktop.gpg
|binary
graphics-libs/mesa/DETAILS |
2
graphics-libs/mesa/HISTORY |
4
graphics-libs/mesa/patches/0001-install-GL-headers-in-.mesa.patch |
52 ++++++++--
graphics-libs/mesa/patches/0002-install-libGL-to-lib-.mesa.patch |
24 ----
graphics-libs/mesa/patches/0003-install-libEGL.so-into-lib-.mesa.patch |
24 ----
7 files changed, 54 insertions(+), 55 deletions(-)

New commits:
commit 4dc9435bb1d5eb286db81d7b23717abda6fe9a76
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

freedesktop.gpg - add Dylan Baker

commit 13858c6bffa6126aba7bac33738bcacb941169d4
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

mesa: => 19.0.0

diff --git a/ChangeLog b/ChangeLog
index 17bb15f..e3abfdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2019-03-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * freedesktop.gpg: add Dylan Baker <dylan AT pnwbakers.com>
+
2019-03-08 Treeve Jelbert <treeve AT sourcemage.org>
* gnu.gpg: add 1AA44BE649DE760A: "Mark Wielaard <mark AT klomp.org>"

diff --git a/freedesktop.gpg b/freedesktop.gpg
index ae0f4e7..267d9a3 100644
Binary files a/freedesktop.gpg and b/freedesktop.gpg differ
diff --git a/graphics-libs/mesa/DETAILS b/graphics-libs/mesa/DETAILS
index 7122409..733f138 100755
--- a/graphics-libs/mesa/DETAILS
+++ b/graphics-libs/mesa/DETAILS
@@ -9,7 +9,7 @@ if [[ "${MESA_BRANCH}" == "scm" ]]; then
SOURCE_IGNORE="volatile"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
else
- VERSION=18.3.4
+ VERSION=19.0.0
SOURCE=mesa-$VERSION.tar.xz
SOURCE_URL[0]="https://mesa.freedesktop.org/archive/${SOURCE}";
SOURCE2=$SOURCE.sig
diff --git a/graphics-libs/mesa/HISTORY b/graphics-libs/mesa/HISTORY
index 07d19bb..5b8ca1b 100644
--- a/graphics-libs/mesa/HISTORY
+++ b/graphics-libs/mesa/HISTORY
@@ -1,3 +1,7 @@
+2019-03-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 19.0.0
+ * patches/*: updated
+
2019-02-18 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 18.3.4

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
index 85b06a1..1a65c31 100644
--- a/graphics-libs/mesa/patches/0001-install-GL-headers-in-.mesa.patch
+++ b/graphics-libs/mesa/patches/0001-install-GL-headers-in-.mesa.patch
@@ -1,14 +1,18 @@
-From 116e1dfc61d38104a7c1459b25c3fdb628375d87 Mon Sep 17 00:00:00 2001
+From 2dad413e70bb47131da58043537aaf669b0c6f5f 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 1/3] install GL headers in .mesa
+Subject: [PATCH 1/2] install GL headers in .mesa install libGL to lib/.mesa
+ install libEGL.so* into lib/.mesa

---
- include/meson.build | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ 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 b4555eabbf..c4a5b224a2 100644
+index 081c1bc0008..93e884ec525 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -50,16 +50,16 @@ endif
@@ -31,6 +35,42 @@ index b4555eabbf..c4a5b224a2 100644
endif

if with_egl
+diff --git a/src/egl/meson.build b/src/egl/meson.build
+index b7ff09e9fed..bea2f7ffe30 100644
+--- a/src/egl/meson.build
++++ b/src/egl/meson.build
+@@ -170,6 +170,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
+diff --git a/src/glx/meson.build b/src/glx/meson.build
+index 061e026e53f..e236a2b5db1 100644
+--- a/src/glx/meson.build
++++ b/src/glx/meson.build
+@@ -164,6 +164,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 a7f0904b699..9935df71f90 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.18.0
+2.21.0

diff --git a/graphics-libs/mesa/patches/0002-install-libGL-to-lib-.mesa.patch
b/graphics-libs/mesa/patches/0002-install-libGL-to-lib-.mesa.patch
deleted file mode 100644
index 26695a7..0000000
--- a/graphics-libs/mesa/patches/0002-install-libGL-to-lib-.mesa.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From eefa135633a91894819a97017f39563fe11e9eda Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Sun, 10 Feb 2019 12:18:58 +0100
-Subject: [PATCH] install libGL to lib/.mesa
-
----
- src/glx/meson.build | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/glx/meson.build b/src/glx/meson.build
-index a61f959..e863796 100644
---- a/src/glx/meson.build
-+++ b/src/glx/meson.build
-@@ -165,6 +165,7 @@ libgl = shared_library(
- ],
- version : gl_lib_version,
- install : true,
-+ install_dir : 'lib/.mesa'
- )
-
- if with_tests
---
-2.20.1
-
diff --git
a/graphics-libs/mesa/patches/0003-install-libEGL.so-into-lib-.mesa.patch
b/graphics-libs/mesa/patches/0003-install-libEGL.so-into-lib-.mesa.patch
deleted file mode 100644
index 4c0dd88..0000000
--- a/graphics-libs/mesa/patches/0003-install-libEGL.so-into-lib-.mesa.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b05dff426cd49ec63646252c80cfdb25868b742e 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 3/3] 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 89a84fd890..dd9ee7936d 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],
- 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.18.0
-



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (4dc9435bb1d5eb286db81d7b23717abda6fe9a76), Treeve Jelbert, 03/13/2019

Archive powered by MHonArc 2.6.24.

Top of Page