summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-02-28 10:59:00 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2021-03-07 19:58:55 +0100
commit5b33a00dfa2100e86087874e1a03833098938625 (patch)
tree11822a3557a413b131b405335bcea0e3de6668a1 /media-libs
parentgames-board/gambit: Switch to cmake.eclass, add missing desktop.eclass (diff)
downloadgentoo-5b33a00dfa2100e86087874e1a03833098938625.tar.gz
gentoo-5b33a00dfa2100e86087874e1a03833098938625.tar.bz2
gentoo-5b33a00dfa2100e86087874e1a03833098938625.zip
media-libs/libprojectm: Drop 2.1.0-r2
Bug: https://bugs.gentoo.org/763405 Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libprojectm/Manifest1
-rw-r--r--media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch64
-rw-r--r--media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch21
-rw-r--r--media-libs/libprojectm/files/libprojectm-2.1.0-path.patch13
-rw-r--r--media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild58
5 files changed, 0 insertions, 157 deletions
diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest
index 714a571549ab..6aa7269ad122 100644
--- a/media-libs/libprojectm/Manifest
+++ b/media-libs/libprojectm/Manifest
@@ -1,4 +1,3 @@
DIST libprojectm-3.1.11.tar.gz 52831435 BLAKE2B 286cbe5d7c497b0955da38d3ccfd4a5c97d80bc102a4bb739f98ee6c39afb1420d780c989997c16be9d2e7d54718a498769f98e15e2443bc7ac8ad850ecbb2df SHA512 da2c34ce5798205d31906c401d98ad2f16a45b6123975a291657c892db41c86d05d38edee34b52f2415c4442d8302c8c0dc5bb89e5932a057df17f7ccac7db22
DIST libprojectm-3.1.12.tar.gz 52831726 BLAKE2B f9a9ecf8fc55b49e664a61a5c0ca3eef745b00390d5dd3b1549d6d68985c246834d35adb96ab8595e2bf78997c4688096c7931a6be54ea9d867bfdbe5a427832 SHA512 6d265280f3e3e952686ebf77afd8b083669e9ab81d2d9d122168d47747c367ff3b17ab682cc041e4ac9cee9607b7393b5dcb067deac95fcbb97d63a9656912a5
DIST libprojectm-3.1.8.tar.gz 55482686 BLAKE2B 226cc62ce84932e81c650dac8dcf89eed4d71513324b3bb3a7250c450cb002870f2c2c2eaf6947f6056b35efa5159ea7956bfec420e9f545df445f7654a76d05 SHA512 efbcd5e867ab9e710d11018d580ae6c3bc7aaba46e3ce2a3d682e9ec341756db6ecf613deab0a9d13ed6ace3d05dcf19a384c00ee21832acd5b6ebfe2b806f44
-DIST projectM-complete-2.1.0-Source.tar.gz 31130351 BLAKE2B ec3540326751aba45b9620adfe1e7aed21347c97278de6d23b53ed7fb03878c2d02982fba17b4cda4f713d2cf624fd24adeb15b28fed9d2ab165567f9ff49eaa SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f
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
deleted file mode 100644
index e3e156620935..000000000000
--- a/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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
deleted file mode 100644
index aceee30e6278..000000000000
--- a/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libprojectM/CMakeLists.txt
-+++ libprojectM/CMakeLists.txt
-@@ -35,7 +35,7 @@
-
- ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
-
--SET(LIB_INSTALL_DIR "\${exec_prefix}/lib"
-+SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
- CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
- FORCE)
-
-@@ -234,7 +234,7 @@
- FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga")
- INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets)
- INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders)
--INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
-+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM)
- INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM)
--INSTALL(TARGETS projectM DESTINATION lib)
-+INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX})
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch
deleted file mode 100644
index bb780e8943ad..000000000000
--- a/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: 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)
- #
-
--ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"")
-+ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}")
-
- SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}"
- CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)"
diff --git a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
deleted file mode 100644
index 7795ea42bbf1..000000000000
--- a/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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="amd64 ~arm arm64 ppc ppc64 sparc x86"
-IUSE="debug openmp video_cards_nvidia"
-
-RDEPEND="media-fonts/dejavu
- >=media-libs/ftgl-2.1.3_rc5
- media-libs/freetype:2
- media-libs/mesa[X(+)]
- 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
-}