Re: [audacity-freeworld] Update to Audacity 2.3.3. Modify wxWidgets build require to wxGTK3 (gtk3 version). Modify libdir pat

Friday, 29 November 2019


Le ven. 29 nov. 2019 à 11:14, David Timms <dtimms(a)rpmfusion.org&gt; a écrit :
...

 commit 8eb6c033f30f616867f13afc21d90076e9bc9374
 Author: David Timms <dtimms(a)iinet.net.au&gt;
 Date:   Fri Nov 29 21:11:52 2019 +1100

     Update to Audacity 2.3.3.
     Modify wxWidgets build require to wxGTK3 (gtk3 version).
     Modify libdir patch for 2.3.3.
     Fix -manual file archive dropping the leading help/ in path.
     Disable twolame for EPEL-8 as the -devel package isn't available. ...
...
 diff --git a/audacity-2.3.3-libdir.patch
b/audacity-2.3.3-libdir.patch
 new file mode 100644
 index 0000000..2659a0c
 --- /dev/null
 +++ b/audacity-2.3.3-libdir.patch
 @@ -0,0 +1,15 @@
 +--- ./src/effects/ladspa/LadspaEffect.cpp.orig 2019-10-22 07:29:41.000000000 +1100
 ++++ ./src/effects/ladspa/LadspaEffect.cpp      2019-11-10 09:44:41.865684664 +1100
 +@@ -378,11 +378,10 @@
 + #else
 +
 +    pathList.push_back(wxGetHomeDir() + wxFILE_SEP_PATH + wxT(".ladspa"));
 ++   pathList.push_back(wxT("/usr/%{_lib}/ladspa")); ^^ This looks wrong
as %{_lib} is a RPM macro and there is no reason
this will be expanded to either lib or lib64. (unless you are
dynamically patching the patch which looks wrong.)

...
 + #if defined(__LP64__) This is also wrong, as aarch64 (aka
arm64) are LP64 but isn't using
the lib64, same for ppc64le (IIRC).
You really need to use the configured --libdir, there is no way around.

...
 +-   pathList.push_back(wxT("/usr/local/lib64/ladspa"));
 +    pathList.push_back(wxT("/usr/lib64/ladspa"));
 + #endif
 +-   pathList.push_back(wxT("/usr/local/lib/ladspa"));
 +    pathList.push_back(wxT("/usr/lib/ladspa"));
 +    pathList.push_back(wxT(LIBDIR) wxT("/ladspa"));
 +
 diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
 index 02b5bf0..b57840c 100644
 --- a/audacity-freeworld.spec
 +++ b/audacity-freeworld.spec
 @@ -8,8 +8,8 @@

  Name: audacity-freeworld

 -Version: 2.3.2
 -Release: 2%{?dist}
 +Version: 2.3.3
 +Release: 1%{?dist}
  Summary: Multitrack audio editor
  License: GPLv2 ...
...
  BuildRequires: taglib-devel
 +%if 0%{?rhel} && 0%{?rhel} == 8
 +#note: epel-8 currently doesn't have twolame-devel.
 +%else Please fix the above, we have twolame-libs in appstream repository,
but we are using a -devel in our override repo, so it's there.
http://koji.rpmfusion.org/buildsys-override/el8-free/x86_64/

...
  BuildRequires: twolame-devel
 +%endif 


-- 
-

Nicolas (kwizart)

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007