gentoo auto-resync : 01:11:2024 - 03:04:33

5 files changed, 107 insertions, 9 deletions

diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 2dfdc05fd695..c7fe4986df91 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,5 +1,8 @@
-AUX chuck-1.4.0.0-hid-smc.patch 2937 BLAKE2B 5bc65ffc74409860218983635501c319f4a69448e93340671ad252cd4bb5edd3d4765aa196b3618d7af37897aff40267e7d8538672560dc4de9650a12a5964b6 SHA512 09b04441e9bbd11a15e798878b79010598dd97513a64f6df21e5ed066147382d6021a496e1d1a33b2268d04caa972a1a94afe48c44a226439e3334da35f47be0
-AUX chuck-1.4.1.1-makefile.patch 1482 BLAKE2B 42e88771eebc224b217ce51dc0d127609b157874f81b23cbc641e0437a37a1ebc17d8977e068deb21db5660a1bb5b4ab349370c69a5ba253ac2260885b6561a9 SHA512 b11d263a26cea372ab93212805592e260ef4626b8513758b1b78f678623eb0da1826236d36c15af75129962e8735ead2aa31836f87dd3ee6c4388e99e7ddd7a1
+AUX chuck-1.4.0.0-hid-smc.patch 2887 BLAKE2B e02129a2f3e550fa383a691a3e55870d152c89386703e01d134ef345efadadcccf190d07b191f096995b9df2f27e85ccc3e26cb7e73052432c44e43bf82c8d5a SHA512 fb15c2c5e0cfe1e8326c71fe11a72bd3d04996890e7a466111d0360e6f8050408c7ba61f23ab57ae8d3d21fa009ac3afbba002b63819c321d6a55e83e000fe0a
+AUX chuck-1.4.1.1-makefile.patch 1185 BLAKE2B 25ab9eadab5e3ddf5369cc0b44f66d3a37010b0dab35251cafd6b663ef8382e699b05cf32d0771e7292c4019b9b3326774e7b081208123b73c592424e46b6b6f SHA512 3e2253fdb32a0eca92e2a8555d4d49f252b1a512d7ba8eb4ef7c9a68e51b4260529e5988f7cab53fabdb11198c710211734e1bec44688bc0315754c825a7b473
+AUX chuck-1.5.3.2-makefile.patch 567 BLAKE2B e860079107526b090d592fadf0652dd26b29139cb081eaf43071544ac6f23cde2ddc50db59b57370b09aad19fc595b12b75341908716a0faf13ebedf0c437da0 SHA512 363dce64af8dded1115473d5268f69a0a4a391a0825a1f0811d8f490ec6181118b6f34af5934ffcd02a5ac9459faee1aef3ff4a2e06b0291bae473173dba99cf
 DIST chuck-1.4.1.1.tgz 14940362 BLAKE2B 21cd9d30d471c87e35e479dabede5a8ec5c9c8952a24636768aaabddd2bbd6fb00f45bf1394fc218a3fddd9c771473a7b52da779a9e89690cf0eb0ed2801c604 SHA512 8202c9275c6341f35f87fb5140b507936183f3365839f5ba240cd758b6e9b12138e4669ab37f84e218010b49cfcbed777352ba7b69e02b5efc3b800e1977a360
+DIST chuck-1.5.3.2.tgz 22275903 BLAKE2B e59145cc0e1f347168cbeabcd9208768559bd6caef3fdc4de6a1adf93d696f425a4ae3e0a70a59db7346e4ea5ad01c374e16b2d94e3d47cef376fd6ac2bbabe0 SHA512 9a853b192c01f3eab40a2d368a372950eb377a713820628cef1bb7fdd5e71221940274ce6ad8e726cf0ecc0e24919451a70d751871d0166855619c6409020fb2
 EBUILD chuck-1.4.1.1.ebuild 1856 BLAKE2B 3ac1450b0a819d7d2c4a7e3daf0f3eec0b24bf5671813ccaac0b31792c8091898a60c39354037f0840c0d988b4cfd1eb5ee172074a66ab354d030db576523f1e SHA512 3c7edb4e92c43fb7ebe9d2ff8fa105423e5b7e62839cedecd8ab8e20408726628b8611627ce97e211387f44a5eda7e0519842c53592f09825108567f34b61c12
+EBUILD chuck-1.5.3.2.ebuild 1855 BLAKE2B 0cd25e5032ce928c1bff8969d383a14722275667ed03b10c57c70726b57347263ade552ac558a4699af82bf812f19928e2d1aa5d32fe67bfd2c24b01b2f432e6 SHA512 1e0faac1cc0ba109609fdc27c14bd40e18e92797e7d764104fbf66bccaf1265590aa4b14873a7811b18ce9923c0a16cd0cf78e68de7c6fca3c9e31f2f5f26684
 MISC metadata.xml 968 BLAKE2B 5f7c72834133fedc3ffb54f563dc80552668484628029f8d205444cd69f89f91081ed6a71aae4d542dae09bcfc729ad88c6701df450313275e6d1c1f522fd7a6 SHA512 c548e0d3c701497e696626f46c010aea9a90bb1b52bd5f2e1ebe0f4189b171dc21c0848b90a6a23cc44ae2ba5e98d8671529fe6b14c957ad73202191c2915c0f
