commit:     fe97459fc24f4748587ce92087398df9f4780733
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  6 15:34:27 2024 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 15:41:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe97459f

media-libs/libprojectm: add 4.1.0

Thank you Kai Blaschke <kai.blaschke <AT> kb-dev.net>

Closes: https://bugs.gentoo.org/903879

Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>

 media-libs/libprojectm/Manifest                    |  1 +
 .../libprojectm-4.1.0-patch-include-dir.patch      | 14 +++++
 media-libs/libprojectm/libprojectm-4.1.0.ebuild    | 51 ++++++++++++++++++
 media-libs/libprojectm/libprojectm-9999.ebuild     | 61 +++++++---------------
 4 files changed, 86 insertions(+), 41 deletions(-)

diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 68e4a8bfd054..3b1bc9de8622 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1 +1,2 @@
 DIST libprojectm-3.1.12.tar.gz 52831726 BLAKE2B 
f9a9ecf8fc55b49e664a61a5c0ca3eef745b00390d5dd3b1549d6d68985c246834d35adb96ab8595e2bf78997c4688096c7931a6be54ea9d867bfdbe5a427832
 SHA512 
6d265280f3e3e952686ebf77afd8b083669e9ab81d2d9d122168d47747c367ff3b17ab682cc041e4ac9cee9607b7393b5dcb067deac95fcbb97d63a9656912a5
+DIST libprojectm-4.1.0.tar.gz 47988290 BLAKE2B 
e593ddec881880fd767b0a89272e12fd383bf4695962243e2f9a968d0a09ee9522d5b60b783ec04b202fec53df4dfb006d940102bb2e548571275f525357e0fd
 SHA512 
034b217e65ddea246c460ea72b69fdb5836b2e8e34cf9d72d705258e10dba01132265010902da0ac1baf2bb52f2453ce38bfb3934a4816f17304a01963829a42

diff --git 
a/media-libs/libprojectm/files/libprojectm-4.1.0-patch-include-dir.patch 
b/media-libs/libprojectm/files/libprojectm-4.1.0-patch-include-dir.patch
new file mode 100644
index 000000000000..5bb0ac6507ba
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-4.1.0-patch-include-dir.patch
@@ -0,0 +1,14 @@
+--- a/vendor/SOIL2/CMakeLists.txt 2024-03-06 16:13:12.614370496 +0100
++++ b/vendor/SOIL2/CMakeLists.txt 2024-03-06 16:10:54.700987578 +0100
+@@ -22,8 +22,10 @@
+         )
+ 
+ target_include_directories(SOIL2
+-        PUBLIC
++        PRIVATE
+         "."
++        PUBLIC
++        "${CMAKE_CURRENT_SOURCE_DIR}/.."
+         )
+ 
+ target_link_libraries(SOIL2

diff --git a/media-libs/libprojectm/libprojectm-4.1.0.ebuild 
b/media-libs/libprojectm/libprojectm-4.1.0.ebuild
new file mode 100644
index 000000000000..bf97fbb81cb7
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-4.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="https://github.com/projectM-visualizer/projectm";
+
+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/releases/download/v${MY_PV}/libprojectM-${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+       KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+       S="${WORKDIR}/libprojectM-${MY_PV}"
+fi
+
+LICENSE="LGPL-2"
+SLOT="4"
+IUSE="gles2-only static-libs"
+
+RDEPEND="media-libs/mesa[X(+)]"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+       "${FILESDIR}"/libprojectm-4.1.0-patch-include-dir.patch
+)
+
+multilib_prc_prepare() {
+       cmake_src_prepare
+}
+
+multilib_src_configure() {
+       local mycmakeargs=(
+               -DENABLE_SDL_UI=OFF
+               -DENABLE_CXX_INTERFACE=OFF
+               -DENABLE_GLES=$(usex gles2-only)
+               -DENABLE_SYSTEM_GLM=ON
+               -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
+       )
+
+       cmake_src_configure
+}
+
+multilib_src_install_all() {
+       default
+}

diff --git a/media-libs/libprojectm/libprojectm-9999.ebuild 
b/media-libs/libprojectm/libprojectm-9999.ebuild
index 80cbf850fe76..9ab20605ed83 100644
--- a/media-libs/libprojectm/libprojectm-9999.ebuild
+++ b/media-libs/libprojectm/libprojectm-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit autotools
+inherit cmake-multilib
 
 DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
 HOMEPAGE="https://github.com/projectM-visualizer/projectm";
@@ -13,56 +13,35 @@ if [[ ${PV} == *9999 ]] ; then
        inherit git-r3
 else
        MY_PV="${PV/_/-}"
-       
SRC_URI="https://github.com/projectM-visualizer/projectm/archive/v${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+       
SRC_URI="https://github.com/projectM-visualizer/projectm/releases/download/v${MY_PV}/libprojectM-${MY_PV}.tar.gz
 -> ${P}.tar.gz"
        KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-       S=${WORKDIR}/projectm-${MY_PV}/
+       S="${WORKDIR}/libprojectM-${MY_PV}"
 fi
 
 LICENSE="LGPL-2"
-SLOT="0/2"
-IUSE="gles2 jack pulseaudio qt5 sdl"
-REQUIRED_USE="
-       jack? ( qt5 )
-       pulseaudio? ( qt5 )
-"
+SLOT="4"
+IUSE="gles2-only static-libs"
 
-RDEPEND="
-       gles2? ( media-libs/mesa[gles2] )
-       media-libs/glm
-       media-libs/mesa[X(+)]
-       jack? ( virtual/jack )
-       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 )
-       sdl? ( >=media-libs/libsdl2-2.0.5 )
-       sys-libs/zlib"
+RDEPEND="media-libs/mesa[X(+)]"
 
 DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-       default
-       eautoreconf
+multilib_prc_prepare() {
+       cmake_src_prepare
 }
 
-src_configure() {
-       local myeconfargs=(
-               $(use_enable gles2 gles)
-               $(use_enable jack)
-               $(use_enable qt5 qt)
-               $(use_enable pulseaudio)
-               $(use_enable sdl)
-               --enable-emscripten=no
+multilib_src_configure() {
+       local mycmakeargs=(
+               -DENABLE_SDL_UI=OFF
+               -DENABLE_CXX_INTERFACE=OFF
+               -DENABLE_GLES=$(usex gles2-only)
+               -DENABLE_SYSTEM_GLM=ON
+               -DBUILD_SHARED_LIBS=$(usex static-libs OFF ON)
        )
-       econf "${myeconfargs[@]}"
+
+       cmake_src_configure
 }
 
-src_install() {
+multilib_src_install_all() {
        default
-       find "${ED}" -name '*.la' -delete || die
 }

Reply via email to