Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 930404 - media-video/movit: fix media-libs/libepoxy[egl] dep
Summary: media-video/movit: fix media-libs/libepoxy[egl] dep
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Current packages (show other bugs)
Hardware: All Linux
: Normal normal
Assignee: No maintainer - Look at https://wiki.gentoo.org/wiki/Project:Proxy_Maintainers if you want to take care of it
URL:
Whiteboard:
Keywords: PullRequest
Depends on: 931696
Blocks:
  Show dependency tree
 
Reported: 2024-04-22 06:24 UTC by Klaus Kusche
Modified: 2024-05-10 23:06 UTC (History)
10 users (show)

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


Attachments
proposal ebuild (movit-1.6.3-r2.ebuild,1.13 KB, application/vnd.gentoo.ebuild)
2024-04-24 23:29 UTC, jms
Details
diff movit-1.6.3-r1 movit-1.6.3-r2 (movit-1.6.3-r2.diff,826 bytes, patch)
2024-04-24 23:37 UTC, jms
Details | Diff
proposal ebuild v2 (movit-1.6.3-r2.ebuild,1.08 KB, application/vnd.gentoo.ebuild)
2024-04-25 06:45 UTC, jms
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Klaus Kusche 2024-04-22 06:24:01 UTC
The four packages in the symmary depend on media-libs/libepoxy[egl].

This must be changed to media-libs/libepoxy[egl(+)],
because the current version of media-libs/libepoxy no longer has an egl USE flag,
egl is always provided now.

Reproducible: Always

Steps to Reproduce:
Try to update world:


Actual Results:  
  (media-libs/libepoxy-1.5.10-r3:0/0::gentoo, ebuild scheduled for merge) USE="X -test" conflicts with
WARNING: One or more updates/rebuilds have been skipped due to a dependency conflict:

media-libs/libepoxy:0

    >=media-libs/libepoxy-1.4[egl,X(+)] required by (gui-libs/gtk-4.12.5:4/4::gentoo, installed) USE="X cups gstreamer (-aqua) -broadway -cloudproviders -colord -examples (-ffmpeg) -introspection -sysprof -test (-vulkan) -wayland" CPU_FLAGS_X86="f16c"
Comment 1 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2024-04-22 06:28:37 UTC
commit 28b1e127fbd1c23073f172c09cc3725cd3887271
Author: Mart Raudsepp <leio@gentoo.org>
Date:   Mon Apr 22 07:32:59 2024 +0300

    gui-libs/wpebackend-fdo: Update dep for media-libs/libepoxy[egl] IUSE removal

    Signed-off-by: Mart Raudsepp <leio@gentoo.org>

commit 52ff5fb39a3c2a27bc76ee78a133789f5dd92568
Author: Mart Raudsepp <leio@gentoo.org>
Date:   Mon Apr 22 07:31:52 2024 +0300

    gui-libs/gtk: Update dep for media-libs/libepoxy[egl] IUSE removal

    Signed-off-by: Mart Raudsepp <leio@gentoo.org>


One bug per package though, please, or at least logically-related ones / maintained by the same people.

I'll change this one to be for movit.
Comment 2 Mart Raudsepp gentoo-dev 2024-04-22 07:16:59 UTC
Note that wpebackend-fdo you should be able to depclean from the system instead.
Comment 3 jms 2024-04-24 23:29:29 UTC
Created attachment 891669 [details]
proposal ebuild

Hi,
maybe this ebuild can be of use
Disclaimer true ebuild neophyte
it does compile...
Comment 4 jms 2024-04-24 23:37:33 UTC
Created attachment 891670 [details, diff]
diff movit-1.6.3-r1 movit-1.6.3-r2

--- /var/db/repos/localrepo/media-video/movit/movit-1.6.3-r1.ebuild     2024-04-24 17:45:21.805587993 +0200
+++ /var/db/repos/localrepo/media-video/movit/movit-1.6.3-r2.ebuild     2024-04-25 01:15:12.353980115 +0200
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -13,14 +13,17 @@

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"

 # no sane way to use OpenGL from within tests?
 RESTRICT="test"

 RDEPEND="media-libs/mesa[X(+)]
        >=dev-cpp/eigen-3.2.0:3
-       media-libs/libepoxy[egl,X]
+       || (
+               =media-libs/libepoxy-1.5.10-r2[egl,X]
+               >=media-libs/libepoxy-1.5.10-r3[X]
+       )
        >=sci-libs/fftw-3:=
        media-libs/libsd
Comment 5 Matt Whitlock 2024-04-25 01:17:37 UTC
> -       media-libs/libepoxy[egl,X]
> +       || (
> +               =media-libs/libepoxy-1.5.10-r2[egl,X]
> +               >=media-libs/libepoxy-1.5.10-r3[X]
> +       )

Why all the verbosity? Just do as the OP suggested: change "[egl,X]" to "[egl(+),X]".
Comment 6 jms 2024-04-25 06:36:46 UTC
(In reply to Matt Whitlock from comment #5)
> > -       media-libs/libepoxy[egl,X]
> > +       || (
> > +               =media-libs/libepoxy-1.5.10-r2[egl,X]
> > +               >=media-libs/libepoxy-1.5.10-r3[X]
> > +       )
> 
> Why all the verbosity? Just do as the OP suggested: change "[egl,X]" to
> "[egl(+),X]".

yes you're right

Beginning with EAPI 4, USE dependencies may specify default assumptions about values for flags that may or may not be missing from the IUSE of the matched package. Such defaults are specified by immediately following a flag with either (+) or (-). Use (+) to behave as if a missing flag is present and enabled, or (-) to behave as if it is present and disabled
Comment 7 jms 2024-04-25 06:45:15 UTC
Created attachment 891681 [details]
proposal ebuild v2

--- /var/db/repos/localrepo/media-video/movit/movit-1.6.3-r1.ebuild     2024-04-24 17:45:21.805587993 +0200
+++ /var/db/repos/localrepo/media-video/movit/movit-1.6.3-r2.ebuild     2024-04-25 08:25:26.466480532 +0200
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

 EAPI=8
@@ -13,14 +13,14 @@

 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"

 # no sane way to use OpenGL from within tests?
 RESTRICT="test"

 RDEPEND="media-libs/mesa[X(+)]
        >=dev-cpp/eigen-3.2.0:3
-       media-libs/libepoxy[egl,X]
+       media-libs/libepoxy[egl(+),X]
        >=sci-libs/fftw-3:=
        media-libs/libsdl2"
 DEPEND="${RDEPEND}"
Comment 8 Larry the Git Cow gentoo-dev 2024-05-02 08:51:48 UTC
The bug has been referenced in the following commit(s):

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

commit 265460200b9bfd8d758660e4c59953d8851bb39a
Author:     jms <buyer.jmsalvat@gmail.com>
AuthorDate: 2024-04-30 16:16:19 +0000
Commit:     Sam James <sam@gentoo.org>
CommitDate: 2024-05-02 08:51:22 +0000

    media-video/movit: add 1.7.1
    
    Closes: https://bugs.gentoo.org/930643
    Bug: https://bugs.gentoo.org/930404
    Signed-off-by: jms <buyer.jmsalvat@gmail.com>
    Closes: https://github.com/gentoo/gentoo/pull/36511
    Signed-off-by: Sam James <sam@gentoo.org>

 media-video/movit/Manifest           |  1 +
 media-video/movit/movit-1.7.1.ebuild | 44 ++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
Comment 9 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2024-05-10 23:06:56 UTC
Filed bug 931696 for stabilisation.