SHA256
1
0
forked from pool/lilv
lilv/lilv-0.4.2-lserd.patch
2011-06-06 18:19:50 +00:00

78 lines
3.5 KiB
Diff

Index: wscript
===================================================================
--- wscript.orig 2011-06-03 18:51:51.976991193 +0200
+++ wscript 2011-06-03 18:56:04.153991150 +0200
@@ -9,7 +9,7 @@ import waflib.Logs as Logs
# Version of this package (even if built as a child)
LILV_VERSION = '0.4.2'
-LILV_MAJOR_VERSION = '0'
+LILV_MAJOR_VERSION = ''
# Library version (UNIX style major, minor, micro)
# major increment <=> incompatible changes
@@ -70,7 +70,9 @@ def configure(conf):
atleast_version='2.0.0', mandatory=True)
autowaf.check_pkg(conf, 'gthread-2.0', uselib_store='GTHREAD',
atleast_version='2.0.0', mandatory=False)
- autowaf.check_pkg(conf, 'sord-0', uselib_store='SORD',
+ autowaf.check_pkg(conf, 'sord', uselib_store='SORD',
+ atleast_version='0.4.0', mandatory=True)
+ autowaf.check_pkg(conf, 'serd', uselib_store='SERD',
atleast_version='0.4.0', mandatory=True)
autowaf.check_pkg(conf, 'jack', uselib_store='JACK',
atleast_version='0.107.0', mandatory=False)
@@ -129,7 +131,7 @@ def configure(conf):
conf.env['BUILD_UTILS'] = not Options.options.no_utils
conf.env['BASH_COMPLETION'] = not Options.options.no_bash_completion
- conf.env['LIB_LILV'] = ['lilv-%s' % LILV_MAJOR_VERSION]
+ conf.env['LIB_LILV'] = ['lilv%s' % LILV_MAJOR_VERSION]
if conf.is_defined('HAVE_JACK') and not Options.options.no_jack:
autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/event/event.h',
@@ -197,14 +199,14 @@ def build(bld):
source = lib_source,
includes = ['.', './src'],
name = 'liblilv',
- target = 'lilv-%s' % LILV_MAJOR_VERSION,
+ target = 'lilv%s' % LILV_MAJOR_VERSION,
vnum = LILV_LIB_VERSION,
install_path = '${LIBDIR}',
cflags = libflags + [
'-DLILV_SHARED',
'-DLILV_INTERNAL' ],
linkflags = linkflags)
- autowaf.use_lib(bld, obj, 'SORD SERD LV2CORE GLIB')
+ autowaf.use_lib(bld, obj, 'SERD SORD LV2CORE GLIB')
if bld.env['BUILD_TESTS']:
# Static library (for unit test code coverage)
@@ -216,14 +218,14 @@ def build(bld):
install_path = '',
cflags = [ '-fprofile-arcs', '-ftest-coverage', '-DLILV_INTERNAL' ],
linkflags = linkflags)
- autowaf.use_lib(bld, obj, 'SORD SERD LV2CORE GLIB')
+ autowaf.use_lib(bld, obj, 'SERD SORD LV2CORE GLIB')
# Unit test program
obj = bld(features = 'c cprogram',
source = 'test/lilv_test.c',
includes = ['.', './src'],
use = 'liblilv_static',
- uselib = 'SORD SERD LV2CORE',
+ uselib = 'SERD SORD LV2CORE',
linkflags = linkflags + ['-lgcov'],
target = 'test/lilv_test',
install_path = '',
Index: lilv.pc.in
===================================================================
--- lilv.pc.in.orig 2011-06-03 19:13:54.000000000 +0200
+++ lilv.pc.in 2011-06-03 19:14:48.072991013 +0200
@@ -7,4 +7,4 @@ Name: Lilv
Version: @LILV_VERSION@
Description: Simple C library for hosting LV2 plugins
Libs: -L${libdir} -l@LIB_LILV@ -ldl
-Cflags: -I${includedir}/lilv-@LILV_MAJOR_VERSION@
+Cflags: -I${includedir}/lilv