From cf971117eda3b7ec3c87b40490710a1456b28fb0 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Mon, 6 May 2019 15:08:13 +0200 Subject: [PATCH] media-sound/yoshimi: 1.5.10.2 version bump, EAPI-7 bump Bug: https://bugs.gentoo.org/680684 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner --- media-sound/yoshimi/Manifest | 1 + .../files/yoshimi-1.5.10.2-cxxflags.patch | 66 +++++++++++++++++++ media-sound/yoshimi/yoshimi-1.5.10.2.ebuild | 53 +++++++++++++++ 3 files changed, 120 insertions(+) create mode 100644 media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch create mode 100644 media-sound/yoshimi/yoshimi-1.5.10.2.ebuild diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest index a7fd339dc2cf..945ef733a6c9 100644 --- a/media-sound/yoshimi/Manifest +++ b/media-sound/yoshimi/Manifest @@ -1,2 +1,3 @@ +DIST yoshimi-1.5.10.2.tar.gz 9668476 BLAKE2B 1b443a51e952123abaf54b992902113533461064f2fc99032ac89f28a25ba4687176a97013ea118283e8ca2b7d92f44c105380e3d6cecb66560db7a0a8ef6532 SHA512 a39ba123f304e43d70833648ce224733794cb43c160fd2e6cf29bb4a782bea355c4bbfa1c33bf20c98a8c1f5d049788154aaf906a3daa56f288719a0b019139c DIST yoshimi-1.5.10.tar.bz2 9406870 BLAKE2B e665f6a30094e8396fcadb2e423ccb74e07226d02a51811466fa4a04ee266364d6d9fa9f6bdef6712d24616888b9042bd7c818d21e41fde1d2f41b1eaad47c01 SHA512 1d6371f1d82438dc8b65fdb21b0460d998616c4a27bcee4f3e450542eb346eeb87e59a9448ef210fa45a119efdfc3d6dd7a6acd20ef3ad5a29d982f218704d48 DIST yoshimi-1.5.8.2.tar.bz2 7537329 BLAKE2B d26619742f351a48f0457468c5c3f2a85cb04c479a8fe5b88616e4738092875df6e5d27be91d2fca42693e2e32d6c6f4b76308b93d99496dc5fff7d16da1712d SHA512 398fb57c171ee72d160b680cbb3de9db226cd281972a1a518cb52fdae617ba89e72b7d5fd1c6666e4bcd2df2d17789daf46aff2299c103429f07db0c83160d84 diff --git a/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch b/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch new file mode 100644 index 000000000000..dc5544339b54 --- /dev/null +++ b/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch @@ -0,0 +1,66 @@ +Respect user CXXFLAGS setting. + +--- a/src/CMakeLists.txt 2019-05-06 15:09:19.010755505 +0200 ++++ b/src/CMakeLists.txt 2019-05-06 15:14:11.668510627 +0200 +@@ -307,28 +307,28 @@ + endif(READLINE_FOUND) + + # set platform specific compiler flags +-if (BuildFor0ld_X86) +- set (OurCxxFlags ${BuildOptions_X86}) +-else (BuildFor0ld_X86) +- if (BuildForAMD_X86_64) +- set (OurCxxFlags ${BuildOptions_X86_64AMD}) +- else (BuildForAMD_X86_64) +- if (BuildForCore2_X86_64) +- set (OurCxxFlags ${BuildOptions_X86_64Core2}) +- else (BuildForCore2_X86_64) +- if (BuildForNEON) +- set (OurCxxFlags ${BuildOptions_NEON}) +- else (BuildForNEON) +- if (BuildForThisCPU) +- set (OurCxxFlags ${BuildOptionsThisCPU}) +- else (BuildForThisCPU) +- set (OurCxxFlags ${BuildOptionsBasic}) +- endif (BuildForThisCPU) +- endif (BuildForNEON) +- endif (BuildForCore2_X86_64) +- endif (BuildForAMD_X86_64) +-endif (BuildFor0ld_X86) +-set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}") ++# if (BuildFor0ld_X86) ++# set (OurCxxFlags ${BuildOptions_X86}) ++# else (BuildFor0ld_X86) ++# if (BuildForAMD_X86_64) ++# set (OurCxxFlags ${BuildOptions_X86_64AMD}) ++# else (BuildForAMD_X86_64) ++# if (BuildForCore2_X86_64) ++# set (OurCxxFlags ${BuildOptions_X86_64Core2}) ++# else (BuildForCore2_X86_64) ++# if (BuildForNEON) ++# set (OurCxxFlags ${BuildOptions_NEON}) ++# else (BuildForNEON) ++# if (BuildForThisCPU) ++# set (OurCxxFlags ${BuildOptionsThisCPU}) ++# else (BuildForThisCPU) ++# set (OurCxxFlags ${BuildOptionsBasic}) ++# endif (BuildForThisCPU) ++# endif (BuildForNEON) ++# endif (BuildForCore2_X86_64) ++# endif (BuildForAMD_X86_64) ++# endif (BuildFor0ld_X86) ++# set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}") + + if (BuildForDebug) + set (CMAKE_BUILD_TYPE "Debug") +@@ -330,8 +330,8 @@ + message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}") + else (BuildForDebug) + set (CMAKE_BUILD_TYPE "Release") +- set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease}) +- message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}") ++ # set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease}) ++ message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS}") + endif (BuildForDebug) + + configure_file( diff --git a/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild new file mode 100644 index 000000000000..20aed1d839fc --- /dev/null +++ b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils xdg + +DESCRIPTION="Software synthesizer based on ZynAddSubFX" +HOMEPAGE="https://yoshimi.github.io/" +SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+lv2" + +BDEPEND="virtual/pkgconfig" +RDEPEND=" + >=dev-libs/mxml-2.5 + >=media-libs/alsa-lib-1.0.17 + media-libs/fontconfig + media-libs/libsndfile + sci-libs/fftw:3.0= + sys-libs/ncurses:0= + sys-libs/readline:0= + sys-libs/zlib + virtual/jack + x11-libs/cairo[X] + x11-libs/fltk:1[opengl] + lv2? ( media-libs/lv2 ) +" +DEPEND="${RDEPEND} + dev-libs/boost +" + +CMAKE_USE_DIR="${WORKDIR}/${P}/src" + +PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch ) + +DOCS=( Changelog README.txt ) + +src_prepare() { + cmake-utils_src_prepare + # respect doc dir + sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DLV2Plugin=$(usex lv2) + ) + cmake-utils_src_configure +} -- 2.26.2