public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/chuck/, media-sound/chuck/files/
@ 2018-09-07 20:34 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2018-09-07 20:34 UTC (permalink / raw
  To: gentoo-commits

commit:     6264a78f9b7c0e5074e9357bba5f9b25cd383b8d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  5 21:27:28 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep  7 20:33:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6264a78f

media-sound/chuck: Drop 1.3.5.2

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-sound/chuck/Manifest                         |   1 -
 media-sound/chuck/chuck-1.3.5.2.ebuild             |  72 ----------
 .../chuck/files/chuck-1.2.1.1-hid-smc.patch        | 149 ---------------------
 .../chuck/files/chuck-1.3.5.1-makefile.patch       |  27 ----
 4 files changed, 249 deletions(-)

diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index db8b7944008..9fb583bc5d7 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,2 +1 @@
-DIST chuck-1.3.5.2.tgz 14687476 BLAKE2B 35c3803ba1291bbfedd31d7c2845d20e32af4e91ea77e0790f429465b98d6d3ff91e321f036e3c2294d900d746741d987ac3a231bd6db01e3edaab006d507c97 SHA512 00407b0f20fa9adcd9d0c31078ef7593f8a5b026f19086942c3fa56128fd07e202848651e5e8f41f1d70566de766e84f4a049ca4013e65a61b6f6fb10d69ffbc
 DIST chuck-1.4.0.0.tgz 14664130 BLAKE2B 2009cc3f6905c7e4361aefdbcc89cab08d21328c6fe8ea366aad32a862428a5ffb16d45b1717e849d174f52e104ff0394a0aa2f93cfceed066e7b393edaabb1e SHA512 198b3c08a79bbbd2c0cdd5d9a7a11b8b58f09e949a3f5dd3f330af7d80fdb2861ca53dce807df555aed6ba917e72001ef7147b62a3ada57c34154102388dece1

diff --git a/media-sound/chuck/chuck-1.3.5.2.ebuild b/media-sound/chuck/chuck-1.3.5.2.ebuild
deleted file mode 100644
index fd5abfa7224..00000000000
--- a/media-sound/chuck/chuck-1.3.5.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs flag-o-matic
-
-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? ( media-sound/jack-audio-connection-kit )"
-DEPEND="${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.1.1-hid-smc.patch
-	"${FILESDIR}"/${PN}-1.3.5.1-makefile.patch
-)
-
-compile_backend() {
-	backend=$1
-	pushd "${S}/src" &>/dev/null || die
-	einfo "Compiling against ${backend}"
-	emake CC=$(tc-getCC) CXX=$(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 DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
-	docinto doc
-	dodoc doc/*
-	if use examples; then
-		insinto /usr/share/doc/${PF}/
-		doins -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.2.1.1-hid-smc.patch b/media-sound/chuck/files/chuck-1.2.1.1-hid-smc.patch
deleted file mode 100644
index e5dcef9da81..00000000000
--- a/media-sound/chuck/files/chuck-1.2.1.1-hid-smc.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-diff -ru chuck-1.2.1.1~/src/util_hid.cpp chuck-1.2.1.1/src/util_hid.cpp
---- chuck-1.2.1.1~/src/util_hid.cpp	2008-03-29 23:24:21.000000000 +0100
-+++ chuck-1.2.1.1/src/util_hid.cpp	2008-03-29 23:24:54.000000000 +0100
-@@ -7175,14 +7175,139 @@
- int WiiRemote_send( const HidMsg * msg ){ return -1; }
- const char * WiiRemote_name( int wr ){ return NULL; }
- 
-+#define SYSFS_TILTSENSOR_FILE "/sys/devices/platform/applesmc/position"
-+#define TILTSENSOR_BUF_LEN 32
-+
-+static struct t_TiltSensor_data
-+{
-+	union
-+	{
-+		struct t_macbook
-+		{
-+			int x;
-+			int y;
-+			int z;
-+		} macbook;
-+	} data;
-+	int dataType;
-+	int detected;
-+	int refcount;
-+
-+	t_TiltSensor_data()
-+	{
-+		refcount = 0;
-+		dataType = -1;
-+		detected = 0;
-+	}
-+
-+} TiltSensor_data;
-+enum
-+{
-+	linuxAppleSMCMacBookDataType
-+};
-+static int TiltSensor_detect()
-+{
-+	int fd;
-+
-+	fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
-+
-+	if (fd > 0)
-+	{
-+		TiltSensor_data.dataType = linuxAppleSMCMacBookDataType;
-+		TiltSensor_data.detected = 1;
-+		close(fd);
-+		return 1;
-+	}
-+
-+	TiltSensor_data.detected = -1;
-+
-+	return 0;
-+}
-+
-+static int TiltSensor_do_read()
-+{
-+
-+	switch(TiltSensor_data.dataType)
-+	{
-+		case linuxAppleSMCMacBookDataType:
-+			char buf[TILTSENSOR_BUF_LEN];
-+			int ret, fd;
-+			fd = open(SYSFS_TILTSENSOR_FILE, O_RDONLY);
-+
-+			if (fd < 0) {
-+				return -1;
-+			}
-+			ret = read(fd, buf, TILTSENSOR_BUF_LEN);
-+			if (ret < 0) {
-+				close(fd);
-+				return -1;
-+			}
-+			if (sscanf(buf, "(%d,%d,%d)\n", &TiltSensor_data.data.macbook.x, &TiltSensor_data.data.macbook.y, &TiltSensor_data.data.macbook.z) != 3) {
-+				close(fd);
-+				return -1;
-+			}
-+			close(fd);
-+			break;
-+		default:
-+			return 0;
-+	}
-+	return 1;
-+}
- void TiltSensor_init(){}
- void TiltSensor_quit(){}
- void TiltSensor_probe(){}
--int TiltSensor_count(){ return 0; }
--int TiltSensor_open( int ts ){ return -1; }
--int TiltSensor_close( int ts ){ return -1; }
--int TiltSensor_read( int ts, int type, int num, HidMsg * msg ){ return -1; }
--const char * TiltSensor_name( int ts ){ return NULL; }
-+int TiltSensor_count()
-+{
-+	if(TiltSensor_data.detected == 0)
-+		TiltSensor_detect();
-+
-+	if(TiltSensor_data.detected == -1)
-+		return 0;
-+	else if(TiltSensor_data.detected == 1)
-+		return 1;
-+
-+	return 0;
-+}
-+int TiltSensor_open( int ts )
-+{
-+	if(TiltSensor_data.detected == 0)
-+		TiltSensor_detect();
-+
-+	if(TiltSensor_data.detected == -1)
-+		return -1;
-+
-+	TiltSensor_data.refcount++;
-+
-+	return 0;
-+}
-+int TiltSensor_close( int ts )
-+{
-+	TiltSensor_data.refcount--;
-+
-+	return 0;
-+}
-+int TiltSensor_read( int ts, int type, int num, HidMsg * msg )
-+{
-+
-+	if(TiltSensor_data.detected == -1)
-+		return -1;
-+
-+	if(!TiltSensor_do_read())
-+		return -1;
-+
-+	if(TiltSensor_data.dataType == linuxAppleSMCMacBookDataType)
-+	{
-+		msg->idata[0] = TiltSensor_data.data.macbook.x;
-+		msg->idata[1] = TiltSensor_data.data.macbook.y;
-+		msg->idata[2] = TiltSensor_data.data.macbook.z;
-+	}
-+
-+	return 0;
-+}
-+const char * TiltSensor_name( int ts )
-+{
-+	return "Apple Sudden Motion Sensor";
-+}
- 
- 
- #endif
-Only in chuck-1.2.1.1/src: util_hid.cpp.orig

diff --git a/media-sound/chuck/files/chuck-1.3.5.1-makefile.patch b/media-sound/chuck/files/chuck-1.3.5.1-makefile.patch
deleted file mode 100644
index e714d20e6b9..00000000000
--- a/media-sound/chuck/files/chuck-1.3.5.1-makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- chuck-1.3.5.1/src/makefile
-+++ chuck-1.3.5.1/src/makefile
-@@ -40,8 +40,6 @@
- 
- ifneq ($(CHUCK_DEBUG),)
- CFLAGS+= -g
--else
--CFLAGS+= -O3
- endif
- 
- ifneq ($(USE_64_BIT_SAMPLE),)
---- chuck-1.3.5.1/src/makefile.alsa
-+++ chuck-1.3.5.1/src/makefile.alsa
-@@ -1,4 +1,4 @@
- 
--CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
-+CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
- LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread
- 
---- chuck-1.3.5.1/src/makefile.jack
-+++ chuck-1.3.5.1/src/makefile.jack
-@@ -1,4 +1,4 @@
- 
--CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
-+CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
- LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread
- 


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/chuck/, media-sound/chuck/files/
@ 2022-06-21  4:33 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2022-06-21  4:33 UTC (permalink / raw
  To: gentoo-commits

commit:     cfbf63b4f3849bd447d93415f2b760d779fa9f16
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 04:33:34 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 04:33:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfbf63b4

media-sound/chuck: fixed hardcoded toolchain

Closes: https://bugs.gentoo.org/724756
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/chuck/chuck-1.4.1.1.ebuild             |  4 +-
 .../chuck/files/chuck-1.4.1.1-makefile.patch       | 50 ++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/media-sound/chuck/chuck-1.4.1.1.ebuild b/media-sound/chuck/chuck-1.4.1.1.ebuild
index 67ca0bc1a185..7f3e4f502a22 100644
--- a/media-sound/chuck/chuck-1.4.1.1.ebuild
+++ b/media-sound/chuck/chuck-1.4.1.1.ebuild
@@ -25,14 +25,14 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch
-	"${FILESDIR}"/${PN}-1.4.0.0-makefile.patch
+	"${FILESDIR}"/${P}-makefile.patch
 )
 
 compile_backend() {
 	backend=$1
 	pushd "${S}/src" &>/dev/null || die
 	einfo "Compiling against ${backend}"
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" linux-${backend}
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getCXX)" linux-${backend}
 	mv chuck{,-${backend}} || die
 	emake clean
 	popd &>/dev/null || die

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
new file mode 100644
index 000000000000..98147cf9a81f
--- /dev/null
+++ b/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch
@@ -0,0 +1,50 @@
+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 @@
+ 
+-CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
++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 @@
+ 
+-CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
++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
+ 
+ 
+ ########################### COMPILATION TOOLS ##################################
+-LEX=flex
+-YACC=bison
+-CC=gcc
+-CXX=g++
+-LD=g++
++LEX?=flex
++YACC?=bison
++CC?=gcc
++CXX?=g++
++LD?=g++
+ 
+ 
+ ############################# COMPILER FLAGS ###################################
+@@ -92,8 +92,6 @@ endif
+ 
+ ifneq ($(CHUCK_DEBUG),)
+ CFLAGS+= -g
+-else
+-CFLAGS+= -O3
+ endif
+ 
+ ifneq ($(USE_64_BIT_SAMPLE),)


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/chuck/, media-sound/chuck/files/
@ 2022-07-23  3:45 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2022-07-23  3:45 UTC (permalink / raw
  To: gentoo-commits

commit:     a7687a661b71ca5dd59fec1978361518b484cd0d
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 03:44:56 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 03:44:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7687a66

media-sound/chuck: removed obsolete 1.4.1.0

Bug: https://bugs.gentoo.org/859889
Closes: https://bugs.gentoo.org/713844
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/chuck/Manifest                         |  1 -
 media-sound/chuck/chuck-1.4.1.0.ebuild             | 70 ----------------------
 .../chuck/files/chuck-1.4.0.0-makefile.patch       | 27 ---------
 3 files changed, 98 deletions(-)

diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 362205da2e8c..9b7723431dea 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,2 +1 @@
-DIST chuck-1.4.1.0.tgz 14902696 BLAKE2B df324c793236fccc26f6604d1120dc1777cb2ffd8c95a8eff42e8963b9e7011aa88fb094145b4845821c39be781d77ac163cb02025db4fd6db7972f3c390fe65 SHA512 8967c1279959b6a41759519eace468fa4384cd0511c365cef91f8c03e8d720407637c2f9f33df6abd246b7c2155005e82d206113c90a4f23fb22b02f6f426704
 DIST chuck-1.4.1.1.tgz 14940362 BLAKE2B 21cd9d30d471c87e35e479dabede5a8ec5c9c8952a24636768aaabddd2bbd6fb00f45bf1394fc218a3fddd9c771473a7b52da779a9e89690cf0eb0ed2801c604 SHA512 8202c9275c6341f35f87fb5140b507936183f3365839f5ba240cd758b6e9b12138e4669ab37f84e218010b49cfcbed777352ba7b69e02b5efc3b800e1977a360

diff --git a/media-sound/chuck/chuck-1.4.1.0.ebuild b/media-sound/chuck/chuck-1.4.1.0.ebuild
deleted file mode 100644
index 21730ecc4a19..000000000000
--- a/media-sound/chuck/chuck-1.4.1.0.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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}
-	sys-devel/bison
-	sys-devel/flex"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch
-	"${FILESDIR}"/${PN}-1.4.0.0-makefile.patch
-)
-
-compile_backend() {
-	backend=$1
-	pushd "${S}/src" &>/dev/null || die
-	einfo "Compiling against ${backend}"
-	emake CC="$(tc-getCC)" CXX="$(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 DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO 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-makefile.patch b/media-sound/chuck/files/chuck-1.4.0.0-makefile.patch
deleted file mode 100644
index f8c6561a8141..000000000000
--- a/media-sound/chuck/files/chuck-1.4.0.0-makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- chuck-1.4.0.0/src/makefile
-+++ chuck-1.4.0.0/src/makefile
-@@ -40,8 +40,6 @@
- 
- ifneq ($(CHUCK_DEBUG),)
- CFLAGS+= -g
--else
--CFLAGS+= -O3
- endif
- 
- ifneq ($(USE_64_BIT_SAMPLE),)
---- chuck-1.4.0.0/src/core/makefile.x/makefile.alsa
-+++ chuck-1.4.0.0/src/core/makefile.x/makefile.alsa
-@@ -1,4 +1,4 @@
- 
--CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
-+CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
- LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread
- 
---- chuck-1.4.0.0/src/core/makefile.x/makefile.jack
-+++ chuck-1.4.0.0/src/core/makefile.x/makefile.jack
-@@ -1,4 +1,4 @@
- 
--CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
-+CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
- LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread
- 


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/chuck/, media-sound/chuck/files/
@ 2024-10-31 19:43 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2024-10-31 19:43 UTC (permalink / raw
  To: gentoo-commits

commit:     89268a0990c31627bf6c9ea4dce0d1434b871f24
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 19:43:20 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 19:43:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89268a09

media-sound/chuck: bump to 1.5.3.2 + scrubbed patches

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/chuck/Manifest                         |  1 +
 media-sound/chuck/chuck-1.5.3.2.ebuild             | 70 ++++++++++++++++++++++
 .../chuck/files/chuck-1.4.0.0-hid-smc.patch        |  1 -
 .../chuck/files/chuck-1.4.1.1-makefile.patch       |  6 --
 .../chuck/files/chuck-1.5.3.2-makefile.patch       | 32 ++++++++++
 5 files changed, 103 insertions(+), 7 deletions(-)

diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 9b7723431dea..1e7775c7b44e 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1 +1,2 @@
 DIST chuck-1.4.1.1.tgz 14940362 BLAKE2B 21cd9d30d471c87e35e479dabede5a8ec5c9c8952a24636768aaabddd2bbd6fb00f45bf1394fc218a3fddd9c771473a7b52da779a9e89690cf0eb0ed2801c604 SHA512 8202c9275c6341f35f87fb5140b507936183f3365839f5ba240cd758b6e9b12138e4669ab37f84e218010b49cfcbed777352ba7b69e02b5efc3b800e1977a360
+DIST chuck-1.5.3.2.tgz 22275903 BLAKE2B e59145cc0e1f347168cbeabcd9208768559bd6caef3fdc4de6a1adf93d696f425a4ae3e0a70a59db7346e4ea5ad01c374e16b2d94e3d47cef376fd6ac2bbabe0 SHA512 9a853b192c01f3eab40a2d368a372950eb377a713820628cef1bb7fdd5e71221940274ce6ad8e726cf0ecc0e24919451a70d751871d0166855619c6409020fb2

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?


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/chuck/, media-sound/chuck/files/
@ 2024-12-07 13:51 Miroslav Šulc
  0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2024-12-07 13:51 UTC (permalink / raw
  To: gentoo-commits

commit:     5d36d0a893bf214c02abc4c87ccd66ac3240f473
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  7 13:51:42 2024 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Dec  7 13:51:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d36d0a8

media-sound/chuck: dropped obsolete 1.4.1.1

Bug: https://bugs.gentoo.org/945951
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/chuck/Manifest                         |  1 -
 media-sound/chuck/chuck-1.4.1.1.ebuild             | 70 ----------------------
 .../chuck/files/chuck-1.4.1.1-makefile.patch       | 44 --------------
 3 files changed, 115 deletions(-)

diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index b34b5768d077..5fdb8d6d975c 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,4 +1,3 @@
-DIST chuck-1.4.1.1.tgz 14940362 BLAKE2B 21cd9d30d471c87e35e479dabede5a8ec5c9c8952a24636768aaabddd2bbd6fb00f45bf1394fc218a3fddd9c771473a7b52da779a9e89690cf0eb0ed2801c604 SHA512 8202c9275c6341f35f87fb5140b507936183f3365839f5ba240cd758b6e9b12138e4669ab37f84e218010b49cfcbed777352ba7b69e02b5efc3b800e1977a360
 DIST chuck-1.5.4.1.tgz 22311510 BLAKE2B adfc00bf7b5e828d5b5668b703919d4a4b9e7890a9a59c6d5d1caf2600c9638e14366d4d1fbd417d4fbffbc31003386212d30e1e22f47349c62c36a3b6c8dea4 SHA512 8d372a20c7c98273ac0941a0a59f8e91dbafc9ac290d2454aa23411b4eb515bc7ac12f9635d2f25e2cbf8faca52c67a6ea874bbae52ad24fd44544bd977693aa
 DIST chuck-1.5.4.2.tgz 22311827 BLAKE2B 1215211c837fa55c132742a9a4edef97446304fffb6a6e9f4de0d1da66c634c81398870fbd30ba864939f7e3a54bd0f2125bd6c4c9634edb51da43fa25fd05a9 SHA512 c4ce1e3e04d33fbd516f41eebfbc3b71399c587c0ea7b5d16b4d8a8fe5efb3e244ea0e8860f7331aa740f68f96f6b8f92d37104e6b71f0b6e0cb704acc14715b
 DIST chuck-1.5.4.3.tgz 22318954 BLAKE2B 83fffaa811fb9ba73f2000ea7a6d5e133c42964571340877a4080e2a6360ac3a7df8bda01a7c0a4acbdbe2f64d97310dbcff237d935b5598ba5ca0e1a312cd2f SHA512 a8324c7dcd5d031cc256d0a5e87d69ae728d008735c81d977911695ec9e93ff6e647cbc4ef36f7fabf84674c468fcaf7df3350f4898436267344f44f8e4089c7

diff --git a/media-sound/chuck/chuck-1.4.1.1.ebuild b/media-sound/chuck/chuck-1.4.1.1.ebuild
deleted file mode 100644
index bb23fdb89930..000000000000
--- a/media-sound/chuck/chuck-1.4.1.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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}"/${P}-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 DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO 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.1.1-makefile.patch b/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch
deleted file mode 100644
index b5dc2f994386..000000000000
--- a/media-sound/chuck/files/chuck-1.4.1.1-makefile.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/src/core/makefile.x/makefile.alsa
-+++ b/src/core/makefile.x/makefile.alsa
-@@ -1,4 +1,4 @@
- 
--CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
-+CFLAGS+= -D__LINUX_ALSA__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
- LDFLAGS+= -lasound -lstdc++ -ldl -lm -lsndfile -lpthread
- 
---- a/src/core/makefile.x/makefile.jack
-+++ b/src/core/makefile.x/makefile.jack
-@@ -1,4 +1,4 @@
- 
--CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -O3 -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__
-+CFLAGS+= -D__UNIX_JACK__ -D__PLATFORM_LINUX__ -fno-strict-aliasing -D__CK_SNDFILE_NATIVE__ -fPIC
- LDFLAGS+= -lasound -ljack -lstdc++ -ldl -lm -lsndfile -lpthread
- 
---- a/src/makefile
-+++ b/src/makefile
-@@ -76,11 +76,11 @@ CK_VERSION=1.4.1.1
- 
- 
- ########################### COMPILATION TOOLS ##################################
--LEX=flex
--YACC=bison
--CC=gcc
--CXX=g++
--LD=g++
-+LEX?=flex
-+YACC?=bison
-+CC?=gcc
-+CXX?=g++
-+LD?=g++
- 
- 
- ############################# COMPILER FLAGS ###################################
-@@ -92,8 +92,6 @@ endif
- 
- ifneq ($(CHUCK_DEBUG),)
- CFLAGS+= -g
--else
--CFLAGS+= -O3
- endif
- 
- ifneq ($(USE_64_BIT_SAMPLE),)


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-12-07 13:52 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-07 20:34 [gentoo-commits] repo/gentoo:master commit in: media-sound/chuck/, media-sound/chuck/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2022-06-21  4:33 Miroslav Šulc
2022-07-23  3:45 Miroslav Šulc
2024-10-31 19:43 Miroslav Šulc
2024-12-07 13:51 Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox