[gentoo-commits] repo/gentoo:master commit in: media-sound/yoshimi/files/, media-sound/yoshimi/

[David Seifert]

commit:     a52fd12e24e76263a1754a9407bc42ead866e33f
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 16:47:50 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 16:48:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a52fd12e

media-sound/yoshimi: Version bump to 1.3.8.2

Gentoo-Bug: 572886
* EAPI=6
* Added USE=X dependency on x11-libs/cairo
* Added explicit sys-libs/ncurses dependency
* Fix ncurses underlinking issue

Package-Manager: portage-2.2.27

 media-sound/yoshimi/Manifest                       |  1 +
 .../files/yoshimi-1.3.8.2-underlinking.patch       | 39 ++++++++++++++
 media-sound/yoshimi/yoshimi-1.3.8.2.ebuild         | 59 ++++++++++++++++++++++
 3 files changed, 99 insertions(+)

diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 3116d0c..1a6a350 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,2 +1,3 @@
 DIST yoshimi-1.3.2.tar.bz2 3160607 SHA256 b44a58c7750f4119abd6646b5ec6460082e5cf671242a75f50efeeaf2be38c38 SHA512 a0d9df925dae58aa5ddcbf6da649f0979715c49a8844f6176de819306d6e9b67fc471bc13a1f3ebf5b511afa0bf453c7b64fd2fc6fe2e249d52ecaa94f27b1a7 WHIRLPOOL 891812521641e7646bdf44a6c0e89f8db33485e021a974cbc3d89fd29c5bc089dda1b1ea2fbd752cb4851980b1879e210c044081f30a5e153a48dda7b879ca41
 DIST yoshimi-1.3.5.2.tar.bz2 3442791 SHA256 198f820bfd3979d9dd13d32f7e976c689de25e33ee7cbe69d93a546d27df3d00 SHA512 0b78064e1efe85480e7960766d320e3e1cab194978ba3d10a35f97a73a181aa21993cfe1e58fab799dfe17ea134b158dfc4f6dbe0b4ac2fd4022fa62736dba40 WHIRLPOOL 84dc83ca99e2d1953f5c2d7513e547b101e4edb30bd723eafb22c7f69d8a48b6fc15b8fd7e59d3a85349a9087cefbd01d2770a1a265d13bfcd7b67e4338a0feb
+DIST yoshimi-1.3.8.2.tar.bz2 3576344 SHA256 28778202d1840120347802c591e216eac1ec211b022a374de973dab08da58472 SHA512 2149d113953c2962f5ad9b5148324f1586ec9f8522905735fe940fb2a0ea0307258a1788879efa6a599eab06e246254a92d520ad1f50723e993fcf879bddc15b WHIRLPOOL 58be64c3725127d0c9112eea83431d0f2498390a4adbc0cecc4719953f06b5cf94cf29ddb13e808ef8da3f0724ddb8704c14fab99215611f77c97874c8bc4839

diff --git a/media-sound/yoshimi/files/yoshimi-1.3.8.2-underlinking.patch b/media-sound/yoshimi/files/yoshimi-1.3.8.2-underlinking.patch
new file mode 100644
index 0000000..119973a
--- /dev/null
+++ b/media-sound/yoshimi/files/yoshimi-1.3.8.2-underlinking.patch
@@ -0,0 +1,39 @@
+Search for ncurses properly via pkg-config, in order to avoid breakage due to
+recent internal ncurses linking shuffling.
+
+* /usr/lib/gcc/x86_64-pc-linux-gnu/5.3.0/../../../../x86_64-pc-linux-gnu/bin/ld: CMakeFiles/yoshimi.dir/Misc/CmdInterface.cpp.o: undefined reference to symbol 'LINES'
+* /lib64/libtinfo.so.6: error adding symbols: DSO missing from command line
+
+--- yoshimi-1.3.8.2/src/CMakeLists.txt
++++ yoshimi-1.3.8.2/src/CMakeLists.txt
+@@ -196,6 +196,8 @@
+     HINTS ${Readline_ROOT_DIR}/lib
+ )
+ 
++find_package(PkgConfig REQUIRED)
++pkg_search_module(NCURSES REQUIRED ncurses)
+ if(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
+   set(READLINE_FOUND TRUE)
+ else(Readline_INCLUDE_DIR AND Readline_LIBRARY AND Ncurses_LIBRARY)
+@@ -462,7 +464,7 @@
+ 
+ add_executable (yoshimi ${ProgSources} main.cpp)
+ 
+-target_link_libraries (yoshimi ${ExternLibraries})
++target_link_libraries (yoshimi ${ExternLibraries} ${NCURSES_LIBRARIES})
+ 
+ install (TARGETS yoshimi RUNTIME DESTINATION bin)
+ 
+--- yoshimi-1.3.8.2/src/UI/WidgetPDialUI.fl
++++ yoshimi-1.3.8.2/src/UI/WidgetPDialUI.fl
+@@ -40,8 +40,8 @@
+     \#include <FL/Fl_Tooltip.H>
+     \#include <FL/Fl_Group.H>
+     \#include <FL/x.H>
+-    \#include <cairo/cairo.h>
+-    \#include <cairo/cairo-xlib.h>} {private global
++    \#include <cairo.h>
++    \#include <cairo-xlib.h>} {private global
+ } 
+ 
+ class TipWin {open : {public Fl_Menu_Window, MiscFuncs}

diff --git a/media-sound/yoshimi/yoshimi-1.3.8.2.ebuild b/media-sound/yoshimi/yoshimi-1.3.8.2.ebuild
new file mode 100644
index 0000000..68b5a5f
--- /dev/null
+++ b/media-sound/yoshimi/yoshimi-1.3.8.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/mini-xml-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
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-underlinking.patch"
+	"${FILESDIR}/${PN}-1.1.0-desktop-version.patch"
+)
+DOCS="../Changelog"
+
+S=${WORKDIR}/${P}/src
+
+src_prepare() {
+	cd .. || die
+	default
+
+	sed -i \
+		-e '/set (CMAKE_CXX_FLAGS_RELEASE/d' \
+		-e "s:lib/lv2:$(get_libdir)/lv2:" \
+		src/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBuildLV2Plugin=$(usex lv2 ON OFF)
+	)
+	cmake-utils_src_configure
+}