[PATCH] Re: [ardour-dev] ardour packager feedback requested

Robert Jordens rjo-lists at gmx.de
Mon Mar 14 14:52:20 PST 2005


Hello!

And here is the beef.

        Robert.
-------------- next part --------------
Index: ardour-scons-0.9beta28/SConstruct
===================================================================
--- ardour-scons-0.9beta28.orig/SConstruct	2005-03-14 17:02:34.000000000 +0100
+++ ardour-scons-0.9beta28/SConstruct	2005-03-14 17:32:27.000000000 +0100
@@ -218,13 +218,9 @@
 
 Default (rcbuild)
 
-SConscript('libs/sigc++/SConscript')
 SConscript('libs/pbd/SConscript')
-SConscript('libs/soundtouch/SConscript')
 SConscript('libs/midi++/SConscript')
 SConscript('libs/ardour/SConscript')
-SConscript('libs/gtkmm/SConscript')
-SConscript('libs/gtk-canvas/SConscript')
 SConscript('libs/gtkmmext/SConscript')
 
 if env['GTK'] == 1:
-------------- next part --------------
Index: ardour-scons-0.9beta28/libs/midi++/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/libs/midi++/SConscript	2005-03-14 17:02:42.000000000 +0100
+++ ardour-scons-0.9beta28/libs/midi++/SConscript	2005-03-14 17:40:06.000000000 +0100
@@ -31,7 +31,7 @@
         midi.Append(CXXFLAGS="-DWITH_COREMIDI")
 midi = conf.Finish()
 
-midi.Append(CPPPATH = [ '#libs/sigc++', '#libs/sigc++/sigc++/config', '#libs/pbd' ])
+midi.Append(CPPPATH = [ '#libs/pbd' ])
 midi.ParseConfig('/opt/local/bin/pkg-config --cflags --libs libxml-2.0')
 libmidi = midi.StaticLibrary('midi++', [ sources, sysdep_sources ])
 Default(libmidi)
Index: ardour-scons-0.9beta28/libs/pbd/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/libs/pbd/SConscript	2005-03-14 17:02:42.000000000 +0100
+++ ardour-scons-0.9beta28/libs/pbd/SConscript	2005-03-14 17:40:21.000000000 +0100
@@ -30,7 +30,7 @@
 pbd = conf.Finish()
 
 pbd.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-pbd.Append(CPPPATH = [ '#libs/sigc++', '#libs/sigc++/sigc++/config'])
+pbd.Append(CPPPATH = [ ])
 
 pbd.ParseConfig('pkg-config --cflags --libs libxml-2.0')
 
Index: ardour-scons-0.9beta28/libs/gtkmmext/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/libs/gtkmmext/SConscript	2005-03-14 17:02:41.000000000 +0100
+++ ardour-scons-0.9beta28/libs/gtkmmext/SConscript	2005-03-14 17:39:30.000000000 +0100
@@ -68,13 +68,8 @@
 gtkmmext.Append(CPPPATH = [ 
 '/opt/local/include', 
 '/usr/local/include', 
-'#libs/sigc++', 
 '#libs/pbd', 
-'#libs/midi++', 
-'#libs/gtkmm', 
-'#libs/gtkmm/gdk--', 
-'#libs/gtkmm/src',
-'#libs/gtkmmext'
+'#libs/midi++'
 ])
 
 gtkmmext.ParseConfig('gtk-config --cflags --libs')
Index: ardour-scons-0.9beta28/gtk_ardour/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/gtk_ardour/SConscript	2005-03-14 17:02:35.000000000 +0100
+++ ardour-scons-0.9beta28/gtk_ardour/SConscript	2005-03-14 17:35:39.000000000 +0100
@@ -7,7 +7,7 @@
 # note the use of '#foo' to specify paths relative to the top level
 #
 
-libpath = [ '#libs/sigc++','#libs/pbd','#libs/midi++','#libs/soundtouch','#libs/ardour','#libs/gtkmm','#libs/gtkmmext', '#libs/gtk-canvas', '/usr/lib','/usr/local/lib','/opt/local/lib']
+libpath = [ '#libs/pbd','#libs/midi++','#libs/ardour','#libs/gtkmmext', '/usr/lib','/usr/local/lib','/opt/local/lib']
 
 Import('env idir_prefix distname')
 gtkardour = env.Copy(CPPPATH=".", LIBS=libs, LIBPATH=libpath)
@@ -142,19 +142,11 @@
 
 gtkardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 gtkardour.Append(CPPPATH = [
-'#libs/sigc++',
-'#libs/sigc++/sigc++/config',
 '#libs/pbd',
-'#libs/soundtouch',
 '#libs/midi++',
 '#libs/ardour',
-'#libs/gtkmm',
-'#libs/gtkmm/gdk--',
-'#libs/gtkmm/src',
 '#libs/gtkmmext',
-'#libs',
-'#libs/gtk-canvas',
-'#libs/gtk-canvas/gtk-canvas' ])
+'#libs' ])
 
 gtkardour.Append(CXXFLAGS="-DDATA_DIR=\\\""+idir_prefix+"/share\\\"")
 gtkardour.Append(CXXFLAGS="-DLOCALEDIR=\\\""+idir_prefix+"/share/locale\\\"")
Index: ardour-scons-0.9beta28/ksi_ardour/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/ksi_ardour/SConscript	2005-03-14 17:02:36.000000000 +0100
+++ ardour-scons-0.9beta28/ksi_ardour/SConscript	2005-03-14 17:36:34.000000000 +0100
@@ -6,7 +6,7 @@
 
 ksi_libs = [ 'ardour', 'soundtouch', 'midi++', 'pbd', 'sigc++', 'sndfile', 'lrdf', 'raptor', 'samplerate', 'jack', 'panel', 'ncurses']
 
-libpath = ['../libs/sigc++','../libs/pbd','../libs/midi++','../libs/soundtouch','../libs/ardour', '/usr/lib','/usr/local/lib','/opt/local/lib']
+libpath = ['../libs/pbd','../libs/midi++','../libs/ardour', '/usr/lib','/usr/local/lib','/opt/local/lib']
 
 Import('env idir_prefix distname')
 ksiardour = env.Copy(CPPPATH=".", LIBS=ksi_libs, LIBPATH=libpath)
@@ -25,10 +25,7 @@
 
 ksiardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 ksiardour.Append(CPPPATH = [
-'#libs/sigc++',
-'#libs/sigc++/sigc++/config',
 '#libs/pbd',
-'#libs/soundtouch',
 '#libs/midi++',
 '#libs/ardour',
 '#libs'])
@@ -47,8 +44,6 @@
 rk_libs = [ 'pbd', 'sigc++', 'ncurses', 'pthread']
 
 remotekbd = env.Copy(CPPPATH=".", LIBS=rk_libs, LIBPATH=libpath)
-remotekbd.Append(CXXFLAGS="-Ilibs/sigc++")
-remotekbd.Append(CXXFLAGS="-Ilibs/sigc++/sigc++/config")
 remotekbd.Append(CXXFLAGS="-Ilibs/pbd")
 
 ksiardour_files += ksiardour.Object('pk-ksiardour', 'physical_keyboard.cc')
