* [gentoo-commits] repo/gentoo:master commit in: media-libs/libprojectm/files/, media-libs/libprojectm/
@ 2016-09-14 21:36 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2016-09-14 21:36 UTC (permalink / raw
To: gentoo-commits
commit: 088f74794a0d30c45cc084b032308caa18ddcff1
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 14 21:36:05 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Sep 14 21:36:28 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088f7479
media-libs/libprojectm: Allow for compiling with GCC 6
Gentoo-bug: 582866
* EAPI=6
* Make PATCHES -p1 compliant
* Migrate away from 'base.eclass'
Package-Manager: portage-2.3.0
.../files/libprojectm-2.1.0-fix-c++14.patch | 64 ++++++++++++++++++++++
.../files/libprojectm-2.1.0-multilib.patch | 5 +-
.../libprojectm/files/libprojectm-2.1.0-path.patch | 4 +-
media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild | 59 ++++++++++++++++++++
4 files changed, 127 insertions(+), 5 deletions(-)
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch
new file mode 100644
index 00000000..e3e1566
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch
@@ -0,0 +1,64 @@
+Properly call namespaced std::isnan and use implicit
+conversion operators, such that they work in C++98 and C++14.
+See also:
+https://bugs.gentoo.org/show_bug.cgi?id=582866
+https://sourceforge.net/p/projectm/code/ci/92226e25192a69839b9ae3b66ea7173732c639b3
+
+--- libprojectM/Common.hpp
++++ libprojectM/Common.hpp
+@@ -63,7 +63,7 @@
+
+ #ifdef LINUX
+ #include <cstdlib>
+-#define projectM_isnan isnan
++#define projectM_isnan std::isnan
+
+ #endif
+
+--- libprojectM/MilkdropPresetFactory/Parser.cpp
++++ libprojectM/MilkdropPresetFactory/Parser.cpp
+@@ -1406,7 +1406,7 @@
+ PerFrameEqn * per_frame_eqn;
+ GenExpr * gen_expr;
+
+- if (fs == NULL)
++ if (fs.fail())
+ return NULL;
+ if (param_string == NULL)
+ return NULL;
+@@ -1561,7 +1561,7 @@
+
+ if (preset == NULL)
+ return NULL;
+- if (fs == NULL)
++ if (fs.fail())
+ return NULL;
+
+ if ((token = parseToken(fs, name)) != tEq)
+@@ -1875,7 +1875,7 @@
+ /* Null argument checks */
+ if (preset == NULL)
+ return PROJECTM_FAILURE;
+- if (fs == NULL)
++ if (fs.fail())
+ return PROJECTM_FAILURE;
+ if (token == NULL)
+ return PROJECTM_FAILURE;
+@@ -2166,7 +2166,7 @@
+
+ if (token == NULL)
+ return PROJECTM_FAILURE;
+- if (fs == NULL)
++ if (fs.fail())
+ return PROJECTM_FAILURE;
+ if (preset == NULL)
+ return PROJECTM_FAILURE;
+@@ -2348,7 +2348,7 @@
+ if (token == NULL)
+
+ return PROJECTM_FAILURE;
+- if (fs == NULL)
++ if (fs.fail())
+ return PROJECTM_FAILURE;
+ if (preset == NULL)
+ return PROJECTM_FAILURE;
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch
index 8477a27..aceee30 100644
--- a/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch
+++ b/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch
@@ -1,6 +1,5 @@
-diff -urN projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt projectM-complete-2.1.0-Source.new/src/libprojectM/CMakeLists.txt
---- projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt 2012-05-20 05:43:26.000000000 +0200
-+++ projectM-complete-2.1.0-Source.new/src/libprojectM/CMakeLists.txt 2013-01-21 21:07:49.097541426 +0100
+--- libprojectM/CMakeLists.txt
++++ libprojectM/CMakeLists.txt
@@ -35,7 +35,7 @@
ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch
index 39fa7e3..bb780e8 100644
--- a/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch
+++ b/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch
@@ -1,7 +1,7 @@
Index: projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
===================================================================
---- projectM-complete-2.1.0-Source.orig/src/libprojectM/CMakeLists.txt
-+++ projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt
+--- libprojectM/CMakeLists.txt
++++ libprojectM/CMakeLists.txt
@@ -33,7 +33,7 @@ set(PROJECTM_VERSION 2.1.0)
set(PROJECTM_ABI_LEVEL 2)
#
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
new file mode 100644
index 00000000..7c43321
--- /dev/null
+++ b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic toolchain-funcs
+
+MY_P=${PN/m/M}-complete-${PV}-Source
+MY_P=${MY_P/lib}
+
+DESCRIPTION="A graphical music visualization plugin similar to milkdrop"
+HOMEPAGE="http://projectm.sourceforge.net"
+SRC_URI="mirror://sourceforge/projectm/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="debug openmp video_cards_nvidia"
+
+RDEPEND="media-fonts/dejavu
+ >=media-libs/ftgl-2.1.3_rc5
+ media-libs/freetype:2
+ media-libs/mesa
+ media-libs/glew:=
+ sys-libs/zlib
+ video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}/src/libprojectM
+
+PATCHES=(
+ "${FILESDIR}"/${P}-multilib.patch
+ "${FILESDIR}"/${P}-path.patch
+ "${FILESDIR}"/${P}-fix-c++14.patch
+)
+
+src_configure() {
+ if use video_cards_nvidia; then
+ append-ldflags -L/opt/nvidia-cg-toolkit/$(get_libdir)
+ append-ldflags -L/opt/nvidia-cg-toolkit/lib
+ append-cppflags -I/opt/nvidia-cg-toolkit/include
+ fi
+
+ local mycmakeargs=(
+ -DUSE_CG=$(usex video_cards_nvidia)
+ -DprojectM_FONT_MENU="${EPREFIX}/usr/share/fonts/dejavu/DejaVuSans.ttf"
+ -DprojectM_FONT_TITLE="${EPREFIX}/usr/share/fonts/dejavu/DejaVuSansMono.ttf"
+ )
+
+ if use openmp && tc-has-openmp; then
+ mycmakeargs+=( -DUSE_OPENMP=ON )
+ else
+ mycmakeargs+=( -DUSE_OPENMP=OFF )
+ fi
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libprojectm/files/, media-libs/libprojectm/
@ 2024-03-06 15:41 Craig Andrews
0 siblings, 0 replies; 3+ messages in thread
From: Craig Andrews @ 2024-03-06 15:41 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libprojectm/files/, media-libs/libprojectm/
@ 2024-06-28 8:55 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2024-06-28 8:55 UTC (permalink / raw
To: gentoo-commits
commit: 44f8ed8a5ab719f6ff7c444cdf29f719f445e70b
Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Wed Jun 26 10:56:19 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jun 28 08:55:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f8ed8a
media-libs/libprojectm: update EAPI 7 -> 8, fix some packaging bugs
As changes are trivial, and should not break anything, not keywording for testing
Missing include prevents compilation only on aarch64, apparently
Closes: https://bugs.gentoo.org/891343
Closes: https://bugs.gentoo.org/792204
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/37309
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../libprojectm/files/libprojectm-3.1.12-GL_SMOOTH.patch | 13 +++++++++++++
...ojectm-3.1.12-r1.ebuild => libprojectm-3.1.12-r2.ebuild} | 7 ++++---
2 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/media-libs/libprojectm/files/libprojectm-3.1.12-GL_SMOOTH.patch b/media-libs/libprojectm/files/libprojectm-3.1.12-GL_SMOOTH.patch
new file mode 100644
index 000000000000..874d22aab6d0
--- /dev/null
+++ b/media-libs/libprojectm/files/libprojectm-3.1.12-GL_SMOOTH.patch
@@ -0,0 +1,13 @@
+Unable to replicate error myself, but fix for https://bugs.gentoo.org/792204
+from https://github.com/projectM-visualizer/projectm/issues/449
+diff '--color=auto' -ru a/src/projectM-qt/qprojectmwidget.hpp b/src/projectM-qt/qprojectmwidget.hpp
+--- a/src/projectM-qt/qprojectmwidget.hpp 2024-06-26 10:48:30.825008203 -0000
++++ b/src/projectM-qt/qprojectmwidget.hpp 2024-06-26 10:49:03.265800570 -0000
+@@ -23,6 +23,7 @@
+ #define QPROJECTM_WIDGET_HPP
+
+ #include <iostream>
++#include <GL/gl.h>
+ #include "qprojectm.hpp"
+ #include <QGLWidget>
+ #include <QMutex>
diff --git a/media-libs/libprojectm/libprojectm-3.1.12-r1.ebuild b/media-libs/libprojectm/libprojectm-3.1.12-r2.ebuild
similarity index 92%
rename from media-libs/libprojectm/libprojectm-3.1.12-r1.ebuild
rename to media-libs/libprojectm/libprojectm-3.1.12-r2.ebuild
index c3d809e3beee..9ef68eccccef 100644
--- a/media-libs/libprojectm/libprojectm-3.1.12-r1.ebuild
+++ b/media-libs/libprojectm/libprojectm-3.1.12-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit autotools
@@ -40,7 +40,7 @@ RDEPEND="
dev-qt/qtopengl:5
)
pulseaudio? (
- media-sound/pulseaudio
+ media-libs/libpulse
)
sdl? ( >=media-libs/libsdl2-2.0.5 )
sys-libs/zlib"
@@ -70,4 +70,5 @@ src_configure() {
src_install() {
default
find "${ED}" -name '*.la' -delete || die
+ find "${ED}" -name '*.a' -delete || die
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-28 8:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-14 21:36 [gentoo-commits] repo/gentoo:master commit in: media-libs/libprojectm/files/, media-libs/libprojectm/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2024-03-06 15:41 Craig Andrews
2024-06-28 8:55 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox