← Back to branch summary

~ubuntu-branches/ubuntu/precise/csound/precise

« back to all changes in this revision

Viewing changes to debian/patches/1003-abi-plugin-dir.diff

  • Committer: Package Import Robot
  • Author(s): Felipe Sateler
  • Date: 2012-04-19 09:26:46 UTC
  • mfrom: (3.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20120419092646-96xbj1n6atuqosk2
Tags: 1:5.17.6~dfsg-1
* New upstream release
 - Do not build the wiimote opcodes (we need wiiuse).
* Add new API function to symbols file
* Disable lua opcodes, they were broken. Requires OpenMP to be enabled.
* Backport fixes from upstream:
  - Link dssi4cs with dl. Backport
  - Fix building of CsoundAC

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/1003-abi-plugin-dir.diff
1
 
Description: Append library version to plugin dir
2
 
 Install plugins into a versioned directory to allow co-installation of
3
 
 different versions of the library.
4
 
Author: Felipe Sateler <fsateler@gmail.com>
5
 
--- a/SConstruct
6
 
+++ b/SConstruct
7
 
@@ -920,6 +920,7 @@
8
 
             tmp = '%s/lib64/csound/plugins' % commonEnvironment['prefix']
9
 
         if commonEnvironment['useDouble'] != '0':
10
 
             tmp += '64'
11
 
+        tmp += '-' + csoundLibraryVersion
12
 
         s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp
13
 
         csoundLibraryEnvironment.Append(CPPFLAGS = [s])
14
 
     elif buildOSXFramework != 0:
15
 
@@ -2769,6 +2770,8 @@
16
 
     PLUGIN_DIR = LIB_DIR + "/csound/plugins"
17
 
 else:
18
 
     PLUGIN_DIR = LIB_DIR + "/csound/plugins64"
19
 
+if getPlatform() == 'linux':
20
 
+    PLUGIN_DIR += '-' + csoundLibraryVersion
21
 
 
22
 
 if commonEnvironment['install'] == '1':
23
 
     installExecutables = Alias('install-executables',