commit:     b9f23717ac0349c35e628b4bc037a46445ece35e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 22 18:58:08 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 22 19:44:33 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9f23717

media-libs/libprojectm: Add missing include (again)

Fixes commit 44f8ed8a5ab719f6ff7c444cdf29f719f445e70b

Bug: https://bugs.gentoo.org/792204
Bug: https://bugs.gentoo.org/938435
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../libprojectm-3.1.12-missing-gl-header.patch     | 21 ++++++++++++++++
 .../libprojectm/libprojectm-3.1.12-r2.ebuild       | 28 ++++++++++------------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git 
a/media-libs/libprojectm/files/libprojectm-3.1.12-missing-gl-header.patch 
b/media-libs/libprojectm/files/libprojectm-3.1.12-missing-gl-header.patch
new file mode 100644
index 000000000000..8e6c7344a081
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-3.1.12-missing-gl-header.patch
@@ -0,0 +1,21 @@
+From: Dennis Braun <[email protected]>
+Date: Tue, 25 Oct 2022 10:19:09 +0200
+Subject: Add gl header to fix arm builds
+
+Forwarded: https://github.com/projectM-visualizer/projectm/issues/449
+---
+ src/projectM-qt/qprojectmwidget.hpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/projectM-qt/qprojectmwidget.hpp 
b/src/projectM-qt/qprojectmwidget.hpp
+index f51e2cf..5493acd 100644
+--- a/src/projectM-qt/qprojectmwidget.hpp
++++ b/src/projectM-qt/qprojectmwidget.hpp
+@@ -31,6 +31,7 @@
+ #include <QTimer>
+ #include <QApplication>
+ #include <QSettings>
++#include <GL/gl.h>
+ 
+ class QProjectMWidget : public QGLWidget
+ {

diff --git a/media-libs/libprojectm/libprojectm-3.1.12-r2.ebuild 
b/media-libs/libprojectm/libprojectm-3.1.12-r2.ebuild
index 3a4f384196d3..7694c18cc0c2 100644
--- a/media-libs/libprojectm/libprojectm-3.1.12-r2.ebuild
+++ b/media-libs/libprojectm/libprojectm-3.1.12-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,14 +8,14 @@ inherit autotools xdg
 DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
 HOMEPAGE="https://github.com/projectM-visualizer/projectm";
 
-if [[ ${PV} == *9999 ]] ; then
+if [[ ${PV} == *9999* ]] ; then
        EGIT_REPO_URI="https://github.com/projectM-visualizer/projectm.git";
        inherit git-r3
 else
        MY_PV="${PV/_/-}"
        
SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+       S="${WORKDIR}/projectm-${MY_PV}/"
        KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv sparc x86"
-       S=${WORKDIR}/projectm-${MY_PV}/
 fi
 
 LICENSE="LGPL-2"
@@ -29,26 +29,22 @@ REQUIRED_USE="
 RDEPEND="
        media-libs/glm
        media-libs/libglvnd[X(+)]
-       jack? (
-               virtual/jack
-       )
+       jack? ( virtual/jack )
+       pulseaudio? ( media-libs/libpulse )
        qt5? (
                dev-qt/qtcore:5
                dev-qt/qtdeclarative:5
                dev-qt/qtgui:5
-               dev-qt/qtwidgets:5
                dev-qt/qtopengl:5
-       )
-       pulseaudio? (
-               media-libs/libpulse
+               dev-qt/qtwidgets:5
        )
        sdl? ( >=media-libs/libsdl2-2.0.5 )
-       sys-libs/zlib"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-       virtual/pkgconfig
+       sys-libs/zlib
 "
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-missing-gl-header.patch" ) # bug 792204
 
 src_prepare() {
        default
@@ -59,8 +55,8 @@ src_configure() {
        local myeconfargs=(
                $(use_enable gles2 gles)
                $(use_enable jack)
-               $(use_enable qt5 qt)
                $(use_enable pulseaudio)
+               $(use_enable qt5 qt)
                $(use_enable sdl)
                --enable-emscripten=no
        )

Reply via email to