From ba6effbcc0d8d9795c4f496457ddfdd024b6e864 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 2 Apr 2024 02:14:11 +0100 Subject: gentoo auto-resync : 02:04:2024 - 02:14:11 --- media-sound/reaper-bin/Manifest | 13 +- .../files/libSwell-makefile-lazy-binding.patch | 46 ++++++ media-sound/reaper-bin/reaper-bin-7.11.ebuild | 160 -------------------- media-sound/reaper-bin/reaper-bin-7.12-r1.ebuild | 161 +++++++++++++++++++++ 4 files changed, 214 insertions(+), 166 deletions(-) create mode 100644 media-sound/reaper-bin/files/libSwell-makefile-lazy-binding.patch delete mode 100644 media-sound/reaper-bin/reaper-bin-7.11.ebuild create mode 100644 media-sound/reaper-bin/reaper-bin-7.12-r1.ebuild (limited to 'media-sound/reaper-bin') diff --git a/media-sound/reaper-bin/Manifest b/media-sound/reaper-bin/Manifest index 1a843059c5ab..198f04274472 100644 --- a/media-sound/reaper-bin/Manifest +++ b/media-sound/reaper-bin/Manifest @@ -1,8 +1,9 @@ AUX libSwell-makefile-cflags.patch 891 BLAKE2B 183683844184162cae7b01393900fc92e21a697de0832f57ffdaea7494f052d507ebeb0e5e941fd37ff2f9e5f887d954976ceb32d4cebbdf034e8336dbe14742 SHA512 62bdbd2e51c237b305ffa0ddb31c17dd6fca64cafb838fe1cfcb5496dc044ece124241e65f9aa66a25332ca1de6ba5d7f102cddf6749726080a0ba221988c127 -DIST WDL-805967d09d659aa1504bd8551a4c52c4c98ef65c.tar.gz 2470609 BLAKE2B 97087165aa4b1423bb65e67a041cb2266b532baeea565752f554e767cd337b4a1c9b0d19b1d34d53b788df74ec0ebda22ca898589dc0d695c2868aba03e9654d SHA512 0a82505d5db5e4470173aff1795e80d780d034c02d9cf0a94410f9a4ba156ac677fc659b5f18c369478e4f71cc4d80aa7bb833a9b5d835427889cda5dc8760bd -DIST reaper711_linux_aarch64.tar.xz 10895364 BLAKE2B 9199e71888389dd4859cb3245d566773ae7145d713012f6d6564223d0a345a44c9b23bef893f1cf69ffe1246f7a9d7ea54c2782f4bb63f3935f2d3192aa7deb7 SHA512 dc12ae9b3cd282d57834f02d26dbf0e464998cdcd31ffdb80c7f3867cb8a6eeb940a6a9b32af1b9d595c33b5bd4455d4f872a6dd9053c9c083e39a9880fadffc -DIST reaper711_linux_armv7l.tar.xz 10548776 BLAKE2B 5341d96ffaa8a491d01fb1be3e58bcdf266a5133516eda6fcceaef7558ad359f70d52a4601305b211082d4fdf526920b1eac0f22df71fee353dee903477d0219 SHA512 7326500e5e1e20af007d978e4e2f60d32f4bf5fcfa1630cfaf1e49512f93f11bca0abb3c9e8136bfc3641820efe5ac4151994895ae27637b02ba43cf3682c76b -DIST reaper711_linux_i686.tar.xz 12179400 BLAKE2B 7cd19c31097ae916ca7247c1abc3a0ac3030c82822b15453eef310f5bd6e2b128072b0ce16f2975f5297afd1b9ff2935d85b308fb25195663ab1c9e9dcaf8128 SHA512 e39bf420ab3e58054a463f48a534ab666194924c72cba27db6ea03a9f6cb38a7dc8db75431afd6887dd4b8d908a8e82ac6a5c1717ec130ba8db2759402b24a08 -DIST reaper711_linux_x86_64.tar.xz 12173844 BLAKE2B 760b662a01ad89d188ece040dd49861c907e03c159b6983f2433fef8635ae0e7204e90ca8c0da410dd8b4a5da040f78398755db9d90ba7bc2134e196403c5b81 SHA512 d55a3c4c0524a4c8417b2db0cc23083c99b702e2c86a1f38f55d672f1a07320308962acc16554cbfe03c83cd386051b0401c678ece9baccdeb3741467d3411fe -EBUILD reaper-bin-7.11.ebuild 5023 BLAKE2B 307895fcd3bdc4e2f9a413317bb99a59861b54140165beb88dfe922cc97f2cea60972a0186cc0b753fdee931a2652196c008af20ee5bc2e45dcab5cbd448fca8 SHA512 762a08d6b1b2e76e53fa81f8e48398eddc4c1beca0fac1f3e6d5321d87678109a4a61d60fd81a1689e8430acb5b86bdfa3f4d487fd0f4409ee6d95edf4ed5103 +AUX libSwell-makefile-lazy-binding.patch 1651 BLAKE2B 41b7dc25d58291f70fd842b89e436fc4be902cff27264fef8410e047a554fbc748b075796ca1ce0340c77f439c6a867e9dca147077b34d5cfcadf8cfbafea843 SHA512 8f55fc2138a1fc075fa53cf980b09fd2f9b0f74de5be594416126cc6350e37464e88d54f0ce4e287b19fd98f01c021e53a9a4988e9d2cf502acaa528cc6c0725 +DIST WDL-9df70be13fcb75eb69adcf957ea3bff4f259fa84.tar.gz 2471215 BLAKE2B 501b973ad764901321d29726927e079c96bcfe8535f76e67bd3ade6b0e3a2385ee741ae6430682c33b136715629a1f0370f52bbf1715d28515496cf09c6fb4b1 SHA512 c3ca582d654af202f352169955d6622266b0acefe00e94ee05bf18802327a7e8fd9d42b54881c4442eed8af36d0040e21e27a624a0ff26328385eec8947e3510 +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 +DIST reaper712_linux_x86_64.tar.xz 12207388 BLAKE2B 0f4e5a362dd64d264edb9803876d477e11f14fd27442dd0b88fb85da82997c2f8849b800f4534e7733e579381b481258032ed8c467da96f12e2a6cc892c3d309 SHA512 08a76e75b204711629da5909ed1554e52b39ba335e90bd12053db9a45dc12dd9e5ff01087a02d4267f92708c3f43d24f65fc2ef4ee5e41c087d37f83ad8800d8 +EBUILD reaper-bin-7.12-r1.ebuild 5082 BLAKE2B b26b3ff0c5fe9dfbc852de9c7f4897dde7694a5a50b3d9a000a9f7afa1626f9ecac17c76cf635949f4d4c489023791115d0d26e9917f8f50031219bec6866ec3 SHA512 348fcaffd50d954d650ce0f7437997e743a8f511b37d4e934f5e760f589070ab26f97f6be83af63be4773a541ca33ef2205e41dae58a257babbf1b4c98bc4cf0 MISC metadata.xml 359 BLAKE2B 44ae94f40b3ca881cdd62ce045dc9af2bf6d1f2ca266a5f81071c0f734acfe83c888fead3c51c247f26e20365e3428ac2fdafc50ed634f9850b52103dc9ddbfe SHA512 13fb4544ffaee84f70475f2ed41a3c1d4effd92f95dea397708b193513d49cc7cf9037c816fc983228a12d31741722cd3487973dc5e60226c8cfe0ecb73789ba diff --git a/media-sound/reaper-bin/files/libSwell-makefile-lazy-binding.patch b/media-sound/reaper-bin/files/libSwell-makefile-lazy-binding.patch new file mode 100644 index 000000000000..9d9508071af8 --- /dev/null +++ b/media-sound/reaper-bin/files/libSwell-makefile-lazy-binding.patch @@ -0,0 +1,46 @@ +From d7fa7b22fdbc894a9986ab686b9c009d25f8cae7 Mon Sep 17 00:00:00 2001 +From: "Jason A. Donenfeld" +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.11.ebuild b/media-sound/reaper-bin/reaper-bin-7.11.ebuild deleted file mode 100644 index 16ee9c73c255..000000000000 --- a/media-sound/reaper-bin/reaper-bin-7.11.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 2023-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit desktop xdg - -DESCRIPTION="Digital audio workstation" -HOMEPAGE="https://www.reaper.fm" - -WDL_COMMIT="805967d09d659aa1504bd8551a4c52c4c98ef65c" - -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 ) - x86? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_i686.tar.xz ) - arm64? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_aarch64.tar.xz ) - arm? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_armv7l.tar.xz ) - https://github.com/justinfrankel/WDL/archive/${WDL_COMMIT}.tar.gz -> WDL-${WDL_COMMIT}.tar.gz -" - -LICENSE="Cockos" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -RESTRICT="mirror" - -IUSE="+jack pulseaudio mp3 ffmpeg" - -RDEPEND=" - ${DEPEND} - media-libs/alsa-lib - media-libs/libglvnd - jack? ( virtual/jack ) - pulseaudio? ( media-libs/libpulse ) - mp3? ( media-sound/lame ) - ffmpeg? ( media-video/ffmpeg ) -" - -DEPEND=" - x11-libs/gtk+:3[X] - x11-libs/libX11 - x11-libs/libXi - media-libs/fontconfig - media-libs/freetype -" - -S="${WORKDIR}" - -src_prepare() { - default - cd "WDL-${WDL_COMMIT}" || die - eapply "${FILESDIR}"/libSwell-makefile-cflags.patch -} - -src_compile() { - emake -C "WDL-${WDL_COMMIT}/WDL/swell" \ - ALLOW_WARNINGS=1 \ - PRELOAD_GDK=1 -} - -QA_PREBUILT="*/*.so */reaper */reaper_host_*" - -src_install() { - cd "reaper_linux_"* || die - mv -fv "../WDL-${WDL_COMMIT}/WDL/swell/libSwell.so" REAPER/ || die - - ./install-reaper.sh --install "${D}"/opt || die - rm -f "${D}"/opt/REAPER/uninstall-reaper.sh - - dosym ../../opt/REAPER/reaper /usr/bin/reaper - - # The following is pulled out of install-reaper.sh to match desktop.eclass. - cd REAPER || die - - newicon -s 256 Resources/main.png cockos-reaper.png - doicon -s 256 Resources/cockos-reaper-backup.png - doicon -s 256 Resources/cockos-reaper-document.png - doicon -s 256 Resources/cockos-reaper-theme.png - doicon -s 256 Resources/cockos-reaper-peak.png - doicon -s 256 Resources/cockos-reaper-template.png - doicon -s 256 Resources/cockos-reaper-template2.png - - cat > cockos-reaper.desktop <<-EOF - [Desktop Entry] - Encoding=UTF-8 - Type=Application - Name=REAPER - Comment=REAPER - Categories=Audio;Video;AudioVideo;AudioVideoEditing;Recorder; - Exec="/usr/bin/reaper" %F - Icon=cockos-reaper - MimeType=application/x-reaper-project;application/x-reaper-project-backup;application/x-reaper-theme - StartupWMClass=REAPER - EOF - domenu cockos-reaper.desktop - - cat > application-x-reaper.xml <<-EOF - - - - - REAPER project - - - - - - REAPER project backup - - - - - - - REAPER configuration - - - - - REAPER fx chain - - - - - - REAPER track template - - - - - REAPER theme - - - - - - - REAPER undo - - - - - REAPER undo backup - - - - REAPER peak file - - - - - - REAPER proxy - - - - EOF - insopts -m 0644 - insinto /usr/share/mime - doins application-x-reaper.xml -} diff --git a/media-sound/reaper-bin/reaper-bin-7.12-r1.ebuild b/media-sound/reaper-bin/reaper-bin-7.12-r1.ebuild new file mode 100644 index 000000000000..a6338707abea --- /dev/null +++ b/media-sound/reaper-bin/reaper-bin-7.12-r1.ebuild @@ -0,0 +1,161 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit desktop xdg + +DESCRIPTION="Digital audio workstation" +HOMEPAGE="https://www.reaper.fm" + +WDL_COMMIT="9df70be13fcb75eb69adcf957ea3bff4f259fa84" + +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 ) + x86? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_i686.tar.xz ) + arm64? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_aarch64.tar.xz ) + arm? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(( 10#$(ver_cut 2) )))_linux_armv7l.tar.xz ) + https://github.com/justinfrankel/WDL/archive/${WDL_COMMIT}.tar.gz -> WDL-${WDL_COMMIT}.tar.gz +" + +LICENSE="Cockos" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +RESTRICT="mirror" + +IUSE="+jack pulseaudio mp3 ffmpeg" + +RDEPEND=" + ${DEPEND} + media-libs/alsa-lib + media-libs/libglvnd + jack? ( virtual/jack ) + pulseaudio? ( media-libs/libpulse ) + mp3? ( media-sound/lame ) + ffmpeg? ( media-video/ffmpeg ) +" + +DEPEND=" + x11-libs/gtk+:3[X] + x11-libs/libX11 + x11-libs/libXi + media-libs/fontconfig + media-libs/freetype +" + +S="${WORKDIR}" + +src_prepare() { + default + cd "WDL-${WDL_COMMIT}" || die + eapply "${FILESDIR}"/libSwell-makefile-cflags.patch + eapply "${FILESDIR}"/libSwell-makefile-lazy-binding.patch +} + +src_compile() { + emake -C "WDL-${WDL_COMMIT}/WDL/swell" \ + PRELOAD_GDK=1 \ + ALLOW_WARNINGS=1 +} + +QA_PREBUILT="*/*.so */reaper */reaper_host_*" + +src_install() { + cd "reaper_linux_"* || die + mv -fv "../WDL-${WDL_COMMIT}/WDL/swell/libSwell.so" REAPER/ || die + + ./install-reaper.sh --install "${D}"/opt || die + rm -f "${D}"/opt/REAPER/uninstall-reaper.sh + + dosym ../../opt/REAPER/reaper /usr/bin/reaper + + # The following is pulled out of install-reaper.sh to match desktop.eclass. + cd REAPER || die + + newicon -s 256 Resources/main.png cockos-reaper.png + doicon -s 256 Resources/cockos-reaper-backup.png + doicon -s 256 Resources/cockos-reaper-document.png + doicon -s 256 Resources/cockos-reaper-theme.png + doicon -s 256 Resources/cockos-reaper-peak.png + doicon -s 256 Resources/cockos-reaper-template.png + doicon -s 256 Resources/cockos-reaper-template2.png + + cat > cockos-reaper.desktop <<-EOF + [Desktop Entry] + Encoding=UTF-8 + Type=Application + Name=REAPER + Comment=REAPER + Categories=Audio;Video;AudioVideo;AudioVideoEditing;Recorder; + Exec="/usr/bin/reaper" %F + Icon=cockos-reaper + MimeType=application/x-reaper-project;application/x-reaper-project-backup;application/x-reaper-theme + StartupWMClass=REAPER + EOF + domenu cockos-reaper.desktop + + cat > application-x-reaper.xml <<-EOF + + + + + REAPER project + + + + + + REAPER project backup + + + + + + + REAPER configuration + + + + + REAPER fx chain + + + + + + REAPER track template + + + + + REAPER theme + + + + + + + REAPER undo + + + + + REAPER undo backup + + + + REAPER peak file + + + + + + REAPER proxy + + + + EOF + insopts -m 0644 + insinto /usr/share/mime + doins application-x-reaper.xml +} -- cgit v1.2.3