media-sound/alsa-scarlett-gui: add 0.3.3, drop 0.3.2.0.0.20231129

Signed-off-by: Jason A. Donenfeld <zx2c4@gentoo.org>

3 files changed, 36 insertions, 4 deletions

diff --git a/media-sound/alsa-scarlett-gui/Manifest b/media-sound/alsa-scarlett-gui/Manifest
index 75e16480604d..dbd80f4f96f5 100644
--- a/media-sound/alsa-scarlett-gui/Manifest
+++ b/media-sound/alsa-scarlett-gui/Manifest
@@ -1 +1 @@
-DIST alsa-scarlett-gui-0.3.2.0.0.20231129.tar.gz 3113572 BLAKE2B 3af6bb7a6e1415285e070e5fde414b1456a1da94c65b88bd058d7cad693417e1f7114664bc386c6652ce6956b71064ec41c754942257811383c0953fe6b4f807 SHA512 4f6c99ee318cee218bb1235fe844f754787985ab44c4e24c73c21e0e8ee7a75e6da1423f7e3f577c2303394f7993d0757928b3e3c3f031f01cdb01816c153dbd
+DIST alsa-scarlett-gui-0.3.3.tar.gz 3113190 BLAKE2B 16128c8795c4a4ebd9d711f64dad1dd0e38ba17e34a50d17cf43b8ce454409ee2a5bc817120d5b421b367d3f1e5ef0f9f7868fb1109af6edb8d820579cad7b14 SHA512 38b0e8cb0bb1d9039463d7635ee81ad1ae477628b885f5f1f3601c163369ff59c7effbba140fb761b26dca7cf9c0f6b5a3f8db0b68a8c604078fe8f08cea082f
diff --git a/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.3.2.0.0.20231129.ebuild b/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.3.3.ebuild
index c29ec55d0c5b..1ff6d2f932c1 100644
--- a/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.3.2.0.0.20231129.ebuild
+++ b/media-sound/alsa-scarlett-gui/alsa-scarlett-gui-0.3.3.ebuild
@@ -5,8 +5,7 @@ EAPI=8
 
 DESCRIPTION="A UI for Focusrite Scarlett and Clarett audio interfaces"
 HOMEPAGE="https://github.com/geoffreybennett/alsa-scarlett-gui"
-MY_PV="32c00623676e70572195ef28fd01ab8409b82541"
-SRC_URI="https://github.com/geoffreybennett/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/geoffreybennett/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -20,6 +19,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${MY_PV}/src"
+PATCHES=( "${FILESDIR}"/"${P}"-cflags.patch )
+MAKEOPTS="-C src"
 
 export PREFIX="/usr"
diff --git a/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.3.3-cflags.patch b/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.3.3-cflags.patch
new file mode 100644
index 000000000000..696df40d6269
--- /dev/null
+++ b/media-sound/alsa-scarlett-gui/files/alsa-scarlett-gui-0.3.3-cflags.patch
@@ -0,0 +1,32 @@
+From 00c84902e508c20c61b003a64f772cfe82f18d43 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Fri, 1 Dec 2023 04:39:56 +0100
+Subject: [PATCH] Makefile: prefer distro cflags if specified
+
+The compilation flags that are necessary for building and part of the
+developer's intentions belong in the `+=` section, but the base flags
+that distros like to override belong in a `?=` section, so that build
+systems using their own are respected.
+
+Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
+---
+ src/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 2c9d51b..bba8d42 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -12,7 +12,8 @@ VERSION := $(shell \
+ DEPDIR := .deps
+ DEPFLAGS = -MT $@ -MMD -MP -MF $(DEPDIR)/$*.d
+ 
+-CFLAGS += -Wall -Werror -ggdb -fno-omit-frame-pointer -O2 -D_FORTIFY_SOURCE=2
++CFLAGS ?= -ggdb -fno-omit-frame-pointer -O2
++CFLAGS += -Wall -Werror -D_FORTIFY_SOURCE=2
+ CFLAGS += -DVERSION=\"$(VERSION)\"
+ CFLAGS += -Wno-error=deprecated-declarations
+ 
+-- 
+2.42.0
+