From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-libs/libprojectm/Manifest | 9 +++ .../files/libprojectm-2.1.0-fix-c++14.patch | 64 ++++++++++++++++++++++ .../files/libprojectm-2.1.0-multilib.patch | 21 +++++++ .../libprojectm/files/libprojectm-2.1.0-path.patch | 13 +++++ media-libs/libprojectm/libprojectm-2.1.0-r1.ebuild | 57 +++++++++++++++++++ media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild | 58 ++++++++++++++++++++ media-libs/libprojectm/metadata.xml | 11 ++++ 7 files changed, 233 insertions(+) create mode 100644 media-libs/libprojectm/Manifest create mode 100644 media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch create mode 100644 media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch create mode 100644 media-libs/libprojectm/files/libprojectm-2.1.0-path.patch create mode 100644 media-libs/libprojectm/libprojectm-2.1.0-r1.ebuild create mode 100644 media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild create mode 100644 media-libs/libprojectm/metadata.xml (limited to 'media-libs/libprojectm') diff --git a/media-libs/libprojectm/Manifest b/media-libs/libprojectm/Manifest new file mode 100644 index 000000000000..7ca82c29019f --- /dev/null +++ b/media-libs/libprojectm/Manifest @@ -0,0 +1,9 @@ +AUX libprojectm-2.1.0-fix-c++14.patch 1505 SHA256 af1a5761c03de76e6313fd29a0052234b9d64cb46c06705a800be3396079a478 SHA512 071070f2f8c890cccdba09bbe9cb1a68451ebdf30ae339263e322afbaccf974be41a0eabeab12e1432382bc94bff4df46a4f1e2c227c3de77577f5a8776aa3c6 WHIRLPOOL f8ca2dc3d88c2251f252ec1ff0ca03844564a35766cf3467d2419c0ce385979537f66daeeeaf0cc3e8a6fa2b1ff06c407dc976cf6b00f8b5b8d952ba0e6a0755 +AUX libprojectm-2.1.0-multilib.patch 1245 SHA256 26466ef3983e7491b1cc49ca21edede31de41e255c424811ea3d03d9bafdb286 SHA512 562e9616500a49b52e29d50d7c40b8db2b8eb36dbcf28c2b415975b0ce751d21d8ecc06747c3c810303078a2e83ee1c6ed438818d936ddd86efe94900d1a348d WHIRLPOOL e88125fc22e9eb8ce0a704d42c770b825da9f8020f0d188387a7e3dde6c0a62667016889eae70047168976cb8a4aea387bb90e68f29dfe43c1965e32591a6e1b +AUX libprojectm-2.1.0-path.patch 593 SHA256 887ef4d5ef8c37dbbee6ef375f47e031c4ed7a95ab506b8bc8ee376069984631 SHA512 c2c7a26de1166dada74e7ee3c50da9548992eaf3e3d3881e637ccbef76649c99639f0e2d64e2db4622ce1beb90670504222de3576efc13c35527f9ef064b5bc3 WHIRLPOOL 1965eb4fc9121f273ee2902d4b18ab05721246415286f4082a757013290d23238205526414dbb18a779c77d75bd42178e6abe7ddcafc56a6d21cf67a4a5a41ad +DIST projectM-complete-2.1.0-Source.tar.gz 31130351 SHA256 513204f033006bd3dcdf8aada196d816d6b7187266ddcbb1594d0285cc9406ee SHA512 53f4531208d2594f1c28a7f7842fb5ee3349ca9e48f9f0d999a90b6a62d315c9c0ae9cba1cdfacb8a149eba3e5ddc4517ac406ee2c53718191be8e26ee2cca5f WHIRLPOOL f60ee006dac8465a17e1397a9331bdabd7a3967455f9e16644e1ff5e544ab1662b3aa8a2b428c0258f0b38c91513bfbda3cd29b4419e05e64aa410e61ad03972 +EBUILD libprojectm-2.1.0-r1.ebuild 1487 SHA256 b3f652811648f9f98633ac7fba6cced100f67e41ccc223d0e620d14b69d8e557 SHA512 c193f1203dfc28da59eb4d953f172c5f47efaaa661d9d25401e83c9ef9c68c0a3740ee86bd533cbc71b19b0ddf2c62fc1cb02f1169e4c5d73e74de7d9e48df55 WHIRLPOOL 2ed1dd241c47562df31eb1020b00aa53d1e98bbbbcc7729466fb85bdeac1d64ee088a89075f1cfc4b07dde878bea69f4992afc6d8a8256c72de81635ad2eb853 +EBUILD libprojectm-2.1.0-r2.ebuild 1500 SHA256 c1030e5b61f5fd9ddd529eb61b2ac61894c0e58be351c2f66bbc979ffea530ac SHA512 96acaeafb588137a924ac7c3336ed7d6a5414644c0c737383a4b1095ecc405a86068739167a50f9aead2aa872dc1261215868bf2c119f9fc0388d3b1c10e7084 WHIRLPOOL 338ac5139ae6c7aaecb153e2c2475e3555897c2be1a8a669cfdc27c4c2d51a089b21da56a9f37f8cd214274d3f2b227275f83fccdbd12ae0dcbd2f67c687ea55 +MISC ChangeLog 3306 SHA256 de2e37250d05afafe9dc7140acb819626d8097157529d375687f8cdf657ad3ac SHA512 88a66209f27a1b84a0c343b9d1191d83f412ab1a8afd9d071ef945ab3cf005f63dc60b5e0bbeeac0d5eba440dc45724c10986b1c4cd64e80eeeb7077393818b6 WHIRLPOOL 12f14de7ceae134005203b3047afbb235f45dce9e3b4c11131498db27d9c773b4711253f8c122c0f441d9958d5436fea031768b7e79479e82f4a6f18482fe1b6 +MISC ChangeLog-2015 8622 SHA256 78cd5658f1b616e8b74a9363b0316a9de9292dd1b841a3bc43dbfed51a69f8c5 SHA512 f72fc69541b07f8d832268350f3aa534c8d3916ec11a503d1a39841a312ce062848413132a2d0e6374f61259c30f909532f92cecdb8e5fec87000e3bd9b4089e WHIRLPOOL ff27c28a08dbaf3fabf131444473e80d680de96e75381b2511afc5304b85b79ef7df341a058b2ff340c90f36223bc88c205da6435c617324c27e993fec623a2e +MISC metadata.xml 331 SHA256 7980d09ed08ac1b06efd12fa6022b052f892c81eb21e0af43115341b4bdfd1ff SHA512 59a9da9a791cafc359a9b09d67c4f7bffdf48021e92f2974d0ed1477f5923690f5a40ff82e171a55a86ed997d7c30c445a8f83890396aae00f66656eb082b740 WHIRLPOOL 364e9e4036552c4311c7ea3f7ec078fc120ce2f2cb3c8476ffabf4cd18cae4dd49f8cb7335a32d0e75a5da5c81573b9bf581855fce96c987136400bb8fdc14f8 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 000000000000..e3e156620935 --- /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 +-#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 new file mode 100644 index 000000000000..aceee30e6278 --- /dev/null +++ b/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch @@ -0,0 +1,21 @@ +--- 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 new file mode 100644 index 000000000000..bb780e8943ad --- /dev/null +++ b/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch @@ -0,0 +1,13 @@ +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-r1.ebuild b/media-libs/libprojectm/libprojectm-2.1.0-r1.ebuild new file mode 100644 index 000000000000..3b248ee9b6f0 --- /dev/null +++ b/media-libs/libprojectm/libprojectm-2.1.0-r1.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit base cmake-utils flag-o-matic eutils toolchain-funcs multilib + +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 +) + +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=( + $(cmake-utils_use_use video_cards_nvidia CG) + "-DUSE_OPENMP=OFF" + "-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+=( + $(cmake-utils_use_use openmp) + ) + fi + + cmake-utils_src_configure +} 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 000000000000..528900f6c3e7 --- /dev/null +++ b/media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2016 Gentoo Foundation +# 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="~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 +} diff --git a/media-libs/libprojectm/metadata.xml b/media-libs/libprojectm/metadata.xml new file mode 100644 index 000000000000..4b7d1d427e51 --- /dev/null +++ b/media-libs/libprojectm/metadata.xml @@ -0,0 +1,11 @@ + + + + + sound@gentoo.org + Gentoo Sound project + + + projectm + + -- cgit v1.2.3