Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 924439 - x11-apps/mesa-progs unneeded dependency on media-libs/mesa
Summary: x11-apps/mesa-progs unneeded dependency on media-libs/mesa
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: Gentoo X packagers
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-02-13 20:28 UTC by stefan11111
Modified: 2024-05-20 06:27 UTC (History)
1 user (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description stefan11111 2024-02-13 20:28:26 UTC
x11-apps/mesa-progs depends on media-libs/mesa, but it builds and runs fine without mesa.

--- /var/db/repos/gentoo/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild    2024-01-17 02:10:45.000000000 +0200
+++ github/stefan_overlay/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild   2024-02-13 22:05:20.125896275 +0200
@@ -24,7 +24,6 @@
 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}]
Comment 1 stefan11111 2024-02-13 20:50:14 UTC
Better patch:

--- /var/db/repos/gentoo/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild    2024-01-17 02:10:45.000000000 +0200
+++ github/stefan_overlay/x11-apps/mesa-progs/mesa-progs-8.5.0.ebuild   2024-02-13 22:46:30.903427981 +0200
@@ -24,7 +24,7 @@
 IUSE="gles2 wayland X"

 RDEPEND="
-       media-libs/mesa[${MULTILIB_USEDEP},egl(+),gles2?,wayland?,X?]
+       media-libs/libglvnd[${MULTILIB_USEDEP},X?]
        wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
        X? (
                x11-libs/libX11[${MULTILIB_USEDEP}]
Comment 2 Matt Turner gentoo-dev 2024-02-14 03:55:49 UTC
Can you make a pull request or attach a git formatted patch?
Comment 3 stefan11111 2024-02-14 05:53:59 UTC
(In reply to Matt Turner from comment #2)
> Can you make a pull request or attach a git formatted patch?

Opened:
https://github.com/gentoo/gentoo/pull/35319
Comment 4 Larry the Git Cow gentoo-dev 2024-04-18 17:58:28 UTC
The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba4a4ca9d57c3f62630f0344c11c6163af388c42

commit ba4a4ca9d57c3f62630f0344c11c6163af388c42
Author:     Matt Turner <mattst88@gentoo.org>
AuthorDate: 2024-04-18 17:46:24 +0000
Commit:     Matt Turner <mattst88@gentoo.org>
CommitDate: 2024-04-18 17:58:10 +0000

    x11-apps/mesa-progs: Version bump to 9.0.0
    
    Closes: https://bugs.gentoo.org/857018
    Closes: https://bugs.gentoo.org/894156
    Closes: https://bugs.gentoo.org/924439
    Signed-off-by: Matt Turner <mattst88@gentoo.org>

 x11-apps/mesa-progs/Manifest                       |   1 +
 .../files/9.0.0-Disable-things-we-don-t-want.patch | 215 +++++++++++++++++++++
 x11-apps/mesa-progs/mesa-progs-9.0.0.ebuild        |  93 +++++++++
 3 files changed, 309 insertions(+)

Additionally, it has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aaca5e35eeb9f8cde316cc54a44f72900584be94

commit aaca5e35eeb9f8cde316cc54a44f72900584be94
Author:     Matt Turner <mattst88@gentoo.org>
AuthorDate: 2024-04-18 15:42:17 +0000
Commit:     Matt Turner <mattst88@gentoo.org>
CommitDate: 2024-04-18 17:58:09 +0000

    x11-apps/mesa-progs: Depend on libglvnd instead of mesa
    
    Bug: https://bugs.gentoo.org/857018
    Bug: https://bugs.gentoo.org/924439
    Signed-off-by: Matt Turner <mattst88@gentoo.org>

 x11-apps/mesa-progs/mesa-progs-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Comment 5 stefan11111 2024-04-19 15:20:11 UTC
It seems like things are somewhat different with mesa-progs-9.0.0
compared to mesa-progs-8.5.0.

There is a problematic dependency on glu.
I need this patch to get it to build:

--- a/meson.build   2024-04-19 18:09:42.688659443 +0300
+++ b/meson.build   2024-04-19 18:11:11.174063925 +0300
@@ -95,7 +95,7 @@
     _glu_name = 'glu32'
   endif
   dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
-    required : dep_x11.found())
+    required : false)
 endif
 dep_glu = disabler()


This patch applies on top of the already existing patch in
x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch

The patch could, perhaps, be modified to include the above?
Comment 6 stefan11111 2024-05-20 06:25:44 UTC
(In reply to stefan11111 from comment #5)
> It seems like things are somewhat different with mesa-progs-9.0.0
> compared to mesa-progs-8.5.0.
> 
> There is a problematic dependency on glu.
> I need this patch to get it to build:
> 
> --- a/meson.build   2024-04-19 18:09:42.688659443 +0300
> +++ b/meson.build   2024-04-19 18:11:11.174063925 +0300
> @@ -95,7 +95,7 @@
>      _glu_name = 'glu32'
>    endif
>    dep_glu = cc.find_library(_glu_name, has_headers: 'GL/glu.h',
> -    required : dep_x11.found())
> +    required : false)
>  endif
>  dep_glu = disabler()
> 
> 
> This patch applies on top of the already existing patch in
> x11-apps/mesa-progs/files/9.0.0-Disable-things-we-don-t-want.patch
> 
> The patch could, perhaps, be modified to include the above?

Looks like this was fixed.
https://github.com/gentoo/gentoo/commit/36c7d400cda7e81d361764954da2b872201ec07b
https://bugs.gentoo.org/show_bug.cgi?id=930356