diff --git a/media-sound/chuck/chuck-1.5.3.2.ebuild b/media-sound/chuck/chuck-1.5.3.2.ebuild
new file mode 100644
index 000000000000..70115f4d5785
--- /dev/null
+++ b/media-sound/chuck/chuck-1.5.3.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language"
+HOMEPAGE="http://chuck.cs.princeton.edu/"
+SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack examples"
+REQUIRED_USE="|| ( alsa jack )"
+
+RDEPEND="app-eselect/eselect-chuck
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}
+	app-alternatives/yacc
+	app-alternatives/lex"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch
+	"${FILESDIR}"/${PN}-1.5.3.2-makefile.patch
+)
+
+compile_backend() {
+	backend=$1
+	pushd "${S}/src" &>/dev/null || die
+	einfo "Compiling against ${backend}"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" linux-${backend}
+	mv chuck{,-${backend}} || die
+	emake clean
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	# when compile with athlon or athlon-xp flags
+	# chuck crashes on removing a shred with a double free or corruption
+	# it happens in Chuck_VM_Stack::shutdown() on the line
+	#   SAFE_DELETE_ARRAY( stack );
+	replace-cpu-flags athlon athlon-xp i686
+
+	use jack && compile_backend jack
+	use alsa && compile_backend alsa
+}
+
+src_install() {
+	use jack && dobin src/chuck-jack
+	use alsa && dobin src/chuck-alsa
+
+	dodoc AUTHORS DEVELOPERS QUICKSTART README.md THANKS VERSIONS
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Chuck now can use multiple audio engines, so you can specify"
+		elog "the preferred audio engine with chuck-{jack,alsa}"
+		elog "Or you can use 'eselect chuck' to set the audio engine"
+	fi
+	eselect chuck update --if-unset
+}
diff --git a/media-sound/chuck/files/chuck-1.4.0.0-hid-smc.patch b/media-sound/chuck/files/chuck-1.4.0.0-hid-smc.patch
index 0f608f579953..12f0091fd04c 100644
--- a/media-sound/chuck/files/chuck-1.4.0.0-hid-smc.patch
+++ b/media-sound/chuck/files/chuck-1.4.0.0-hid-smc.patch
@@ -145,4 +145,3 @@
  
  
  #endif
-Only in chuck-1.4.0.0/src/core: util_hid.cpp.orig
diff --git a/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch b/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch
index 98147cf9a81f..b5dc2f994386 100644
--- a/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch
+++ b/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch
@@ -1,5 +1,3 @@
-diff --git a/src/core/makefile.x/makefile.alsa b/src/core/makefile.x/makefile.alsa
-index 5694257..577dd91 100644
 --- a/src/core/makefile.x/makefile.alsa
 +++ b/src/core/makefile.x/makefile.alsa
 @@ -1,4 +1,4 @@
@@ -8,8 +6,6 @@ index 5694257..577dd91 100644
 +CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
  LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread
  
-diff --git a/src/core/makefile.x/makefile.jack b/src/core/makefile.x/makefile.jack
-index 86b2511..442708b 100644
 --- a/src/core/makefile.x/makefile.jack
 +++ b/src/core/makefile.x/makefile.jack
 @@ -1,4 +1,4 @@
@@ -18,8 +14,6 @@ index 86b2511..442708b 100644
 +CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
  LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread
  
-diff --git a/src/makefile b/src/makefile
-index f52f0c2..310991a 100644
 --- a/src/makefile
 +++ b/src/makefile
 @@ -76,11 +76,11 @@ CK_VERSION=1.4.1.1
diff --git a/media-sound/chuck/files/chuck-1.5.3.2-makefile.patch b/media-sound/chuck/files/chuck-1.5.3.2-makefile.patch
new file mode 100644
index 000000000000..3a4e041bb8a5
--- /dev/null
+++ b/media-sound/chuck/files/chuck-1.5.3.2-makefile.patch
@@ -0,0 +1,32 @@
+--- a/src/makefile
++++ b/src/makefile
+@@ -90,15 +90,15 @@ win32:
+ 
+ ########################### COMPILATION TOOLS #################################
+ # lexer
+-LEX=flex
++LEX?=flex
+ # parser
+-YACC=bison
++YACC?=bison
+ # c compiler
+-CC=gcc
++CC?=gcc
+ # c++ compiler
+-CXX=g++
++CXX?=g++
+ # linker
+-LD=$(CXX)
++LD?=$(CXX)
+ 
+ 
+ ############################# COMPILER FLAGS ##################################
+@@ -113,8 +113,6 @@ endif
+ # enable chuck debug macros?
+ ifneq ($(CHUCK_DEBUG),)
+ CFLAGS+= -g -D__CHUCK_DEBUG__
+-else
+-CFLAGS+= -O3
+ endif
+ 
+ # use 64-bit audio samples?