[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/

2024-05-15 Thread Matt Turner 
commit: 78ed12b887ff02fab48a27d5985876db76a4477f
Author: Matt Turner  gentoo  org>
AuthorDate: Wed May 15 18:21:38 2024 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed May 15 18:22:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78ed12b8

x11-apps/mesa-progs: Rebase live patch

Signed-off-by: Matt Turner  gentoo.org>

 .../files/-Disable-things-we-don-t-want.patch  | 22 +++---
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
index 5566a8de45d3..5e0dccb6445b 100644
--- a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From c2e2f995bca3086cfc40b698533e7ec0bba98d85 Mon Sep 17 00:00:00 2001
+From 5736ae25541e414a0e950e8c8bcf80d374f3308d Mon Sep 17 00:00:00 2001
 From: Matt Turner 
 Date: Thu, 18 Apr 2024 13:24:18 -0400
 Subject: [PATCH] Disable things we don't want
@@ -9,30 +9,22 @@ v4: Disable dmabufshare and remove dep on libXext
 v5: Drop trackball.c and showbuffer.c
 v6: Fix disabling GLU
 v7: Link against libOpenGL rather than libGL
+v8: Rebase
 ---
- meson.build   | 15 +++
+ meson.build   | 13 ++---
  src/egl/opengl/meson.build| 35 --
  src/egl/opengles2/meson.build |  5 -
  src/meson.build   |  2 --
  src/util/gl_wrap.h|  2 --
  src/util/meson.build  |  9 +
  src/xdemos/meson.build| 36 ---
- 7 files changed, 4 insertions(+), 100 deletions(-)
+ 7 files changed, 3 insertions(+), 99 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index d487a11f..31625a99 100644
+index 8d495ec9..3f5c5c9b 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -39,7 +39,7 @@ add_project_arguments(
- dep_m = cc.find_library('m', required : false)
- dep_winmm = cc.find_library('winmm', required : false)
- 
--dep_gl = dependency('gl')
-+dep_gl = dependency('opengl')
- 
- dep_epoll = dependency('epoll-shim', required : false)
- dep_gles1 = dependency('glesv1_cm', required : get_option('gles1'))
-@@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
+@@ -55,7 +55,7 @@ dep_drm = dependency('libdrm',
required : get_option('libdrm'),
disabler : true
  )
@@ -41,7 +33,7 @@ index d487a11f..31625a99 100644
required : get_option('x11'),
disabler : true
  )
-@@ -87,16 +87,7 @@ endif
+@@ -90,16 +90,7 @@ endif
  
  dep_threads = dependency('threads')

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/

2024-05-09 Thread Matt Turner 
commit: a1824d39d36224b9d5673cea1dda8c017dbc79d3
Author: Matt Turner  gentoo  org>
AuthorDate: Thu May  9 23:17:45 2024 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu May  9 23:24:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1824d39

x11-apps/mesa-progs: Link against libOpenGL

Closes: https://bugs.gentoo.org/931647
Signed-off-by: Matt Turner  gentoo.org>

 .../files/9.0.0-Disable-things-we-don-t-want.patch | 17 +
 .../files/-Disable-things-we-don-t-want.patch  | 18 ++
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
index dcf7fdcc17ac..49a47f92bdc7 100644
--- a/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
@@ -1,22 +1,31 @@
-From beccb3024fee949bfb7bdfd19225e93a7cb0e906 Mon Sep 17 00:00:00 2001
+From 77e41ec954f7e366bf4dccbd9c867ff7ddcca600 Mon Sep 17 00:00:00 2001
 From: Matt Turner 
 Date: Thu, 18 Apr 2024 13:24:18 -0400
 Subject: [PATCH] Disable things we don't want
 
 ---
- meson.build   | 13 ++---
+ meson.build   | 15 +++
  src/egl/opengl/meson.build| 28 ---
  src/egl/opengles2/meson.build |  5 -
  src/meson.build   |  2 --
  src/util/gl_wrap.h|  2 --
  src/util/meson.build  |  9 +
  src/xdemos/meson.build| 36 ---
- 7 files changed, 3 insertions(+), 92 deletions(-)
+ 7 files changed, 4 insertions(+), 93 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index c1853f94..d1457a35 100644
+index c1853f94..e3012fb0 100644
 --- a/meson.build
 +++ b/meson.build
+@@ -39,7 +39,7 @@ add_project_arguments(
+ dep_m = cc.find_library('m', required : false)
+ dep_winmm = cc.find_library('winmm', required : false)
+ 
+-dep_gl = dependency('gl')
++dep_gl = dependency('opengl')
+ 
+ dep_epoll = dependency('epoll-shim', required : false)
+ dep_gles1 = dependency('glesv1_cm', required : get_option('gles1'))
 @@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
required : get_option('libdrm'),
disabler : true

diff --git a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
index 02855c749e3d..5566a8de45d3 100644
--- a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From 6622a4e4a170d6c784d46638a128068ea5203493 Mon Sep 17 00:00:00 2001
+From c2e2f995bca3086cfc40b698533e7ec0bba98d85 Mon Sep 17 00:00:00 2001
 From: Matt Turner 
 Date: Thu, 18 Apr 2024 13:24:18 -0400
 Subject: [PATCH] Disable things we don't want
@@ -8,20 +8,30 @@ v3: Enable most of libutil to fix undefined references in 
es2gears
 v4: Disable dmabufshare and remove dep on libXext
 v5: Drop trackball.c and showbuffer.c
 v6: Fix disabling GLU
+v7: Link against libOpenGL rather than libGL
 ---
- meson.build   | 13 ++---
+ meson.build   | 15 +++
  src/egl/opengl/meson.build| 35 --
  src/egl/opengles2/meson.build |  5 -
  src/meson.build   |  2 --
  src/util/gl_wrap.h|  2 --
  src/util/meson.build  |  9 +
  src/xdemos/meson.build| 36 ---
- 7 files changed, 3 insertions(+), 99 deletions(-)
+ 7 files changed, 4 insertions(+), 100 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index d487a11f..4cd6abf7 100644
+index d487a11f..31625a99 100644
 --- a/meson.build
 +++ b/meson.build
+@@ -39,7 +39,7 @@ add_project_arguments(
+ dep_m = cc.find_library('m', required : false)
+ dep_winmm = cc.find_library('winmm', required : false)
+ 
+-dep_gl = dependency('gl')
++dep_gl = dependency('opengl')
+ 
+ dep_epoll = dependency('epoll-shim', required : false)
+ dep_gles1 = dependency('glesv1_cm', required : get_option('gles1'))
 @@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
required : get_option('libdrm'),
disabler : true

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/

2024-04-21 Thread Matt Turner 
commit: 36c7d400cda7e81d361764954da2b872201ec07b
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Apr 21 17:44:25 2024 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Apr 21 17:46:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36c7d400

x11-apps/mesa-progs: Fix disabling dep on libGLU

Closes: https://bugs.gentoo.org/930356
Signed-off-by: Matt Turner  gentoo.org>

 .../files/9.0.0-Disable-things-we-don-t-want.patch | 26 ++---
 .../files/-Disable-things-we-don-t-want.patch  | 27 +++---
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
index 5b1104e71a13..dcf7fdcc17ac 100644
--- a/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
@@ -1,20 +1,20 @@
-From 0e87b772b5d291ecf2cdc3f209321ea586918375 Mon Sep 17 00:00:00 2001
+From beccb3024fee949bfb7bdfd19225e93a7cb0e906 Mon Sep 17 00:00:00 2001
 From: Matt Turner 
 Date: Thu, 18 Apr 2024 13:24:18 -0400
 Subject: [PATCH] Disable things we don't want
 
 ---
- meson.build   |  3 ++-
+ meson.build   | 13 ++---
  src/egl/opengl/meson.build| 28 ---
  src/egl/opengles2/meson.build |  5 -
  src/meson.build   |  2 --
  src/util/gl_wrap.h|  2 --
  src/util/meson.build  |  9 +
  src/xdemos/meson.build| 36 ---
- 7 files changed, 3 insertions(+), 82 deletions(-)
+ 7 files changed, 3 insertions(+), 92 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index c1853f94..5424dc73 100644
+index c1853f94..d1457a35 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
@@ -26,10 +26,20 @@ index c1853f94..5424dc73 100644
required : get_option('x11'),
disabler : true
  )
-@@ -97,6 +97,7 @@ if not dep_glu.found() and host_machine.system() != 'darwin'
-   dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
- required : dep_x11.found())
- endif
+@@ -87,16 +87,7 @@ endif
+ 
+ dep_threads = dependency('threads')
+ 
+-dep_glu = dependency('glu', required : false)
+-# GLU is part of OpenGL.Framework
+-if not dep_glu.found() and host_machine.system() != 'darwin'
+-  _glu_name = 'GLU'
+-  if host_machine.system() == 'windows'
+-_glu_name = 'glu32'
+-  endif
+-  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
+-required : dep_x11.found())
+-endif
 +dep_glu = disabler()
  
  dep_glx = dependency('glx', required: false, disabler : true)

