Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/yoshimi/, media-sound/yoshimi/files/
Date: Fri, 04 Jan 2019 19:31:13
Message-Id: 1546630231.71708110bc8e0fb124b605b6ab5bb7a6a0b9f638.radhermit@gentoo
1 commit: 71708110bc8e0fb124b605b6ab5bb7a6a0b9f638
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jan 4 19:25:47 2019 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 4 19:30:31 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71708110
7
8 media-sound/yoshimi: version bump to 1.5.10
9
10 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
11
12 media-sound/yoshimi/Manifest | 1 +
13 .../yoshimi/files/yoshimi-1.5.10-cxxflags.patch | 64 ++++++++++++++++++++++
14 media-sound/yoshimi/yoshimi-1.5.10.ebuild | 63 +++++++++++++++++++++
15 3 files changed, 128 insertions(+)
16
17 diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
18 index 0cd11d6fa01..4753901cc5d 100644
19 --- a/media-sound/yoshimi/Manifest
20 +++ b/media-sound/yoshimi/Manifest
21 @@ -1,3 +1,4 @@
22 DIST yoshimi-1.4.1.tar.bz2 3674539 BLAKE2B a3561f4129b1da137caec4a4bb8a59222ca43c875a6533ce0c74ccff8d499a40cf98a1258f44e1a2f290fdc6f28786ce26772d19489c03590a360825488e5b3c SHA512 2ae98e4cfb0a24f7777a76c971fae9b12244624d18d1dd1cb3142af421be9f55874aac658b666fe29367aa75902895b9ec5a608939ab44b2158bdc5ef7a59499
23 DIST yoshimi-1.5.1.1.tar.bz2 4035895 BLAKE2B 4579555c96f68ede8f6b604039f23512a041f879b23155334c6aab891fdb11d4e77b8d7d38ebad98b114d49da5fa815114872ca5cddd7f30fd5d56b5d4178be9 SHA512 f7f47835aceb30ca889ec536f922a30ef3d1e4d306c666c91b984a314781e5245045aab216be3dbdca95250f8e941229db799afd6b5fa079b61e75fd92ee1c28
24 +DIST yoshimi-1.5.10.tar.bz2 9406870 BLAKE2B e665f6a30094e8396fcadb2e423ccb74e07226d02a51811466fa4a04ee266364d6d9fa9f6bdef6712d24616888b9042bd7c818d21e41fde1d2f41b1eaad47c01 SHA512 1d6371f1d82438dc8b65fdb21b0460d998616c4a27bcee4f3e450542eb346eeb87e59a9448ef210fa45a119efdfc3d6dd7a6acd20ef3ad5a29d982f218704d48
25 DIST yoshimi-1.5.8.2.tar.bz2 7537329 BLAKE2B d26619742f351a48f0457468c5c3f2a85cb04c479a8fe5b88616e4738092875df6e5d27be91d2fca42693e2e32d6c6f4b76308b93d99496dc5fff7d16da1712d SHA512 398fb57c171ee72d160b680cbb3de9db226cd281972a1a518cb52fdae617ba89e72b7d5fd1c6666e4bcd2df2d17789daf46aff2299c103429f07db0c83160d84
26
27 diff --git a/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch b/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
28 new file mode 100644
29 index 00000000000..7e64e1fdc72
30 --- /dev/null
31 +++ b/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
32 @@ -0,0 +1,64 @@
33 +Respect user CXXFLAGS setting.
34 +
35 +--- yoshimi-1.5.10/src/CMakeLists.txt
36 ++++ yoshimi-1.5.10/src/CMakeLists.txt
37 +@@ -302,27 +302,27 @@
38 + set (YOSHI_INCLUDES ${FLTK_INCLUDE_DIR})
39 +
40 + # set platform specific compiler flags
41 +-if (BuildFor0ld_X86)
42 +- set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
43 +-else (BuildFor0ld_X86)
44 +- if (BuildForAMD_X86_64)
45 +- set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
46 +- else (BuildForAMD_X86_64)
47 +- if (BuildForCore2_X86_64)
48 +- set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
49 +- else (BuildForCore2_X86_64)
50 +- if (BuildForNEON)
51 +- set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
52 +- else (BuildForNEON)
53 +- if (BuildForThisCPU)
54 +- set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
55 +- else (BuildForThisCPU)
56 +- set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
57 +- endif (BuildForThisCPU)
58 +- endif (BuildForNEON)
59 +- endif (BuildForCore2_X86_64)
60 +- endif (BuildForAMD_X86_64)
61 +-endif (BuildFor0ld_X86)
62 ++#if (BuildFor0ld_X86)
63 ++ #set (CMAKE_CXX_FLAGS ${BuildOptions_X86})
64 ++#else (BuildFor0ld_X86)
65 ++ #if (BuildForAMD_X86_64)
66 ++ #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64AMD})
67 ++ #else (BuildForAMD_X86_64)
68 ++ #if (BuildForCore2_X86_64)
69 ++ #set (CMAKE_CXX_FLAGS ${BuildOptions_X86_64Core2})
70 ++ #else (BuildForCore2_X86_64)
71 ++ #if (BuildForNEON)
72 ++ #set (CMAKE_CXX_FLAGS ${BuildOptions_NEON})
73 ++ #else (BuildForNEON)
74 ++ #if (BuildForThisCPU)
75 ++ #set (CMAKE_CXX_FLAGS ${BuildOptionsThisCPU})
76 ++ #else (BuildForThisCPU)
77 ++ #set (CMAKE_CXX_FLAGS ${BuildOptionsBasic})
78 ++ #endif (BuildForThisCPU)
79 ++ #endif (BuildForNEON)
80 ++ #endif (BuildForCore2_X86_64)
81 ++ #endif (BuildForAMD_X86_64)
82 ++#endif (BuildFor0ld_X86)
83 +
84 + if (BuildForDebug)
85 + set (CMAKE_BUILD_TYPE "Debug")
86 +@@ -330,8 +330,8 @@
87 + message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
88 + else (BuildForDebug)
89 + set (CMAKE_BUILD_TYPE "Release")
90 +- set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
91 +- message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
92 ++ #set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
93 ++ message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS}")
94 + endif (BuildForDebug)
95 +
96 + configure_file(
97
98 diff --git a/media-sound/yoshimi/yoshimi-1.5.10.ebuild b/media-sound/yoshimi/yoshimi-1.5.10.ebuild
99 new file mode 100644
100 index 00000000000..e7de4819215
101 --- /dev/null
102 +++ b/media-sound/yoshimi/yoshimi-1.5.10.ebuild
103 @@ -0,0 +1,63 @@
104 +# Copyright 1999-2019 Gentoo Authors
105 +# Distributed under the terms of the GNU General Public License v2
106 +
107 +EAPI=6
108 +
109 +inherit cmake-utils gnome2-utils xdg-utils
110 +
111 +DESCRIPTION="A software synthesizer based on ZynAddSubFX"
112 +HOMEPAGE="http://yoshimi.sourceforge.net/"
113 +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
114 +
115 +LICENSE="GPL-2"
116 +SLOT="0"
117 +KEYWORDS="~amd64 ~x86"
118 +IUSE="+lv2"
119 +
120 +RDEPEND="
121 + >=dev-libs/mxml-2.5
122 + >=media-libs/alsa-lib-1.0.17
123 + media-libs/fontconfig
124 + media-libs/libsndfile
125 + >=media-sound/jack-audio-connection-kit-0.115.6
126 + sci-libs/fftw:3.0=
127 + sys-libs/ncurses:0=
128 + sys-libs/readline:0=
129 + sys-libs/zlib:0=
130 + x11-libs/cairo[X]
131 + x11-libs/fltk:1[opengl]
132 + lv2? ( media-libs/lv2 )
133 +"
134 +DEPEND="${RDEPEND}
135 + dev-libs/boost
136 + virtual/pkgconfig
137 +"
138 +
139 +CMAKE_USE_DIR="${WORKDIR}/${P}/src"
140 +PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch )
141 +
142 +DOCS=( Changelog README.txt )
143 +
144 +src_prepare() {
145 + # respect doc dir
146 + sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die
147 +
148 + cmake-utils_src_prepare
149 +}
150 +
151 +src_configure() {
152 + local mycmakeargs=(
153 + -DLV2Plugin=$(usex lv2)
154 + )
155 + cmake-utils_src_configure
156 +}
157 +
158 +pkg_postinst() {
159 + gnome2_icon_cache_update
160 + xdg_desktop_database_update
161 +}
162 +
163 +pkg_postrm() {
164 + gnome2_icon_cache_update
165 + xdg_desktop_database_update
166 +}