* [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/, x11-apps/mesa-progs/
@ 2023-02-17 15:19 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2023-02-17 15:19 UTC (permalink / raw
To: gentoo-commits
commit: 3d0bf5f876dd08de8a820da21d1cd7cc98d504cd
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Fri Feb 17 15:06:17 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 15:19:35 2023 +0000
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 <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/29635
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-apps/mesa-progs/files/9999-wayland-build.patch | 25 ----------------------
x11-apps/mesa-progs/mesa-progs-9999.ebuild | 1 -
2 files changed, 26 deletions(-)
diff --git a/x11-apps/mesa-progs/files/9999-wayland-build.patch b/x11-apps/mesa-progs/files/9999-wayland-build.patch
deleted file mode 100644
index 24af53dbc450..000000000000
--- a/x11-apps/mesa-progs/files/9999-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 <orbea@riseup.net>
-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-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 50eb10914473..e41db480b343 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -42,7 +42,6 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/9999-Disable-things-we-don-t-want.patch
- "${FILESDIR}"/9999-wayland-build.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/, x11-apps/mesa-progs/
@ 2024-09-18 18:22 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2024-09-18 18:22 UTC (permalink / raw
To: gentoo-commits
commit: 30f9323dbf4c1fe9f19e89b9b0af30add98b45dd
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 18 18:18:53 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Sep 18 18:22:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30f9323d
x11-apps/mesa-progs: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
x11-apps/mesa-progs/Manifest | 1 -
.../files/8.5.0-Disable-things-we-don-t-want.patch | 254 ---------------------
x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild | 78 -------
3 files changed, 333 deletions(-)
diff --git a/x11-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
index 0bb6b296cda9..ec59b11faacc 100644
--- a/x11-apps/mesa-progs/Manifest
+++ b/x11-apps/mesa-progs/Manifest
@@ -1,2 +1 @@
-DIST mesa-demos-8.5.0.tar.bz2 10367517 BLAKE2B 60e9edfcfe6d28f73964b81ae4e016fdbeb45d9d6d91de71bf736c86fa6181749f2e12729c8c716f6e6f5d4e39075de131877d1f09c3e511a4338b0f44ddb6a6 SHA512 df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8
DIST mesa-demos-9.0.0.tar.xz 14839368 BLAKE2B 426211886344e88616670f0da8c71385e0ab86fd7dab60c7a477b165f33d2f7bd5fd9297f1f67c78e60fed5c98ab8851c1bd4ae92a6b0b486fd158196b109eb0 SHA512 af33ef72a521416e39d93370b2b4ccb768f08084c9e4c0aa62868210d9465c858e5cb8e5d23952295a3073946f609eb8723ee60b39dd9fb6696c4e45aafbb2c1
diff --git a/x11-apps/mesa-progs/files/8.5.0-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/8.5.0-Disable-things-we-don-t-want.patch
deleted file mode 100644
index 666f568e461f..000000000000
--- a/x11-apps/mesa-progs/files/8.5.0-Disable-things-we-don-t-want.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From caa6f31f1032f21756ab327429702feb4381045e Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-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 <GL/freeglut.h>')
-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, idep_eglut_x11]
--)
--executable(
-- 'xeglgears', files('xeglgears.c'),
-- dependencies: [_deps, dep_egl, dep_x11]
--)
--executable(
-- 'xeglthreads', files('xeglthreads.c'),
-- dependencies: [_deps, dep_x11]
--)
--
- executable(
- 'eglgears_wayland', files('eglgears.c'),
- dependencies: [_deps, idep_eglut_wayland]
- )
--executable(
-- 'egltri_wayland', files('egltri.c'),
-- dependencies: [_deps, 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_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
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -55,5 +55,3 @@ endif
- if host_machine.system() == 'windows'
- subdir('wgl')
- endif
--
--subdir('data')
-diff --git a/src/util/gl_wrap.h b/src/util/gl_wrap.h
-index b2ff9c8f..f482df5e 100644
---- a/src/util/gl_wrap.h
-+++ b/src/util/gl_wrap.h
-@@ -7,10 +7,8 @@
-
- #ifdef __APPLE__
- # include <OpenGL/gl.h>
--# include <OpenGL/glu.h>
- #else
- # include <GL/gl.h>
--# include <GL/glu.h>
- #endif
-
- #ifndef GLAPIENTRY
-diff --git a/src/util/meson.build b/src/util/meson.build
-index 9168aecf..066073cc 100644
---- a/src/util/meson.build
-+++ b/src/util/meson.build
-@@ -20,26 +20,6 @@
-
- inc_util = include_directories('.')
-
--files_libutil = files(
-- 'readtex.c',
-- 'showbuffer.c',
-- 'trackball.c',
--)
--
--_deps = []
--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,
- )
-diff --git a/src/xdemos/meson.build b/src/xdemos/meson.build
-index d6d5d5d5..ce26699f 100644
---- a/src/xdemos/meson.build
-+++ b/src/xdemos/meson.build
-@@ -21,25 +21,7 @@
- glx_deps = [dep_gl, dep_x11, dep_m]
-
- progs = [
-- 'glsync',
-- 'glxdemo',
- 'glxgears',
-- 'glxgears_pixmap',
-- 'glxcontexts',
-- 'glxheads',
-- 'glxpixmap',
-- 'glxpbdemo',
-- 'glxsnoop',
-- 'glxswapcontrol',
-- 'manywin',
-- 'multictx',
-- 'offset',
-- 'overlay',
-- 'shape',
-- 'sharedtex',
-- 'texture_from_pixmap',
-- 'wincopy',
-- 'xfont',
- ]
- foreach p : progs
- executable(
-@@ -56,23 +38,7 @@ executable(
- install: true
- )
-
--executable(
-- 'xrotfontdemo',
-- files('xrotfontdemo.c', 'xuserotfont.c'),
-- dependencies: glx_deps,
-- install: true
--)
--
--_libpbutil = static_library(
-- 'pbutil',
-- files('pbutil.c'),
-- dependencies: glx_deps
--)
--
- pbutil_progs = [
-- 'glxgears_fbconfig',
-- 'pbinfo',
-- 'pbdemo',
- ]
- foreach p : pbutil_progs
- executable(
-@@ -84,8 +50,6 @@ foreach p : pbutil_progs
- endforeach
-
- thread_progs = [
-- 'glthreads',
-- 'sharedtex_mt',
- ]
- foreach p : thread_progs
- executable(
---
-2.35.1
-
diff --git a/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
deleted file mode 100644
index 7f0ce5664002..000000000000
--- a/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson-multilib
-
-MY_PN="${PN/progs/demos}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
-HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/ https://gitlab.freedesktop.org/mesa/demos"
-if [[ ${PV} = 9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
-else
- SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
- https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
- S="${WORKDIR}/${MY_P}"
-fi
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="gles2 wayland X"
-
-RDEPEND="
- media-libs/mesa[${MULTILIB_USEDEP},egl(+),gles2?,wayland?,X?]
- wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
- X? (
- x11-libs/libX11[${MULTILIB_USEDEP}]
- x11-libs/libXext[${MULTILIB_USEDEP}]
- )
-"
-DEPEND="${RDEPEND}
- wayland? ( >=dev-libs/wayland-protocols-1.12 )
- X? ( x11-base/xorg-proto )
-"
-BDEPEND="
- virtual/pkgconfig
- wayland? ( dev-util/wayland-scanner )
-"
-
-PATCHES=(
- "${FILESDIR}"/8.5.0-Disable-things-we-don-t-want.patch
-)
-
-pkg_setup() {
- MULTILIB_CHOST_TOOLS+=(
- /usr/bin/eglinfo
- )
-
- use X && MULTILIB_CHOST_TOOLS+=(
- /usr/bin/glxgears
- /usr/bin/glxinfo
- )
-
- use gles2 && use X && MULTILIB_CHOST_TOOLS+=(
- /usr/bin/es2_info
- /usr/bin/es2gears_x11
- )
-
- use gles2 && use wayland && MULTILIB_CHOST_TOOLS+=(
- /usr/bin/es2gears_wayland
- )
-}
-
-multilib_src_configure() {
- local emesonargs=(
- -Dlibdrm=disabled
- -Degl=enabled
- -Dgles1=disabled
- $(meson_feature gles2)
- -Dosmesa=disabled
- $(meson_feature wayland)
- $(meson_feature X x11)
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/, x11-apps/mesa-progs/
@ 2022-06-22 1:25 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2022-06-22 1:25 UTC (permalink / raw
To: gentoo-commits
commit: 18ce64eb9720d2a4dbbe459a7627c483907b4271
Author: Mike Lothian <mike <AT> fireburn <DOT> co <DOT> uk>
AuthorDate: Tue Jun 21 23:50:55 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 22 01:24:57 2022 +0000
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 <mike <AT> fireburn.co.uk>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../files/9999-Disable-things-we-don-t-want.patch | 254 +++++++++++++++++++++
x11-apps/mesa-progs/mesa-progs-9999.ebuild | 2 +-
2 files changed, 255 insertions(+), 1 deletion(-)
diff --git a/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
new file mode 100644
index 000000000000..9d923a9cbc5c
--- /dev/null
+++ b/x11-apps/mesa-progs/files/9999-Disable-things-we-don-t-want.patch
@@ -0,0 +1,254 @@
+From caa6f31f1032f21756ab327429702feb4381045e Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+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 <GL/freeglut.h>')
+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
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -55,5 +55,3 @@ endif
+ if host_machine.system() == 'windows'
+ subdir('wgl')
+ endif
+-
+-subdir('data')
+diff --git a/src/util/gl_wrap.h b/src/util/gl_wrap.h
+index b2ff9c8f..f482df5e 100644
+--- a/src/util/gl_wrap.h
++++ b/src/util/gl_wrap.h
+@@ -7,10 +7,8 @@
+
+ #ifdef __APPLE__
+ # include <OpenGL/gl.h>
+-# include <OpenGL/glu.h>
+ #else
+ # include <GL/gl.h>
+-# include <GL/glu.h>
+ #endif
+
+ #ifndef GLAPIENTRY
+diff --git a/src/util/meson.build b/src/util/meson.build
+index 9168aecf..066073cc 100644
+--- a/src/util/meson.build
++++ b/src/util/meson.build
+@@ -20,26 +20,6 @@
+
+ inc_util = include_directories('.')
+
+-files_libutil = files(
+- 'readtex.c',
+- 'showbuffer.c',
+- 'trackball.c',
+-)
+-
+-_deps = [dep_glu]
+-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,
+ )
+diff --git a/src/xdemos/meson.build b/src/xdemos/meson.build
+index d6d5d5d5..ce26699f 100644
+--- a/src/xdemos/meson.build
++++ b/src/xdemos/meson.build
+@@ -21,25 +21,7 @@
+ glx_deps = [dep_gl, dep_x11, dep_m]
+
+ progs = [
+- 'glsync',
+- 'glxdemo',
+ 'glxgears',
+- 'glxgears_pixmap',
+- 'glxcontexts',
+- 'glxheads',
+- 'glxpixmap',
+- 'glxpbdemo',
+- 'glxsnoop',
+- 'glxswapcontrol',
+- 'manywin',
+- 'multictx',
+- 'offset',
+- 'overlay',
+- 'shape',
+- 'sharedtex',
+- 'texture_from_pixmap',
+- 'wincopy',
+- 'xfont',
+ ]
+ foreach p : progs
+ executable(
+@@ -56,23 +38,7 @@ executable(
+ install: true
+ )
+
+-executable(
+- 'xrotfontdemo',
+- files('xrotfontdemo.c', 'xuserotfont.c'),
+- dependencies: glx_deps,
+- install: true
+-)
+-
+-_libpbutil = static_library(
+- 'pbutil',
+- files('pbutil.c'),
+- dependencies: glx_deps
+-)
+-
+ pbutil_progs = [
+- 'glxgears_fbconfig',
+- 'pbinfo',
+- 'pbdemo',
+ ]
+ foreach p : pbutil_progs
+ executable(
+@@ -84,8 +50,6 @@ foreach p : pbutil_progs
+ endforeach
+
+ thread_progs = [
+- 'glthreads',
+- 'sharedtex_mt',
+ ]
+ foreach p : thread_progs
+ executable(
+--
+2.35.1
+
diff --git a/x11-apps/mesa-progs/mesa-progs-9999.ebuild b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
index 0de99d7b802b..cc49098d3e76 100644
--- a/x11-apps/mesa-progs/mesa-progs-9999.ebuild
+++ b/x11-apps/mesa-progs/mesa-progs-9999.ebuild
@@ -41,7 +41,7 @@ BDEPEND="
"
PATCHES=(
- "${FILESDIR}"/8.5.0-Disable-things-we-don-t-want.patch
+ "${FILESDIR}"/9999-Disable-things-we-don-t-want.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/, x11-apps/mesa-progs/
@ 2019-03-18 17:23 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2019-03-18 17:23 UTC (permalink / raw
To: gentoo-commits
commit: 8a1131945d85c4aa12bc24d6333cc6861f71b5d3
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 18 09:24:07 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 17:22:49 2019 +0000
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 <polynomial-c <AT> gentoo.org>
Signed-off-by: Matt Turner <mattst88 <AT> 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 00000000000..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 <brianp@vmware.com>
+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 <mathias.froehlich@web.de>
+Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+---
+ 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 , "GL_MAX_GEOMETRY_OUTPUT_VERTICES " },
+- { GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS, "GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS" },
+- { GL_MAX_GEOMETRY_INPUT_COMPONENTS , "GL_MAX_GEOMETRY_INPUT_COMPONENTS " },
+- { GL_MAX_GEOMETRY_OUTPUT_COMPONENTS, "GL_MAX_GEOMETRY_OUTPUT_COMPONENTS" },
+- { (GLenum) 0, NULL }
+- };
+-
+- switch (target) {
+- case GL_VERTEX_SHADER:
+- printf(" GL_VERTEX_SHADER_ARB:\n");
+- print_shader_limit_list(vertex_limits);
+- break;
+-
+- case GL_FRAGMENT_SHADER:
+- printf(" GL_FRAGMENT_SHADER_ARB:\n");
+- print_shader_limit_list(fragment_limits);
+- break;
+-
+- case GL_GEOMETRY_SHADER:
+- printf(" GL_GEOMETRY_SHADER:\n");
+- print_shader_limit_list(geometry_limits);
+- break;
+- }
+-}
+-
+-
+ /**
+ * Print interesting limits for vertex/fragment programs.
+ */
+@@ -627,7 +559,17 @@ print_limits(const char *extensions, const char *oglstring, int version,
+ { 1, GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS, "GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS", "GL_ARB_tessellation_shader" },
+ { 1, GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS, "GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS", "GL_ARB_tessellation_shader" },
+ #endif
+-
++#if defined(GL_VERSION_2_0)
++ { 1, GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS", "2.0" },
++ { 1, GL_MAX_DRAW_BUFFERS, "GL_MAX_DRAW_BUFFERS", "2.0" },
++ { 1, GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS", "2.0" },
++ { 1, GL_MAX_TEXTURE_COORDS, "GL_MAX_TEXTURE_COORDS", "2.0" },
++ { 1, GL_MAX_TEXTURE_IMAGE_UNITS, "GL_MAX_TEXTURE_IMAGE_UNITS", "2.0" },
++ { 1, GL_MAX_VARYING_FLOATS, "GL_MAX_VARYING_FLOATS", "2.0" },
++ { 1, GL_MAX_VERTEX_ATTRIBS, "GL_MAX_VERTEX_ATTRIBS", "2.0" },
++ { 1, GL_MAX_VERTEX_UNIFORM_COMPONENTS, "GL_MAX_VERTEX_UNIFORM_COMPONENTS", "2.0" },
++ { 1, GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS", "2.0" },
++#endif
+ #if defined(GL_VERSION_3_0)
+ { 1, GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS, "GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS", "3.0" },
+ { 1, GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS, "GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS", "3.0" },
+@@ -819,15 +761,6 @@ print_limits(const char *extensions, const char *oglstring, int version,
+ print_program_limits(GL_FRAGMENT_PROGRAM_ARB, extfuncs);
+ }
+ #endif
+- if (extension_supported("GL_ARB_vertex_shader", extensions)) {
+- print_shader_limits(GL_VERTEX_SHADER_ARB);
+- }
+- if (extension_supported("GL_ARB_fragment_shader", extensions)) {
+- print_shader_limits(GL_FRAGMENT_SHADER_ARB);
+- }
+- if (version >= 32) {
+- print_shader_limits(GL_GEOMETRY_SHADER);
+- }
+ }
+
+
+--
+2.19.2
+
+From 9804a083feb676cf810905a6826f708f54a15be2 Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Wed, 28 Feb 2018 11:19:43 -0700
+Subject: [PATCH 2/4] glxinfo/wglinfo: fix VP/FP strings, indentation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Print extensions string instead of program target.
+Use less indentation to match other sections.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105285
+Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
+Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+---
+ src/xdemos/glinfo_common.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/xdemos/glinfo_common.c b/src/xdemos/glinfo_common.c
+index 7ffbeac5..57dccc82 100644
+--- a/src/xdemos/glinfo_common.c
++++ b/src/xdemos/glinfo_common.c
+@@ -419,10 +419,10 @@ print_program_limits(GLenum target,
+ int i;
+
+ if (target == GL_VERTEX_PROGRAM_ARB) {
+- printf(" GL_VERTEX_PROGRAM_ARB:\n");
++ printf(" GL_ARB_vertex_program:\n");
+ }
+ else if (target == GL_FRAGMENT_PROGRAM_ARB) {
+- printf(" GL_FRAGMENT_PROGRAM_ARB:\n");
++ printf(" GL_ARB_fragment_program:\n");
+ }
+ else {
+ return; /* something's wrong */
+@@ -431,14 +431,14 @@ print_program_limits(GLenum target,
+ for (i = 0; common_limits[i].token; i++) {
+ extfuncs->GetProgramivARB(target, common_limits[i].token, max);
+ if (glGetError() == GL_NO_ERROR) {
+- printf(" %s = %d\n", common_limits[i].name, max[0]);
++ printf(" %s = %d\n", common_limits[i].name, max[0]);
+ }
+ }
+ if (target == GL_FRAGMENT_PROGRAM_ARB) {
+ for (i = 0; fragment_limits[i].token; i++) {
+ extfuncs->GetProgramivARB(target, fragment_limits[i].token, max);
+ if (glGetError() == GL_NO_ERROR) {
+- printf(" %s = %d\n", fragment_limits[i].name, max[0]);
++ printf(" %s = %d\n", fragment_limits[i].name, max[0]);
+ }
+ }
+ }
+--
+2.19.2
+
+From 6a7cee63b714699b98a31b3e57039d26506465ae Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Mon, 5 Mar 2018 09:37:17 -0700
+Subject: [PATCH 3/4] glxinfo/wglinfo: print (110) instead of empty line
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The GL_SHADING_LANGUAGE_VERSION query returns an empty string for
+GLSL 1.10. Instead of printing an empty line, print (110).
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105285
+Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
+Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+---
+ src/xdemos/glinfo_common.c | 13 +++++++++++--
+ 1 file changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/xdemos/glinfo_common.c b/src/xdemos/glinfo_common.c
+index 57dccc82..a8ec12e7 100644
+--- a/src/xdemos/glinfo_common.c
++++ b/src/xdemos/glinfo_common.c
+@@ -745,8 +745,17 @@ print_limits(const char *extensions, const char *oglstring, int version,
+ glGetIntegerv(GL_NUM_SHADING_LANGUAGE_VERSIONS, &n);
+ printf(" GL_NUM_SHADING_LANGUAGE_VERSIONS = %d\n", n);
+ for (i = 0; i < n; i++) {
+- printf(" %s\n", (const char *)
+- extfuncs->GetStringi(GL_SHADING_LANGUAGE_VERSION, i));
++ const char *lang = (const char *)
++ extfuncs->GetStringi(GL_SHADING_LANGUAGE_VERSION, i);
++ if (lang[0] == 0) {
++ /* The empty string is really GLSL 1.10. Instead of
++ * printing an empty line, print (110). For more info,
++ * see the GL 4.3 compatibility profile specification,
++ * page 628.
++ */
++ lang = "(110)";
++ }
++ printf(" %s\n", lang);
+ }
+ }
+ #endif
+--
+2.19.2
+
+From 27a0e5af804b3d28c51bd05ad38d25a2c8b4112d Mon Sep 17 00:00:00 2001
+From: Brian Paul <brianp@vmware.com>
+Date: Mon, 5 Mar 2018 09:44:41 -0700
+Subject: [PATCH 4/4] glxinfo/wglinfo: improve GL_ARB_imaging query code
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Print GL_MAX_CONVOLUTION_WIDTH, HEIGHT on separate lines.
+Print GL_MAX_COLOR_MATRIX_STACK_DEPTH in same section.
+
+Reviewed-by: Mathias Fröhlich <mathias.froehlich@web.de>
+Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
+---
+ src/xdemos/glinfo_common.c | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/xdemos/glinfo_common.c b/src/xdemos/glinfo_common.c
+index a8ec12e7..92467d67 100644
+--- a/src/xdemos/glinfo_common.c
++++ b/src/xdemos/glinfo_common.c
+@@ -464,7 +464,6 @@ print_limits(const char *extensions, const char *oglstring, int version,
+ { 1, GL_MAX_ATTRIB_STACK_DEPTH, "GL_MAX_ATTRIB_STACK_DEPTH", NULL },
+ { 1, GL_MAX_CLIENT_ATTRIB_STACK_DEPTH, "GL_MAX_CLIENT_ATTRIB_STACK_DEPTH", NULL },
+ { 1, GL_MAX_CLIP_PLANES, "GL_MAX_CLIP_PLANES", NULL },
+- { 1, GL_MAX_COLOR_MATRIX_STACK_DEPTH, "GL_MAX_COLOR_MATRIX_STACK_DEPTH", "GL_ARB_imaging" },
+ { 1, GL_MAX_ELEMENTS_VERTICES, "GL_MAX_ELEMENTS_VERTICES", NULL },
+ { 1, GL_MAX_ELEMENTS_INDICES, "GL_MAX_ELEMENTS_INDICES", NULL },
+ { 1, GL_MAX_EVAL_ORDER, "GL_MAX_EVAL_ORDER", NULL },
+@@ -716,12 +715,16 @@ print_limits(const char *extensions, const char *oglstring, int version,
+
+ /* these don't fit into the above mechanism, unfortunately */
+ if (extension_supported("GL_ARB_imaging", extensions)) {
++ GLint d;
++ printf(" GL_ARB_imaging:\n");
+ extfuncs->GetConvolutionParameteriv(GL_CONVOLUTION_2D,
+- GL_MAX_CONVOLUTION_WIDTH, max);
++ GL_MAX_CONVOLUTION_WIDTH, &d);
++ printf(" GL_MAX_CONVOLUTION_WIDTH = %d\n", d);
+ extfuncs->GetConvolutionParameteriv(GL_CONVOLUTION_2D,
+- GL_MAX_CONVOLUTION_HEIGHT, max+1);
+- printf(" GL_ARB_imaging:\n");
+- printf(" GL_MAX_CONVOLUTION_WIDTH/HEIGHT = %d, %d\n", max[0], max[1]);
++ GL_MAX_CONVOLUTION_HEIGHT, &d);
++ printf(" GL_MAX_CONVOLUTION_HEIGHT = %d\n", d);
++ glGetIntegerv(GL_MAX_COLOR_MATRIX_STACK_DEPTH, &d);
++ printf(" GL_MAX_COLOR_MATRIX_STACK_DEPTH = %d\n", d);
+ }
+
+ if (extension_supported("GL_ARB_texture_compression", extensions)) {
+--
+2.19.2
+
diff --git a/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
new file mode 100644
index 00000000000..a2a56e359cd
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-8.4.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PN="${PN/progs/demos}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/demos.git"
+ EGIT_CHECKOUT_DIR="${S}"
+ EXPERIMENTAL="true"
+else
+ SRC_URI="https://mesa.freedesktop.org/archive/demos/${MY_P}.tar.bz2
+ https://mesa.freedesktop.org/archive/demos/${PV}/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+ S="${WORKDIR}/${MY_P}"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="egl gles2"
+
+RDEPEND="
+ media-libs/mesa[egl?,gles2?]
+ virtual/opengl
+ x11-libs/libX11"
+DEPEND="${RDEPEND}
+ media-libs/glew
+ virtual/glu
+ x11-base/xorg-proto"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-improve-printing.patch
+)
+
+src_prepare() {
+ default
+ [[ $PV = 9999* ]] && eautoreconf
+}
+
+src_compile() {
+ emake -C src/xdemos glxgears glxinfo
+
+ if use egl; then
+ emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
+ emake -C src/egl/eglut/ libeglut_x11.la
+ emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
+
+ if use gles2; then
+ emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
+ emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
+ fi
+ fi
+}
+
+src_install() {
+ dobin src/xdemos/{glxgears,glxinfo}
+ if use egl; then
+ dobin src/egl/opengl/egl{info,gears_x11}
+
+ use gles2 && dobin src/egl/opengles2/es2{_info,gears_x11}
+ fi
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/, x11-apps/mesa-progs/
@ 2015-08-29 17:47 Matt Turner
0 siblings, 0 replies; 5+ messages in thread
From: Matt Turner @ 2015-08-29 17:47 UTC (permalink / raw
To: gentoo-commits
commit: ae997dc2325c0b74ad1c9b6ee8542d44354c60b4
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 17:49:52 2015 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 17:50:59 2015 +0000
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 0000000..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 = 9999* ]] && git-r3_src_unpack
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-18 18:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-17 15:19 [gentoo-commits] repo/gentoo:master commit in: x11-apps/mesa-progs/files/, x11-apps/mesa-progs/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2024-09-18 18:22 Matt Turner
2022-06-22 1:25 Matt Turner
2019-03-18 17:23 Matt Turner
2015-08-29 17:47 Matt Turner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox