Fix build with portmidi (bug #417769).

Package-Manager: portage-2.2.0_alpha108/cvs/Linux x86_64

4 files changed, 37 insertions, 11 deletions

diff --git a/media-sound/csound/ChangeLog b/media-sound/csound/ChangeLog
index 9977dafd8cd3..53db8efadbee 100644
--- a/media-sound/csound/ChangeLog
+++ b/media-sound/csound/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/csound
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.15 2012/04/16 19:16:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/ChangeLog,v 1.16 2012/05/29 11:00:58 radhermit Exp $
+
+  29 May 2012; Tim Harder <radhermit@gentoo.org> csound-5.17.6.ebuild,
+  +files/csound-5.17.6-porttime-in-portmidi.patch:
+  Fix build with portmidi (bug #417769).
 
   16 Apr 2012; Tim Harder <radhermit@gentoo.org> csound-5.17.6.ebuild,
   +files/csound-5.17.6-fltk.patch:
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 9158097e706a..7a018daff936 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -5,20 +5,21 @@ AUX csound-5.16.6-install.patch 7688 RMD160 1f7da4193df6e187ff0d7bc5cf7ab55d161b
 AUX csound-5.16.6-tests.patch 2356 RMD160 6b3d93e4e062d009b7776ece4cf9c39a7da7ac0c SHA1 11e2132a702565c7386c4b54b2e42d63820fd568 SHA256 0b242d94b1718671d325b20cbd3faf4bc2437738fd88d49586a73fc84e5e9dca
 AUX csound-5.17.2-scons.patch 13382 RMD160 1d98fdbb0333dd405c44264b2cbf6b5e39f9dd3a SHA1 a68c0f862d94f1183cce3d1aa297df526e2642a9 SHA256 e9425100c7fd9bee73e7c8aeb1a6b17dffda4161769bda90cc9fc02c3567712b
 AUX csound-5.17.6-fltk.patch 343 RMD160 704ed3df1f9dabbe9720c5a35b7c01430e7a4a2a SHA1 f7b9025d03232bc457d9e0949d75b4cbcda3420d SHA256 b6d8f8df2b2f8930d4d84191e3791912ede9f068722fa82d3afa81f55c2eaf86
+AUX csound-5.17.6-porttime-in-portmidi.patch 614 RMD160 61ce8520f0480879487f42b3d2a1074b830cfa9c SHA1 b5c6c5a7ee027452bde510dcbc61740479ad012c SHA256 98a9fd9a7d3b2ff5fd287aedd062763c695c50ba369748b5fecb7338a7b1b48c
 DIST Csound5.17.2.tar.gz 8777963 RMD160 79bb854e722c049afd4a2e048b2332223c2a0f97 SHA1 717233f40fe516a955b9caf2ddad3b5c85634b36 SHA256 b46c7efc23831b2c611b0f77d2222a8d0055eee094d92ac3fb7eb1aa969003bb
 DIST Csound5.17.6.tar.gz 9132954 RMD160 8b42227b149664bb0c72713818d67018bbe428ee SHA1 ee1e999e51dc3377b9409cd43cd84ce32f3bf1c8 SHA256 d161acddb4a419fc15097e4f508b7b4e09fadb25b72906cf4f485ca9415fe6d1
 EBUILD csound-5.17.2-r1.ebuild 5347 RMD160 737073bbaf5b04920b80458b3ce24d66e1343933 SHA1 f88471c6c9d02581f9370e19c896da8e39e4807b SHA256 dff64cd4aea79f89ec929214dbfc9d98b9a6206ab7c66c3af6023190cc125b4c
-EBUILD csound-5.17.6.ebuild 5346 RMD160 0d972ccf7d1396371d39b09cb2369fb2c5ed2d25 SHA1 37ffdec955e2292d042d6db6e336ad83617ef759 SHA256 a654bb61be6e4d67f7cc14b270a0f36212e1e8631934d4cee42845bdce9b8357
-MISC ChangeLog 2624 RMD160 52447384446cbe90bec2d80960aa1bb1925ff8e8 SHA1 384d08b1d89cf6992b923a878589b9d77bd3430c SHA256 2d0a572dcd318f1df4a80fdf7132a3e0f0bee386ca4e754b24f3f95954465a76
+EBUILD csound-5.17.6.ebuild 5400 RMD160 0a1e0450bd3aa5265ba3aa1e9ac2ca479ac95949 SHA1 e71535727729dfa476c84f69fd1905228646bfc6 SHA256 063f74545144b5077f792f3fbdfad05baabaf073fce73fa9748835516446c17d
+MISC ChangeLog 2788 RMD160 6a40c2790df88f1dca35a7dcc2af007035029ade SHA1 40a77099f50728f4942871b92021db8832d97887 SHA256 ab8e63369d93bca6b3d2c76398de030c80c10d4c899ce945f5b0977b8fe20516
 MISC metadata.xml 1412 RMD160 c6e0d21b6e3be750430852d3814414fc4ce4c109 SHA1 c99d16c25cd572e31aeccf34261f36c84502cf84 SHA256 3bf65b3bc701d6e4f28b9074673e81914fa637c6b430b31b8d5cf3f191a3fb41
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPjHAfAAoJEEqz6FtPBkyjHq4H/2IObrdTjjTM4B/TcPVT1dtn
-olTwSxWtPwPOT3PGT0PjiMaP5LtFKNtby0SAhdTtsvOOL7gUTQmYNIaqbE5T+4bI
-KwKnHyQaQ5cKpxJcgf+2Mz+tlMUG1duZrykptizDeiovno5vCzJl4pHFr3aNdcsi
-+q66VIeKkmC4FSSG4EbsGqliv7O4Dp6IuaSCoXKM9/w1ueM4PcTWAOqVOn+N5p3f
-nX6bFstA6eHY1n8viSbHXRFEhLNn4iR4ATaVwSlY8cNjVag+wch59csNgyINrhtL
-hwzhDQo4KR7U/l4BTNSovC+qEvw/rq50Y3BBhHUR6VoyDQGQiMFk36FF9i0j2m8=
-=u+FV
+iQEcBAEBCgAGBQJPxKxwAAoJEEqz6FtPBkyj2DMH/2OayZxqj7c8JHNoXKPPaucG
+XWYlZbV1w+7vA8wH3lOx+kJG0TGsFNJJzs64L/dhbXM4YfNr9ZGI4gxWz7xYMO7S
+qDwaHx/rPUhbeHMC5Wpx57DeGBaWYQLGWQgt0kQwcLE+/LdlMjESt2a691Mnf1EB
+1GHnvdaxqs8FcYEk/tXFApzi4/q72FmLDMrv/YF26RGb83NtiqTXA488TbVs5Gm1
+3R7x0TH8TXdSUnswKmI+ACTzYC6+9rwFpiF+eoFitmhNXd7Lz63hHOeQDzbxfIOU
+F0bvZ9qRvlbM3m7wsxqr/HTcEUlCj31IxduUdTSxp/3wDrxdILBHGAcJbWQKvOA=
+=2A3f
 -----END PGP SIGNATURE-----
diff --git a/media-sound/csound/csound-5.17.6.ebuild b/media-sound/csound/csound-5.17.6.ebuild
index 7239e66ddd3b..7ec06c62587c 100644
--- a/media-sound/csound/csound-5.17.6.ebuild
+++ b/media-sound/csound/csound-5.17.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.17.6.ebuild,v 1.2 2012/04/16 19:16:38 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.17.6.ebuild,v 1.3 2012/05/29 11:00:58 radhermit Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -82,6 +82,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-5.16.6-tests.patch
 	epatch "${FILESDIR}"/${P}-fltk.patch
+	epatch "${FILESDIR}"/${P}-porttime-in-portmidi.patch
 
 	sed -i -e "s:^\(csoundExecutable =\).*:\1 \"${WORKDIR}/${P}_build/csound\":" \
 		tests/test.py || die
diff --git a/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch b/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch
new file mode 100644
index 000000000000..3f69a3795f04
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.6-porttime-in-portmidi.patch
@@ -0,0 +1,20 @@
+--- Csound5.17.6/InOut/CMakeLists.txt
++++ Csound5.17.6/InOut/CMakeLists.txt
+@@ -26,7 +26,6 @@
+ endif()

+ if(USE_PORTMIDI)

+     find_library(PORTMIDI_LIBRARY portmidi)

+-    find_library(PORTTIME_LIBRARY porttime)

+     check_include_file(portmidi.h PORTMIDI_HEADER)

+ endif()

+ if(USE_JACK)

+@@ -116,9 +115,6 @@
+ check_deps(USE_PORTMIDI PORTMIDI_HEADER PORTMIDI_LIBRARY)

+ if(USE_PORTMIDI)

+     set(pmidi_LIBS ${PORTMIDI_LIBRARY})

+-    if(NOT APPLE)

+-        list(APPEND pmidi_LIBS ${PORTTIME_LIBRARY})

+-    endif()

+     if(WIN32)

+         list(APPEND pmidi_LIBS ${CSOUND_WINDOWS_LIBRARIES})

+     endif()