summaryrefslogtreecommitdiff
path: root/audio/SuperCollider/fixups_for_x86_64.diff
blob: 0973385deae0ef05716fb873ee6124e9762aa85b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
diff -Naur SuperCollider-Source.orig/cmake_modules/FindFFTW3f.cmake SuperCollider-Source/cmake_modules/FindFFTW3f.cmake
--- SuperCollider-Source.orig/cmake_modules/FindFFTW3f.cmake	2012-01-23 15:05:09.000000000 +0100
+++ SuperCollider-Source/cmake_modules/FindFFTW3f.cmake	2012-09-24 10:05:11.828461684 +0200
@@ -11,9 +11,9 @@
 FIND_LIBRARY(
     FFTW3F_LIBRARY
     NAMES fftw3f libfftw3f
-    HINTS $ENV{FFTW3_DIR}/lib
+    HINTS $ENV{FFTW3_DIR}/lib64
     PATHS /usr/local/lib
-          /usr/lib
+          /usr/lib64
 )
 
 SET(FFTW3F_FOUND "NO")
diff -Naur SuperCollider-Source.orig/cmake_modules/FindJack.cmake SuperCollider-Source/cmake_modules/FindJack.cmake
--- SuperCollider-Source.orig/cmake_modules/FindJack.cmake	2012-01-23 15:05:09.000000000 +0100
+++ SuperCollider-Source/cmake_modules/FindJack.cmake	2012-09-24 10:05:11.828461684 +0200
@@ -45,7 +45,7 @@
       jack
     PATHS
       ${_JACK_LIBDIR}
-      /usr/lib
+      /usr/lib64
       /usr/local/lib
       /opt/local/lib
       /sw/lib
diff -Naur SuperCollider-Source.orig/cmake_modules/FindPortaudio.cmake SuperCollider-Source/cmake_modules/FindPortaudio.cmake
--- SuperCollider-Source.orig/cmake_modules/FindPortaudio.cmake	2012-01-04 00:09:36.000000000 +0100
+++ SuperCollider-Source/cmake_modules/FindPortaudio.cmake	2012-09-24 10:05:11.832459176 +0200
@@ -53,7 +53,7 @@
       NAMES
         portaudio
       PATHS
-        /usr/lib
+        /usr/lib64
         /usr/local/lib
         /opt/local/lib
         /sw/lib
@@ -63,7 +63,7 @@
       NAMES
         portaudio
       PATHS
-        /usr/lib
+        /usr/lib64
         /usr/local/lib
         /opt/local/lib
         /sw/lib
diff -Naur SuperCollider-Source.orig/editors/sced/CMakeLists.txt SuperCollider-Source/editors/sced/CMakeLists.txt
--- SuperCollider-Source.orig/editors/sced/CMakeLists.txt	2012-09-02 14:59:36.000000000 +0200
+++ SuperCollider-Source/editors/sced/CMakeLists.txt	2012-09-24 10:21:37.405264362 +0200
@@ -17,10 +17,10 @@
             DESTINATION share/mime/packages)
 
     install(FILES data/sced.gedit-plugin
-            DESTINATION lib/gedit-2/plugins)
+            DESTINATION lib64/gedit-2/plugins)
 
     install(DIRECTORY sced
-            DESTINATION lib/gedit-2/plugins)
+            DESTINATION lib64/gedit-2/plugins)
 
 elseif(NOT WIN32 AND SC_ED EQUAL 3)
 
@@ -35,7 +35,7 @@
             DESTINATION share/mime/packages)
 
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sced3/supercollider.plugin sced3/supercollider.py
-            DESTINATION lib/gedit/plugins)
+            DESTINATION lib64/gedit/plugins)
 
 elseif(WIN32)
 
diff -Naur SuperCollider-Source.orig/external_libraries/boost_lockfree/libs/lockfree/examples/Jamfile.v2 SuperCollider-Source/external_libraries/boost_lockfree/libs/lockfree/examples/Jamfile.v2
--- SuperCollider-Source.orig/external_libraries/boost_lockfree/libs/lockfree/examples/Jamfile.v2	2012-08-12 16:43:59.000000000 +0200
+++ SuperCollider-Source/external_libraries/boost_lockfree/libs/lockfree/examples/Jamfile.v2	2012-09-24 10:05:11.832459176 +0200
@@ -4,7 +4,7 @@
 
 project boost/lockfree/example
     : requirements
-       <library>/usr/lib/libboost_thread.so # temporary hack
+       <library>/usr/lib64/libboost_thread.so # temporary hack
     ;
 
 exe fifo : fifo.cpp ;
diff -Naur SuperCollider-Source.orig/external_libraries/oscpack/Makefile SuperCollider-Source/external_libraries/oscpack/Makefile
--- SuperCollider-Source.orig/external_libraries/oscpack/Makefile	2012-01-04 00:09:36.000000000 +0100
+++ SuperCollider-Source/external_libraries/oscpack/Makefile	2012-09-24 10:05:11.832459175 +0200
@@ -71,12 +71,12 @@
 
 #Installs the library on a system global location
 install: lib