diff --git a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
index 9c352fea35db..02855c749e3d 100644
--- a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From b7bced77da267e51eaceeef68a213007ba54aa86 Mon Sep 17 00:00:00 2001
+From 6622a4e4a170d6c784d46638a128068ea5203493 Mon Sep 17 00:00:00 2001
 From: Matt Turner 
 Date: Thu, 18 Apr 2024 13:24:18 -0400
 Subject: [PATCH] Disable things we don't want
@@ -7,18 +7,19 @@ v2: Enable libglad to satisfy egl dependencies
 v3: Enable most of libutil to fix undefined references in es2gears
 v4: Disable dmabufshare and remove dep on libXext
 v5: Drop trackball.c and showbuffer.c
+v6: Fix disabling GLU
 ---
- meson.build   |  3 ++-
+ meson.build   | 13 ++---
  src/egl/opengl/meson.build| 35 --
  src/egl/opengles2/meson.build |  5 -
  src/meson.build   |  2 --
  src/util/gl_wrap.h|  2 --
  src/util/meson.build  |  9 +
  src/xdemos/meson.build| 36 ---
- 7 files changed, 3 insertions(+), 89 deletions(-)
+ 7 files changed, 3 insertions(+), 99 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index d487a11f..ff360c2e 100644
+index d487a11f..4cd6abf7 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -52,7 +52,7 @@ dep_drm = dependency('libdrm',
@@ -30,10 +31,20 @@ index d487a11f..ff360c2e 100644
required : get_option('x11'),
disabler : true
  )
-@@ -97,6 +97,7 @@ if not dep_glu.found() and host_machine.system() != 'darwin'
-   dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
- required : dep_x11.found())
- endif
+@@ -87,16 +87,7 @@ endif
+ 
+ dep_threads = dependency('threads')
+ 
+-dep_glu = dependency('glu', required : false)
+-# GLU is part of OpenGL.Framework
+-if not dep_glu.found() and host_machine.system() != 'darwin'
+-  _glu_name = 'GLU'
+-  if host_machine.system() == 'windows'
+-_glu_name = 'glu32'
+-  endif
+-  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
+-

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/

2024-04-18 Thread Matt Turner 
commit: 76eadd4eb864bd27c6916e0246dd93854d1dc742
Author: Matt Turner  gentoo  org>
AuthorDate: Thu Apr 18 18:52:15 2024 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Apr 18 18:56:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76eadd4e

x11-apps/mesa-progs: Drop some unnecessary utility code

These are not used by any of the programs we install, and they add
explicit dependence on desktop OpenGL.

Signed-off-by: Matt Turner  gentoo.org>

 .../files/9.0.0-Disable-things-we-don-t-want.patch| 14 +++---
 .../files/-Disable-things-we-don-t-want.patch | 15 ---
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
index b2374db36ba4..5b1104e71a13 100644
--- a/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From 4fa5131036f8db3186a9f7a9cce74261411c4ed9 Mon Sep 17 00:00:00 2001
+From 0e87b772b5d291ecf2cdc3f209321ea586918375 Mon Sep 17 00:00:00 2001
 From: Matt Turner 
 Date: Thu, 18 Apr 2024 13:24:18 -0400
 Subject: [PATCH] Disable things we don't want
@@ -9,9 +9,9 @@ Subject: [PATCH] Disable things we don't want
  src/egl/opengles2/meson.build |  5 -
  src/meson.build   |  2 --
  src/util/gl_wrap.h|  2 --
- src/util/meson.build  |  7 +--
+ src/util/meson.build  |  9 +
  src/xdemos/meson.build| 36 ---
- 7 files changed, 3 insertions(+), 80 deletions(-)
+ 7 files changed, 3 insertions(+), 82 deletions(-)
 
 diff --git a/meson.build b/meson.build
 index c1853f94..5424dc73 100644
@@ -125,16 +125,16 @@ index b2ff9c8f..f482df5e 100644
  
  #ifndef GLAPIENTRY
 diff --git a/src/util/meson.build b/src/util/meson.build
-index b4fe614f..e56b456e 100644
+index b4fe614f..d2c42dc2 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
-@@ -22,17 +22,12 @@ inc_util = include_directories('.')
+@@ -22,17 +22,10 @@ inc_util = include_directories('.')
  
  files_libutil = files(
'glinfo_common.c',
 -  'readtex.c',
-   'showbuffer.c',
-   'trackball.c',
+-  'showbuffer.c',
+-  'trackball.c',
'matrix.c',
  )
  

diff --git a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
index fd00abd227e7..9c352fea35db 100644
--- a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From edef3e745190669dcaedcb6c7798f5bd625254a7 Mon Sep 17 00:00:00 2001
+From b7bced77da267e51eaceeef68a213007ba54aa86 Mon Sep 17 00:00:00 2001
 From: Matt Turner 
 Date: Thu, 18 Apr 2024 13:24:18 -0400
 Subject: [PATCH] Disable things we don't want
@@ -6,15 +6,16 @@ Subject: [PATCH] Disable things we don't want
 v2: Enable libglad to satisfy egl dependencies
 v3: Enable most of libutil to fix undefined references in es2gears
 v4: Disable dmabufshare and remove dep on libXext
