summaryrefslogtreecommitdiff
path: root/audio/SuperCollider/fixups_for_x86_64.diff
diff options
context:
space:
mode:
Diffstat (limited to 'audio/SuperCollider/fixups_for_x86_64.diff')
-rw-r--r--audio/SuperCollider/fixups_for_x86_64.diff118
1 files changed, 43 insertions, 75 deletions
diff --git a/audio/SuperCollider/fixups_for_x86_64.diff b/audio/SuperCollider/fixups_for_x86_64.diff
index 0973385dea..2f4fc83919 100644
--- a/audio/SuperCollider/fixups_for_x86_64.diff
+++ b/audio/SuperCollider/fixups_for_x86_64.diff
@@ -1,10 +1,10 @@
-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
+diff -Nur SuperCollider-Source.orig/cmake_modules/FindFFTW3f.cmake SuperCollider-Source/cmake_modules/FindFFTW3f.cmake
+--- SuperCollider-Source.orig/cmake_modules/FindFFTW3f.cmake 2012-12-07 10:38:09.000000000 -0600
++++ SuperCollider-Source/cmake_modules/FindFFTW3f.cmake 2013-02-17 19:25:40.179025178 -0600
@@ -11,9 +11,9 @@
FIND_LIBRARY(
FFTW3F_LIBRARY
- NAMES fftw3f libfftw3f
+ NAMES fftw3f libfftw3f fftw3f-3
- HINTS $ENV{FFTW3_DIR}/lib
+ HINTS $ENV{FFTW3_DIR}/lib64
PATHS /usr/local/lib
@@ -13,9 +13,9 @@ diff -Naur SuperCollider-Source.orig/cmake_modules/FindFFTW3f.cmake SuperCollide
)
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
+diff -Nur SuperCollider-Source.orig/cmake_modules/FindJack.cmake SuperCollider-Source/cmake_modules/FindJack.cmake
+--- SuperCollider-Source.orig/cmake_modules/FindJack.cmake 2011-05-11 04:52:03.000000000 -0500
++++ SuperCollider-Source/cmake_modules/FindJack.cmake 2013-02-17 19:26:09.253703065 -0600
@@ -45,7 +45,7 @@
jack
PATHS
@@ -25,9 +25,9 @@ diff -Naur SuperCollider-Source.orig/cmake_modules/FindJack.cmake SuperCollider-
/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
+diff -Nur SuperCollider-Source.orig/cmake_modules/FindPortaudio.cmake SuperCollider-Source/cmake_modules/FindPortaudio.cmake
+--- SuperCollider-Source.orig/cmake_modules/FindPortaudio.cmake 2011-05-11 04:52:03.000000000 -0500
++++ SuperCollider-Source/cmake_modules/FindPortaudio.cmake 2013-02-17 19:26:45.942296599 -0600
@@ -53,7 +53,7 @@
NAMES
portaudio
@@ -46,11 +46,11 @@ diff -Naur SuperCollider-Source.orig/cmake_modules/FindPortaudio.cmake SuperColl
/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)
+diff -Nur SuperCollider-Source.orig/editors/sced/CMakeLists.txt SuperCollider-Source/editors/sced/CMakeLists.txt
+--- SuperCollider-Source.orig/editors/sced/CMakeLists.txt 2012-12-07 10:38:09.000000000 -0600
++++ SuperCollider-Source/editors/sced/CMakeLists.txt 2013-02-17 19:27:46.569624922 -0600
+@@ -14,10 +14,10 @@
+ DESTINATION share/gtksourceview-2.0/language-specs)
install(FILES data/sced.gedit-plugin
- DESTINATION lib/gedit-2/plugins)
@@ -62,8 +62,8 @@ diff -Naur SuperCollider-Source.orig/editors/sced/CMakeLists.txt SuperCollider-S
elseif(NOT WIN32 AND SC_ED EQUAL 3)
-@@ -35,7 +35,7 @@
- DESTINATION share/mime/packages)
+@@ -29,7 +29,7 @@
+ DESTINATION share/gtksourceview-3.0/language-specs)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/sced3/supercollider.plugin sced3/supercollider.py
- DESTINATION lib/gedit/plugins)
@@ -71,21 +71,9 @@ diff -Naur SuperCollider-Source.orig/editors/sced/CMakeLists.txt SuperCollider-S
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
+diff -Nur SuperCollider-Source.orig/external_libraries/oscpack/Makefile SuperCollider-Source/external_libraries/oscpack/Makefile
+--- SuperCollider-Source.orig/external_libraries/oscpack/Makefile 2011-05-11 04:52:03.000000000 -0500
++++ SuperCollider-Source/external_libraries/oscpack/Makefile 2013-02-17 19:29:13.509661735 -0600
@@ -71,12 +71,12 @@
#Installs the library on a system global location
@@ -102,40 +90,21 @@ diff -Naur SuperCollider-Source.orig/external_libraries/oscpack/Makefile SuperCo
@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 @@
+diff -Nur SuperCollider-Source.orig/server/plugins/CMakeLists.txt SuperCollider-Source/server/plugins/CMakeLists.txt
+--- SuperCollider-Source.orig/server/plugins/CMakeLists.txt 2012-12-07 10:38:09.000000000 -0600
++++ SuperCollider-Source/server/plugins/CMakeLists.txt 2013-02-17 19:31:54.557877532 -0600
+@@ -263,6 +263,6 @@
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}
+ install(TARGETS ${plugins} ${supernova_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 @@
+diff -Nur SuperCollider-Source.orig/server/scsynth/CMakeLists.txt SuperCollider-Source/server/scsynth/CMakeLists.txt
+--- SuperCollider-Source.orig/server/scsynth/CMakeLists.txt 2012-12-18 06:03:55.000000000 -0600
++++ SuperCollider-Source/server/scsynth/CMakeLists.txt 2013-02-17 19:32:38.951385712 -0600
+@@ -169,7 +169,7 @@
endif(SNDFILE_FOUND)
if(CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
@@ -144,24 +113,23 @@ diff -Naur SuperCollider-Source.orig/server/scsynth/CMakeLists.txt SuperCollider
endif()
if (AUDIOAPI STREQUAL jack)
-@@ -229,7 +229,7 @@
- PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+@@ -247,6 +247,6 @@
else()
- install(TARGETS libscsynth scsynth
+ install(TARGETS ${INSTALL_TARGETS}
+ RUNTIME DESTINATION "bin"
- 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 @@
-
+diff -Nur SuperCollider-Source.orig/server/supernova/server/main.cpp SuperCollider-Source/server/supernova/server/main.cpp
+--- SuperCollider-Source.orig/server/supernova/server/main.cpp 2012-12-18 06:03:55.000000000 -0600
++++ SuperCollider-Source/server/supernova/server/main.cpp 2013-02-17 19:33:08.666056514 -0600
+@@ -196,7 +196,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__)
+ path home = resolve_home();
+ sc_factory->load_plugin_folder("/usr/local/lib/SuperCollider/plugins");
+- sc_factory->load_plugin_folder("/usr/lib/SuperCollider/plugins");
++ sc_factory->load_plugin_folder("/usr/lib64/SuperCollider/plugins");
+ sc_factory->load_plugin_folder(home / "/.local/share/SuperCollider/plugins");
+ sc_factory->load_plugin_folder(home / "share/SuperCollider/plugins");
+ #else
generated by cgit v1.2.3 (git 2.26.2) at 2024-11-24 02:10:17 +0000