+++ /dev/null
-Respect user CXXFLAGS setting.
-
---- yoshimi-1.5.10/src/CMakeLists.txt
-+++ yoshimi-1.5.10/src/CMakeLists.txt
-@@ -302,27 +302,27 @@
- set (YOSHI_INCLUDES ${FLTK_INCLUDE_DIR})
-
- # set platform specific compiler flags
--if (BuildFor0ld_X86)
-- set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
--else (BuildFor0ld_X86)
-- if (BuildForAMD_X86_64)
-- set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
-- else (BuildForAMD_X86_64)
-- if (BuildForCore2_X86_64)
-- set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
-- else (BuildForCore2_X86_64)
-- if (BuildForNEON)
-- set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
-- else (BuildForNEON)
-- if (BuildForThisCPU)
-- set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
-- else (BuildForThisCPU)
-- set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
-- endif (BuildForThisCPU)
-- endif (BuildForNEON)
-- endif (BuildForCore2_X86_64)
-- endif (BuildForAMD_X86_64)
--endif (BuildFor0ld_X86)
-+#if (BuildFor0ld_X86)
-+ #set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
-+#else (BuildFor0ld_X86)
-+ #if (BuildForAMD_X86_64)
-+ #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
-+ #else (BuildForAMD_X86_64)
-+ #if (BuildForCore2_X86_64)
-+ #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
-+ #else (BuildForCore2_X86_64)
-+ #if (BuildForNEON)
-+ #set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
-+ #else (BuildForNEON)
-+ #if (BuildForThisCPU)
-+ #set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
-+ #else (BuildForThisCPU)
-+ #set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
-+ #endif (BuildForThisCPU)
-+ #endif (BuildForNEON)
-+ #endif (BuildForCore2_X86_64)
-+ #endif (BuildForAMD_X86_64)
-+#endif (BuildFor0ld_X86)
-
- 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(
+++ /dev/null
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils gnome2-utils xdg-utils
-
-DESCRIPTION="A software synthesizer based on ZynAddSubFX"
-HOMEPAGE="http://yoshimi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lv2"
-
-RDEPEND="
- >=dev-libs/mxml-2.5
- >=media-libs/alsa-lib-1.0.17
- media-libs/fontconfig
- media-libs/libsndfile
- >=media-sound/jack-audio-connection-kit-0.115.6
- sci-libs/fftw:3.0=
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- sys-libs/zlib:0=
- x11-libs/cairo[X]
- x11-libs/fltk:1[opengl]
- lv2? ( media-libs/lv2 )
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- virtual/pkgconfig
-"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/src"
-PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch )
-
-DOCS=( Changelog README.txt )
-
-src_prepare() {
- # respect doc dir
- sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLV2Plugin=$(usex lv2)
- )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
-}
+++ /dev/null
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A software synthesizer based on ZynAddSubFX"
-HOMEPAGE="http://yoshimi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+lv2"
-
-RDEPEND="
- >=dev-libs/mxml-2.5
- >=media-libs/alsa-lib-1.0.17
- media-libs/fontconfig
- media-libs/libsndfile
- >=media-sound/jack-audio-connection-kit-0.115.6
- sci-libs/fftw:3.0
- sys-libs/ncurses:0=
- sys-libs/readline:0=
- sys-libs/zlib
- x11-libs/cairo[X]
- x11-libs/fltk:1[opengl]
- lv2? ( media-libs/lv2 )
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
- virtual/pkgconfig
-"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/src"
-
-src_prepare() {
- mv Change{l,L}og || die
- sed -i \
- -e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
- -e "s:lib/lv2:$(get_libdir)/lv2:" \
- src/CMakeLists.txt || die
-
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLV2Plugin=$(usex lv2)
- )
- cmake-utils_src_configure
-}