-	@$(INSTALL) -m 755 $(LIBFILENAME) $(PREFIX)/lib/$(LIBFILENAME)
-	@ln -s -f $(PREFIX)/lib/$(LIBFILENAME) $(PREFIX)/lib/$(LIBSONAME) 
+	@$(INSTALL) -m 755 $(LIBFILENAME) $(PREFIX)/lib64/$(LIBFILENAME)
+	@ln -s -f $(PREFIX)/lib64/$(LIBFILENAME) $(PREFIX)/lib64/$(LIBSONAME) 
 	@mkdir  -p $(PREFIX)/include/oscpack/ip $(PREFIX)/include/oscpack/osc
 	@$(INSTALL) -m 644 ip/*.h $(PREFIX)/include/oscpack/ip
 	@$(INSTALL) -m 644 osc/*.h $(PREFIX)/include/oscpack/osc
-	@echo "SUCCESS! oscpack has been installed in $(PREFIX)/lib and $(PREFIX)/include/ospack/"
+	@echo "SUCCESS! oscpack has been installed in $(PREFIX)/lib64 and $(PREFIX)/include/ospack/"
 	@echo "now doing ldconfig..."
 	@ldconfig
 
diff -Naur SuperCollider-Source.orig/lang/CMakeLists.txt SuperCollider-Source/lang/CMakeLists.txt
--- SuperCollider-Source.orig/lang/CMakeLists.txt	2012-09-02 14:59:36.000000000 +0200
+++ SuperCollider-Source/lang/CMakeLists.txt	2012-09-24 10:06:58.587243029 +0200
@@ -307,7 +307,7 @@
 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 else()
 	install(TARGETS sclang
-			LIBRARY DESTINATION "lib"
+			LIBRARY DESTINATION "lib64"
 			RUNTIME DESTINATION "bin"
 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endif()
diff -Naur SuperCollider-Source.orig/server/plugins/CMakeLists.txt SuperCollider-Source/server/plugins/CMakeLists.txt
--- SuperCollider-Source.orig/server/plugins/CMakeLists.txt	2012-09-02 14:59:36.000000000 +0200
+++ SuperCollider-Source/server/plugins/CMakeLists.txt	2012-09-24 10:05:54.339310317 +0200
@@ -259,12 +259,12 @@
 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 else()
 	install(TARGETS ${plugins}
-			DESTINATION "lib/SuperCollider/plugins"
+			DESTINATION "lib64/SuperCollider/plugins"
 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 
 	if (SUPERNOVA)
 		install(TARGETS ${supernova_plugins}
-			DESTINATION "lib/supernova/plugins"
+			DESTINATION "lib64/supernova/plugins"
 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 	endif()
 endif()
diff -Naur SuperCollider-Source.orig/server/scsynth/CMakeLists.txt SuperCollider-Source/server/scsynth/CMakeLists.txt
--- SuperCollider-Source.orig/server/scsynth/CMakeLists.txt	2012-09-02 14:59:36.000000000 +0200
+++ SuperCollider-Source/server/scsynth/CMakeLists.txt	2012-09-24 10:07:21.145304431 +0200
@@ -160,7 +160,7 @@
 endif(SNDFILE_FOUND)
 
 if(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-	add_definitions(-DSC_PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/lib/SuperCollider/plugins")
+	add_definitions(-DSC_PLUGIN_DIR="${CMAKE_INSTALL_PREFIX}/lib64/SuperCollider/plugins")
 endif()
 
 if (AUDIOAPI STREQUAL jack)
@@ -229,7 +229,7 @@
 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 else()
 	install(TARGETS libscsynth scsynth
-			LIBRARY DESTINATION "lib"
+			LIBRARY DESTINATION "lib64"
 			RUNTIME DESTINATION "bin"
 			PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 endif()
diff -Naur SuperCollider-Source.orig/server/supernova/server/main.cpp SuperCollider-Source/server/supernova/server/main.cpp
--- SuperCollider-Source.orig/server/supernova/server/main.cpp	2012-09-02 14:59:36.000000000 +0200
+++ SuperCollider-Source/server/supernova/server/main.cpp	2012-09-24 10:05:11.833458554 +0200
@@ -190,7 +190,7 @@
 
 #ifdef __linux__
         sc_factory->load_plugin_folder("/usr/local/lib/supernova/plugins");
-        sc_factory->load_plugin_folder("/usr/lib/supernova/plugins");
+        sc_factory->load_plugin_folder("/usr/lib64/supernova/plugins");
         sc_factory->load_plugin_folder(home / "/.local/share/SuperCollider/supernova_plugins");
         sc_factory->load_plugin_folder(home / "share/SuperCollider/supernova_plugins");
 #elif defined(__APPLE__)