gentoo auto-resync : 14:01:2024 - 13:14:55

5 files changed, 74 insertions, 6 deletions

diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index bb3a57038433..e461674f3490 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,5 +1,8 @@
-AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
-AUX din-55-makefile.patch 564 BLAKE2B fb483ef0182b5bed5131a2915204c1a564ac31acef1faaa780804a46f3d23717d3af8222702b3d6846fdccf2a7370546d6f586add8a42a3fa2bff130b9c9b9f7 SHA512 e37d9bdec42df1abff6be2ffe80d4b46838d451e015a0d557f387922dddd54718733353e7f5cb198bf4d56b45754a933657a182b8420b81770fc5e2435719b6d
+AUX din-48-fix-random-constants.patch 596 BLAKE2B ce3cbe6a34c15fc18dc7f91607833b3292188be1594eda141f6d42c7d5b89fcc637933ce1b3aa1e4fe84ec0da4433116de9794d0a833f13e3d8b62ae74996f66 SHA512 f94f98ea97698cf9b385ac9e8556a6235f2d8799117d575596534d4bdfbe078002bb947965d818d51596204b8f03ee14bf8b2e1d69a1e4ceb59ed69a7332116b
+AUX din-55-makefile.patch 487 BLAKE2B bccf6518c6e07ff13a6f51a75f4b3c5cc0ce38fb60c311b4cc420be96564d9312c3e97606cb39e56778640cd602c77dea3f3b8114dd06a8a1e1be152e24d69d9 SHA512 ec4a7da6f922475cf238546df74769dd4e1aad66207c85895d8abc2d7b514298fbd8a43bce3c47933232e54d00631ab9ce0579638ea220b97c7de9b2685ace08
+AUX din-58.1-makefile.patch 453 BLAKE2B 0fec0a3ccad87af423e2b708358f8be913461d329328fc0f63d003ecc731bcb579d1b7f4941a5667b287fe8d5bd3e69220b2b70e2ecf3e7045c3c8717cbd9edb SHA512 c7b8aae35710311ce6b0a146592c90dc6279a8ab4089c9cfa82d79b079ee701a20956ae883bdfe9ccd7a6012e3644f796ee2f9988d9c969dc131f3bcaa6b2fd7
 DIST din-57.tar.gz 3693381 BLAKE2B b9e56c067830f3e164ac6e3e2d7a189569d5abf25ca3281491ad3ed29155a6e85fef5d7d4336d918104df3a8156f60c61294856665e775a8ef3c593bd17f08b7 SHA512 03dfa45fb8c58f3f8dc739ec3c4c31029c544d9f0b1cf3dbae61643e5accd951ad65ebf19c078bfb1d30d3a8ccea7ffec2f1cb44f38bab1b07cfd2071361590c
+DIST din-58.1.tar.gz 3689591 BLAKE2B 2ccb48fed8aa16edb53cf6643b63a842c28cd700621d2273a94913ab7a6ae8b50da72c3509a8b9b6189fcd4beaa5afbfa3a92430acb18c4cc9a7cfb057209c29 SHA512 ee2d63309347167af3b4e41a0ad3ce1faad727a4e079cd9e63d402b680144aed81dbee9d38bc517acbb30a1c9af18b726841d0c94d96cbfb2b1581da98af21c1
 EBUILD din-57.ebuild 1087 BLAKE2B 300260c74a6720e91dbadff855669dc4fa7325b6fd3a0d28ed528bba528b62fb69510ff11ede9b79d722330fdbf3037573401b7089fc5bb12655c1f0a12fc8b3 SHA512 3b397eca6e68d7948aa4b4d17efccb5f25790dded0605fb733545fc76afd93fb476824475b8816916d282d732098e1cb5c00f10a052e5fdb18bddc8d2eafffe3
+EBUILD din-58.1.ebuild 1091 BLAKE2B c994f48cba93b448fe9b98efde662ff8cad66127b2dc86a9181624147bbfcf61b261d6f139b4bd3bcaecbc9df3ed4a660c13c144e0e35dd156b8b5f7ddb8add5 SHA512 dc738e04ff3d568b30bf1b466179f57ffada3b6f3dae518a672469b7351dea607f6ad21609fcf6395fcabfac224b5f825a38d53c80a4ae825416c7edd3b053bc
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-58.1.ebuild b/media-sound/din/din-58.1.ebuild
new file mode 100644
index 000000000000..96e21a3778e0
--- /dev/null
+++ b/media-sound/din/din-58.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools edos2unix xdg
+
+DESCRIPTION="a software musical instrument and audio synthesizer"
+HOMEPAGE="https://dinisnoise.org/"
+SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack"
+
+RDEPEND="
+	dev-lang/tcl:0=
+	media-libs/libsdl:=
+	virtual/glu
+	virtual/opengl
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="|| ( alsa jack )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-58.1-makefile.patch"
+	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
+)
+
+src_prepare() {
+	default
+
+	edos2unix pixmaps/${PN}.desktop
+
+	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
+
+	eautoreconf
+}
+
+src_configure() {
+	# Jack takes over alsa.
+	local sound_engine
+
+	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
+
+	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
+}
diff --git a/media-sound/din/files/din-48-fix-random-constants.patch b/media-sound/din/files/din-48-fix-random-constants.patch
index 8e60204ad429..aef491fe5709 100644
--- a/media-sound/din/files/din-48-fix-random-constants.patch
+++ b/media-sound/din/files/din-48-fix-random-constants.patch
@@ -1,5 +1,3 @@
-diff --git a/src/random.h b/src/random.h
-index d5a2bc6..38f0d14 100644
 --- a/src/random.h
 +++ b/src/random.h
 @@ -16,8 +16,8 @@
diff --git a/media-sound/din/files/din-55-makefile.patch b/media-sound/din/files/din-55-makefile.patch
index 5ce81bd0c1f8..9466a35e5a02 100644
--- a/media-sound/din/files/din-55-makefile.patch
+++ b/media-sound/din/files/din-55-makefile.patch
@@ -1,5 +1,3 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 1c54f03..db187eb 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
 @@ -1,7 +1,7 @@
diff --git a/media-sound/din/files/din-58.1-makefile.patch b/media-sound/din/files/din-58.1-makefile.patch
new file mode 100644
index 000000000000..37e24b966eec
--- /dev/null
+++ b/media-sound/din/files/din-58.1-makefile.patch
@@ -0,0 +1,12 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,7 +1,7 @@
+ #dinincludedir = $(pkgsrcdir)
+ 
+-AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -DPREFIX=\"@prefix@\"
+-LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
++AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D__SVG__ -D__GPL20__ -DPREFIX=\"@prefix@\"
++LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
+ 
+ bin_PROGRAMS = din
+