[SCM] supercollider/master: SOs get SONAMEs (backported from SC upstream)

[danstowell-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 56e57335c9339cb8144dc05970387aa201fbfde9
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Mon Mar 28 16:10:02 2011 +0100

    SOs get SONAMEs (backported from SC upstream)

diff --git a/debian/patches/14_add_sonames.diff b/debian/patches/14_add_sonames.diff
new file mode 100644
index 0000000..3a019d4
--- /dev/null
+++ b/debian/patches/14_add_sonames.diff
@@ -0,0 +1,65 @@
+Description: SOs get SONAMEs (backported from SC upstream)
+Author: Dan Stowell
+Forwarded: yes
+Index: supercollider/common/SConstruct
+===================================================================
+--- a/common/SConstruct
++++ b/common/SConstruct
+@@ -751,17 +751,6 @@
+                '#Headers/server'],
+     CPPDEFINES = [('SC_PLUGIN_DIR', '\\"' + pkg_lib_dir(FINAL_PREFIX, 'plugins') + '\\"'), ('SC_PLUGIN_EXT', '\\"' + PLUGIN_EXT + '\\"')],
+     LIBPATH = 'build')
+-libscsynthEnv = serverEnv.Clone(
+-    PKGCONFIG_NAME = 'libscsynth',
+-    PKGCONFIG_DESC = 'SuperCollider synthesis server library',
+-    PKGCONFIG_PREFIX = FINAL_PREFIX,
+-    PKGCONFIG_REQUIRES = make_pkgconfig_requires(libraries['sndfile'],
+-                                                 libraries['audioapi'],
+-                                                 libraries['rendezvous']),
+-    PKGCONFIG_LIBS = ['-lscsynth'],
+-#     PKGCONFIG_LIBS_PRIVATE = ['-lm', '-lpthread', '-ldl'],
+-    PKGCONFIG_CFLAGS = ['-D' + PLATFORM_SYMBOL, '-I${includedir}/common', '-I${includedir}/plugin_interface', '-I${includedir}/server']
+-    )
+ 
+ # platform specific
+ 
+@@ -797,6 +786,21 @@
+     serverEnv.Append(CPPDEFINES = ['HAVE_LIBCURL'])
+     merge_lib_info(serverEnv, libraries['libcurl'])
+ 
++libscsynthEnv = serverEnv.Clone(
++    PKGCONFIG_NAME = 'libscsynth',
++    PKGCONFIG_DESC = 'SuperCollider synthesis server library',
++    PKGCONFIG_PREFIX = FINAL_PREFIX,
++    PKGCONFIG_REQUIRES = make_pkgconfig_requires(libraries['sndfile'],
++                                                 libraries['audioapi'],
++                                                 libraries['rendezvous']),
++    PKGCONFIG_LIBS = ['-lscsynth'],
++#     PKGCONFIG_LIBS_PRIVATE = ['-lm', '-lpthread', '-ldl'],
++    PKGCONFIG_CFLAGS = ['-D' + PLATFORM_SYMBOL, '-I${includedir}/common', '-I${includedir}/plugin_interface', '-I${includedir}/server']
++    )
++if PLATFORM == 'linux':
++    libscsynthEnv.Append(
++        LINKFLAGS = ['-Wl,-soname,libscsynth.so'])
++
+ libscsynthSources = Split('''
+ Source/server/Rendezvous.cpp
+ Source/server/Samp.cpp
+@@ -824,7 +828,7 @@
+ 
+ scsynthSources = ['Source/server/scsynth_main.cpp']
+ 
+-libscsynth = serverEnv.SharedLibrary('build/scsynth', libscsynthSources)
++libscsynth = libscsynthEnv.SharedLibrary('build/scsynth', libscsynthSources)
+ env.Alias('install-programs', env.Install(lib_dir(INSTALL_PREFIX), [libscsynth]))
+ 
+ libscsynthStaticSources = libscsynthSources + make_static_objects(serverEnv, commonSources, "_libscsynthStatic");
+@@ -1140,7 +1144,7 @@
+ sclangSources = ['Source/lang/LangSource/cmdLineFuncs.cpp']
+ 
+ if env['LANG']:
+-    libsclang = langEnv.SharedLibrary('build/sclang', libsclangSources)
++    libsclang = libsclangEnv.SharedLibrary('build/sclang', libsclangSources)
+     env.Alias('install-bin', env.Install(lib_dir(INSTALL_PREFIX), [libsclang]))
+     if PLATFORM == 'darwin':
+         sclangLibs = ['scsynth', 'sclang']
diff --git a/debian/patches/series b/debian/patches/series
index 0cdab33..a9b48d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 07_deb_sced.diff
 08_deb_scvim_checkactive.diff
 10_fix_rpath.diff
+14_add_sonames.diff

-- 
supercollider packaging