commit: d81e904c7818b8e5017630958243770b7fe4fc56 Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> AuthorDate: Wed Apr 3 02:39:43 2024 +0000 Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> CommitDate: Wed Apr 3 02:41:45 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d81e904c
media-sound/reaper-bin: use upstream commit for lazy binding Now that this patch is upstream, use it. Link: https://github.com/justinfrankel/WDL/pull/22 Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org> media-sound/reaper-bin/Manifest | 2 +- .../files/libSwell-makefile-lazy-binding.patch | 46 ---------------------- media-sound/reaper-bin/reaper-bin-7.12-r1.ebuild | 3 +- 3 files changed, 2 insertions(+), 49 deletions(-) diff --git a/media-sound/reaper-bin/Manifest b/media-sound/reaper-bin/Manifest index e5f669df6521..9096cd06bd32 100644 --- a/media-sound/reaper-bin/Manifest +++ b/media-sound/reaper-bin/Manifest @@ -1,4 +1,4 @@ -DIST WDL-9df70be13fcb75eb69adcf957ea3bff4f259fa84.tar.gz 2471215 BLAKE2B 501b973ad764901321d29726927e079c96bcfe8535f76e67bd3ade6b0e3a2385ee741ae6430682c33b136715629a1f0370f52bbf1715d28515496cf09c6fb4b1 SHA512 c3ca582d654af202f352169955d6622266b0acefe00e94ee05bf18802327a7e8fd9d42b54881c4442eed8af36d0040e21e27a624a0ff26328385eec8947e3510 +DIST WDL-ce8eaac26787a8e059cbeb808d566e8bf1438075.tar.gz 2471262 BLAKE2B 20901c986cb9719cfe654137bfa5a4e571b9255373ba18d0c53f61e16ab077277913e6b379d62d328cd5ec617bdc8dea5300f176b55115f4553045dfe559c84b SHA512 e03493ad6809d4b436aed603e0e87fcb8dc17c9f810b6ca59ad0684639f4a54cc4b520711ae65b7ed9d4af2f00b9554ef488346678ae79f254bc30aeb9c500f0 DIST reaper712_linux_aarch64.tar.xz 10918388 BLAKE2B 00d652993267b15687aef81106868a7fa3544eba49a3d7664c52d737d58e56ff5775584edb1bfdb4b1310ded233326699125725e884a17f505d5e658a89fe3cf SHA512 d82754f08860769d3e7af9a04dcc7e54a89bdd42c649afaf3760d9198cbadad0e7be29a5896802bb8fa650c0d9f1f109d0fd44e6adbf122045f90db2f9c46835 DIST reaper712_linux_armv7l.tar.xz 10575044 BLAKE2B a1cc04a4ff70889580199f0ff48cafd7341f92b15bdebe38dd3e636cecba15d8d8d18bbeb8bc9ecea797d334632b98df86f9e76141422cdf60a8c0ceef0be7b6 SHA512 25d472e065814f33c728797b01b45328ee6d2bd30e22ab7cab22218418d94c7325cadb1e6a2a008fa6c0d5ddca9f4981c10e0faf896d3bd8175d8a183ca23268 DIST reaper712_linux_i686.tar.xz 12211908 BLAKE2B e392b86a81ad33c4cd3d339acbb51466a0bc591bec1a031004d3f1fade8afcf85cdd274cb26e731ece1db3aa4b0b0c6f665635f8d3e0448ee646d33652f9e7ca SHA512 f6d3b2e0cedb35c7579ee6594807f13a8c85cb61ca6c3c9fd0d36f2ab5ad9f21be29eefd0f2428a6442e29c38a434c73b2f98e7822bb341052ec93c765ff95ad diff --git a/media-sound/reaper-bin/files/libSwell-makefile-lazy-binding.patch b/media-sound/reaper-bin/files/libSwell-makefile-lazy-binding.patch deleted file mode 100644 index 9d9508071af8..000000000000 --- a/media-sound/reaper-bin/files/libSwell-makefile-lazy-binding.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d7fa7b22fdbc894a9986ab686b9c009d25f8cae7 Mon Sep 17 00:00:00 2001 -From: "Jason A. Donenfeld" <ja...@zx2c4.com> -Date: Tue, 2 Apr 2024 01:03:30 +0200 -Subject: [PATCH] swell-linux: ensure LD lazily binds symbols - -On newer toolchains that by default set `-Wl,-z,now`, such as Gentoo's -23.0 toolchain, setting PRELOAD_GDK causes swell's dlopen() to fail with -an error like: - - Error loading '/opt/REAPER/libSwell.so': /opt/REAPER/libSwell.so: undefined symbol: gdk_x11_window_get_xid - -This is because -z,now, according to the man page, "When generating an -executable or shared library, mark it to tell the dynamic linker to -resolve all symbols when the program is started, or when the shared -library is loaded by dlopen, instead of deferring function call -resolution to the point when the function is first called." This is -basically the opposite of what swell's preloading feature wants. - -This can be overridden by setting -z,lazy, which according to the man -page, "When generating an executable or shared library, mark it to tell -the dynamic linker to defer function call resolution to the point when -the function is called (lazy binding), rather than at load time." - -So pass -Wl,-z,lazy in the preloading case, so that it works no matter -what the toolchain defaults are. ---- - WDL/swell/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/WDL/swell/Makefile b/WDL/swell/Makefile -index 9e7e2d87..8033fb30 100644 ---- a/WDL/swell/Makefile -+++ b/WDL/swell/Makefile -@@ -140,6 +140,9 @@ ifndef NOGDK - endif - endif - LINKEXTRA += -lGL -+ ifdef PRELOAD_GDK -+ CFLAGS += -Wl,-z,lazy -+ endif - endif - - CXXFLAGS = $(CFLAGS) --- -2.44.0 - diff --git a/media-sound/reaper-bin/reaper-bin-7.12-r1.ebuild b/media-sound/reaper-bin/reaper-bin-7.12-r1.ebuild index a6338707abea..b06b170162e9 100644 --- a/media-sound/reaper-bin/reaper-bin-7.12-r1.ebuild +++ b/media-sound/reaper-bin/reaper-bin-7.12-r1.ebuild @@ -8,7 +8,7 @@ inherit desktop xdg DESCRIPTION="Digital audio workstation" HOMEPAGE="https://www.reaper.fm"; -WDL_COMMIT="9df70be13fcb75eb69adcf957ea3bff4f259fa84" +WDL_COMMIT="ce8eaac26787a8e059cbeb808d566e8bf1438075" SRC_URI=" amd64? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_x86_64.tar.xz ) @@ -49,7 +49,6 @@ src_prepare() { default cd "WDL-${WDL_COMMIT}" || die eapply "${FILESDIR}"/libSwell-makefile-cflags.patch - eapply "${FILESDIR}"/libSwell-makefile-lazy-binding.patch } src_compile() {
