Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/yoshimi/, media-sound/yoshimi/files/
Date: Wed, 08 May 2019 17:05:28
Message-Id: 1557335014.cf971117eda3b7ec3c87b40490710a1456b28fb0.asturm@gentoo
1 commit: cf971117eda3b7ec3c87b40490710a1456b28fb0
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 6 13:08:13 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed May 8 17:03:34 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf971117
7
8 media-sound/yoshimi: 1.5.10.2 version bump, EAPI-7 bump
9
10 Bug: https://bugs.gentoo.org/680684
11 Package-Manager: Portage-2.3.66, Repoman-2.3.12
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 media-sound/yoshimi/Manifest | 1 +
15 .../yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch | 66 ++++++++++++++++++++++
16 media-sound/yoshimi/yoshimi-1.5.10.2.ebuild | 53 +++++++++++++++++
17 3 files changed, 120 insertions(+)
18
19 diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
20 index a7fd339dc2c..945ef733a6c 100644
21 --- a/media-sound/yoshimi/Manifest
22 +++ b/media-sound/yoshimi/Manifest
23 @@ -1,2 +1,3 @@
24 +DIST yoshimi-1.5.10.2.tar.gz 9668476 BLAKE2B 1b443a51e952123abaf54b992902113533461064f2fc99032ac89f28a25ba4687176a97013ea118283e8ca2b7d92f44c105380e3d6cecb66560db7a0a8ef6532 SHA512 a39ba123f304e43d70833648ce224733794cb43c160fd2e6cf29bb4a782bea355c4bbfa1c33bf20c98a8c1f5d049788154aaf906a3daa56f288719a0b019139c
25 DIST yoshimi-1.5.10.tar.bz2 9406870 BLAKE2B e665f6a30094e8396fcadb2e423ccb74e07226d02a51811466fa4a04ee266364d6d9fa9f6bdef6712d24616888b9042bd7c818d21e41fde1d2f41b1eaad47c01 SHA512 1d6371f1d82438dc8b65fdb21b0460d998616c4a27bcee4f3e450542eb346eeb87e59a9448ef210fa45a119efdfc3d6dd7a6acd20ef3ad5a29d982f218704d48
26 DIST yoshimi-1.5.8.2.tar.bz2 7537329 BLAKE2B d26619742f351a48f0457468c5c3f2a85cb04c479a8fe5b88616e4738092875df6e5d27be91d2fca42693e2e32d6c6f4b76308b93d99496dc5fff7d16da1712d SHA512 398fb57c171ee72d160b680cbb3de9db226cd281972a1a518cb52fdae617ba89e72b7d5fd1c6666e4bcd2df2d17789daf46aff2299c103429f07db0c83160d84
27
28 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
29 new file mode 100644
30 index 00000000000..dc5544339b5
31 --- /dev/null
32 +++ b/media-sound/yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch
33 @@ -0,0 +1,66 @@
34 +Respect user CXXFLAGS setting.
35 +
36 +--- a/src/CMakeLists.txt 2019-05-06 15:09:19.010755505 +0200
37 ++++ b/src/CMakeLists.txt 2019-05-06 15:14:11.668510627 +0200
38 +@@ -307,28 +307,28 @@
39 + endif(READLINE_FOUND)
40 +
41 + # set platform specific compiler flags
42 +-if (BuildFor0ld_X86)
43 +- set (OurCxxFlags ${BuildOptions_X86})
44 +-else (BuildFor0ld_X86)
45 +- if (BuildForAMD_X86_64)
46 +- set (OurCxxFlags ${BuildOptions_X86_64AMD})
47 +- else (BuildForAMD_X86_64)
48 +- if (BuildForCore2_X86_64)
49 +- set (OurCxxFlags ${BuildOptions_X86_64Core2})
50 +- else (BuildForCore2_X86_64)
51 +- if (BuildForNEON)
52 +- set (OurCxxFlags ${BuildOptions_NEON})
53 +- else (BuildForNEON)
54 +- if (BuildForThisCPU)
55 +- set (OurCxxFlags ${BuildOptionsThisCPU})
56 +- else (BuildForThisCPU)
57 +- set (OurCxxFlags ${BuildOptionsBasic})
58 +- endif (BuildForThisCPU)
59 +- endif (BuildForNEON)
60 +- endif (BuildForCore2_X86_64)
61 +- endif (BuildForAMD_X86_64)
62 +-endif (BuildFor0ld_X86)
63 +-set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}")
64 ++# if (BuildFor0ld_X86)
65 ++# set (OurCxxFlags ${BuildOptions_X86})
66 ++# else (BuildFor0ld_X86)
67 ++# if (BuildForAMD_X86_64)
68 ++# set (OurCxxFlags ${BuildOptions_X86_64AMD})
69 ++# else (BuildForAMD_X86_64)
70 ++# if (BuildForCore2_X86_64)
71 ++# set (OurCxxFlags ${BuildOptions_X86_64Core2})
72 ++# else (BuildForCore2_X86_64)
73 ++# if (BuildForNEON)
74 ++# set (OurCxxFlags ${BuildOptions_NEON})
75 ++# else (BuildForNEON)
76 ++# if (BuildForThisCPU)
77 ++# set (OurCxxFlags ${BuildOptionsThisCPU})
78 ++# else (BuildForThisCPU)
79 ++# set (OurCxxFlags ${BuildOptionsBasic})
80 ++# endif (BuildForThisCPU)
81 ++# endif (BuildForNEON)
82 ++# endif (BuildForCore2_X86_64)
83 ++# endif (BuildForAMD_X86_64)
84 ++# endif (BuildFor0ld_X86)
85 ++# set (CMAKE_CXX_FLAGS "${OurCxxFlags} ${CMAKE_CXX_FLAGS}")
86 +
87 + if (BuildForDebug)
88 + set (CMAKE_BUILD_TYPE "Debug")
89 +@@ -330,8 +330,8 @@
90 + message (STATUS "DEBUG Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
91 + else (BuildForDebug)
92 + set (CMAKE_BUILD_TYPE "Release")
93 +- set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
94 +- message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE}")
95 ++ # set (CMAKE_CXX_FLAGS_RELEASE ${BuildOptionsRelease})
96 ++ message (STATUS "RELEASE Build, flags: ${CMAKE_CXX_FLAGS}")
97 + endif (BuildForDebug)
98 +
99 + configure_file(
100
101 diff --git a/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
102 new file mode 100644
103 index 00000000000..20aed1d839f
104 --- /dev/null
105 +++ b/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
106 @@ -0,0 +1,53 @@
107 +# Copyright 1999-2019 Gentoo Authors
108 +# Distributed under the terms of the GNU General Public License v2
109 +
110 +EAPI=7
111 +
112 +inherit cmake-utils xdg
113 +
114 +DESCRIPTION="Software synthesizer based on ZynAddSubFX"
115 +HOMEPAGE="https://yoshimi.github.io/"
116 +SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
117 +
118 +LICENSE="GPL-2"
119 +SLOT="0"
120 +KEYWORDS="~amd64 ~x86"
121 +IUSE="+lv2"
122 +
123 +BDEPEND="virtual/pkgconfig"
124 +RDEPEND="
125 + >=dev-libs/mxml-2.5
126 + >=media-libs/alsa-lib-1.0.17
127 + media-libs/fontconfig
128 + media-libs/libsndfile
129 + sci-libs/fftw:3.0=
130 + sys-libs/ncurses:0=
131 + sys-libs/readline:0=
132 + sys-libs/zlib
133 + virtual/jack
134 + x11-libs/cairo[X]
135 + x11-libs/fltk:1[opengl]
136 + lv2? ( media-libs/lv2 )
137 +"
138 +DEPEND="${RDEPEND}
139 + dev-libs/boost
140 +"
141 +
142 +CMAKE_USE_DIR="${WORKDIR}/${P}/src"
143 +
144 +PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch )
145 +
146 +DOCS=( Changelog README.txt )
147 +
148 +src_prepare() {
149 + cmake-utils_src_prepare
150 + # respect doc dir
151 + sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die
152 +}
153 +
154 +src_configure() {
155 + local mycmakeargs=(
156 + -DLV2Plugin=$(usex lv2)
157 + )
158 + cmake-utils_src_configure
159 +}