gentoo auto-resync : 12:12:2023 - 23:32:21

3 files changed, 64 insertions, 16 deletions

diff --git a/media-sound/reaper-bin/Manifest b/media-sound/reaper-bin/Manifest
index f89928df99aa..68e1db1710dd 100644
--- a/media-sound/reaper-bin/Manifest
+++ b/media-sound/reaper-bin/Manifest
@@ -1,6 +1,8 @@
-DIST reaper706_linux_aarch64.tar.xz 10859760 BLAKE2B daaa00fdcfdfaf0fa68463494605be5bf66bb56e76f2c87edae41d3e2701a1320d63f021c4e5f5f6682090c8969a565832f0f030f987a99a0027fa559bbfaab5 SHA512 c2ee60efbecbc04f7fb5a0e1f8316c6983a83bdae14e7ed677e577c013d1f822bc5e788754e56adca4e246a7179e614fa7f0161fb4176500c856f0876d59272b
-DIST reaper706_linux_armv7l.tar.xz 10515852 BLAKE2B 0420bbc76b849b51381e8310f1131c7f34098d26bcab675953c82257f434ddbebe412d030ccfadcc4ff8d93c5e2d7a776c9882cccf71a07f062e22ec0fc0b63f SHA512 a2b1037c43176ab87b8ff9bb0f65b33383f0abfbb3dfe7ac4be83caa3aee310d39b84a9dd74a9c51de352552052096843b04cd184ae2a12fee3d65a5f0506392
-DIST reaper706_linux_i686.tar.xz 12137272 BLAKE2B 0cce92132f5f330bebc5ac43a2e4ecc65e6afce3fb7dbb6893cc38ffdf29cdab37e61f43661b661579a95b2ef8f207532bd25a58839c53662a311de29d385523 SHA512 84d90f503fb4faabbe79d1a46fabda83a6b0a9ae8cce9b532ee5c316446eff786b82f29db51499b3c0ba0b2c925a3b3bb2d8a12df30240234d389f6241f3bdd8
-DIST reaper706_linux_x86_64.tar.xz 12131904 BLAKE2B 01bdd499e305c0f3125c874a1e273b954ec748c74b66fbbd8ef80d5953d18bdbe564e0c9010be52e3ef69cec2f557adc8c4a570a8c95f37387204cb4ee0dd065 SHA512 de3190cb9c8e84c3aafc8693c48cdf67d0ec9ff5c2a2e49d02cb83cea6d74d6ff4ac4346e03014daa66e79435d82e81854084a6d6e8c73a47ed3fb7c1d6f7b8a
-EBUILD reaper-bin-7.06.ebuild 4591 BLAKE2B 76f358ffcedeabc2efcf921762f5161c6496d8efb648ae0670a944960ef6e0d3bb2d5754a191673e9e8c1d0fc5a4abdcb371c8e910d75dacceaa3d4711e2d336 SHA512 adb3d6bb14d17f30f63275b74f95fa3af841e30ce8a6e8d7e83b4b2cb25a095739abbc6ec96d3d19b4a4bf7ad8a88c3098435386f25bbf82cbc0109ff79be6a9
+AUX libSwell-makefile-cflags.patch 891 BLAKE2B 183683844184162cae7b01393900fc92e21a697de0832f57ffdaea7494f052d507ebeb0e5e941fd37ff2f9e5f887d954976ceb32d4cebbdf034e8336dbe14742 SHA512 62bdbd2e51c237b305ffa0ddb31c17dd6fca64cafb838fe1cfcb5496dc044ece124241e65f9aa66a25332ca1de6ba5d7f102cddf6749726080a0ba221988c127
+DIST WDL-d974e49ac5afb57be6329674e046649a4f30bce9.tar.gz 2468612 BLAKE2B f09ab35041ca5e774c7bdb1982ea1267bb73af9782b176304bf943642f9a487c2670960bb72a485093f8b2e09d6f5d9363a1476a9f6ca947f90f9137133ac1cf SHA512 f63cdec3ba957de77c6ff62a9b2d501ba43bfbadd814b6b59027bfddf918b35d109a748427269aedbad70c06e8d940df8ad8d67acca5f0586c32802c28843fab
+DIST reaper707_linux_aarch64.tar.xz 10872932 BLAKE2B 92c94de3be59eb1509472e63904eff1e2123e80618381545c9ef7673665c624ea83713f6b435adadd35c54e70210b468c79c9e75376d24c4272473e37d424d0e SHA512 1bff4e77e1c050f716cab23f5c6446524c08b91f8cd0b1c74de198b803e8c699fc3dd0145a8a9f195b0219b59acad592239700baef5ec66e29b8c317615681b4
+DIST reaper707_linux_armv7l.tar.xz 10527968 BLAKE2B fc4ef0a1ff5c336e05ef120d2f32f32de6c07ecc0652abb2aff756b1b96b63b098641dde29b8d7ac958b5f7e50b370076c1d171899a2342186507e14175ccd07 SHA512 9bd87c775a48b8d11cc1d9869dc78ea615c8cc5eeea615b12b58249940f2708de4b209b1af293a8728fcc574f1bc07e1cde89a3c370a6b0efee74940956a811a
+DIST reaper707_linux_i686.tar.xz 12150956 BLAKE2B 9b97f0d47ba17402ee67a74f0014c28da53f0f7c8b090416ee27babda1707493fbdcd5e33c749e42c14c959775af17ab885662941f3e76b3c84f5fd371e333a3 SHA512 70822d91b6a4728ad10a2d234692b7a21844b591a57a04784b2261591d22e3824b586dfc2e8e282fafba61a2dd5a1c155c7d000b6af74da059d7d9682ee1f690
+DIST reaper707_linux_x86_64.tar.xz 12146556 BLAKE2B 97287bec2abc801da2fab244b6b2b86854f1e6ef11c06d55c03d8fc48ae3299a946c2425e525eb57148eacf46f29d3d3f5f3dce47d74d1308c5a2b852b2991ea SHA512 d5e13584c409be97257098a882dd0ba79f9ff77ea8363f41aed16a2d5b21b35f7c9d9099fdece6523f509c1f1c93bdbad82a69203cbd9336099b8c648e5f717c
+EBUILD reaper-bin-7.07-r1.ebuild 4956 BLAKE2B 21342c8a2329fada7647938604e9cac6bb1d6b02a5ff2447f3940fc752a252993a585f97fc6f0fa00cb42ec9075898e0786d187159e081dc626c1ff03b3a74b3 SHA512 4a95ec0656596668aa7aace25862d4230f3f30347bebeec2ca81f0725fd03b2e68419dd4d418b58587ae08c76d79d6156e012fcea4c54697c7b4821893a8f02f
 MISC metadata.xml 353 BLAKE2B 554655f33e936a80aba4dad4fd3be66c44c3d6f1672f4f2f860ca6e6f4f3974d5e67ea9b1e7c0bfb674d4a64288a657dfd102919d2f19fa7e37b470454037a72 SHA512 7127a26ff66fbf7fd640234e4aa99f76ac9b9643ae25ff12a639e31ecd2b6066d06c6d481ad73b8787bd9b5b504a3ceda8cd3eb45d0a6bc5878208d4dce1e851
