From dbcbed86a1c525c926184a6476e9091bf84aa69c Mon Sep 17 00:00:00 2001 From: Brendan Jones Date: Sun, 19 Feb 2017 10:54:42 +0100 Subject: [PATCH] Update to 0.35.2 --- .gitignore | 1 + guitarix-0.35.0-abs-fix.patch | 12 ---- guitarix-0.35.0-abs-unsigned-fix.patch | 76 +++++++++++++++++++++----- guitarix-0.35.0-glib.patch | 42 -------------- guitarix.spec | 11 ++-- sources | 3 +- 6 files changed, 68 insertions(+), 77 deletions(-) delete mode 100644 guitarix-0.35.0-abs-fix.patch delete mode 100644 guitarix-0.35.0-glib.patch diff --git a/.gitignore b/.gitignore index f441108..d88aee5 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ guitarix-0.11.0.tar.bz2 /guitarix2-0.34.0.tar.bz2 /guitarix2-0.35.0.tar.xz /guitarix-0.35.0-abs-fix.patch +/guitarix2-0.35.2.tar.xz diff --git a/guitarix-0.35.0-abs-fix.patch b/guitarix-0.35.0-abs-fix.patch deleted file mode 100644 index fdd6c3b..0000000 --- a/guitarix-0.35.0-abs-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nurp guitarix-0.35.0.mod/libgxwmm/gxwmm/gainline.h guitarix-0.35.0/libgxwmm/gxwmm/gainline.h ---- guitarix-0.35.0.mod/libgxwmm/gxwmm/gainline.h 2016-04-24 06:18:37.000000000 +0200 -+++ guitarix-0.35.0/libgxwmm/gxwmm/gainline.h 2016-04-24 21:22:44.846076833 +0200 -@@ -22,7 +22,7 @@ - #include - #include - --inline bool operator==(const gain_points& p1, const gain_points& p2) { return p1.i == p2.i && abs(p1.g - p2.g) < 1e-4 * (p1.g + p2.g); } -+inline bool operator==(const gain_points& p1, const gain_points& p2) { return p1.i == p2.i && fabs(p1.g - p2.g) < 1e-4 * (p1.g + p2.g); } - inline bool operator!=(const gain_points& p1, const gain_points& p2) { return !(p1 == p2); } - - class Gainline: public std::vector diff --git a/guitarix-0.35.0-abs-unsigned-fix.patch b/guitarix-0.35.0-abs-unsigned-fix.patch index 0f27136..ff9ffe0 100644 --- a/guitarix-0.35.0-abs-unsigned-fix.patch +++ b/guitarix-0.35.0-abs-unsigned-fix.patch @@ -1,33 +1,79 @@ ---- guitarix-0.35.0/src/LV2/gx_amp.lv2/gxamp.cpp.orig 2017-02-01 02:29:45.079677350 +0000 -+++ guitarix-0.35.0/src/LV2/gx_amp.lv2/gxamp.cpp 2017-02-01 02:29:52.482664335 +0000 -@@ -238,7 +238,7 @@ +diff -Nurp guitarix-0.35.2.orig/src/LV2/gx_amp.lv2/gxamp.cpp guitarix-0.35.2.mod/src/LV2/gx_amp.lv2/gxamp.cpp +--- guitarix-0.35.2.orig/src/LV2/gx_amp.lv2/gxamp.cpp 2016-10-11 10:01:02.000000000 +0200 ++++ guitarix-0.35.2.mod/src/LV2/gx_amp.lv2/gxamp.cpp 2017-02-19 00:17:58.519635549 +0100 +@@ -235,19 +235,19 @@ private: + volatile int32_t schedule_wait; + inline bool cab_changed() - {return abs(cab - (clevel_ + c_model_)) > 0.1;} +- {return abs(cab - clevel_ ) > 0.1;} ++ {return std::abs(cab - clevel_ ) > 0.1;} inline bool buffsize_changed() - {return abs(bufsize - cur_bufsize) != 0;} + {return bufsize != cur_bufsize;} inline void update_cab() - {cab = (clevel_ + c_model_); c_old_model_ = c_model_;} + {cab = clevel_ ; c_old_model_ = c_model_;} inline bool change_cab() ---- guitarix-0.35.0/src/LV2/gx_amp_stereo.lv2/gxamp_stereo.cpp.orig 2017-02-01 03:05:16.841927625 +0000 -+++ guitarix-0.35.0/src/LV2/gx_amp_stereo.lv2/gxamp_stereo.cpp 2017-02-01 03:05:25.646912084 +0000 -@@ -238,7 +238,7 @@ +- {return abs(c_old_model_ - c_model_) > 0.1;} ++ {return std::abs(c_old_model_ - c_model_) > 0.1;} + inline bool pre_changed() +- {return abs(pre - alevel_) > 0.1;} ++ {return std::abs(pre - alevel_) > 0.1;} + inline void update_pre() + {pre = (alevel_);} + inline bool val_changed() +- {return abs(alevel_ - (*alevel)) > 0.1 || abs(clevel_ - (*clevel)) > 0.1 || abs(c_model_ - (*c_model)) > 0.1;} ++ {return std::abs(alevel_ - (*alevel)) > 0.1 || std::abs(clevel_ - (*clevel)) > 0.1 || std::abs(c_model_ - (*c_model)) > 0.1;} + + // LV2 stuff + LV2_URID_Map* map; +diff -Nurp guitarix-0.35.2.orig/src/LV2/gx_amp_stereo.lv2/gxamp_stereo.cpp guitarix-0.35.2.mod/src/LV2/gx_amp_stereo.lv2/gxamp_stereo.cpp +--- guitarix-0.35.2.orig/src/LV2/gx_amp_stereo.lv2/gxamp_stereo.cpp 2016-10-11 10:01:02.000000000 +0200 ++++ guitarix-0.35.2.mod/src/LV2/gx_amp_stereo.lv2/gxamp_stereo.cpp 2017-02-19 00:18:20.624972976 +0100 +@@ -235,19 +235,19 @@ private: + volatile int32_t schedule_wait; + bool cab_changed() - {return abs(cab - (clevel_ + c_model_)) > 0.1;} +- {return abs(cab - clevel_ ) > 0.1;} ++ {return std::abs(cab - clevel_ ) > 0.1;} bool buffsize_changed() - {return abs(bufsize - cur_bufsize) != 0;} + {return bufsize != cur_bufsize;} void update_cab() - {cab = (clevel_ + c_model_); c_old_model_ = c_model_;} + {cab = (clevel_ ); c_old_model_ = c_model_;} bool change_cab() ---- guitarix-0.35.0/src/LV2/gx_cabinet.lv2/gxcabinet.cpp.orig 2017-02-01 03:17:43.878609086 +0000 -+++ guitarix-0.35.0/src/LV2/gx_cabinet.lv2/gxcabinet.cpp 2017-02-01 03:17:56.236587274 +0000 -@@ -107,7 +107,7 @@ +- {return abs(c_old_model_ - c_model_) > 0.1;} ++ {return std::abs(c_old_model_ - c_model_) > 0.1;} + bool pre_changed() +- {return abs(pre - alevel_) > 0.1;} ++ {return std::abs(pre - alevel_) > 0.1;} + void update_pre() + {pre = (alevel_);} + inline bool val_changed() +- {return abs(alevel_ - (*alevel)) > 0.1 || abs(clevel_ - (*clevel)) > 0.1 || abs(c_model_ - (*c_model)) > 0.1;} ++ {return std::abs(alevel_ - (*alevel)) > 0.1 || std::abs(clevel_ - (*clevel)) > 0.1 || std::abs(c_model_ - (*c_model)) > 0.1;} + + // LV2 stuff + LV2_URID_Map* map; +diff -Nurp guitarix-0.35.2.orig/src/LV2/gx_cabinet.lv2/gxcabinet.cpp guitarix-0.35.2.mod/src/LV2/gx_cabinet.lv2/gxcabinet.cpp +--- guitarix-0.35.2.orig/src/LV2/gx_cabinet.lv2/gxcabinet.cpp 2016-10-11 10:01:02.000000000 +0200 ++++ guitarix-0.35.2.mod/src/LV2/gx_cabinet.lv2/gxcabinet.cpp 2017-02-19 00:17:18.791826329 +0100 +@@ -106,15 +106,15 @@ private: + volatile int32_t schedule_wait; + inline bool cab_changed() - {return abs(cab - (cbass_ + ctreble_ + clevel_ + c_model_)) > 0.1;} +- {return abs(cab_bass - cbass_) > 0.1 || abs(cab_treble - ctreble_) > 0.1 || abs(cab_level - clevel_) > 0.1;} ++ {return std::abs(cab_bass - cbass_) > 0.1 || std::abs(cab_treble - ctreble_) > 0.1 || std::abs(cab_level - clevel_) > 0.1;} inline bool buffsize_changed() - {return abs(bufsize - cur_bufsize) != 0;} + {return bufsize != cur_bufsize;} inline void update_cab() - {cab = (cbass_ + ctreble_ + clevel_ + c_model_); c_old_model_ = c_model_;} + {cab_bass = cbass_; cab_treble = ctreble_; cab_level = clevel_; c_old_model_ = c_model_;} inline bool change_cab() +- {return abs(c_old_model_ - c_model_) > 0.1;} ++ {return std::abs(c_old_model_ - c_model_) > 0.1;} + inline bool val_changed() +- {return abs(cbass_ - (*cbass)) > 0.1 || abs(ctreble_ != (*ctreble)) > 0.1 || abs(clevel_ != (*clevel)) > 0.1 || abs(c_model_ != (*c_model)) > 0.1;} ++ {return std::abs(cbass_ - (*cbass)) > 0.1 || std::abs(ctreble_ != (*ctreble)) > 0.1 || std::abs(clevel_ != (*clevel)) > 0.1 || std::abs(c_model_ != (*c_model)) > 0.1;} + + // LV2 stuff + LV2_URID_Map* map; diff --git a/guitarix-0.35.0-glib.patch b/guitarix-0.35.0-glib.patch deleted file mode 100644 index 5b08984..0000000 --- a/guitarix-0.35.0-glib.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up ./src/gx_head/engine/gx_system.cpp.glib ./src/gx_head/engine/gx_system.cpp ---- ./src/gx_head/engine/gx_system.cpp.glib 2016-12-28 20:22:44.773717749 -0500 -+++ ./src/gx_head/engine/gx_system.cpp 2016-12-28 20:22:58.771251220 -0500 -@@ -329,7 +329,7 @@ IRFileListing::IRFileListing(const std:: - "," G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME - "," G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE); - Glib::RefPtr file_info; -- while ((file_info = child_enumeration->next_file()) != 0) { -+ while (file_info = child_enumeration->next_file()) { - if (file_info->get_attribute_string(G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE) == "audio/x-wav") { - listing.push_back( - FileName( -@@ -349,7 +349,7 @@ static void list_subdirs(const Glib::Ref - file->enumerate_children(G_FILE_ATTRIBUTE_STANDARD_NAME - "," G_FILE_ATTRIBUTE_STANDARD_DISPLAY_NAME); - Glib::RefPtr file_info; -- while ((file_info = child_enumeration->next_file()) != 0) { -+ while (file_info = child_enumeration->next_file()) { - if (file_info->get_file_type() == Gio::FILE_TYPE_DIRECTORY) { - Glib::RefPtr child = file->get_child( - file_info->get_attribute_byte_string(G_FILE_ATTRIBUTE_STANDARD_NAME)); -diff -up ./src/gx_head/engine/ladspaback.cpp.glib ./src/gx_head/engine/ladspaback.cpp ---- ./src/gx_head/engine/ladspaback.cpp.glib 2016-04-24 00:18:37.000000000 -0400 -+++ ./src/gx_head/engine/ladspaback.cpp 2016-12-28 20:22:31.664218123 -0500 -@@ -1622,7 +1622,7 @@ void LadspaPluginList::load(gx_system::C - "," G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE); - Glib::RefPtr file_info; - -- while ((file_info = child_enumeration->next_file()) != 0) { -+ while (file_info = child_enumeration->next_file()) { - if (file_info->get_attribute_string(G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE) == "application/x-sharedlib") { - std::string nm = file_info->get_attribute_byte_string(G_FILE_ATTRIBUTE_STANDARD_NAME); - if (lib_is_blacklisted(nm)) { -@@ -1650,7 +1650,7 @@ void LadspaPluginList::load(gx_system::C - "," G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE); - Glib::RefPtr file_info; - -- while ((file_info = child_enumeration->next_file()) != 0) { -+ while (file_info = child_enumeration->next_file()) { - //if not f.endswith((".rdf",".rdfs")): - if (file_info->get_attribute_string(G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE) == "application/rdf+xml") { - std::string nm = file_info->get_attribute_byte_string(G_FILE_ATTRIBUTE_STANDARD_NAME); diff --git a/guitarix.spec b/guitarix.spec index 927ab19..4c6e3d6 100644 --- a/guitarix.spec +++ b/guitarix.spec @@ -4,16 +4,14 @@ %global altname2 guitarix2 Name: guitarix -Version: 0.35.0 -Release: 5%{?dist} +Version: 0.35.2 +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.xz -Patch1: guitarix-0.35.0-abs-fix.patch -Patch2: guitarix-0.35.0-glib.patch # https://sourceforge.net/p/guitarix/bugs/35/ Patch3: guitarix-0.35.0-abs-unsigned-fix.patch @@ -138,8 +136,6 @@ guitarix, but can also be used by any other ladspa host. %prep %setup -q -n %{name}-%{version} -%patch1 -p1 -%patch2 -p1 -b .glib %patch3 -p1 -b .abs-unsigned-fix # The build system does not use these bundled libraries by default. But @@ -225,6 +221,9 @@ chmod 755 %{buildroot}%{_libdir}/glade/modules/libgladegx.so %{_libdir}/lv2/* %changelog +* Sun Feb 19 2017 Brendan Jones - 0.35.2-1 +- Update to 0.35.2 + * Fri Feb 10 2017 Fedora Release Engineering - 0.35.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index bea63cf..a1211b4 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -cb708dc9229ad784aba3865749e63466 guitarix2-0.35.0.tar.xz -a09d63328d248f58c1c605a0071aadda guitarix-0.35.0-abs-fix.patch +SHA512 (guitarix2-0.35.2.tar.xz) = 8b7fcd17e7ef4ea3bcb28d042aaa99d3370b9d0926aeff09030f08be0a824ceb4880c9d2286dd0a952692cafae704545822fc483bf3c8bd88c9ea961aef3dd30