diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-01-12 16:58:08 +0000 |
commit | c8a77dfe4d3d307c1d5dd2650b7297447d8b609d (patch) | |
tree | 9ea78393bc3ecd6ab4de449383d4e97e5f3648ae /media-sound/yoshimi | |
parent | 2891d29af8907ce881662f4a02844926d7a293c7 (diff) |
gentoo resync : 12.01.2019
Diffstat (limited to 'media-sound/yoshimi')
-rw-r--r-- | media-sound/yoshimi/Manifest | 7 | ||||
-rw-r--r-- | media-sound/yoshimi/files/yoshimi-1.5.10-cxxflags.patch | 64 | ||||
-rw-r--r-- | media-sound/yoshimi/yoshimi-1.4.1.ebuild | 52 | ||||
-rw-r--r-- | media-sound/yoshimi/yoshimi-1.5.10.ebuild (renamed from media-sound/yoshimi/yoshimi-1.5.1.1.ebuild) | 28 |
4 files changed, 86 insertions, 65 deletions
diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest index 906161fd30da..eedf60147ca9 100644 --- a/media-sound/yoshimi/Manifest +++ b/media-sound/yoshimi/Manifest @@ -1,7 +1,6 @@ -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 +AUX yoshimi-1.5.10-cxxflags.patch 2471 BLAKE2B 0e3d614e4cb9ccb1eb7a25665794fb22db89ca877d613fe4806afebd3692fafa422c2bcba7c9d28080e37a0e7004fcbefeedd0532c5541220e77e4149f8551f6 SHA512 cd15dd79b324ae27c80745c84720bf6b04d7d78c3bed3f2541ab84f82e60928865a49ded6f7fb383cdb5fdc61a05fb8d9fc02869d4846f734eab332f040fa7d0 +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 -EBUILD yoshimi-1.4.1.ebuild 1015 BLAKE2B 80c0ec583a13eb7aae5ea376c447c02ae31009cf73d4be324e8364203ab2b13f81294d77089d814e926eee592183eb0ee9ba5269113394eb3e1c042c6584561d SHA512 4dd13708b3d1829755bde9e37d982a7c61e822ef61fae1303fdb87318b6847ec96e002b7b16a94103f7e924fd869e65aa4a80acf28b091a28476b4fed76e3e15 -EBUILD yoshimi-1.5.1.1.ebuild 1032 BLAKE2B dcbedf93b5ca4c39206ac0809c6147b8b9133eeefb2692346ca3575ed40441c3bb0d32d855a8bfcb36686e434916775d9501537a81d313ec3fece389dde84788 SHA512 5764063f8511b3ad75e1ea4fdaedd377cc0622ef2bd0a576701d4bb047a144e60b9e458bf90b626ca9d6b555b66fe726c207c2a59cebe5507e982c767ca0e496 +EBUILD yoshimi-1.5.10.ebuild 1224 BLAKE2B cc6bfae99aa65e76e3b7b4037832d3b7fae68e5ccbfdc40c3ddb0b8013474ea8a44fed1de95f51bf278f6a8796c74e84c18907ce913e968cff0034be5f8de9ea SHA512 55de53bd5189d84d1832fae1ae8eb2048e84eff2e61305862e5f14e01769d11acb16a1e573b1d57dedd6d7bea7cb8dd45a01a5f69aa068f5922a0888f192d99b EBUILD yoshimi-1.5.8.2.ebuild 1032 BLAKE2B 3d2293725a28d677eee7846e86370f7b4b48f2a45bb5c7f37be2df15eeca6fdd76b8b99a1d1e4c7444967346b3aa9d02b6189f29150a81512545057374246496 SHA512 68c13d8841deb26933ae05c9dcf6cd7212d0a8768989062209361539f123dd268b68035b4954848652cafeaa223569fc137ba989217ab3ba546f0e56d173c7c6 MISC metadata.xml 397 BLAKE2B 2c4e07b154aa3dc9c5cfac332fe039e9dc6251673aaf29e256aae8ddb146851174bde3d16e892ecfcda54d53d544514cc36f8f46373764c907e98d2f0cf5ed5a SHA512 1fbabe7286878f7ae5877cf95384b7574a8cd7656c6dc8296608af2bb2bd0004379b6f7fe920005baa00d00687b56511f90b79709ff71145384cb748bd45f231 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 000000000000..7e64e1fdc729 --- /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.4.1.ebuild b/media-sound/yoshimi/yoshimi-1.4.1.ebuild deleted file mode 100644 index d7d64c58b5a2..000000000000 --- a/media-sound/yoshimi/yoshimi-1.4.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2016 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/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=( - -DBuildLV2Plugin=$(usex lv2) - ) - cmake-utils_src_configure -} diff --git a/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild b/media-sound/yoshimi/yoshimi-1.5.10.ebuild index b8e82d9c8ffe..e7de48192156 100644 --- a/media-sound/yoshimi/yoshimi-1.5.1.1.ebuild +++ b/media-sound/yoshimi/yoshimi-1.5.10.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -inherit cmake-utils +inherit cmake-utils gnome2-utils xdg-utils DESCRIPTION="A software synthesizer based on ZynAddSubFX" HOMEPAGE="http://yoshimi.sourceforge.net/" @@ -20,10 +20,10 @@ RDEPEND=" media-libs/fontconfig media-libs/libsndfile >=media-sound/jack-audio-connection-kit-0.115.6 - sci-libs/fftw:3.0 + sci-libs/fftw:3.0= sys-libs/ncurses:0= sys-libs/readline:0= - sys-libs/zlib + sys-libs/zlib:0= x11-libs/cairo[X] x11-libs/fltk:1[opengl] lv2? ( media-libs/lv2 ) @@ -34,13 +34,13 @@ DEPEND="${RDEPEND} " CMAKE_USE_DIR="${WORKDIR}/${P}/src" +PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch ) + +DOCS=( Changelog README.txt ) 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 + # respect doc dir + sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die cmake-utils_src_prepare } @@ -51,3 +51,13 @@ src_configure() { ) cmake-utils_src_configure } + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} |