+v5: Drop trackball.c and showbuffer.c
 ---
  meson.build   |  3 ++-
  src/egl/opengl/meson.build| 35 --
  src/egl/opengles2/meson.build |  5 -
  src/meson.build   |  2 --
  src/util/gl_wrap.h|  2 --
- src/util/meson.build  |  7 +--
+ src/util/meson.build  |  9 +
  src/xdemos/meson.build| 36 ---
- 7 files changed, 3 insertions(+), 87 deletions(-)
+ 7 files changed, 3 insertions(+), 89 deletions(-)
 
 diff --git a/meson.build b/meson.build
 index d487a11f..ff360c2e 100644
@@ -134,16 +135,16 @@ index b2ff9c8f..f482df5e 100644
  
  #ifndef GLAPIENTRY
 diff --git a/src/util/meson.build b/src/util/meson.build
-index b4fe614f..e56b456e 100644
+index b4fe614f..d2c42dc2 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
-@@ -22,17 +22,12 @@ inc_util = include_directories('.')
+@@ -22,17 +22,10 @@ inc_util = include_directories('.')
  
  files_libutil = files(
'glinfo_common.c',
 -  'readtex.c',
-   'showbuffer.c',
-   'trackball.c',
+-  'showbuffer.c',
+-  'trackball.c',
'matrix.c',
  )

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/

2023-08-15 Thread Matt Turner 
commit: c893b5ef17bcd89e009f765f813b9da3a7771d88
Author: orbea  riseup  net>
AuthorDate: Tue Aug 15 14:12:24 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Tue Aug 15 14:39:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c893b5ef

x11-apps/mesa-progs: rebase live patch

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/32322
Signed-off-by: Matt Turner  gentoo.org>

 .../mesa-progs/files/-Disable-things-we-don-t-want.patch | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
index 417ee5b14185..55483ad5ec23 100644
--- a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From fa9eb6da5af8f55c49e4594b490d8af5904835f7 Mon Sep 17 00:00:00 2001
+From 639005a81abf915e7b6450baacf40ede01121cb7 Mon Sep 17 00:00:00 2001
 From: Matt Turner 
 Date: Fri, 27 Jan 2023 06:40:05 -0800
 Subject: [PATCH] Disable things we don't want
@@ -16,7 +16,7 @@ v3: Enable most of libutil to fix undefined references in 
es2gears
  7 files changed, 4 insertions(+), 89 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index bc3278e1..66433403 100644
+index 3e39b5a2..6d064ef6 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -87,16 +87,7 @@ endif
@@ -37,15 +37,15 @@ index bc3278e1..66433403 100644
  
  dep_glx = dependency('glx', required: false, disabler : true)
  if not dep_glx.found()
-@@ -145,6 +136,8 @@ else
+@@ -165,6 +156,8 @@ else
dep_glut = dependency('', required : false)
  endif
  
 +dep_glut = disabler()
 +
