[SCM] supercollider/master: patches 8, 14 and 15 removed (upstreamed in SC 3.4.2)
danstowell-guest at users.alioth.debian.org
danstowell-guest at users.alioth.debian.org
Mon Mar 28 21:36:35 UTC 2011
The following commit has been merged in the master branch:
commit b8281f3571de692c7e1c0c177a1d219b7698a6ff
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date: Mon Mar 28 21:51:16 2011 +0100
patches 8, 14 and 15 removed (upstreamed in SC 3.4.2)
diff --git a/debian/patches/08_deb_scvim_checkactive.diff b/debian/patches/08_deb_scvim_checkactive.diff
deleted file mode 100644
index 2ba311b..0000000
--- a/debian/patches/08_deb_scvim_checkactive.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Warn if the vim addon is not activated
-Author: Артём Попов <artfwo at gmail.com>
-Applied-Upstream: commit:10405
-Index: supercollider/editors/scvim/bin/scvim
-===================================================================
---- supercollider.orig/editors/scvim/bin/scvim 2010-10-05 18:53:49.000000000 -0400
-+++ supercollider/editors/scvim/bin/scvim 2010-10-05 18:57:45.000000000 -0400
-@@ -31,6 +31,24 @@
- #the location of the rc file to source
- rcloc = nil
-
-+if %x[which vim-addons]!="" && %x[vim-addons -q status supercollider | grep installed]==""
-+ puts "scvim has detected that you haven't activated the vim supercollider plugin."
-+ puts "to enable scvim to work, please execute either "
-+ puts " vim-addons install supercollider"
-+ puts "to enable it for the current user, or "
-+ puts " sudo vim-addons -w install supercollider"
-+ puts "to enable it system-wide."
-+ puts ""
-+ puts "Would you like me to run \"vim-addons install supercollider\" for you?"
-+ puts "Press 'y' and then Enter if so. Otherwise just press Enter to exit."
-+ userreply = gets.chomp
-+ if userreply == 'y'
-+ %x[vim-addons install supercollider]
-+ else
-+ exit
-+ end
-+end
-+
- opts = OptionParser.new do |opts|
- #the usage banner
- opts.banner = "Usage: #{$0} [OPTION]... [FILE]..."
diff --git a/debian/patches/14_add_sonames.diff b/debian/patches/14_add_sonames.diff
deleted file mode 100644
index 3a019d4..0000000
--- a/debian/patches/14_add_sonames.diff
+++ /dev/null
@@ -1,65 +0,0 @@
-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/15_versioned_sos.diff b/debian/patches/15_versioned_sos.diff
deleted file mode 100644
index 5f76e8a..0000000
--- a/debian/patches/15_versioned_sos.diff
+++ /dev/null
@@ -1,87 +0,0 @@
-Description: Add versioning to the libscsynth and libsclang installed SOs.
-Author: Dan Stowell and Felipe Satelier
-Forwarded: yes
-Index: supercollider/common/SConstruct
-===================================================================
---- a/common/SConstruct
-+++ b/common/SConstruct
-@@ -267,6 +267,16 @@
- def make_static_objects(env, sources, postfix="_a"):
- return map(lambda x: make_static_object(env, x, postfix), sources)
-
-+# for linking libX.so => libX.so.1 on *nixy systems. Note, they must be in same dir.
-+def make_local_symlink(target, source, env):
-+ targetname = os.path.basename(str(target[0]))
-+ if os.path.isfile(targetname):
-+ if not os.path.islink(targetname):
-+ liblog.error("ERROR: cannot create symlink %s because already exists as non-symlink." % (targetname))
-+ else:
-+ os.symlink(os.path.basename(str(source[0])), targetname)
-+ return None
-+
- # ======================================================================
- # command line options
- # ======================================================================
-@@ -288,7 +298,8 @@
- BoolOption('DEBUG',
- 'Build with debugging information', 0),
- PathOption('DESTDIR',
-- 'Intermediate installation prefix for packaging', '/'),
-+ 'Intermediate installation prefix for packaging', '/',
-+ PathOption.PathAccept),
- BoolOption('DEVELOPMENT',
- 'Build and install the development files', 0),
- BoolOption('FFTW',
-@@ -795,11 +806,15 @@
- 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']
-+ PKGCONFIG_CFLAGS = ['-D' + PLATFORM_SYMBOL, '-I${includedir}/common', '-I${includedir}/plugin_interface', '-I${includedir}/server'],
-+ SHLIBSUFFIX='.so.1.0.0',
-+ LIBSUFFIXES=['.so.1.0.0']
- )
- if PLATFORM == 'linux':
- libscsynthEnv.Append(
-- LINKFLAGS = ['-Wl,-soname,libscsynth.so'])
-+ LINKFLAGS = ['-Wl,-soname,libscsynth.so.1.0.0'])
-+ # create local symlink for linker to follow (not installed)
-+ libscsynthEnv.Command('build/libscsynth.so', 'build/libscsynth.so.1.0.0', make_local_symlink, chdir=1)
-
- libscsynthSources = Split('''
- Source/server/Rendezvous.cpp
-@@ -830,6 +845,7 @@
-
- libscsynth = libscsynthEnv.SharedLibrary('build/scsynth', libscsynthSources)
- env.Alias('install-programs', env.Install(lib_dir(INSTALL_PREFIX), [libscsynth]))
-+env.Alias('install-programs', env.Command(lib_dir(INSTALL_PREFIX) + '/libscsynth.so', lib_dir(INSTALL_PREFIX) + '/libscsynth.so.1.0.0', make_local_symlink, chdir=1))
-
- libscsynthStaticSources = libscsynthSources + make_static_objects(serverEnv, commonSources, "_libscsynthStatic");
- libscsynthStatic = serverEnv.StaticLibrary('build/scsynth', libscsynthStaticSources)
-@@ -1037,11 +1053,16 @@
- PKGCONFIG_PREFIX = FINAL_PREFIX,
- PKGCONFIG_REQUIRES = make_pkgconfig_requires(libraries['sndfile']) + ['libscsynth'],
- PKGCONFIG_LIBS = ['-lsclang'],
-- PKGCONFIG_CFLAGS = ['-D' + PLATFORM_SYMBOL, '-I${includedir}/common', '-I${includedir}/plugin_interface', '-I${includedir}/lang', '-I${includedir}/server']
-+ PKGCONFIG_CFLAGS = ['-D' + PLATFORM_SYMBOL, '-I${includedir}/common', '-I${includedir}/plugin_interface', '-I${includedir}/lang', '-I${includedir}/server'],
-+ SHLIBSUFFIX='.so.1.0.0',
-+ LIBSUFFIXES=['.so.1.0.0']
- )
- if PLATFORM == 'linux':
- libsclangEnv.Append(
-- LINKFLAGS = ['-Wl,-soname,libsclang.so'])
-+ LINKFLAGS = ['-Wl,-soname,libsclang.so.1.0.0'])
-+ # create local symlink for linker to follow (not installed)
-+ libsclangEnv.Command('build/libsclang.so', 'build/libsclang.so.1.0.0', make_local_symlink, chdir=1)
-+ Requires('build/libsclang.so.1.0.0', 'build/libscsynth.so')
-
- # required libraries
- merge_lib_info(langEnv, libraries['sndfile'])
-@@ -1146,6 +1167,7 @@
- if env['LANG']:
- libsclang = libsclangEnv.SharedLibrary('build/sclang', libsclangSources)
- env.Alias('install-bin', env.Install(lib_dir(INSTALL_PREFIX), [libsclang]))
-+ env.Alias('install-bin', env.Command(lib_dir(INSTALL_PREFIX) + '/libsclang.so', lib_dir(INSTALL_PREFIX) + '/libsclang.so.1.0.0', make_local_symlink, chdir=1))
- if PLATFORM == 'darwin':
- sclangLibs = ['scsynth', 'sclang']
- else:
diff --git a/debian/patches/series b/debian/patches/series
index 7f7fcb9..5120d95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,4 @@
03_fix_elisp_install_path.diff
06_deb_scvim.diff
07_deb_sced.diff
-08_deb_scvim_checkactive.diff
10_fix_rpath.diff
-14_add_sonames.diff
-15_versioned_sos.diff
--
supercollider packaging
More information about the pkg-multimedia-commits
mailing list