| 1 |
radhermit 12/02/27 13:37:57 |
| 2 |
|
| 3 |
Modified: csound-5.16.6-install.patch |
| 4 |
Log: |
| 5 |
Revbump to properly install all required headers. Remove old. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 media-sound/csound/files/csound-5.16.6-install.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/csound/files/csound-5.16.6-install.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/csound/files/csound-5.16.6-install.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/csound/files/csound-5.16.6-install.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: csound-5.16.6-install.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/csound/files/csound-5.16.6-install.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- csound-5.16.6-install.patch 27 Feb 2012 05:37:48 -0000 1.1 |
| 23 |
+++ csound-5.16.6-install.patch 27 Feb 2012 13:37:56 -0000 1.2 |
| 24 |
@@ -66,7 +66,7 @@ |
| 25 |
if err == 0: |
| 26 |
if i[:13] == 'libcsound.so.': |
| 27 |
err = installLink(i, concatPath([libDir, 'libcsound.so'])) |
| 28 |
-@@ -292,7 +267,7 @@ |
| 29 |
+@@ -292,11 +267,26 @@ |
| 30 |
if i in pluginList: |
| 31 |
pluginList.remove(i) |
| 32 |
for i in pluginList: |
| 33 |
@@ -75,7 +75,26 @@ |
| 34 |
installErrors = installErrors or err |
| 35 |
|
| 36 |
# copy header files |
| 37 |
-@@ -313,6 +288,7 @@ |
| 38 |
+ |
| 39 |
++# Add forgotten header dependencies |
| 40 |
++headerdeps = [] |
| 41 |
++for header in headerFiles: |
| 42 |
++ f = open(header) |
| 43 |
++ for line in f: |
| 44 |
++ m = re.findall('^#include "\w+.\w+"', line) |
| 45 |
++ if m: |
| 46 |
++ n = re.match('^#include "(.+)"', "".join(m)) |
| 47 |
++ if os.path.isfile("H/" + n.group(1)): |
| 48 |
++ headerdeps.append("H/" + n.group(1)) |
| 49 |
++ else: |
| 50 |
++ headerdeps.append("interfaces/" + n.group(1)) |
| 51 |
++ f.close() |
| 52 |
++headerFiles = list(set(headerdeps + headerFiles)) |
| 53 |
++ |
| 54 |
+ print ' === Installing header files ===' |
| 55 |
+ err = installFiles(headerFiles, includeDir) |
| 56 |
+ installErrors = installErrors or err |
| 57 |
+@@ -313,6 +303,7 @@ |
| 58 |
['_loris\\.so', '1', pythonDir2], |
| 59 |
['_scoregen\\.so', '1', pythonDir2], |
| 60 |
['_CsoundAC\\.so ', '1', pythonDir2], |
| 61 |
@@ -83,13 +102,14 @@ |
| 62 |
['csnd\\.jar', '0', javaDir], |
| 63 |
['interfaces/csound5\\.lisp', '0', lispDir]] |
| 64 |
for i in wrapperList: |
| 65 |
-@@ -322,48 +298,21 @@ |
| 66 |
+@@ -322,48 +313,21 @@ |
| 67 |
if i[1] == '0': |
| 68 |
err = installFile(fName, i[2]) |
| 69 |
else: |
| 70 |
- err = installXFile('--strip-debug', fName, i[2]) |
| 71 |
-- installErrors = installErrors or err |
| 72 |
-- |
| 73 |
++ err = installXFile('', fName, i[2]) |
| 74 |
+ installErrors = installErrors or err |
| 75 |
+ |
| 76 |
-# copy XMG files |
| 77 |
- |
| 78 |
-print ' === Installing Localisation files ===' |
| 79 |
@@ -109,9 +129,8 @@ |
| 80 |
- print ' %s' % fileName |
| 81 |
- else: |
| 82 |
- print ' *** error copying %s' % fileName |
| 83 |
-+ err = installXFile('', fName, i[2]) |
| 84 |
- installErrors = installErrors or err |
| 85 |
- |
| 86 |
+- installErrors = installErrors or err |
| 87 |
+- |
| 88 |
-# Copy documentation |
| 89 |
- |
| 90 |
-print ' === Installing documentation ===' |
| 91 |
@@ -138,7 +157,7 @@ |
| 92 |
|
| 93 |
# copy STK raw wave files |
| 94 |
|
| 95 |
-@@ -398,7 +347,7 @@ |
| 96 |
+@@ -398,7 +362,7 @@ |
| 97 |
pdDir = '' |
| 98 |
if pdDir != '': |
| 99 |
print ' === Installing csoundapi~ PD object ===' |
| 100 |
@@ -147,7 +166,7 @@ |
| 101 |
if err == 0: |
| 102 |
try: |
| 103 |
os.chmod(concatPath([instDir, pdDir, 'csoundapi~.pd_linux']), 0644) |
| 104 |
-@@ -420,42 +369,6 @@ |
| 105 |
+@@ -420,42 +384,6 @@ |
| 106 |
'%s/%s' % (vimDir, 'syntax')) |
| 107 |
installErrors = installErrors or err |
| 108 |
|
| 109 |
@@ -190,7 +209,7 @@ |
| 110 |
|
| 111 |
# ----------------------------------------------------------------------------- |
| 112 |
|
| 113 |
-@@ -481,10 +394,6 @@ |
| 114 |
+@@ -481,10 +409,6 @@ |
| 115 |
print ' CSSTRNGS=%s' % xmgDir |
| 116 |
if '%s/libstk.so' % pluginDir in fileList: |
| 117 |
print ' RAWWAVE_PATH=%s' % rawWaveDir |
Archives