commit:     71708110bc8e0fb124b605b6ab5bb7a6a0b9f638
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  4 19:25:47 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Jan  4 19:30:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71708110

media-sound/yoshimi: version bump to 1.5.10

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 media-sound/yoshimi/Manifest                       |  1 +
 .../yoshimi/files/yoshimi-1.5.10-cxxflags.patch    | 64 ++++++++++++++++++++++
 media-sound/yoshimi/yoshimi-1.5.10.ebuild          | 63 +++++++++++++++++++++
 3 files changed, 128 insertions(+)

diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 0cd11d6fa01..4753901cc5d 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,3 +1,4 @@
 DIST yoshimi-1.4.1.tar.bz2 3674539 BLAKE2B 
a3561f4129b1da137caec4a4bb8a59222ca43c875a6533ce0c74ccff8d499a40cf98a1258f44e1a2f290fdc6f28786ce26772d19489c03590a360825488e5b3c
 SHA512 
2ae98e4cfb0a24f7777a76c971fae9b12244624d18d1dd1cb3142af421be9f55874aac658b666fe29367aa75902895b9ec5a608939ab44b2158bdc5ef7a59499
 DIST yoshimi-1.5.1.1.tar.bz2 4035895 BLAKE2B 
4579555c96f68ede8f6b604039f23512a041f879b23155334c6aab891fdb11d4e77b8d7d38ebad98b114d49da5fa815114872ca5cddd7f30fd5d56b5d4178be9
 SHA512 
f7f47835aceb30ca889ec536f922a30ef3d1e4d306c666c91b984a314781e5245045aab216be3dbdca95250f8e941229db799afd6b5fa079b61e75fd92ee1c28
+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-cxxflags.patch 
b/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
new file mode 100644
index 00000000000..7e64e1fdc72
--- /dev/null
+++ b/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
@@ -0,0 +1,64 @@
+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(

diff --git a/media-sound/yoshimi/yoshimi-1.5.10.ebuild 
b/media-sound/yoshimi/yoshimi-1.5.10.ebuild
new file mode 100644
index 00000000000..e7de4819215
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.5.10.ebuild
@@ -0,0 +1,63 @@
+# 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
+}

Reply via email to