diff --git a/media-sound/reaper-bin/files/libSwell-makefile-cflags.patch b/media-sound/reaper-bin/files/libSwell-makefile-cflags.patch
new file mode 100644
index 000000000000..dd87a76756c8
--- /dev/null
+++ b/media-sound/reaper-bin/files/libSwell-makefile-cflags.patch
@@ -0,0 +1,31 @@
+diff -ru justinfrankel-WDL-d974e49/WDL/swell/Makefile justinfrankel-WDL-d974e49.new/WDL/swell/Makefile
+--- justinfrankel-WDL-d974e49/WDL/swell/Makefile	2023-12-10 17:12:41.000000000 +0100
++++ justinfrankel-WDL-d974e49.new/WDL/swell/Makefile	2023-12-12 19:42:19.161433462 +0100
+@@ -17,7 +17,7 @@
+ 
+ COMPILER=GCC
+ 
+-CFLAGS = -pipe -fvisibility=hidden -fno-math-errno -fPIC -DPIC -Wall -Wshadow -Wno-unused-function -Wno-multichar -Wtype-limits
++CFLAGS += -fvisibility=hidden -fno-math-errno -fPIC -DPIC -Wall -Wshadow -Wno-unused-function -Wno-multichar -Wtype-limits
+ 
+ CFLAGS += -DSWELL_MAKING_DYLIB
+ 
+@@ -63,16 +63,9 @@
+ 
+ 
+ ifdef DEBUG
+-CFLAGS += -O0 -g -D_DEBUG
++CFLAGS += -D_DEBUG
+ else
+-CFLAGS += -O2 -DNDEBUG
+-  ifdef DEBUG_INFO
+-    CFLAGS += -g
+-  else
+-    ifneq ($(COMPILER),CLANG)
+-      CFLAGS += -s
+-    endif
+-  endif
++CFLAGS += -DNDEBUG
+ endif
+ 
+ LINKEXTRA =  -lpthread -ldl 
diff --git a/media-sound/reaper-bin/reaper-bin-7.06.ebuild b/media-sound/reaper-bin/reaper-bin-7.07-r1.ebuild
index 349be01721e7..cdf5489d9c6e 100644
--- a/media-sound/reaper-bin/reaper-bin-7.06.ebuild
+++ b/media-sound/reaper-bin/reaper-bin-7.07-r1.ebuild
@@ -8,44 +8,59 @@ inherit desktop xdg
 DESCRIPTION="Digital audio workstation"
 HOMEPAGE="https://www.reaper.fm"
 
+WDL_COMMIT="d974e49ac5afb57be6329674e046649a4f30bce9"
+
 SRC_URI="
 	amd64? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(ver_cut 2))_linux_x86_64.tar.xz )
 	x86? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(ver_cut 2))_linux_i686.tar.xz )
 	arm64? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(ver_cut 2))_linux_aarch64.tar.xz )
 	arm? ( https://www.reaper.fm/files/$(ver_cut 1).x/reaper$(ver_cut 1)$(printf %02d $(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/fontconfig
 	media-libs/libglvnd
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11
-	x11-libs/libXi
 	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
+}
+
 QA_PREBUILT="*/*.so */reaper */reaper_host_*"
 
 src_install() {
-	local -A ARCH_MAP=(
-		[amd64]=x86_64
-		[x86]=i686
-		[arm64]=aarch64
-		[arm]=armv7l
-	)
-	cd "reaper_linux_${ARCH_MAP[$ARCH]}" || die
+	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