Index: ardour-scons-0.9beta28/libs/ardour/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/libs/ardour/SConscript	2005-03-14 17:38:09.000000000 +0100
+++ ardour-scons-0.9beta28/libs/ardour/SConscript	2005-03-14 17:38:43.000000000 +0100
@@ -78,7 +78,7 @@
 """)
 
 ardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-ardour.Append(CPPPATH = [ '#libs/sigc++', '#libs/sigc++/sigc++/config', '#libs/pbd', '#libs/soundtouch', '#libs/midi++' ])
+ardour.Append(CPPPATH = ['#libs/pbd', '#libs/midi++'])
 
 ardour.Append(CXXFLAGS="-DDATA_DIR=\\\""+idir_prefix+"/share\\\"")
 ardour.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+idir_prefix+"/etc\\\"")
-------------- next part --------------
Index: ardour-scons-0.9beta28/libs/midi++/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/libs/midi++/SConscript	2005-03-14 19:04:33.000000000 +0100
+++ ardour-scons-0.9beta28/libs/midi++/SConscript	2005-03-14 19:04:34.000000000 +0100
@@ -33,6 +33,8 @@
 
 midi.Append(CPPPATH = [ '#libs/pbd' ])
 midi.ParseConfig('/opt/local/bin/pkg-config --cflags --libs libxml-2.0')
+midi.ParseConfig('sigc-config --cflags --libs')
+
 libmidi = midi.StaticLibrary('midi++', [ sources, sysdep_sources ])
 Default(libmidi)
 
Index: ardour-scons-0.9beta28/libs/pbd/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/libs/pbd/SConscript	2005-03-14 19:04:33.000000000 +0100
+++ ardour-scons-0.9beta28/libs/pbd/SConscript	2005-03-14 19:04:34.000000000 +0100
@@ -32,6 +32,7 @@
 pbd.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
 pbd.Append(CPPPATH = [ ])
 
+pbd.ParseConfig('sigc-config --cflags --libs')
 pbd.ParseConfig('pkg-config --cflags --libs libxml-2.0')
 
 
Index: ardour-scons-0.9beta28/libs/gtkmmext/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/libs/gtkmmext/SConscript	2005-03-14 19:04:33.000000000 +0100
+++ ardour-scons-0.9beta28/libs/gtkmmext/SConscript	2005-03-14 19:04:34.000000000 +0100
@@ -73,6 +73,8 @@
 ])
 
 gtkmmext.ParseConfig('gtk-config --cflags --libs')
+gtkmmext.ParseConfig('sigc-config --cflags --libs')
+gtkmmext.ParseConfig('gtkmm-config --cflags --libs')
 
 libgtkmmext = gtkmmext.StaticLibrary('gtkmmext', gtkmmext_files)
 
Index: ardour-scons-0.9beta28/gtk_ardour/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/gtk_ardour/SConscript	2005-03-14 19:04:33.000000000 +0100
+++ ardour-scons-0.9beta28/gtk_ardour/SConscript	2005-03-14 19:05:22.000000000 +0100
@@ -1,7 +1,7 @@
 import os
 import glob
 
-libs = [ 'ardour', 'soundtouch', 'midi++', 'gtkmmext', 'gtkmm', 'gtk-canvas', 'pbd', 'sigc++', 'sndfile', 'lrdf', 'raptor', 'samplerate', 'jack']
+libs = [ 'ardour', 'soundtouch', 'midi++', 'gtkmmext', 'gtkmm', 'gtk-canvas', 'pbd', 'sndfile', 'lrdf', 'raptor', 'samplerate', 'jack']
 
 #
 # note the use of '#foo' to specify paths relative to the top level
@@ -162,6 +162,9 @@
 gtkardour.ParseConfig('pkg-config --cflags --libs libart-2.0')
 gtkardour.ParseConfig('gtk-config --cflags --libs')
 #gtkardour.ParseConfig('pkg-config --cflags --libs jack')
+gtkardour.ParseConfig('sigc-config --cflags --libs')
+gtkardour.ParseConfig('gtkmm-config --cflags --libs')
+
 
 def build_version_h (target, source, env):
    text = "#ifndef __gtk_ardour_version_h__\n#define __gtk_ardour_version_h__\n\n" + "static const char *gtk_ardour_version  = \""
Index: ardour-scons-0.9beta28/ksi_ardour/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/ksi_ardour/SConscript	2005-03-14 19:04:33.000000000 +0100
+++ ardour-scons-0.9beta28/ksi_ardour/SConscript	2005-03-14 19:05:44.000000000 +0100
@@ -4,7 +4,7 @@
 ksiardour_files = ['ksi.cc', 'main.cc', 'opts.cc']
 remotekbd_files = ['remote_kbd.cc']
 
-ksi_libs = [ 'ardour', 'soundtouch', 'midi++', 'pbd', 'sigc++', 'sndfile', 'lrdf', 'raptor', 'samplerate', 'jack', 'panel', 'ncurses']
+ksi_libs = [ 'ardour', 'soundtouch', 'midi++', 'pbd', 'sndfile', 'lrdf', 'raptor', 'samplerate', 'jack', 'panel', 'ncurses']
 
 libpath = ['../libs/pbd','../libs/midi++','../libs/ardour', '/usr/lib','/usr/local/lib','/opt/local/lib']
 
@@ -40,8 +40,9 @@
 ksiardour.ParseConfig('pkg-config --cflags --libs lrdf')
 ksiardour.ParseConfig('pkg-config --cflags --libs jack')
 ksiardour.ParseConfig('pkg-config --cflags --libs glib')
+ksiardour.ParseConfig('sigc-config --cflags --libs')
 
-rk_libs = [ 'pbd', 'sigc++', 'ncurses', 'pthread']
+rk_libs = [ 'pbd', 'ncurses', 'pthread']
 
 remotekbd = env.Copy(CPPPATH=".", LIBS=rk_libs, LIBPATH=libpath)
 remotekbd.Append(CXXFLAGS="-Ilibs/pbd")
Index: ardour-scons-0.9beta28/libs/ardour/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/libs/ardour/SConscript	2005-03-14 19:04:33.000000000 +0100
+++ ardour-scons-0.9beta28/libs/ardour/SConscript	2005-03-14 19:04:34.000000000 +0100
@@ -89,6 +89,7 @@
 ardour.ParseConfig('pkg-config --cflags --libs lrdf')
 ardour.ParseConfig('pkg-config --cflags --libs jack')
 ardour.ParseConfig('pkg-config --cflags --libs samplerate')
+ardour.ParseConfig('sigc-config --cflags --libs')
 
 #
 # See if JACK supports jack_client_open()
-------------- next part --------------
Index: ardour-scons-0.9beta28/gtk_ardour/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/gtk_ardour/SConscript	2005-03-14 19:05:22.000000000 +0100
+++ ardour-scons-0.9beta28/gtk_ardour/SConscript	2005-03-14 19:06:07.000000000 +0100
@@ -1,7 +1,7 @@
 import os
 import glob
 
-libs = [ 'ardour', 'soundtouch', 'midi++', 'gtkmmext', 'gtkmm', 'gtk-canvas', 'pbd', 'sndfile', 'lrdf', 'raptor', 'samplerate', 'jack']
+libs = [ 'ardour', 'SoundTouch', 'midi++', 'gtkmmext', 'gtkmm', 'gtk-canvas', 'pbd', 'sndfile', 'lrdf', 'raptor', 'samplerate', 'jack']
 
 #
 # note the use of '#foo' to specify paths relative to the top level
Index: ardour-scons-0.9beta28/ksi_ardour/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/ksi_ardour/SConscript	2005-03-14 19:05:44.000000000 +0100
+++ ardour-scons-0.9beta28/ksi_ardour/SConscript	2005-03-14 19:06:17.000000000 +0100
@@ -4,7 +4,7 @@
 ksiardour_files = ['ksi.cc', 'main.cc', 'opts.cc']
 remotekbd_files = ['remote_kbd.cc']
 
-ksi_libs = [ 'ardour', 'soundtouch', 'midi++', 'pbd', 'sndfile', 'lrdf', 'raptor', 'samplerate', 'jack', 'panel', 'ncurses']
+ksi_libs = [ 'ardour', 'SoundTouch', 'midi++', 'pbd', 'sndfile', 'lrdf', 'raptor', 'samplerate', 'jack', 'panel', 'ncurses']
 
 libpath = ['../libs/pbd','../libs/midi++','../libs/ardour', '/usr/lib','/usr/local/lib','/opt/local/lib']
 
-------------- next part --------------
--- ardour-0.9beta3/gtk_ardour/canvas-imageframe.c.orig	2003-09-24 11:45:18.000000000 +0200
+++ ardour-0.9beta3/gtk_ardour/canvas-imageframe.c	2003-09-24 11:45:34.000000000 +0200
@@ -18,8 +18,8 @@
 #include "libart_lgpl/art_pixbuf.h"
 #include "libart_lgpl/art_rgb_pixbuf_affine.h"
 #include "canvas-imageframe.h"
-#include <gtk-canvas-util.h>
-#include <gtk-canvastypebuiltins.h>
+#include <gtk-canvas/gtk-canvas-util.h>
+#include <gtk-canvas/gtk-canvastypebuiltins.h>
 
 
 enum {
-------------- next part --------------
Index: ardour-scons-0.9beta28/libs/midi++/SConscript
===================================================================
--- ardour-scons-0.9beta28.orig/libs/midi++/SConscript	2005-03-14 18:25:15.000000000 +0100
+++ ardour-scons-0.9beta28/libs/midi++/SConscript	2005-03-14 18:25:37.000000000 +0100
@@ -32,7 +32,7 @@
 midi = conf.Finish()
 
 midi.Append(CPPPATH = [ '#libs/pbd' ])
-midi.ParseConfig('/opt/local/bin/pkg-config --cflags --libs libxml-2.0')
+midi.ParseConfig('pkg-config --cflags --libs libxml-2.0')
 midi.ParseConfig('sigc-config --cflags --libs')
 
 libmidi = midi.StaticLibrary('midi++', [ sources, sysdep_sources ])
-------------- next part --------------
diff -Naur ardour-0.9beta11.2.orig/gtk_ardour/crossfade_edit.h ardour-0.9beta11.2/gtk_ardour/crossfade_edit.h
--- ardour-0.9beta11.2.orig/gtk_ardour/crossfade_edit.h	2004-02-29 03:55:26.000000000 +0000
+++ ardour-0.9beta11.2/gtk_ardour/crossfade_edit.h	2004-03-01 16:06:11.000000000 +0000
@@ -7,7 +7,7 @@
 #include <gtk--/box.h>
 #include <gtk--/button.h>
 #include <gtk--/radiobutton.h>
-#include <gtk-canvas/gtk-canvas.h>
+#include <gtk-canvas.h>
 
 #include <ardour/curve.h>
 
-------------- next part --------------
Index: ardour-scons-0.9beta28/gtk_ardour/utils.h
===================================================================
--- ardour-scons-0.9beta28.orig/gtk_ardour/utils.h	2005-03-14 17:02:36.000000000 +0100
+++ ardour-scons-0.9beta28/gtk_ardour/utils.h	2005-03-14 18:27:42.000000000 +0100
@@ -26,7 +26,7 @@
 #include <cmath>
 #include <ardour/types.h>
 #include <gtk-canvas/gtk-canvas.h>
-#include <gdk--/gdk--/types.h>
+#include <gdk--/types.h>
 
 namespace Gtk {
 	class Window;
-------------- next part --------------
--- libs/pbd/pbd/atomic.h.orig	2003-09-20 08:59:54.000000000 +0200
+++ libs/pbd/pbd/atomic.h	2003-09-20 09:25:31.000000000 +0200
@@ -431,120 +431,6 @@
 
 #else /* !PPC && !i386 */
 
-#ifdef __sparc__
-
-/* atomic.h: These still suck, but the I-cache hit rate is higher.
- *
- * Copyright (C) 1996 David S. Miller (davem at caip.rutgers.edu)
- * Copyright (C) 2000 Anton Blanchard (anton at linuxcare.com.au)
- */
-
-#ifndef __ARCH_SPARC_ATOMIC__
-#define __ARCH_SPARC_ATOMIC__
-
-typedef struct { volatile int counter; } atomic_t;
-
-#ifndef CONFIG_SMP
-
-#define ATOMIC_INIT(i)  { (i) }
-#define atomic_read(v)          ((v)->counter)
-#define atomic_set(v, i)        (((v)->counter) = i)
-
-#else
-/* We do the bulk of the actual work out of line in two common
- * routines in assembler, see arch/sparc/lib/atomic.S for the
- * "fun" details.
- *
- * For SMP the trick is you embed the spin lock byte within
- * the word, use the low byte so signedness is easily retained
- * via a quick arithmetic shift.  It looks like this:
- *
- *	----------------------------------------
- *	| signed 24-bit counter value |  lock  |  atomic_t
- *	----------------------------------------
- *	 31                          8 7      0
- */
-
-#define ATOMIC_INIT(i)	{ (i << 8) }
-
-static __inline__ int atomic_read(atomic_t *v)
-{
-	int ret = v->counter;
-
-	while(ret & 0xff)
-		ret = v->counter;
-
-	return ret >> 8;
-}
-
-#define atomic_set(v, i)	(((v)->counter) = ((i) << 8))
-#endif
-
-static __inline__ int __atomic_add(int i, atomic_t *v)
-{
-	register volatile int *ptr asm("g1");
-	register int increment asm("g2");
-
-	ptr = &v->counter;
-	increment = i;
-
-	__asm__ __volatile__(
-	"mov	%%o7, %%g4\n\t"
-	"call	___atomic_add\n\t"
-	" add	%%o7, 8, %%o7\n"
-	: "=&r" (increment)
-	: "0" (increment), "r" (ptr)
-	: "g3", "g4", "g7", "memory", "cc");
-
-	return increment;
-}
-
-static __inline__ int __atomic_sub(int i, atomic_t *v)
-{
-	register volatile int *ptr asm("g1");
-	register int increment asm("g2");
-
-	ptr = &v->counter;
-	increment = i;
-
-	__asm__ __volatile__(
-	"mov	%%o7, %%g4\n\t"
-	"call	___atomic_sub\n\t"
-	" add	%%o7, 8, %%o7\n"
-	: "=&r" (increment)
-	: "0" (increment), "r" (ptr)
-	: "g3", "g4", "g7", "memory", "cc");
-
-	return increment;
-}
-
-#define atomic_add(i, v) ((void)__atomic_add((i), (v)))
-#define atomic_sub(i, v) ((void)__atomic_sub((i), (v)))
-
-#define atomic_dec_return(v) __atomic_sub(1, (v))
-#define atomic_inc_return(v) __atomic_add(1, (v))
-
-#define atomic_sub_and_test(i, v) (__atomic_sub((i), (v)) == 0)
-#define atomic_dec_and_test(v) (__atomic_sub(1, (v)) == 0)
-
-#define atomic_inc(v) ((void)__atomic_add(1, (v)))
-#define atomic_dec(v) ((void)__atomic_sub(1, (v)))
-
-#define atomic_add_negative(i, v) (__atomic_add((i), (v)) < 0)
-
-/* Atomic operations are already serializing */
-#define smp_mb__before_atomic_dec()	barrier()
-#define smp_mb__after_atomic_dec()	barrier()
-#define smp_mb__before_atomic_inc()	barrier()
-#define smp_mb__after_atomic_inc()	barrier()
-
-
-#endif /* !(__ARCH_SPARC_ATOMIC__) */
-
-/***********************************************************************/
-
-#else
-
 #ifdef __ia64__
 
 #ifndef __ARCH_IA64_ATOMIC__
@@ -1229,7 +1115,6 @@
 #  endif /* s390 */
 #  endif /* alpha */
 #  endif /* ia64 */
-#  endif /* sparc */
 #  endif /* i386 */
 #  endif /* ppc */
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.ardour.org/pipermail/ardour-dev-ardour.org/attachments/20050314/f8138df0/attachment.pgp>


More information about the Ardour-Dev mailing list