* [gentoo-commits] repo/gentoo:master commit in: media-sound/yoshimi/, media-sound/yoshimi/files/
@ 2019-01-04 19:31 Tim Harder
0 siblings, 0 replies; 5+ messages in thread
From: Tim Harder @ 2019-01-04 19:31 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/yoshimi/, media-sound/yoshimi/files/
@ 2019-05-08 17:05 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-05-08 17:05 UTC (permalink / raw
To: gentoo-commits
commit: cf971117eda3b7ec3c87b40490710a1456b28fb0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 6 13:08:13 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 8 17:03:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf971117
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 <asturm <AT> gentoo.org>
media-sound/yoshimi/Manifest | 1 +
.../yoshimi/files/yoshimi-1.5.10.2-cxxflags.patch | 66 ++++++++++++++++++++++
media-sound/yoshimi/yoshimi-1.5.10.2.ebuild | 53 +++++++++++++++++
3 files changed, 120 insertions(+)
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index a7fd339dc2c..945ef733a6c 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 00000000000..dc5544339b5
--- /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 00000000000..20aed1d839f
--- /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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/yoshimi/, media-sound/yoshimi/files/
@ 2019-05-08 17:05 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-05-08 17:05 UTC (permalink / raw
To: gentoo-commits
commit: c8fa43c4b21ab2c19cf6a4d9ce6f4e875b651a89
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 6 13:50:47 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 8 17:03:35 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8fa43c4
media-sound/yoshimi: Drop old
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/yoshimi/Manifest | 2 -
.../yoshimi/files/yoshimi-1.5.10-cxxflags.patch | 64 ----------------------
media-sound/yoshimi/yoshimi-1.5.10.ebuild | 63 ---------------------
media-sound/yoshimi/yoshimi-1.5.8.2.ebuild | 53 ------------------
4 files changed, 182 deletions(-)
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 945ef733a6c..5677960a65f 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,3 +1 @@
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-cxxflags.patch b/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
deleted file mode 100644
index 7e64e1fdc72..00000000000
--- a/media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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
deleted file mode 100644
index e7de4819215..00000000000
--- a/media-sound/yoshimi/yoshimi-1.5.10.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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
-}
diff --git a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild b/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
deleted file mode 100644
index c5fd3cc38be..00000000000
--- a/media-sound/yoshimi/yoshimi-1.5.8.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/yoshimi/, media-sound/yoshimi/files/
@ 2020-08-12 7:23 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2020-08-12 7:23 UTC (permalink / raw
To: gentoo-commits
commit: a6ebfac088b89ad44478c1fc902fbbf78e888330
Author: Denis Reva <denis7774 <AT> gmail <DOT> com>
AuthorDate: Mon Jul 6 04:23:12 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 07:22:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6ebfac0
media-sound/yoshimi: fix #729716 LV2_Descriptor
Created new ebuild -r1 with patch from bugzilla.
Closes: https://bugs.gentoo.org/729716
Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Denis Reva <denis7774 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16606
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/yoshimi-1.7.1-fix-LV2_Descriptor.patch | 47 ++++++++++++++++++++++
...oshimi-1.7.1.ebuild => yoshimi-1.7.1-r1.ebuild} | 2 +
2 files changed, 49 insertions(+)
diff --git a/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch b/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch
new file mode 100644
index 00000000000..94e225e4f48
--- /dev/null
+++ b/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch
@@ -0,0 +1,47 @@
+diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.cpp b/src/LV2_Plugin/YoshimiLV2Plugin.cpp
+index 3502689..9be6128 100644
+--- a/src/LV2_Plugin/YoshimiLV2Plugin.cpp
++++ b/src/LV2_Plugin/YoshimiLV2Plugin.cpp
+@@ -378,7 +378,7 @@ bool YoshimiLV2Plugin::init()
+ }
+
+
+-LV2_Handle YoshimiLV2Plugin::instantiate (const struct _LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
++LV2_Handle YoshimiLV2Plugin::instantiate (const struct LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
+ {
+ SynthEngine *synth = new SynthEngine(0, NULL, true);
+ if (synth == NULL || !synth->getRuntime().isRuntimeSetupCompleted()){
+@@ -711,9 +711,9 @@ bool YoshimiLV2PluginUI::init()
+ }
+
+
+-LV2UI_Handle YoshimiLV2PluginUI::instantiate(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
++LV2UI_Handle YoshimiLV2PluginUI::instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
+ {
+- const _LV2UI_Descriptor *desc = descriptor;
++ const LV2UI_Descriptor *desc = descriptor;
+ descriptor = desc;
+ const char *plug = plugin_uri;
+ plugin_uri = plug;
+diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.h b/src/LV2_Plugin/YoshimiLV2Plugin.h
+index a484a8b..47f4729 100644
+--- a/src/LV2_Plugin/YoshimiLV2Plugin.h
++++ b/src/LV2_Plugin/YoshimiLV2Plugin.h
+@@ -106,7 +106,7 @@ public:
+ virtual void registerAudioPort(int) {}
+
+ //static methods
+- static LV2_Handle instantiate (const struct _LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
++ static LV2_Handle instantiate (const struct LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
+ static void connect_port(LV2_Handle instance, uint32_t port, void *data_location);
+ static void activate(LV2_Handle instance);
+ static void deactivate(LV2_Handle instance);
+@@ -159,7 +159,7 @@ public:
+ YoshimiLV2PluginUI(const char *, LV2UI_Write_Function, LV2UI_Controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
+ ~YoshimiLV2PluginUI();
+ bool init();
+- static LV2UI_Handle instantiate(const struct _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
++ static LV2UI_Handle instantiate(const struct LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
+ static void cleanup(LV2UI_Handle ui);
+ static void static_guiClosed(void *arg);
+ void run();
diff --git a/media-sound/yoshimi/yoshimi-1.7.1.ebuild b/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
similarity index 94%
rename from media-sound/yoshimi/yoshimi-1.7.1.ebuild
rename to media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
index d9faf9344bf..4c2573a12e3 100644
--- a/media-sound/yoshimi/yoshimi-1.7.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
@@ -35,6 +35,8 @@ CMAKE_USE_DIR="${WORKDIR}/${P}/src"
DOCS=( Changelog README.txt )
+PATCHES=( "${FILESDIR}/${PN}-1.7.1-fix-LV2_Descriptor.patch" )
+
src_prepare() {
cmake_src_prepare
append-cxxflags -lpthread
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/yoshimi/, media-sound/yoshimi/files/
@ 2020-10-13 15:02 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-10-13 15:02 UTC (permalink / raw
To: gentoo-commits
commit: ada017ed321da4cd5e350bd01535fb3e93b54818
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 13 14:21:25 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 13 15:01:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada017ed
media-sound/yoshimi: Drop 1.7.1-r1
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/yoshimi/Manifest | 1 -
.../files/yoshimi-1.7.1-fix-LV2_Descriptor.patch | 47 -------------------
media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild | 53 ----------------------
3 files changed, 101 deletions(-)
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 79022d2a18c..8299e872d6b 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,2 +1 @@
-DIST yoshimi-1.7.1.tar.gz 10067045 BLAKE2B 6a9d84d47413ec26c733515bd3becaca436c8168f0f22d2b71f502fde126aa5347ee55d60a74473936933f4831e9feec21c2ebc6916cdde2b2822ecddf3da4c5 SHA512 d422c08caa6bf20665442b2d88fc4ccc41b881d719d5150d1cd3d2617f2216b18c112107c5723cb1077da0ba2278a3eb2db0a8dda4ce3c6315e3875cbfaf421c
DIST yoshimi-1.7.2.tar.gz 10256155 BLAKE2B e330e2d22117bbed2c2054efabf852aa67141a40539ca96e2df7c88cedabb445214f2d79c0f681b68d70b8c832b7bb7852d44442d3f6b1e4183fd2297768b0ca SHA512 7a52dd847cfd19c6b7cb802f181baaa291e73b52f8243e34f9899651f003779b402a20281995ce24f2335570191f6973c2bafb58a5093eba868033b6b9dd4fd9
diff --git a/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch b/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch
deleted file mode 100644
index 94e225e4f48..00000000000
--- a/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.cpp b/src/LV2_Plugin/YoshimiLV2Plugin.cpp
-index 3502689..9be6128 100644
---- a/src/LV2_Plugin/YoshimiLV2Plugin.cpp
-+++ b/src/LV2_Plugin/YoshimiLV2Plugin.cpp
-@@ -378,7 +378,7 @@ bool YoshimiLV2Plugin::init()
- }
-
-
--LV2_Handle YoshimiLV2Plugin::instantiate (const struct _LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
-+LV2_Handle YoshimiLV2Plugin::instantiate (const struct LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
- {
- SynthEngine *synth = new SynthEngine(0, NULL, true);
- if (synth == NULL || !synth->getRuntime().isRuntimeSetupCompleted()){
-@@ -711,9 +711,9 @@ bool YoshimiLV2PluginUI::init()
- }
-
-
--LV2UI_Handle YoshimiLV2PluginUI::instantiate(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
-+LV2UI_Handle YoshimiLV2PluginUI::instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
- {
-- const _LV2UI_Descriptor *desc = descriptor;
-+ const LV2UI_Descriptor *desc = descriptor;
- descriptor = desc;
- const char *plug = plugin_uri;
- plugin_uri = plug;
-diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.h b/src/LV2_Plugin/YoshimiLV2Plugin.h
-index a484a8b..47f4729 100644
---- a/src/LV2_Plugin/YoshimiLV2Plugin.h
-+++ b/src/LV2_Plugin/YoshimiLV2Plugin.h
-@@ -106,7 +106,7 @@ public:
- virtual void registerAudioPort(int) {}
-
- //static methods
-- static LV2_Handle instantiate (const struct _LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
-+ static LV2_Handle instantiate (const struct LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
- static void connect_port(LV2_Handle instance, uint32_t port, void *data_location);
- static void activate(LV2_Handle instance);
- static void deactivate(LV2_Handle instance);
-@@ -159,7 +159,7 @@ public:
- YoshimiLV2PluginUI(const char *, LV2UI_Write_Function, LV2UI_Controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
- ~YoshimiLV2PluginUI();
- bool init();
-- static LV2UI_Handle instantiate(const struct _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-+ static LV2UI_Handle instantiate(const struct LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
- static void cleanup(LV2UI_Handle ui);
- static void static_guiClosed(void *arg);
- void run();
diff --git a/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild b/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
deleted file mode 100644
index 4c2573a12e3..00000000000
--- a/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg flag-o-matic
-
-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"
-DEPEND="
- >=dev-libs/mxml-2.5
- media-libs/alsa-lib
- 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 )
-"
-RDEPEND="${DEPEND}"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/src"
-
-DOCS=( Changelog README.txt )
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.1-fix-LV2_Descriptor.patch" )
-
-src_prepare() {
- cmake_src_prepare
- append-cxxflags -lpthread
- append-cppflags -lpthread
-}
-
-src_configure() {
- local mycmakeargs=( -DLV2Plugin=$(usex lv2) )
- cmake_src_configure
-}
-src_install() {
- cmake_src_install
- mv "${D}"/usr/share/doc/yoshimi "${D}"/usr/share/doc/${P}
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-10-13 15:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-04 19:31 [gentoo-commits] repo/gentoo:master commit in: media-sound/yoshimi/, media-sound/yoshimi/files/ Tim Harder
-- strict thread matches above, loose matches on Subject: below --
2019-05-08 17:05 Andreas Sturmlechner
2019-05-08 17:05 Andreas Sturmlechner
2020-08-12 7:23 Joonas Niilola
2020-10-13 15:02 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox