Revision: 1815
Author:   keenblade
Date:     2010-12-04 02:12:56 +0100 (Sat, 04 Dec 2010)
Log Message:
-----------
csound-5.12.1-r1: lots of changes in ebuild referenced from csound-wii overlay

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/csound/ChangeLog
    trunk/overlays/proaudio/media-sound/csound/Manifest

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/csound/csound-5.12.1-r1.ebuild
    trunk/overlays/proaudio/media-sound/csound/files/install-stk.patch
    trunk/overlays/proaudio/media-sound/csound/files/javaVM.patch
    trunk/overlays/proaudio/media-sound/csound/files/libmusicxml.patch

Modified: trunk/overlays/proaudio/media-sound/csound/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/csound/ChangeLog        2010-11-28 
10:33:39 UTC (rev 1814)
+++ trunk/overlays/proaudio/media-sound/csound/ChangeLog        2010-12-04 
01:12:56 UTC (rev 1815)
@@ -2,6 +2,14 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*csound-5.12.1-r1 (04 Dec 2010)
+
+  04 Dec 2010; Hakan Demiralp <[email protected]>
+  +csound-5.12.1-r1.ebuild, +files/install-stk.patch, +files/javaVM.patch,
+  +files/libmusicxml.patch:
+  csound-5.12.1-r1: lots of changes in ebuild referenced from csound-wii
+  overlay
+
 *csound-5.12.1 (07 Mar 2010)
 
   07 Mar 2010; Frieder Buerzele <[email protected]>

Modified: trunk/overlays/proaudio/media-sound/csound/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/csound/Manifest 2010-11-28 10:33:39 UTC 
(rev 1814)
+++ trunk/overlays/proaudio/media-sound/csound/Manifest 2010-12-04 01:12:56 UTC 
(rev 1815)
@@ -2,6 +2,9 @@
 AUX csound-SConsruct.diff 2225 RMD160 56e261b5f9f41d4c0fb8d7bc26220cc35b0317ff 
SHA1 4e26a9e356ba49e39ba3d5c66407676219fa4634 SHA256 
bfbbc049f4f5ac3ff6d54384bdb5561483882eab407bbd9ab12924931002c81d
 AUX csound-remote.patch 591 RMD160 d75bc68af8be51b21ebc432ab15d2850af22514f 
SHA1 536cfe0c9026f3830030ed18370ab26ebf4a1501 SHA256 
05cccce1a722d598c2ac05a4ccaa296d12f842ea412c3a8cc66eef39834a9e2b
 AUX custom.py 629 RMD160 a9186ab29d7424f72b5e13eec1a0aa5d2c92140f SHA1 
97c66fbebd758eaae98974d97aa7a765cb79ae58 SHA256 
81fea3923cc0b9b0eeca9c6a2270c2e2f4d3ded756a888649ebc1d5bbb492544
+AUX install-stk.patch 1457 RMD160 edb7e42a0ae29e7722b342bc05ce6ead6abad004 
SHA1 25b2841f8c587ebec28575724c3200f3ea568865 SHA256 
3b513d5f249e4759fac621ed97589d05ff56382372c1cde96ff30cb61a695db2
+AUX javaVM.patch 1133 RMD160 c66ad3b4119dcf956c1256045b057d8118baa94e SHA1 
7da1ce2a91da9a623c4e0c71508afab2fa32da7b SHA256 
d0c65e81397b0ff76d45d94b2695de713cbab0d210ce6312d86c62779c253577
+AUX libmusicxml.patch 391 RMD160 3a6f700ed241f055ad37300012df35d92c848939 SHA1 
9cffe53f19aab21ded69eefa13dfefa343f0da80 SHA256 
a909e49b535accd2e2d1bfbe9ecb73454d9b59cd165e87c6bba9e10e65c4ab65
 DIST Csound5.01_src.tar.gz 2031426 RMD160 
24652f8f650464d886f6d537ae991654f475ad4a SHA1 
b387da9b6c24961397e89ddcedd1229cdfebffe7 SHA256 
c6daea25bd3a17d174416caff35bdc649e5a33ef4ef1513304c1c1db8991d3f6
 DIST Csound5.02.1_src.tar.gz 2312669 RMD160 
61246996294b4af4d0267649b5e1c59aff97568e SHA1 
2f6aca855b2c4edde365c2620fa3c066ddeb4534 SHA256 
118261afe65755e93c2df9c86ddf715c59cbe25dedbf593c0fcd6bf51db89f9e
 DIST Csound5.02_src.tar.gz 2311932 RMD160 
b642e23ccf46ddf65c3fa0c716c42363f4b851a5 SHA1 
cade4a0368de9ced88400e61a4cc156b51744a51 SHA256 
2f0f711942b30c6464acfcaad80af27f58b0b44852cb9c63a7d0cdecf0473b66
@@ -9,12 +12,16 @@
 DIST Csound5.08.0.tar.gz 14011319 RMD160 
ada40251f35ae3bb71560045090327cd081557c2 SHA1 
cbec78ab92cfce3ad35478ded7ab97f9459625a2 SHA256 
413d066b575b72e980ddeae2a39770445a9d17c353a19ced151b609605a3c172
 DIST Csound5.09.0.tar.gz 5987096 RMD160 
99bcbf0b026475d2051ec37d4a556df69afa336d SHA1 
1ccffa90e65e2809dad4a799a8fde4e961ecc313 SHA256 
561787f5dbf6b8507faaee9cb06df811facbd35a4137578d1a64f5c3671a3ba8
 DIST Csound5.12.1.tar.gz 6121581 RMD160 
df4613caef522bb113617f072313ab55882ff820 SHA1 
9b2e0f7dc04aa715acee4f37a1b02dedcdd5b552 SHA256 
89173d666df4e109e6bbbd9232e68f7710711fa0e853a29f7704aa01d502360d
+DIST Csound5.12_manual_html.zip 5495041 RMD160 
c20cdf9497e3ebc95a95de1ec364f5071fd76d96 SHA1 
4b04e00033e9a5ec50f3abb712de63b19d786cff SHA256 
27f3f92e6634db4ce5cd3a311cce33aecd003f12f0fc6e08cabe86aa8cb3d6c6
+DIST stk-4.4.2.tar.gz 2056848 RMD160 7226186bea51f59a0a08ef51dc366cf41a6fc39b 
SHA1 f610edc8c1367a96a78314d4113b105369ea5fa7 SHA256 
8bef3ab3de10dc587afac47aa7710f3579bd39d6aaf2f155305ad94f81e3c17a
+DIST vstsdk2_4_rev1.zip 7063115 RMD160 
abfa1ab621f2efe5cb5b61c252dcd12196d7d8ed SHA1 
293d2861a9e580ecdcfed55b1d2b6f602423eecc SHA256 
57d8b8e196b1ffda412a887adcf544533a48cee409a4676f832746cafe27d77b
 EBUILD csound-5.01.ebuild 3026 RMD160 6617d0ad705df942ef12596a3cd18288a16cac58 
SHA1 8e2cae81d66f2e539d1a4443e4a0f950b10aab43 SHA256 
1e293b6fb63eaa17d2781403bf6dd12a16a6ef7f6ad019133082e0bae6a21efe
 EBUILD csound-5.02.1.ebuild 2987 RMD160 
00add814f42210f449bcac2f085af9749cfa155d SHA1 
051bee633f0264620f3f07b4c085d5ebdbeeb91a SHA256 
b1afb96045df98181eb447d93780cd720302f366e7799045c9c892fe17fedc42
 EBUILD csound-5.02.ebuild 2987 RMD160 00add814f42210f449bcac2f085af9749cfa155d 
SHA1 051bee633f0264620f3f07b4c085d5ebdbeeb91a SHA256 
b1afb96045df98181eb447d93780cd720302f366e7799045c9c892fe17fedc42
 EBUILD csound-5.07.0.ebuild 2940 RMD160 
d3dbbebea4a89d549e7e1ebef7ff2e82acb2e10d SHA1 
da2d8d8fd4f9802845fbe5dbf163d9c062429986 SHA256 
b8914f6cb6b6db40ba1f0f78f807969c4b91a27fc7f2aa3e9a1d2a5820bf257f
 EBUILD csound-5.08.0.ebuild 2941 RMD160 
9749d3b3131ecac73660929a841d1ded1e9b11a4 SHA1 
744c6b8f126e9143e424ecf5a2c924746e4be38d SHA256 
f5ae6f6e666be6929f87a337cdf4c33a7e7e1f8594c797e3a5c24f2d66eb3c7e
 EBUILD csound-5.09.0-r1.ebuild 3042 RMD160 
8f7b11517e7f5bc3cccf1e03544c98750422b6d0 SHA1 
76d56ef6bf1e4830dcb221dd402e6833fa235dc7 SHA256 
a7679d519ee4347d4fa8a5986acd8230466ace1761f3a0eaf4e95d204534e576
+EBUILD csound-5.12.1-r1.ebuild 7106 RMD160 
5c9ef85585b15553e853c75ef745935a031baff0 SHA1 
d0532f1748c65df4e787a4c436ace92ed26677f3 SHA256 
44aed25f45070b391f948e0eb305e4d53e9613e045047b78df9dc6abc0cc5128
 EBUILD csound-5.12.1.ebuild 3043 RMD160 
ca18bb046d0505e20a2fa03508c3b24ebe502cc2 SHA1 
c42a18d4cf126462a6afb3dcc20bec3536318193 SHA256 
93c50d7073586ddb49672ae1d1e4d0b4a62db4ef80f65b29dd1d84c39c30a4df
 MISC ChangeLog 739 RMD160 c14611a396dcdb1f328abc74e41e0ab076e34da5 SHA1 
9ff8a5d21ebff5f1ab3c8728f40f3f5dfb8bcaa1 SHA256 
a16cba70f84cfe903b775aac4d1bfe3824e44ac7ae9081dd2b879e4b452b2223
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 
2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 
96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Copied: trunk/overlays/proaudio/media-sound/csound/csound-5.12.1-r1.ebuild 
(from rev 1814, trunk/overlays/proaudio/media-sound/csound/csound-5.12.1.ebuild)
===================================================================
--- trunk/overlays/proaudio/media-sound/csound/csound-5.12.1-r1.ebuild          
                (rev 0)
+++ trunk/overlays/proaudio/media-sound/csound/csound-5.12.1-r1.ebuild  
2010-12-04 01:12:56 UTC (rev 1815)
@@ -0,0 +1,225 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+PYTHON_DEPEND="2"
+EAPI="2"
+
+inherit exteutils python eutils toolchain-funcs
+
+MY_P=${P/csound-/Csound}
+MY_PV=${PV/12.1/12}
+STK_VERSION="4.4.2"
+
+DESCRIPTION="Csound is a sound and music synthesis system, providing 
facilities for composition and performance"
+HOMEPAGE="http://csound.sourceforge.net";
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
+doc? ( mirror://sourceforge/${PN}/Csound${MY_PV}_manual_html.zip )
+stk? ( 
http://ccrma.stanford.edu/software/stk/release/stk-${STK_VERSION}.tar.gz )
+vst? ( vstsdk2_4_rev1.zip )
+vst-host? ( vstsdk2_4_rev1.zip )"
+RESTRICT="mirror"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc"
+IUSE="+alsa altivec amd64 ppc64 csoundac -doc +double-precision +nodebug dssi 
editor examples fluidsynth gui jack java lua mp3 musicxml newparser osc p5glove 
pd +python -portaudio +static stk tcl vst wiimote"
+
+RDEPEND="media-libs/ladspa-sdk
+       alsa? ( media-libs/alsa-lib )
+       csoundac? ( x11-libs/fltk:1.1[threads]
+               dev-libs/boost
+               dev-lang/swig )
+       dssi? ( media-libs/dssi
+               media-libs/ladspa-sdk )
+       >=media-libs/libsndfile-1.0.16
+       editor? ( x11-libs/fltk:1.1[threads] )
+       fluidsynth? ( media-sound/fluidsynth )
+       gui? ( x11-libs/fltk:1.1[threads] )
+       jack? ( media-sound/jack-audio-connection-kit )
+       java? ( || ( virtual/jre virtual/jdk ) )
+       lua? ( dev-lang/lua )
+       mp3? ( media-sound/mpadec )
+       musicxml? ( media-libs/libmusicxml:2 )
+       osc? ( media-libs/liblo )
+       p5glove? ( media-libs/libp5glove )
+       pd? ( virtual/pd )
+       stk? ( =media-libs/stk-${STK_VERSION} )
+       tcl? ( >=dev-lang/tcl-8.5
+               >=dev-lang/tk-8.5 )
+       wiimote? ( media-libs/wiiuse )"
+
+DEPEND="${RDEPEND}
+       app-arch/unzip
+       dev-util/pkgconfig
+       dev-util/scons
+       >=dev-lang/python-2.4
+       portaudio? ( =media-libs/portaudio-19* )
+       doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+       python_set_active_version 2
+
+       if use pd; then
+               ewarn "You have enabled pd (PureData) use-flag."
+               ewarn "Please abort the build with CTRL-C, and install"
+               ewarn "\"pd-overlay\" with layman ...unless you have done"
+               ewarn "it already."
+               ewarn
+               epause 5
+       fi
+
+       if use vst; then
+               if ! use csoundac || ! use gui; then
+                       eerror "Please set USE=\"csoundac gui\" with vst 
use-flag!"
+                       die
+               fi
+       fi
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/install-stk.patch
+       epatch "${FILESDIR}"/javaVM.patch
+       epatch "${FILESDIR}"/libmusicxml.patch
+
+       if use stk; then
+               ebegin "Copying Perry Cook's Synthesis ToolKit to the tree"
+               cp -r "${WORKDIR}"/stk-"${STK_VERSION}"/* "${S}"/Opcodes/stk/
+               eend
+       fi
+
+       if use vst || use vst-host; then
+               ebegin "Copying Steinberg's VST SDK to the tree"
+               cp -r "${WORKDIR}"/vstsdk2.4 "${S}"/frontends/CsoundVST/
+               eend
+       fi
+}
+
+src_compile() {
+       local sconsconf="prefix=/usr \
+               pythonVersion=$(python_get_version) \
+               tclversion=8.5 \
+               usePortAudio=0 \
+               usePortMIDI=0 \
+               useCoreAudio=0 \
+               buildUtilities=1 \
+               buildInterfaces=1"
+       if use amd64; then
+               sconsconf="${sconsconf} Word64=1 Lib64=1"
+       fi
+       ! use alsa; sconsconf="${sconsconf} useALSA=$?"
+       ! use altivec; sconsconf="${sconsconf} useAltivec=$?"
+       ! use csoundac; sconsconf="${sconsconf} buildCsoundAC=$?"
+       ! use nodebug; sconsconf="${sconsconf} buildRelease=$?"
+       # Pdf generation is totally broken, so it is disabled by default
+       ! use doc; sconsconf="${sconsconf} generatePdf=$?"
+       ! use double-precision; sconsconf="${sconsconf} useDouble=$?"
+       ! use dssi; sconsconf="${sconsconf} buildDSSI=$?"
+       ! use editor; sconsconf="${sconsconf} useFLTK=$? buildCSEditor=$?"
+       ! use gui; sconsconf="${sconsconf} useFLTK=$? buildCsound5GUI=$? 
buildVirtual=$?"
+       ! use jack; sconsconf="${sconsconf} useJack=$?"
+       ! use java; sconsconf="${sconsconf} buildJavaWrapper=$?"
+       # Handled by the media-libs/loris package
+       #! use loris; sconsconf="${sconsconf} buildLoris=$?"
+       ! use lua; sconsconf="${sconsconf} buildLuaWrapper=$?"
+       ! use mp3; sconsconf="${sconsconf} includeMP3=$?"
+       ! use newparser; sconsconf="${sconsconf} buildNewParser=$?"
+       ! use osc; sconsconf="${sconsconf} useOSC=$?"
+       ! use p5glove; sconsconf="${sconsconf} includeP5Glove=$?"
+       ! use pd; sconsconf="${sconsconf} buildPDClass=$?"
+# Pdf generation is totally broken, so it is disabled by default
+       ! use doc; sconsconf="${sconsconf} generatePdf=$?"
+       ! use double-precision; sconsconf="${sconsconf} useDouble=$?"
+       ! use dssi; sconsconf="${sconsconf} buildDSSI=$?"
+       ! use editor; sconsconf="${sconsconf} useFLTK=$? buildCSEditor=$?"
+       ! use gui; sconsconf="${sconsconf} useFLTK=$? buildCsound5GUI=$? 
buildVirtual=$?"
+# Portaudio is broken, so it is disabled by default
+       ! use portaudio; sconsconf="${sconsconf} usePortAudio=$?"
+       ! use python; sconsconf="${sconsconf} buildPythonOpcodes=$? 
buildPythonWrapper=$?"
+       ! use static; sconsconf="${sconsconf} dynamicCsoundLibrary=$?"
+       ! use stk; sconsconf="${sconsconf} buildStkOpcodes=$?"
+       ! use tcl; sconsconf="${sconsconf} buildTclcsound=$?"
+       ! use vst; sconsconf="${sconsconf} buildCsoundVST=$?"
+       ! use vst-host; sconsconf="${sconsconf} buildvst4cs=$?"
+       ! use wiimote; sconsconf="${sconsconf} includeWii=$?"
+
+       einfo "Building Csound with the following configuration options:"
+       einfo ${sconsconf}
+       epause 5
+
+       # These addpredicts are to stop sandbox violation errors
+       # addpredict in src_compile() alone does not stop sandbox
+       # violation errors in src_install(()
+       addpredict "/usr/include"
+       addpredict "/usr/lib"
+       addpredict "/etc/ld.so.cache"
+
+       einfo "You enabled following scons options: ${myconf}"
+
+       escons \
+#              prefix=/usr \
+               CC="$(tc-getCC)" \
+               CXX="$(tc-getCXX)" \
+               customCCFLAGS="$CFLAGS -fno-strict-aliasing" \
+               customCXXFLAGS="$CXXFLAGS -fno-strict-aliasing" \
+               ${sconsconf} || die "scons failed!"
+}
+
+src_install() {
+       if use amd64; then
+               ./install.py --prefix="/usr" --instdir="${D}" --word64
+       else
+               ./install.py --prefix="/usr" --instdir="${D}"
+       fi
+       # Post-installation fixes (probably should patch install.py instead, 
but...)
+       rm -rf "${D}"/usr/*.md5sums
+       rm -rf "${D}"/usr/share/doc/csound
+       rm -rf "${D}"/usr/bin/uninstall-csound5
+       cd "${D}"/usr/$(get_libdir)
+       ln -s libcsnd.so.5.2 libcsnd.so
+       cd "${S}"
+       if use csoundac; then
+               insinto $(python_get_sitedir)
+               doins CsoundAC.py
+               insopts -m0755
+               doins _CsoundAC.so
+               if use lua; then
+                       insinto /usr/$(get_libdir)/csound/lua
+                       doins luaCsoundAC.so
+               fi
+               insopts -m0644
+       fi
+       if use lua; then
+               insinto /usr/$(get_libdir)/csound/lua
+               insopts -m0755
+               doins luaCsnd.so
+               insopts -m0644
+       fi
+
+       if use double-precision; then
+               echo "OPCODEDIR64=/usr/$(get_libdir)/csound/plugins64" > 
61csound5
+       else
+               echo "OPCODEDIR=/usr/$(get_libdir)/csound/plugins" > 61csound5
+       fi
+       echo "CSSTRNGS=/usr/share/locale" >> 61csound5
+       doenvd 61csound5
+
+       dodoc AUTHORS ChangeLog
+       newdoc Loadable_Opcodes.txt Loadable_Opcodes
+       newdoc readme-csound5.txt README.Csound5
+       newdoc readme-csound5-complete.txt README.Csound5-VST
+       if use doc; then
+               dohtml -r "${WORKDIR}"/html/*
+       fi
+       if use examples; then
+               insinto /usr/share/doc/${PR}
+               doins -r examples
+       fi
+}
+
+pkg_postinst() {
+       elog "If you are interested in 'Loris Opcodes for Csound',"
+       elog "please install media-libs/loris with USE=\"csound\"."
+}

Added: trunk/overlays/proaudio/media-sound/csound/files/install-stk.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/csound/files/install-stk.patch          
                (rev 0)
+++ trunk/overlays/proaudio/media-sound/csound/files/install-stk.patch  
2010-12-04 01:12:56 UTC (rev 1815)
@@ -0,0 +1,38 @@
+--- Csound5.12.1.orig/install.py       2009-10-05 09:30:30.000000000 +0300
++++ Csound5.12.1/install.py    2010-09-09 19:07:25.000000000 +0300
+@@ -116,7 +116,7 @@
+ # LISP interface
+ lispDir     = concatPath([libDir, '/csound/lisp'])
+ # STK raw wave files
+-rawWaveDir  = concatPath([prefix, '/share/csound/rawwaves'])
++rawWaveDir  = concatPath([prefix, '/share/stk/rawwaves'])
+
+ # csnd.py
+ pythonDir   = '/usr/lib%s/python%s/site-packages' % (word64Suffix, pyVersion)
+@@ -335,7 +335,7 @@
+   for i in xmgList:
+     makeDir(concatPath([xmgDir, i, 'LC_MESSAGES']))
+     src = 'po/' + i + '/LC_MESSAGES/csound5.mo'
+-    fileName = concatPath([xmgDir, i, 'LC_MESSAGES/csound5.mo'])
++    fileName = concatPath([instDir,xmgDir, i, 'LC_MESSAGES/csound5.mo'])
+     err = runCmd(['install', '-p', '-m', '0644', src, fileName])
+     if err == 0:
+         addMD5(fileName, fileName)
+@@ -363,17 +363,6 @@
+ err = installXFile('', 'matrix.tk', binDir)
+ installErrors = installErrors or err
+
+-# copy STK raw wave files
+-
+-if '%s/libstk.so' % pluginDir in fileList:
+-    print ' === Installing STK raw wave files ==='
+-    rawWaveFiles = []
+-    for fName in os.listdir('./Opcodes/stk/rawwaves'):
+-        if re.match('^.*\.raw$', fName) != None:
+-            rawWaveFiles += ['./Opcodes/stk/rawwaves/' + fName]
+-    err = installFiles(rawWaveFiles, rawWaveDir)
+-    installErrors = installErrors or err
+-
+ # copy PD object
+ pdDir = '/usr/local/lib' + word64Suffix + '/pd/extra'
+ try:

Added: trunk/overlays/proaudio/media-sound/csound/files/javaVM.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/csound/files/javaVM.patch               
                (rev 0)
+++ trunk/overlays/proaudio/media-sound/csound/files/javaVM.patch       
2010-12-04 01:12:56 UTC (rev 1815)
@@ -0,0 +1,22 @@
+--- Csound5.12.1.orig/SConstruct       2010-01-16 01:27:37.000000000 +0200
++++ Csound5.12.1/SConstruct    2010-09-14 22:06:36.000000000 +0300
+@@ -798,15 +798,10 @@
+ if getPlatform() == 'linux' and not javaFound:
+     if commonEnvironment['buildInterfaces'] != '0':
+         if commonEnvironment['buildJavaWrapper'] != '0':
+-            baseDir = '/usr/lib'
+-            if commonEnvironment['Lib64'] == '1':
+-                baseDir += '64'
+-            for i in ['java', 'jvm/java', 'jvm/java-1.5.0']:
+-                javaIncludePath = '%s/%s/include' % (baseDir, i)
+-                tmp = '%s/linux/jni_md.h' % javaIncludePath
+-                if configure.CheckHeader(tmp, language = "C++"):
+-                    javaFound = 1
+-                    break
++            javaIncludePath = '/etc/java-config-2/current-system-vm/include'
++            tmp = '%s/linux/jni_md.h' % javaIncludePath
++            if configure.CheckHeader(tmp, language = "C++"):
++                javaFound = 1
+     if javaFound:
+         commonEnvironment.Append(CPPPATH = [javaIncludePath])
+         commonEnvironment.Append(CPPPATH = [javaIncludePath + '/linux'])

Added: trunk/overlays/proaudio/media-sound/csound/files/libmusicxml.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/csound/files/libmusicxml.patch          
                (rev 0)
+++ trunk/overlays/proaudio/media-sound/csound/files/libmusicxml.patch  
2010-12-04 01:12:56 UTC (rev 1815)
@@ -0,0 +1,10 @@
+--- Csound5.12.1.orig/custom.py        2008-12-17 17:15:21.000000000 +0200
++++ Csound5.12.1/custom.py     2010-09-14 22:33:01.000000000 +0300
+@@ -17,6 +17,7 @@
+
+ if sys.platform[:5] == 'linux':
+     platform = 'linux'
++    customCPPPATH.append('/usr/include/libmusicxml')
+     customCPPPATH.append('/usr/include/fltk-1.1')
+     customLIBPATH.append('/usr/lib/fltk-1.1')
+ elif sys.platform == 'darwin':

Reply via email to