Update to 0.26.1
This commit is contained in:
Brendan Jones
parent
01d27911bc
commit
4a515daf83
1
.gitignore
vendored
1
.gitignore
vendored
@ -14,3 +14,4 @@ guitarix-0.11.0.tar.bz2
|
||||
/guitarix2-0.24.2.tar.bz2
|
||||
/guitarix2-0.25.1.tar.bz2
|
||||
/guitarix2-0.25.2.tar.bz2
|
||||
/guitarix2-0.26.1.tar.bz2
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
diff --git a/trunk/wscript b/trunk/wscript
|
||||
index a20a54a..8a016f3 100644
|
||||
--- a/trunk/wscript
|
||||
+++ b/trunk/wscript
|
||||
@@ -160,6 +160,12 @@ def set_options(opt):
|
||||
type='string',
|
||||
help='LADSPA plugin directory [Default: <prefix>/lib/ladspa]')
|
||||
|
||||
+ lv2 = opt.add_option_group("LV2 Options")
|
||||
+
|
||||
+ lv2.add_option('--lv2dir',
|
||||
+ type='string',
|
||||
+ help='LV2 plugin directory [Default: <prefix>/lib/lv2]')
|
||||
+
|
||||
opt.recurse('pygxw')
|
||||
opt.recurse('glade-gxw')
|
||||
|
||||
@@ -570,7 +576,10 @@ def configure(conf):
|
||||
|
||||
conf.env['LV2'] = opt.build_lv2
|
||||
if opt.build_lv2:
|
||||
- conf.define('LV2DIR', os.path.normpath(os.path.join(conf.env['LIBDIR'], 'lv2')) )
|
||||
+ if opt.lv2dir:
|
||||
+ conf.define('LV2DIR', opt.lv2dir)
|
||||
+ else:
|
||||
+ conf.define('LV2DIR', os.path.normpath(os.path.join(conf.env['LIBDIR'], 'lv2')) )
|
||||
|
||||
|
||||
conf.env['NEW_LADSPA'] = not opt.no_ladspa and not opt.no_new_ladspa
|
||||
@ -1,32 +0,0 @@
|
||||
diff -up guitarix-0.25.1/src/LV2/gxamp.lv2/StereoAmp/wscript.no-x86 guitarix-0.25.1/src/LV2/gxamp.lv2/StereoAmp/wscript
|
||||
--- guitarix-0.25.1/src/LV2/gxamp.lv2/StereoAmp/wscript.no-x86 2013-01-15 12:11:00.000000000 +0100
|
||||
+++ guitarix-0.25.1/src/LV2/gxamp.lv2/StereoAmp/wscript 2013-01-15 12:16:05.000000000 +0100
|
||||
@@ -31,15 +31,13 @@ def build(bld):
|
||||
src2.append('../../../zita-resampler-1.1.0/resampler-table.cc')
|
||||
incl2.append('../../../zita-resampler-1.1.0')
|
||||
cxxflag1 =[]
|
||||
- if not bld.env['OPT']:
|
||||
- cxxflag2 = [ "-msse2", "-mfpmath=sse"]
|
||||
lv2_plugin_stereo = bld(
|
||||
features='cxx cshlib ',
|
||||
includes = incl2,
|
||||
lib = lib2,
|
||||
uselib = uselib2,
|
||||
obj_ext = '_3.o',
|
||||
- cxxflags = cxxflag2,
|
||||
+ cxxflags = cxxflag1,
|
||||
defines = ["LV2_SO"],
|
||||
target = 'gxamp_stereo',
|
||||
source = src2,
|
||||
diff -up guitarix-0.25.1/src/LV2/gxamp.lv2/wscript.no-x86 guitarix-0.25.1/src/LV2/gxamp.lv2/wscript
|
||||
--- guitarix-0.25.1/src/LV2/gxamp.lv2/wscript.no-x86 2013-01-15 11:59:19.000000000 +0100
|
||||
+++ guitarix-0.25.1/src/LV2/gxamp.lv2/wscript 2013-01-15 11:59:32.000000000 +0100
|
||||
@@ -31,8 +31,6 @@ def build(bld):
|
||||
src.append('../../zita-resampler-1.1.0/resampler-table.cc')
|
||||
incl.append('../../zita-resampler-1.1.0')
|
||||
cxxflag =[]
|
||||
- if not bld.env['OPT']:
|
||||
- cxxflag = [ "-msse2", "-mfpmath=sse"]
|
||||
lv2_plugin = bld(
|
||||
features='cxx cshlib ',
|
||||
includes = incl,
|
||||
@ -1,74 +0,0 @@
|
||||
diff --git a/trunk/libgxw/gxw.pc.in b/trunk/libgxw/gxw.pc.in
|
||||
index 9c72568..510a411 100644
|
||||
--- a/trunk/libgxw/gxw.pc.in
|
||||
+++ b/trunk/libgxw/gxw.pc.in
|
||||
@@ -1,6 +1,6 @@
|
||||
prefix=/path
|
||||
exec_prefix=${prefix}
|
||||
-libdir=${exec_prefix}/lib
|
||||
+libdir=/path
|
||||
datarootdir=${prefix}/share
|
||||
datadir=${datarootdir}
|
||||
includedir=${prefix}/include
|
||||
diff --git a/trunk/libgxwmm/gxwmm.pc.in b/trunk/libgxwmm/gxwmm.pc.in
|
||||
index ffd1974..e26975d 100644
|
||||
--- a/trunk/libgxwmm/gxwmm.pc.in
|
||||
+++ b/trunk/libgxwmm/gxwmm.pc.in
|
||||
@@ -1,6 +1,6 @@
|
||||
prefix=/path
|
||||
exec_prefix=${prefix}
|
||||
-libdir=${exec_prefix}/lib
|
||||
+libdir=/path
|
||||
datarootdir=${prefix}/share
|
||||
datadir=${datarootdir}
|
||||
includedir=${prefix}/include
|
||||
diff --git a/trunk/wafadmin/Tools/libtool.py b/trunk/wafadmin/Tools/libtool.py
|
||||
index 50b28ce..b4074e6 100644
|
||||
--- a/trunk/wafadmin/Tools/libtool.py
|
||||
+++ b/trunk/wafadmin/Tools/libtool.py
|
||||
@@ -51,7 +51,7 @@ def apply_link_libtool(self):
|
||||
linktask=self.link_task
|
||||
self.latask=self.create_task('fakelibtool',linktask.outputs,linktask.outputs[0].change_ext('.la'))
|
||||
if self.bld.is_install:
|
||||
- self.bld.install_files('${PREFIX}/lib',linktask.outputs[0],self.env)
|
||||
+ self.bld.install_files('${LIBDIR}',linktask.outputs[0],self.env)
|
||||
def apply_libtool(self):
|
||||
self.env['vnum']=self.vnum
|
||||
paths=[]
|
||||
@@ -101,7 +101,7 @@ class libtool_la_file:
|
||||
self.shouldnotlink=None
|
||||
self.dlopen=None
|
||||
self.dlpreopen=None
|
||||
- self.libdir='/usr/lib'
|
||||
+ self.libdir='${LIBDIR}'
|
||||
if not self.__parse():
|
||||
raise ValueError("file %s not found!!"%(la_filename))
|
||||
def __parse(self):
|
||||
diff --git a/trunk/wscript b/trunk/wscript
|
||||
index 32950ad..c058f93 100644
|
||||
--- a/trunk/wscript
|
||||
+++ b/trunk/wscript
|
||||
@@ -644,7 +644,8 @@ def configure(conf):
|
||||
pa = conf.env['PREFIX']
|
||||
sub_file('./libgxw/gxw.pc.in', './libgxw/gxw.pc', (('prefix=/path', 'prefix=%s' % pa), ))
|
||||
sub_file('./libgxwmm/gxwmm.pc.in', './libgxwmm/gxwmm.pc', (('prefix=/path', 'prefix=%s' % pa), ))
|
||||
-
|
||||
+ sub_file('./libgxw/gxw.pc.in', './libgxw/gxw.pc', (('libdir=/path','libdir=%s' % conf.env['LIBDIR']), ))
|
||||
+ sub_file('./libgxwmm/gxwmm.pc.in', './libgxwmm/gxwmm.pc', (('libdir=/path','libdir=%s' % conf.env['LIBDIR']), ))
|
||||
|
||||
# some output
|
||||
print("")
|
||||
@@ -773,11 +774,11 @@ def build(bld):
|
||||
if bld.env["GX_LIB_DEV"]:
|
||||
bld.install_files('${PREFIX}/include/gxw','libgxw/gxw/*.h')
|
||||
bld.install_files('${PREFIX}/include','libgxw/gxw.h')
|
||||
- bld.install_files('${PREFIX}/lib/pkgconfig', './libgxw/gxw.pc')
|
||||
+ bld.install_files('${LIBDIR}/pkgconfig', './libgxw/gxw.pc')
|
||||
bld.install_files('${PREFIX}/include/gxwmm','libgxwmm/gxwmm-generated/*.h')
|
||||
bld.install_files('${PREFIX}/include/gxwmm','libgxwmm/gxwmm/*.h')
|
||||
bld.install_files('${PREFIX}/include','libgxwmm/gxwmm.h')
|
||||
- bld.install_files('${PREFIX}/lib/pkgconfig', './libgxwmm/gxwmm.pc')
|
||||
+ bld.install_files('${LIBDIR}/pkgconfig', './libgxwmm/gxwmm.pc')
|
||||
|
||||
################################################################
|
||||
# other commands
|
||||
@ -1,43 +0,0 @@
|
||||
From b642b50320b6f6b42bcf0c9260058d3a905621dd Mon Sep 17 00:00:00 2001
|
||||
From: Brendan Jones <brendan.jones.it@gmail.com>
|
||||
Date: Sat, 5 Jan 2013 09:11:46 +0100
|
||||
Subject: [PATCH 2/2] Add shared library dir patch
|
||||
|
||||
---
|
||||
trunk/wscript | 12 +++++++++++-
|
||||
1 file changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/trunk/wscript b/trunk/wscript
|
||||
index a0d4a57..9c0d8fb 100644
|
||||
--- a/trunk/wscript
|
||||
+++ b/trunk/wscript
|
||||
@@ -79,6 +79,12 @@ def set_options(opt):
|
||||
dest='cxxflags',
|
||||
help='C++ base compiler flags [Default: %default]')
|
||||
|
||||
+ comp.add_option('--libdir',
|
||||
+ type='string',
|
||||
+ default='',
|
||||
+ dest='libdir',
|
||||
+ help='Shared library directory')
|
||||
+
|
||||
comp.add_option('--ldflags',
|
||||
type='string',
|
||||
default='',
|
||||
@@ -562,8 +568,12 @@ def configure(conf):
|
||||
conf.define('OS_32_BIT', 1)
|
||||
# writing config.h
|
||||
conf.write_config_header('config.h')
|
||||
+
|
||||
+ if not opt.libdir:
|
||||
+ conf.define('LIBDIR', os.path.normpath(os.path.join(conf.env['PREFIX'], 'lib')))
|
||||
+ else:
|
||||
+ conf.define('LIBDIR', opt.libdir)
|
||||
|
||||
- conf.define('LIBDIR', os.path.normpath(os.path.join(conf.env['PREFIX'], 'lib')))
|
||||
conf.define('BINDIR', os.path.normpath(os.path.join(conf.env['PREFIX'], 'bin')))
|
||||
conf.define('DESKAPPS_DIR', os.path.normpath(os.path.join(conf.env['SHAREDIR'], 'applications')))
|
||||
conf.define('BIN_NAME', APPNAME)
|
||||
--
|
||||
1.8.0.2
|
||||
|
||||
@ -4,18 +4,14 @@
|
||||
%global altname2 guitarix2
|
||||
|
||||
Name: guitarix
|
||||
Version: 0.25.2
|
||||
Version: 0.26.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Mono amplifier to JACK
|
||||
Group: Applications/Multimedia
|
||||
License: GPLv2+
|
||||
URL: http://guitarix.sourceforge.net/
|
||||
Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{altname2}-%{version}.tar.bz2
|
||||
Patch0: guitarix-0.25.1-lv2dir.patch
|
||||
Patch1: guitarix-0.25.1-shared-lib.patch
|
||||
Patch2: guitarix-0.25.1-pkgconfig.patch
|
||||
# gxamp should use inherited compiler flags
|
||||
Patch3: guitarix-0.25.1-no-x86.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: faust
|
||||
@ -134,7 +130,6 @@ guitarix, but can also be used by any other ladspa host.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch1 -p2
|
||||
|
||||
# The build system does not use these bundled libraries by default. But
|
||||
# just to make sure:
|
||||
@ -219,6 +214,10 @@ chmod 755 %{buildroot}%{_libdir}/glade/modules/libgladegx.so
|
||||
%{_libdir}/lv2/*
|
||||
|
||||
%changelog
|
||||
* Fri Apr 12 2013 Brendan Jones <brendan.jones.it@gmail.com> 0.26.1-1
|
||||
- Remove patches included upstream
|
||||
- Update to 0.26.1
|
||||
|
||||
* Mon Feb 11 2013 Brendan Jones <brendan.jones.it@gmail.com> 0.25.2-1
|
||||
- Remove patches present in new upstream release
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user