Hi,
On Sat, Dec 02, 2006 at 06:45:27PM +0100, [EMAIL PROTECTED] wrote:
> Le jeudi 30 novembre 2006 00:42, Nicolas François a écrit :
Here is a second patch (I could import mucipher nicely with this one).
It does not fix the museek+ build system directly, but fix it in
debian/rules.
As upstream seems to be willing to chnage the build system, it should not
be an issue.
Kind Regards,
--
Nekral
diff -rauN ../orig/museek+-0.1.12/debian/rules ./museek+-0.1.12/debian/rules
--- ../orig/museek+-0.1.12/debian/rules 2006-12-04 19:20:33.000000000 +0100
+++ ./museek+-0.1.12/debian/rules 2006-12-04 19:25:59.000000000 +0100
@@ -25,6 +25,12 @@
build-stamp: patch-stamp
dh_testdir
# Run configure and build with scons
+ # for the SharedLibrary command, SCons needs the sources to be
+ # in place in advance
+ # (Command("mucipher.i", "../mucipher.i", file_copy) do not do
+ # the trick)
+ mkdir -p workdir/Mucipher/python/
+ cp Mucipher/mucipher.i workdir/Mucipher/python/
scons CFLAGS="$(CFLAGS)" QTDIR=/usr/share/qt3/ BUILDDIR=0
touch build-stamp
diff -rauN ../orig/museek+-0.1.12/Tools/SConscript
./museek+-0.1.12/Tools/SConscript
--- ../orig/museek+-0.1.12/Tools/SConscript 2006-05-26 21:47:57.000000000
+0200
+++ ./museek+-0.1.12/Tools/SConscript 2006-12-04 19:03:46.000000000 +0100
@@ -16,7 +16,10 @@
if env['VORBIS']:
env_libmuscan.ParseConfig('pkg-config --libs --cflags vorbisfile')
if conf.CheckLibWithHeader('', 'vorbis/vorbisfile.h', 'C++',
'ov_clear(0);'):
- env_libmuscan.Append(CPPDEFINES = {'HAVE_VORBIS': 1})
+ if env_libmuscan['CPPDEFINES'] != []:
+ env_libmuscan.Append(CPPDEFINES = {"HAVE_VORBIS": 1})
+ else:
+ env_libmuscan.Replace(CPPDEFINES = {"HAVE_VORBIS": 1})
print "OGG Vorbis found, compiling into muscan."
else:
print "OGG Vorbis NOT found, not compiled into muscan."