- if dep_glut.found() and cc.has_function('glutInitContextProfile',
- dependencies: [dep_glut],
- prefix : '#include ')
+ if dep_glut.found() and (dep_glut.type_name() == 'internal' or
+cc.has_function('glutInitContextProfile',
+dependencies: [dep_glut],
 diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
 index 9bca049c..e7122027 100644
 --- a/src/egl/opengl/meson.build

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/

2023-03-03 Thread Sam James 
commit: f0dfca7b390985f0a4e0cc7b37e451a8ee2519a4
Author: orbea  riseup  net>
AuthorDate: Sat Mar  4 04:55:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar  4 07:18:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0dfca7b

x11-apps/mesa-progs: Rebase live patch

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/29917
Signed-off-by: Sam James  gentoo.org>

 .../files/-Disable-things-we-don-t-want.patch  | 24 +++---
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
index fd625c5baf89..b889538a2fc2 100644
--- a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From f687e1297c9a26b219fc8b5a1faa6c1e3d1d6d16 Mon Sep 17 00:00:00 2001
+From 04603e5b169edbbe9a6d7dc6a00906c1382b141a Mon Sep 17 00:00:00 2001
 From: Matt Turner 
 Date: Fri, 27 Jan 2023 06:40:05 -0800
 Subject: [PATCH] Disable things we don't want
@@ -16,7 +16,7 @@ v3: Enable most of libutil to fix undefined references in 
es2gears
  7 files changed, 4 insertions(+), 94 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 6ad6ea7a..1c46da4f 100644
+index 29e5b41e..93a56b5f 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -87,16 +87,7 @@ endif
@@ -35,9 +35,9 @@ index 6ad6ea7a..1c46da4f 100644
 -endif
 +dep_glu = disabler()
  
- # GBM is needed for EGL on KMS
- dep_gbm = dependency('gbm', required : false, disabler : true)
-@@ -135,6 +126,8 @@ else
+ dep_glx = dependency('glx', required: false, disabler : true)
+ if not dep_glx.found() and host_machine.system() == 'darwin'
+@@ -144,6 +135,8 @@ else
dep_glut = dependency('', required : false)
  endif
  
@@ -47,7 +47,7 @@ index 6ad6ea7a..1c46da4f 100644
  dependencies: [dep_glut],
  prefix : '#include ')
 diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
-index 434adf21..e4b0c83a 100644
+index a613eb43..1c91ae1b 100644
 --- a/src/egl/opengl/meson.build
 +++ b/src/egl/opengl/meson.build
 @@ -25,38 +25,12 @@ executable(
@@ -90,7 +90,7 @@ index 434adf21..e4b0c83a 100644
  executable(
'eglinfo', 'eglinfo.c',
 @@ -64,10 +38,3 @@ executable(
-   include_directories: [inc_glad, '../../xdemos'],
+   include_directories: [inc_glad],
install: true
  )
 -
@@ -142,13 +142,13 @@ index b2ff9c8f..f482df5e 100644
  
  #ifndef GLAPIENTRY
 diff --git a/src/util/meson.build b/src/util/meson.build
-index ddcd4834..72e9480d 100644
+index b4fe614f..e56b456e 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
-@@ -21,17 +21,12 @@
- inc_util = include_directories('.')
+@@ -22,17 +22,12 @@ inc_util = include_directories('.')
  
  files_libutil = files(
+   'glinfo_common.c',
 -  'readtex.c',
'showbuffer.c',
'trackball.c',
@@ -165,11 +165,11 @@ index ddcd4834..72e9480d 100644
  _libutil = static_library(
'util',
 diff --git a/src/xdemos/meson.build b/src/xdemos/meson.build
-index d6d5d5d5..ce26699f 100644
+index a569fde5..40007616 100644
 --- a/src/xdemos/meson.build
 +++ b/src/xdemos/meson.build
 @@ -21,25 +21,7 @@
- glx_deps = [dep_gl, dep_x11, dep_m]
+ glx_deps = [dep_gl, dep_glx, dep_x11, dep_m]
  
  progs = [
 -  'glsync',

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/

2023-02-27 Thread Matt Turner 
commit: 042a0738bd4e57609c7744d4cf7b58cff46caaab
Author: orbea  riseup  net>
AuthorDate: Mon Feb 27 14:50:03 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Feb 27 18:44:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=042a0738

x11-apps/mesa-progs: Rebase live patch

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/29833
Signed-off-by: Matt Turner  gentoo.org>

 .../files/-Disable-things-we-don-t-want.patch| 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
index e2f12ba51f8a..fd625c5baf89 100644
--- a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
@@ -1,4 +1,4 @@
-From aeb01fb49314017aa70b63531f728e61c983d4b9 Mon Sep 17 00:00:00 2001
+From f687e1297c9a26b219fc8b5a1faa6c1e3d1d6d16 Mon Sep 17 00:00:00 2001
 From: Matt Turner 
 Date: Fri, 27 Jan 2023 06:40:05 -0800
 Subject: [PATCH] Disable things we don't want
@@ -6,36 +6,38 @@ Subject: [PATCH] Disable things we don't want
 v2: Enable libglad to satisfy egl dependencies
 v3: Enable most of libutil to fix undefined references in es2gears
 ---
- meson.build   | 11 +++
+ meson.build   | 13 +++--
  src/egl/opengl/meson.build| 33 
  src/egl/opengles2/meson.build |  5 -
  src/meson.build   |  2 --
  src/util/gl_wrap.h|  2 --
  src/util/meson.build  |  7 +--
  src/xdemos/meson.build| 36 ---
- 7 files changed, 4 insertions(+), 92 deletions(-)
+ 7 files changed, 4 insertions(+), 94 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index f93a731d..245d1655 100644
+index 6ad6ea7a..1c46da4f 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -81,14 +81,7 @@ endif
+@@ -87,16 +87,7 @@ endif
  
  dep_threads = dependency('threads')
  
--dep_glu = dependency('glu', required : dep_x11.found())
--if not dep_glu.found()
+-dep_glu = dependency('glu', required : false)
+-# GLU is part of OpenGL.Framework
+-if not dep_glu.found() and host_machine.system() != 'darwin'
 -  _glu_name = 'GLU'
 -  if host_machine.system() == 'windows'
 -_glu_name = 'glu32'
 -  endif
--  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h')
+-  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
+-required : dep_x11.found())
 -endif
 +dep_glu = disabler()
  
  # GBM is needed for EGL on KMS
  dep_gbm = dependency('gbm', required : false, disabler : true)
-@@ -127,6 +120,8 @@ else
+@@ -135,6 +126,8 @@ else
dep_glut = dependency('', required : false)
  endif

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/, x11-apps/mesa-progs/

2023-02-17 Thread Matt Turner 
commit: 3d0bf5f876dd08de8a820da21d1cd7cc98d504cd
Author: orbea  riseup  net>
AuthorDate: Fri Feb 17 15:06:17 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Feb 17 15:19:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d0bf5f8

x11-apps/mesa-progs: Remove upstreamed patch

Upstream-PR: https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/114
Upstream-Commit: 
https://gitlab.freedesktop.org/mesa/demos/-/commit/3a9d085315d530d6d9da0887279057077bf65714
Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/29635
Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/mesa-progs/files/-wayland-build.patch | 25 --
 x11-apps/mesa-progs/mesa-progs-.ebuild |  1 -
 2 files changed, 26 deletions(-)

diff --git a/x11-apps/mesa-progs/files/-wayland-build.patch 
b/x11-apps/mesa-progs/files/-wayland-build.patch
deleted file mode 100644
index 24af53dbc450..
--- a/x11-apps/mesa-progs/files/-wayland-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-PR:
-https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/114
-
-From 84e12c852937c03218e39048d7a2642d27e5d037 Mon Sep 17 00:00:00 2001
-From: orbea 
-Date: Fri, 10 Feb 2023 07:44:54 -0800
-Subject: [PATCH] meson: dep_libdecor is disabled without wayland
-

- meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/meson.build b/meson.build
-index f93a731d..cd3f6048 100644
 a/meson.build
-+++ b/meson.build
-@@ -77,6 +77,8 @@ if dep_wayland.found()
- 'xdg-shell', 'xdg-shell.xml'
-   )
-   dep_libdecor = dependency('libdecor-0', version : '>= 0.1')
-+else
-+  dep_libdecor = dependency('', required : false)
- endif
- 
- dep_threads = dependency('threads')

diff --git a/x11-apps/mesa-progs/mesa-progs-.ebuild 
b/x11-apps/mesa-progs/mesa-progs-.ebuild
index 50eb10914473..e41db480b343 100644
--- a/x11-apps/mesa-progs/mesa-progs-.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-.ebuild
@@ -42,7 +42,6 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}"/-Disable-things-we-don-t-want.patch
-   "${FILESDIR}"/-wayland-build.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/

2023-02-02 Thread Matt Turner 
commit: 9ebcb19270a73ada62218837526a42e93cb0730f
Author: orbea  riseup  net>
AuthorDate: Thu Feb  2 16:54:54 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Thu Feb  2 17:10:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ebcb192

x11-apps/mesa-progs: Update live patch

The build fails with USE=gles2 because libutil was disabled in the live
patch, but upstream now changed es2gears_x11 to depend on it. To fix
this most of libutil was enabled again excluding the parts that depend
on glu which do not seem to be required.

Closes: https://bugs.gentoo.org/892860
Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/29396
Signed-off-by: Matt Turner  gentoo.org>

 .../files/-Disable-things-we-don-t-want.patch  | 50 +-
 1 file changed, 21 insertions(+), 29 deletions(-)

diff --git a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
index fe4ced863480..393330b56e6c 100644
--- a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
@@ -1,18 +1,19 @@
-From 0baebcca66eb06aba0831e6596ff5c3245038cae Mon Sep 17 00:00:00 2001
+From 60fbad38f9a394607ac265902fc56c13dd8c9afc Mon Sep 17 00:00:00 2001
 From: Matt Turner 
 Date: Fri, 27 Jan 2023 06:40:05 -0800
 Subject: [PATCH] Disable things we don't want
 
 v2: Enable libglad to satisfy egl dependencies
+v3: Enable most of libutil to fix undefined references in es2gears
 ---
  meson.build   | 11 +++
  src/egl/opengl/meson.build| 26 -
  src/egl/opengles2/meson.build |  5 -
  src/meson.build   |  2 --
  src/util/gl_wrap.h|  2 --
- src/util/meson.build  | 21 
+ src/util/meson.build  |  7 +--
  src/xdemos/meson.build| 36 ---
- 7 files changed, 3 insertions(+), 100 deletions(-)
+ 7 files changed, 4 insertions(+), 85 deletions(-)
 
 diff --git a/meson.build b/meson.build
 index 1fb8eeb1..76f035fb 100644
@@ -44,10 +45,10 @@ index 1fb8eeb1..76f035fb 100644
  dependencies: [dep_glut],
  prefix : '#include ')
 diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
-index 22b8d23c..18ec823d 100644
+index 6b7039dc..46e4bec7 100644
 --- a/src/egl/opengl/meson.build
 +++ b/src/egl/opengl/meson.build
-@@ -4,32 +4,11 @@ executable(
+@@ -24,32 +24,11 @@ executable(
'eglgears_x11', files('eglgears.c'),
dependencies: [_deps, dep_glu, idep_eglut_x11]
  )
@@ -80,7 +81,7 @@ index 22b8d23c..18ec823d 100644
  
  executable(
'eglinfo', 'eglinfo.c',
-@@ -38,8 +17,3 @@ executable(
+@@ -58,8 +37,3 @@ executable(
install: true
  )
  
@@ -90,10 +91,10 @@ index 22b8d23c..18ec823d 100644
 -)
 -
 diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build
-index 9a442988..e912333b 100644
+index de47a69c..9b073a88 100644
 --- a/src/egl/opengles2/meson.build
 +++ b/src/egl/opengles2/meson.build
-@@ -9,11 +9,6 @@ executable(
+@@ -29,11 +29,6 @@ executable(
dependencies: [dep_gles2, idep_eglut_x11, idep_util],
install: true
  )
@@ -131,37 +132,28 @@ index b2ff9c8f..f482df5e 100644
  
  #ifndef GLAPIENTRY
 diff --git a/src/util/meson.build b/src/util/meson.build
-index ddcd4834..066073cc 100644
+index ddcd4834..72e9480d 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
-@@ -20,27 +20,6 @@
- 
+@@ -21,17 +21,12 @@
  inc_util = include_directories('.')
  
--files_libutil = files(
+ files_libutil = files(
 -  'readtex.c',
--  'showbuffer.c',
--  'trackball.c',
--  'matrix.c',
--)
--
+   'showbuffer.c',
+   'trackball.c',
+   'matrix.c',
+ )
+ 
 -_deps = [dep_glu, dep_m]
 -if dep_glut.found()
 -  files_libutil += files('shaderutil.c')
 -  _deps += dep_glut
 -endif
--
--_libutil = static_library(
--  'util',
--  files_libutil,
--  include_directories: inc_glad,
--  dependencies: _deps,
--)
--
- idep_util = declare_dependency(
--  link_with: _libutil,
-   include_directories: inc_util,
- )
++_deps = [dep_m]
+ 
+ _libutil = static_library(
+   'util',
 diff --git a/src/xdemos/meson.build b/src/xdemos/meson.build
 index d6d5d5d5..ce26699f 100644
 --- a/src/xdemos/meson.build

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/

2023-02-01 Thread Matt Turner 
commit: 8db7539aaf8fd57a238d15db9b7f92f7e2e47dc2
Author: orbea  riseup  net>
AuthorDate: Fri Jan 27 14:46:46 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Feb  1 15:59:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8db7539a

x11-apps/mesa-progs: Rebase patch

Signed-off-by: orbea  riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/29302
Signed-off-by: Matt Turner  gentoo.org>

 .../files/-Disable-things-we-don-t-want.patch  | 67 +++---
 1 file changed, 20 insertions(+), 47 deletions(-)

diff --git a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
index ec3219ae6ce3..fe4ced863480 100644
--- a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
@@ -1,24 +1,24 @@
-From e23cb684ce6ca066c73b426d9974a7c823891d88 Mon Sep 17 00:00:00 2001
+From 0baebcca66eb06aba0831e6596ff5c3245038cae Mon Sep 17 00:00:00 2001
 From: Matt Turner 
-Date: Sun, 28 Aug 2022 10:34:42 +0100
+Date: Fri, 27 Jan 2023 06:40:05 -0800
 Subject: [PATCH] Disable things we don't want
 
+v2: Enable libglad to satisfy egl dependencies
 ---
  meson.build   | 11 +++
  src/egl/opengl/meson.build| 26 -
  src/egl/opengles2/meson.build |  5 -
- src/glad/meson.build  | 17 -
  src/meson.build   |  2 --
  src/util/gl_wrap.h|  2 --
- src/util/meson.build  | 20 ---
+ src/util/meson.build  | 21 
  src/xdemos/meson.build| 36 ---
- 8 files changed, 3 insertions(+), 116 deletions(-)
+ 7 files changed, 3 insertions(+), 100 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index 0c15274b..36276541 100644
+index 1fb8eeb1..76f035fb 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -75,14 +75,7 @@ endif
+@@ -80,14 +80,7 @@ endif
  
  dep_threads = dependency('threads')
  
@@ -34,17 +34,17 @@ index 0c15274b..36276541 100644
  
  # GBM is needed for EGL on KMS
  dep_gbm = dependency('gbm', required : false, disabler : true)
-@@ -117,6 +110,8 @@ else
-   )
+@@ -126,6 +119,8 @@ else
+   dep_glut = dependency('', required : false)
  endif
  
 +dep_glut = disabler()
 +
  if dep_glut.found() and cc.has_function('glutInitContextProfile',
- include_directories: glut_incdir,
+ dependencies: [dep_glut],
  prefix : '#include ')
 diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
-index c0d4792b..f27b6885 100644
+index 22b8d23c..18ec823d 100644
 --- a/src/egl/opengl/meson.build
 +++ b/src/egl/opengl/meson.build
 @@ -4,32 +4,11 @@ executable(
@@ -90,11 +90,11 @@ index c0d4792b..f27b6885 100644
 -)
 -
 diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build
-index 59f69ed7..7137a961 100644
+index 9a442988..e912333b 100644
 --- a/src/egl/opengles2/meson.build
 +++ b/src/egl/opengles2/meson.build
 @@ -9,11 +9,6 @@ executable(
-   dependencies: [dep_gles2, idep_eglut_x11, dep_m],
+   dependencies: [dep_gles2, idep_eglut_x11, idep_util],
install: true
  )
 -executable(
@@ -104,37 +104,12 @@ index 59f69ed7..7137a961 100644
 -)
  executable(
'es2gears_wayland', files('es2gears.c'),
-   dependencies: [dep_gles2, idep_eglut_wayland, dep_m],
-diff --git a/src/glad/meson.build b/src/glad/meson.build
-index 2d107609..23dacd45 100644
 a/src/glad/meson.build
-+++ b/src/glad/meson.build
-@@ -19,20 +19,3 @@
- # SOFTWARE.
- 
- inc_glad = include_directories('include')
--
--_libglad_files = files('src/glad.c')
--if host_machine.system() == 'windows'
--  _libglad_files += files('src/glad_wgl.c')
--endif
--
--_libglad = static_library(
--  'glad',
--  _libglad_files,
--  include_directories: inc_glad
--)
--
--idep_glad = declare_dependency(
--  link_with: _libglad,
--  dependencies: dep_dl,
--  include_directories: inc_glad,
--)
+   dependencies: [dep_gles2, idep_eglut_wayland, idep_util],
 diff --git a/src/meson.build b/src/meson.build
-index 39cac78d..4d4abbf8 100644
+index e230057a..198ab59d 100644
 --- a/src/meson.build
 +++ b/src/meson.build
-@@ -55,5 +55,3 @@ endif
+@@ -58,5 +58,3 @@ endif
  if host_machine.system() == 'windows'
subdir('wgl')
  endif
@@ -156,10 +131,10 @@ index b2ff9c8f..f482df5e 100644
  
  #ifndef GLAPIENTRY
 diff --git a/src/util/meson.build b/src/util/meson.build
-index 959e2170..066073cc 100644
+index ddcd4834..066073cc 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
-@@ -20,26 +20,6 @@
+@@ -20,27 +20,6 @@
  
  inc_util = include_directories('.')
  
@@ -167,9 +142,10 @@ index 959e2170..066073cc 100644
 -  'readtex.c',
 -  'showbuffer.c',
 -  'trackball.c',
+-  'matrix.c',
 -)
 -
--_deps = [dep_glu]
+-_deps = [dep_glu, dep_m]
 -if

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/

2022-08-28 Thread Matt Turner 
commit: 10a4f9686a67378a3c49aa2297091f420b7a5e4c
Author: Mike Lothian  fireburn  co  uk>
AuthorDate: Sun Aug 28 09:37:15 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Aug 28 17:57:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a4f968

x11-apps/mesa-progs-: Update patch

This allows the patch to apply cleanly

Signed-off-by: Mike Lothian  fireburn.co.uk>
Signed-off-by: Matt Turner  gentoo.org>

 .../files/-Disable-things-we-don-t-want.patch  | 28 +++---
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
index 9d923a9cbc5c..ec3219ae6ce3 100644
--- a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
+++ b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
@@ -1,21 +1,21 @@
-From caa6f31f1032f21756ab327429702feb4381045e Mon Sep 17 00:00:00 2001
+From e23cb684ce6ca066c73b426d9974a7c823891d88 Mon Sep 17 00:00:00 2001
 From: Matt Turner 
-Date: Mon, 30 May 2022 12:16:24 -0400
+Date: Sun, 28 Aug 2022 10:34:42 +0100
 Subject: [PATCH] Disable things we don't want
 
 ---
  meson.build   | 11 +++
- src/egl/opengl/meson.build| 29 
+ src/egl/opengl/meson.build| 26 -
  src/egl/opengles2/meson.build |  5 -
  src/glad/meson.build  | 17 -
  src/meson.build   |  2 --
  src/util/gl_wrap.h|  2 --
  src/util/meson.build  | 20 ---
  src/xdemos/meson.build| 36 ---
- 8 files changed, 3 insertions(+), 119 deletions(-)
+ 8 files changed, 3 insertions(+), 116 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index e1968fab..9d59c1ec 100644
+index 0c15274b..36276541 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -75,14 +75,7 @@ endif
@@ -44,12 +44,12 @@ index e1968fab..9d59c1ec 100644
  include_directories: glut_incdir,
  prefix : '#include ')
 diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
-index ba7cadc3..789b25a5 100644
+index c0d4792b..f27b6885 100644
 --- a/src/egl/opengl/meson.build
 +++ b/src/egl/opengl/meson.build
-@@ -4,41 +4,12 @@ executable(
+@@ -4,32 +4,11 @@ executable(
'eglgears_x11', files('eglgears.c'),
-   dependencies: [_deps, idep_eglut_x11]
+   dependencies: [_deps, dep_glu, idep_eglut_x11]
  )
 -executable(
 -  'egltri_x11', files('egltri.c'),
@@ -63,7 +63,7 @@ index ba7cadc3..789b25a5 100644
 -  'xeglthreads', files('xeglthreads.c'),
 -  dependencies: [_deps, dep_x11]
 -)
--
+ 
  executable(
'eglgears_wayland', files('eglgears.c'),
dependencies: [_deps, dep_glu, idep_eglut_wayland]
@@ -77,13 +77,13 @@ index ba7cadc3..789b25a5 100644
 -  'eglkms', 'eglkms.c',
 -  dependencies: [_deps, dep_drm, dep_gbm, dep_egl]
 -)
--
+ 
  executable(
'eglinfo', 'eglinfo.c',
-   dependencies: [dep_egl],
+@@ -38,8 +17,3 @@ executable(
install: true
  )
--
+ 
 -executable(
 -  'peglgears', 'peglgears.c',
 -  dependencies: [dep_gl, dep_glu, dep_egl, dep_m, idep_util]
@@ -156,7 +156,7 @@ index b2ff9c8f..f482df5e 100644
  
  #ifndef GLAPIENTRY
 diff --git a/src/util/meson.build b/src/util/meson.build
-index 9168aecf..066073cc 100644
+index 959e2170..066073cc 100644
 --- a/src/util/meson.build
 +++ b/src/util/meson.build
 @@ -20,26 +20,6 @@
@@ -250,5 +250,5 @@ index d6d5d5d5..ce26699f 100644
  foreach p : thread_progs
executable(
 -- 
-2.35.1
+2.37.2

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/, x11-apps/mesa-progs/

2022-06-21 Thread Matt Turner 
commit: 18ce64eb9720d2a4dbbe459a7627c483907b4271
Author: Mike Lothian  fireburn  co  uk>
AuthorDate: Tue Jun 21 23:50:55 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Jun 22 01:24:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ce64eb

x11-apps/mesa-progs: Fix patch with recent upstream changes

This updates the patch after small changes were made to the meson.build
files in https://gitlab.freedesktop.org/mesa/demos/-/merge_requests/82

Closes: https://github.com/gentoo/gentoo/pull/26030
Signed-off-by: Mike Lothian  fireburn.co.uk>
Signed-off-by: Matt Turner  gentoo.org>

 .../files/-Disable-things-we-don-t-want.patch  | 254 +
 x11-apps/mesa-progs/mesa-progs-.ebuild |   2 +-
 2 files changed, 255 insertions(+), 1 deletion(-)

diff --git a/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch 
b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
new file mode 100644
index ..9d923a9cbc5c
--- /dev/null
+++ b/x11-apps/mesa-progs/files/-Disable-things-we-don-t-want.patch
@@ -0,0 +1,254 @@
+From caa6f31f1032f21756ab327429702feb4381045e Mon Sep 17 00:00:00 2001
+From: Matt Turner 
+Date: Mon, 30 May 2022 12:16:24 -0400
+Subject: [PATCH] Disable things we don't want
+
+---
+ meson.build   | 11 +++
+ src/egl/opengl/meson.build| 29 
+ src/egl/opengles2/meson.build |  5 -
+ src/glad/meson.build  | 17 -
+ src/meson.build   |  2 --
+ src/util/gl_wrap.h|  2 --
+ src/util/meson.build  | 20 ---
+ src/xdemos/meson.build| 36 ---
+ 8 files changed, 3 insertions(+), 119 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index e1968fab..9d59c1ec 100644
+--- a/meson.build
 b/meson.build
+@@ -75,14 +75,7 @@ endif
+ 
+ dep_threads = dependency('threads')
+ 
+-dep_glu = dependency('glu', required : dep_x11.found())
+-if not dep_glu.found()
+-  _glu_name = 'GLU'
+-  if host_machine.system() == 'windows'
+-_glu_name = 'glu32'
+-  endif
+-  dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h')
+-endif
++dep_glu = disabler()
+ 
+ # GBM is needed for EGL on KMS
+ dep_gbm = dependency('gbm', required : false, disabler : true)
+@@ -117,6 +110,8 @@ else
+   )
+ endif
+ 
++dep_glut = disabler()
++
+ if dep_glut.found() and cc.has_function('glutInitContextProfile',
+ include_directories: glut_incdir,
+ prefix : '#include ')
+diff --git a/src/egl/opengl/meson.build b/src/egl/opengl/meson.build
+index ba7cadc3..789b25a5 100644
+--- a/src/egl/opengl/meson.build
 b/src/egl/opengl/meson.build
+@@ -4,41 +4,12 @@ executable(
+   'eglgears_x11', files('eglgears.c'),
+   dependencies: [_deps, idep_eglut_x11]
+ )
+-executable(
+-  'egltri_x11', files('egltri.c'),
+-  dependencies: [_deps, dep_glu, idep_eglut_x11]
+-)
+-executable(
+-  'xeglgears', files('xeglgears.c'),
+-  dependencies: [_deps, dep_glu, dep_egl, dep_x11]
+-)
+-executable(
+-  'xeglthreads', files('xeglthreads.c'),
+-  dependencies: [_deps, dep_x11]
+-)
+-
+ executable(
+   'eglgears_wayland', files('eglgears.c'),
+   dependencies: [_deps, dep_glu, idep_eglut_wayland]
+ )
+-executable(
+-  'egltri_wayland', files('egltri.c'),
+-  dependencies: [_deps, dep_glu, idep_eglut_wayland]
+-)
+-
+-executable(
+-  'eglkms', 'eglkms.c',
+-  dependencies: [_deps, dep_drm, dep_gbm, dep_egl]
+-)
+-
+ executable(
+   'eglinfo', 'eglinfo.c',
+   dependencies: [dep_egl],
+   install: true
+ )
+-
+-executable(
+-  'peglgears', 'peglgears.c',
+-  dependencies: [dep_gl, dep_glu, dep_egl, dep_m, idep_util]
+-)
+-
+diff --git a/src/egl/opengles2/meson.build b/src/egl/opengles2/meson.build
+index 59f69ed7..7137a961 100644
+--- a/src/egl/opengles2/meson.build
 b/src/egl/opengles2/meson.build
+@@ -9,11 +9,6 @@ executable(
+   dependencies: [dep_gles2, idep_eglut_x11, dep_m],
+   install: true
+ )
+-executable(
+-  'es2tri', files('es2tri.c'),
+-  dependencies: [_deps_x11, dep_m],
+-  install: true
+-)
+ executable(
+   'es2gears_wayland', files('es2gears.c'),
+   dependencies: [dep_gles2, idep_eglut_wayland, dep_m],
+diff --git a/src/glad/meson.build b/src/glad/meson.build
+index 2d107609..23dacd45 100644
+--- a/src/glad/meson.build
 b/src/glad/meson.build
+@@ -19,20 +19,3 @@
+ # SOFTWARE.
+ 
+ inc_glad = include_directories('include')
+-
+-_libglad_files = files('src/glad.c')
+-if host_machine.system() == 'windows'
+-  _libglad_files += files('src/glad_wgl.c')
+-endif
+-
+-_libglad = static_library(
+-  'glad',
+-  _libglad_files,
+-  include_directories: inc_glad
+-)
+-
+-idep_glad = declare_dependency(
+-  link_with: _libglad,
+-  dependencies: dep_dl,
+-  include_directories: inc_glad,
+-)
+diff --git a/src/meson.build b/src/meson.build
+index 39cac78d..4d4abbf8 100644
+---

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/

2019-03-25 Thread Matt Turner 
commit: 23c2514d4597809769300c80e6f275b7db4c9eb6
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Mar 25 18:19:21 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 25 20:29:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23c2514d

x11-apps/mesa-progs: remove unused patch

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11502
Signed-off-by: Matt Turner  gentoo.org>

 ...sa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch | 33 --
 1 file changed, 33 deletions(-)

diff --git 
a/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch 
b/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch
deleted file mode 100644
index f0389cb8d9c..000
--- 
a/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/src/egl/eglut/eglut.c b/src/egl/eglut/eglut.c
-index 2ee6f15..9921746 100644
 a/src/egl/eglut/eglut.c
-+++ b/src/egl/eglut/eglut.c
-@@ -76,8 +76,7 @@ _eglutNow(void)
- static void
- _eglutDestroyWindow(struct eglut_window *win)
- {
--   if (_eglut->surface_type != EGL_PBUFFER_BIT &&
--   _eglut->surface_type != EGL_SCREEN_BIT_MESA)
-+   if (_eglut->surface_type != EGL_PBUFFER_BIT)
-   eglDestroySurface(_eglut->dpy, win->surface);
- 
-_eglutNativeFiniWindow(win);
-@@ -175,7 +174,6 @@ _eglutCreateWindow(const char *title, int x, int y, int w, 
int h)
- win->config, win->native.u.pixmap, NULL);
-   break;
-case EGL_PBUFFER_BIT:
--   case EGL_SCREEN_BIT_MESA:
-   win->surface = win->native.u.surface;
-   break;
-default:
-@@ -289,9 +287,7 @@ eglutDestroyWindow(int win)
-if (window->index != win)
-   return;
- 
--   /* XXX it causes some bug in st/egl KMS backend */
--   if ( _eglut->surface_type != EGL_SCREEN_BIT_MESA)
--  eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, 
EGL_NO_CONTEXT);
-+   eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, 
EGL_NO_CONTEXT);
- 
-_eglutDestroyWindow(_eglut->current);
- }

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/, x11-apps/mesa-progs/

2019-03-18 Thread Matt Turner 
commit: 8a1131945d85c4aa12bc24d6333cc6861f71b5d3
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Mar 18 09:24:07 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Mar 18 17:22:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a113194

x11-apps/mesa-progs: Bump to version 8.4.0

Closes: https://bugs.gentoo.org/650456
Signed-off-by: Lars Wendler  gentoo.org>
Signed-off-by: Matt Turner  gentoo.org>

 x11-apps/mesa-progs/Manifest   |   1 +
 .../files/mesa-progs-8.4.0-improve-printing.patch  | 289 +
 x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild|  68 +
 3 files changed, 358 insertions(+)

diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 2fff29c5e0a..729d07c6b69 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,2 +1,3 @@
 DIST mesa-demos-8.2.0.tar.bz2 10071635 BLAKE2B 
3619738f9aabb8a32e23e96fb3283c1215354f1b45c5c8df315d339b7d3153b0f0042bd0a5e1f45c8ca4c461284a1843615904a6f0d32b108f60c9a043cb99a8
 SHA512 
590e9fb66e23c0ad526754e9084858eb3e1fa906be55ee6121089325254b970e135e04d53c634cabd13d59c572ea39a4a877bce14b120d73850aafd159a5c8de
 DIST mesa-demos-8.3.0.tar.bz2 10044647 BLAKE2B 
66605d2be7a3e1ea30429b29c574d866961e7df6f17479647d8d4a3cb788f52701ee8c6379c208157348a265d0a3eb90b929415073fa03ba6aefc47f8a45e5c8
 SHA512 
9ba96980306953f7b72745063e75809fb8399bbd5fc58fca96290a8b4e61741bb82fb6171311eddf249ea12face83d7c7b087e6dade6833699a8d220fc752e3f
+DIST mesa-demos-8.4.0.tar.bz2 10073259 BLAKE2B 
d251e705c6e3d2fe959161d736401fd06ba267a9c389341098373670b6f44ca7cdb451d96e94e3b22f006b696a9b19e38096423f6438544539f46beda91c03f4
 SHA512 
b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957

diff --git a/x11-apps/mesa-progs/files/mesa-progs-8.4.0-improve-printing.patch 
b/x11-apps/mesa-progs/files/mesa-progs-8.4.0-improve-printing.patch
new file mode 100644
index 000..ffc4d3fa28d
--- /dev/null
+++ b/x11-apps/mesa-progs/files/mesa-progs-8.4.0-improve-printing.patch
@@ -0,0 +1,289 @@
+From aa9e66f2d1e96937c56e4141bf8c966a8a59983f Mon Sep 17 00:00:00 2001
+From: Brian Paul 
+Date: Wed, 28 Feb 2018 11:14:34 -0700
+Subject: [PATCH 1/4] glxinfo/wglinfo: remove print_shader_limits() code
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+And add queries of GL 2.0 limits.  All the VS, FS, GS limits which were
+reported with print_shader_limits() are also covered by the GL 2.0 and
+3.2 queries.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105285
+Reviewed-by: Mathias Fröhlich 
+Reviewed-by: Emil Velikov 
+---
+ src/xdemos/glinfo_common.c | 89 +-
+ 1 file changed, 11 insertions(+), 78 deletions(-)
+
+diff --git a/src/xdemos/glinfo_common.c b/src/xdemos/glinfo_common.c
+index 3668026b..7ffbeac5 100644
+--- a/src/xdemos/glinfo_common.c
 b/src/xdemos/glinfo_common.c
+@@ -378,74 +378,6 @@ struct token_name
+ };
+ 
+ 
+-static void
+-print_shader_limit_list(const struct token_name *lim)
+-{
+-   GLint max[1];
+-   unsigned i;
+-
+-   for (i = 0; lim[i].token; i++) {
+-  glGetIntegerv(lim[i].token, max);
+-  if (glGetError() == GL_NO_ERROR) {
+-   printf("%s = %d\n", lim[i].name, max[0]);
+-  }
+-   }
+-}
+-
+-
+-/**
+- * Print interesting limits for vertex/fragment shaders.
+- */
+-static void
+-print_shader_limits(GLenum target)
+-{
+-   static const struct token_name vertex_limits[] = {
+-  { GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, 
"GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB" },
+-  { GL_MAX_VARYING_FLOATS_ARB, "GL_MAX_VARYING_FLOATS_ARB" },
+-  { GL_MAX_VERTEX_ATTRIBS_ARB, "GL_MAX_VERTEX_ATTRIBS_ARB" },
+-  { GL_MAX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_TEXTURE_IMAGE_UNITS_ARB" },
+-  { GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB, 
"GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB" },
+-  { GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB, 
"GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB" },
+-  { GL_MAX_TEXTURE_COORDS_ARB, "GL_MAX_TEXTURE_COORDS_ARB" },
+-  { GL_MAX_VERTEX_OUTPUT_COMPONENTS  , "GL_MAX_VERTEX_OUTPUT_COMPONENTS  
" },
+-  { (GLenum) 0, NULL }
+-   };
+-   static const struct token_name fragment_limits[] = {
+-  { GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, 
"GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB" },
+-  { GL_MAX_TEXTURE_COORDS_ARB, "GL_MAX_TEXTURE_COORDS_ARB" },
+-  { GL_MAX_TEXTURE_IMAGE_UNITS_ARB, "GL_MAX_TEXTURE_IMAGE_UNITS_ARB" },
+-  { GL_MAX_FRAGMENT_INPUT_COMPONENTS , "GL_MAX_FRAGMENT_INPUT_COMPONENTS 
" },
+-  { (GLenum) 0, NULL }
+-   };
+-   static const struct token_name geometry_limits[] = {
+-  { GL_MAX_GEOMETRY_UNIFORM_COMPONENTS, 
"GL_MAX_GEOMETRY_UNIFORM_COMPONENTS" },
+-  { GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS, 
"GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS" },
+-  { GL_MAX_GEOMETRY_OUTPUT_VERTICES  ,

[gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/, x11-apps/mesa-progs/

2015-08-29 Thread Matt Turner 
commit: ae997dc2325c0b74ad1c9b6ee8542d44354c60b4
Author: Matt Turner mattst88 AT gentoo DOT org
AuthorDate: Sat Aug 29 17:49:52 2015 +
Commit: Matt Turner mattst88 AT gentoo DOT org
CommitDate: Sat Aug 29 17:50:59 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae997dc2

x11-apps/mesa-progs: Patch out more of EGL_MESA_screen_surface.

Bug: https://bugs.gentoo.org/555186

 ...sa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch | 33 ++
 x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild|  4 +++
 2 files changed, 37 insertions(+)

diff --git 
a/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch 
b/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch
new file mode 100644
index 000..f0389cb
--- /dev/null
+++ 
b/x11-apps/mesa-progs/files/mesa-progs-8.2.0-remove-EGL_SCREEN_BIT_MESA.patch
@@ -0,0 +1,33 @@
+diff --git a/src/egl/eglut/eglut.c b/src/egl/eglut/eglut.c
+index 2ee6f15..9921746 100644
+--- a/src/egl/eglut/eglut.c
 b/src/egl/eglut/eglut.c
+@@ -76,8 +76,7 @@ _eglutNow(void)
+ static void
+ _eglutDestroyWindow(struct eglut_window *win)
+ {
+-   if (_eglut-surface_type != EGL_PBUFFER_BIT 
+-   _eglut-surface_type != EGL_SCREEN_BIT_MESA)
++   if (_eglut-surface_type != EGL_PBUFFER_BIT)
+   eglDestroySurface(_eglut-dpy, win-surface);
+ 
+_eglutNativeFiniWindow(win);
+@@ -175,7 +174,6 @@ _eglutCreateWindow(const char *title, int x, int y, int w, 
int h)
+ win-config, win-native.u.pixmap, NULL);
+   break;
+case EGL_PBUFFER_BIT:
+-   case EGL_SCREEN_BIT_MESA:
+   win-surface = win-native.u.surface;
+   break;
+default:
+@@ -289,9 +287,7 @@ eglutDestroyWindow(int win)
+if (window-index != win)
+   return;
+ 
+-   /* XXX it causes some bug in st/egl KMS backend */
+-   if ( _eglut-surface_type != EGL_SCREEN_BIT_MESA)
+-  eglMakeCurrent(_eglut-dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, 
EGL_NO_CONTEXT);
++   eglMakeCurrent(_eglut-dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, 
EGL_NO_CONTEXT);
+ 
+_eglutDestroyWindow(_eglut-current);
+ }

diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild 
b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
index 359aad5..136546b 100644
--- a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
@@ -42,6 +42,10 @@ DEPEND=${RDEPEND}
 S=${WORKDIR}/${MY_P}
 EGIT_CHECKOUT_DIR=${S}
 
+PATCHES=(
+   ${FILESDIR}/${P}-remove-EGL_SCREEN_BIT_MESA.patch
+)
+
 src_unpack() {
default
[[ $PV = * ]]  git-r3_src_unpack