gentoo auto-resync : 06:03:2024 - 19:06:26

4 files changed, 89 insertions, 42 deletions

diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 5815eaeef7e5..0c8de7172065 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,4 +1,7 @@
+AUX libprojectm-4.1.0-patch-include-dir.patch 352 BLAKE2B a5259cb92ab401f04fb24dcf615bf2ec04491c650b39db246fed2b6c889a5781a7ace32edaf58a2baf04e5724adc123c1bde45f95440ca489af20ae7937ba358 SHA512 37ee8f7662ab2cd5135159b071297c4c72bce602b4af9bbbff3769f6c22795a9421aa14270cbdfb7ba831d0b37456b0dc1b343f713aead6ae77e415374314164
 DIST libprojectm-3.1.12.tar.gz 52831726 BLAKE2B f9a9ecf8fc55b49e664a61a5c0ca3eef745b00390d5dd3b1549d6d68985c246834d35adb96ab8595e2bf78997c4688096c7931a6be54ea9d867bfdbe5a427832 SHA512 6d265280f3e3e952686ebf77afd8b083669e9ab81d2d9d122168d47747c367ff3b17ab682cc041e4ac9cee9607b7393b5dcb067deac95fcbb97d63a9656912a5
+DIST libprojectm-4.1.0.tar.gz 47988290 BLAKE2B e593ddec881880fd767b0a89272e12fd383bf4695962243e2f9a968d0a09ee9522d5b60b783ec04b202fec53df4dfb006d940102bb2e548571275f525357e0fd SHA512 034b217e65ddea246c460ea72b69fdb5836b2e8e34cf9d72d705258e10dba01132265010902da0ac1baf2bb52f2453ce38bfb3934a4816f17304a01963829a42
 EBUILD libprojectm-3.1.12.ebuild 1417 BLAKE2B 0f578630c8c7862fe0fa641ee2ed5014abd3b86c1cb0f6d1b22e8f2b7e5b061c2a67105f40efbb80b0c5301f63c80ef66ab13b8dff313eebdbc5b1dd4a8813d8 SHA512 ee4c2019e0b6b91d88fa09e7028e4c54d495d9e72cd0b5fae9fff369421eda8abe4e69ae484e4df74221629663b573cd3ab42fed3db8e6a77c542a0b847d5f69
-EBUILD libprojectm-9999.ebuild 1414 BLAKE2B f47b16ac9feaede68d778bf595e0e7aa133f631781170928cae5c16b56c06378ed85b0667837bb19c9a5a2017557270622569014b05bd785f4524161b1221196 SHA512 5fd2a192adc90cfe4b8cfd5597399d1ef1a2b36b8c249162d939562cf91caed5863b82b947ef5ef025c549ad1f2d36b44f0e4c8f5307bb48a92ef12bc63ea646
+EBUILD libprojectm-4.1.0.ebuild 1154 BLAKE2B 590790478d6b383a88796a6b9142aa66d6b017cfdd1e373e7b4ce668ce122fa0d3d91cbd0dc7ef8eb173fefec82b261f41fd55f12b52102ed39b34e8ee2f5c05 SHA512 d8b00ef052a861ce40fc2da2e33359a0da82d451876f7275e109e5becbee99b8b9578ed7674a94746e15af9a2884b3ff3ec6183a2afc670f38f1a6e7c73382fd
+EBUILD libprojectm-9999.ebuild 1084 BLAKE2B 16ab7359ff8b7a7cb180c25fb76a0d92a0000311a3733fde08a2ca0e389f76fe648c3a36940f780ac37de2bce74f3248205ea567a7d71cadbb80db31c5ed69d5 SHA512 ece541a2eb5d540f996febd3ec76c5016493dd104dc3e6de6fdd474ae706917ba55da274776eb64bc82deca9e17053181b76c275fa0c55cf3eef566ac5381b80
 MISC metadata.xml 537 BLAKE2B 10a5d33fab64136cfe13e98831827ac21db70fc50262f89b88c0e444981b951695788a939e902c57ed3ccb69a740d8743a3bdca465bc51be0c14f28adb107242 SHA512 648699f222528a76e343792d819e69ff933e3e2d96fe4b38148b4053ad38ac684c4917ce62636abaaee8b3093837af09448e1a7e65cfcd928606295bcc0a36b4
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
 }