Fix building with >= GCC 4.x, bug 153363. Thanks to Maximilian Grothusmann for patch, and Evil Compile Person for reporting.

Package-Manager: portage-2.1.3

5 files changed, 205 insertions, 15 deletions

diff --git a/media-sound/supercollider/ChangeLog b/media-sound/supercollider/ChangeLog
index 826723dd6f29..25fd245e181c 100644
--- a/media-sound/supercollider/ChangeLog
+++ b/media-sound/supercollider/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/supercollider
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/supercollider/ChangeLog,v 1.8 2007/05/01 00:26:46 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/supercollider/ChangeLog,v 1.9 2007/07/29 13:22:35 drac Exp $
+
+*supercollider-20040903-r1 (29 Jul 2007)
+
+  29 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/supercollider-20040903-gcc4.patch,
+  +supercollider-20040903-r1.ebuild:
+  Fix building with >= GCC 4.x, bug 153363. Thanks to Maximilian Grothusmann
+  for patch, and Evil Compile Person for reporting.
 
   01 May 2007; Marius Mauch <genone@gentoo.org>
   supercollider-20040903.ebuild:
diff --git a/media-sound/supercollider/Manifest b/media-sound/supercollider/Manifest
index 5294d91bebbb..2ddfb7fffda4 100644
--- a/media-sound/supercollider/Manifest
+++ b/media-sound/supercollider/Manifest
@@ -1,19 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX README-gentoo.txt 3246 RMD160 aabc84efe4d78e18d7a25ad65000f6d240835ce4 SHA1 2e2ce03562f30c08e645a81695bdb97379a023b4 SHA256 6f4ee95ecfe6cb2a19084e6c20c4fef71612d98bb698c7b11745d353e87d8edd
 MD5 e0d010a09ea7addae1972ed480078139 files/README-gentoo.txt 3246
 RMD160 aabc84efe4d78e18d7a25ad65000f6d240835ce4 files/README-gentoo.txt 3246
 SHA256 6f4ee95ecfe6cb2a19084e6c20c4fef71612d98bb698c7b11745d353e87d8edd files/README-gentoo.txt 3246
+AUX supercollider-20040903-gcc4.patch 1352 RMD160 2cd7a7163af3b0f85346817029e69215e95a1f29 SHA1 31b9490a9df88240966213d596238dbd163b400f SHA256 9c3eb05de85e09f066554abef51fb87252681c48b2ae811f98b0f6b69612914b
+MD5 0bfe73761aef17e9af72f9ef6016f8c4 files/supercollider-20040903-gcc4.patch 1352
+RMD160 2cd7a7163af3b0f85346817029e69215e95a1f29 files/supercollider-20040903-gcc4.patch 1352
+SHA256 9c3eb05de85e09f066554abef51fb87252681c48b2ae811f98b0f6b69612914b files/supercollider-20040903-gcc4.patch 1352
 DIST supercollider-20040903.tgz 2381742 RMD160 305ce210ddcf34b601d35730b944a6fbb71a0691 SHA1 554c6715401673928d119f838ac8bfce3611115f SHA256 342b10d454a9d06822bd0928728951bc824e3531dc60c4990905a74cf097a70e
+EBUILD supercollider-20040903-r1.ebuild 3039 RMD160 9aee7fcab5fedeab8d5d059c2606e1ffc5e2d135 SHA1 1b7593edc3805da31d74154d610cdc78a2e7e985 SHA256 11e23450aa50b43fb0f788e1ef119bc442908d061154589d20181897aca77f02
+MD5 71b9363579b9f915ed5a280df8887925 supercollider-20040903-r1.ebuild 3039
+RMD160 9aee7fcab5fedeab8d5d059c2606e1ffc5e2d135 supercollider-20040903-r1.ebuild 3039
+SHA256 11e23450aa50b43fb0f788e1ef119bc442908d061154589d20181897aca77f02 supercollider-20040903-r1.ebuild 3039
 EBUILD supercollider-20040903.ebuild 2929 RMD160 149c1a98e2c795e331654d429bfcf3edbee99975 SHA1 8b9bf57ea02d1105f3d2fce308bad782e8ed959d SHA256 230e8b551b3ef48ea9d32301c822636457eab6c30250c3d7e5ecc95955cb3e63
 MD5 2c304637a67e4498d8922d4c128f3480 supercollider-20040903.ebuild 2929
 RMD160 149c1a98e2c795e331654d429bfcf3edbee99975 supercollider-20040903.ebuild 2929
 SHA256 230e8b551b3ef48ea9d32301c822636457eab6c30250c3d7e5ecc95955cb3e63 supercollider-20040903.ebuild 2929
-MISC ChangeLog 1247 RMD160 6ac4c42f76dd4c308f93aa38d9d6c3e63d3844b4 SHA1 6931b1246a854679f0f47c024851109420abb7af SHA256 cf29ff5e97e0248ff3b8ae0bfdbd804a4ac3d1d106083246eb2ac007b08a9bc9
-MD5 8f38161d8ed7728f959a19e1ee70e273 ChangeLog 1247
-RMD160 6ac4c42f76dd4c308f93aa38d9d6c3e63d3844b4 ChangeLog 1247
-SHA256 cf29ff5e97e0248ff3b8ae0bfdbd804a4ac3d1d106083246eb2ac007b08a9bc9 ChangeLog 1247
+MISC ChangeLog 1547 RMD160 94eb37a954afea59f848adf8052274a0065e8240 SHA1 d7173345abd44dafae22acd2e26ca6e45d3ea569 SHA256 72b40a29a162e527aebca9068482410bce06dd9b5e1168a18a3e5561bc276a84
+MD5 64244b30e6917cb132d4654d798d58ce ChangeLog 1547
+RMD160 94eb37a954afea59f848adf8052274a0065e8240 ChangeLog 1547
+SHA256 72b40a29a162e527aebca9068482410bce06dd9b5e1168a18a3e5561bc276a84 ChangeLog 1547
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -21,10 +26,6 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 65472a99076ef1d81201dcf3d87b6d9d files/digest-supercollider-20040903 262
 RMD160 b56df9dc794f779eab2ed0718846ef5958c567c5 files/digest-supercollider-20040903 262
 SHA256 03e14877cc25d81426052ecd4d6c7c4e56f65c05708d713d17bba7f6e97d8d50 files/digest-supercollider-20040903 262
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFGNomK6J2i8a8J4okRAggLAKDXY0sCz97UkjDjdoy8qF/2i56TAwCdEe6A
-U5FAjT6cQufMnrOf7MkSRD8=
-=Jk3/
------END PGP SIGNATURE-----
+MD5 65472a99076ef1d81201dcf3d87b6d9d files/digest-supercollider-20040903-r1 262
+RMD160 b56df9dc794f779eab2ed0718846ef5958c567c5 files/digest-supercollider-20040903-r1 262
+SHA256 03e14877cc25d81426052ecd4d6c7c4e56f65c05708d713d17bba7f6e97d8d50 files/digest-supercollider-20040903-r1 262
diff --git a/media-sound/supercollider/files/digest-supercollider-20040903-r1 b/media-sound/supercollider/files/digest-supercollider-20040903-r1
new file mode 100644
index 000000000000..72caae3cb2f0
--- /dev/null
+++ b/media-sound/supercollider/files/digest-supercollider-20040903-r1
@@ -0,0 +1,3 @@
+MD5 f148a95bbe4207d0768c91330ffa2493 supercollider-20040903.tgz 2381742
+RMD160 305ce210ddcf34b601d35730b944a6fbb71a0691 supercollider-20040903.tgz 2381742
+SHA256 342b10d454a9d06822bd0928728951bc824e3531dc60c4990905a74cf097a70e supercollider-20040903.tgz 2381742
diff --git a/media-sound/supercollider/files/supercollider-20040903-gcc4.patch b/media-sound/supercollider/files/supercollider-20040903-gcc4.patch
new file mode 100644
index 000000000000..a3394234420c
--- /dev/null
+++ b/media-sound/supercollider/files/supercollider-20040903-gcc4.patch
@@ -0,0 +1,66 @@
+--- a/headers/lang/ReadWriteMacros.h
++++ b/headers/lang/ReadWriteMacros.h
+@@ -289,43 +289,52 @@ public:
+ 
+ 
+ // core routines
++template <>
+ inline void SC_IOStream<FILE*>::readData(char *data, int size)
+ {
+     fread(data, 1, size, s);
+ }
+ 
++template <>
+ inline uint8 SC_IOStream<FILE*>::readUInt8()
+ {
+     return (uint8)fgetc(s);
+ }
+ 
++template <>
+ inline void SC_IOStream<FILE*>::writeData(char *data, int size)
+ {
+     fwrite(data, 1, size, s);
+ }
+ 
++template <>
+ inline void SC_IOStream<FILE*>::writeUInt8(uint8 inInt)
+ {
+     fputc(inInt, s);
+ }
+ 
+ // core routines
++template <>
+ inline void SC_IOStream<char*>::readData(char *data, int size)
+ {
+     memcpy(data, s, size);
+     s += size;
+ }
++
++template <>
+ inline uint8 SC_IOStream<char*>::readUInt8()
+ {
+     return (uint8)*s++;
+ }
+ 
++template <>
+ inline void SC_IOStream<char*>::writeData(char *data, int size)
+ {
+     memcpy(s, data, size);
+         s += size;
+ }
+ 
++template <>
+ inline void SC_IOStream<char*>::writeUInt8(uint8 inInt)
+ {
+     *s++ = (inInt & 255);
+--- a/source/lang/LangSource/SC_LanguageClient.cpp
++++ b/source/lang/LangSource/SC_LanguageClient.cpp
+@@ -105,7 +105,7 @@ void SC_LanguageClient::compileLibrary()
+ 	::compileLibrary();
+ }
+ 
+-extern void ::shutdownLibrary();
++extern void shutdownLibrary();
+ void SC_LanguageClient::shutdownLibrary()
+ {
+ 	::shutdownLibrary();
diff --git a/media-sound/supercollider/supercollider-20040903-r1.ebuild b/media-sound/supercollider/supercollider-20040903-r1.ebuild
new file mode 100644
index 000000000000..78efc6cce553
--- /dev/null
+++ b/media-sound/supercollider/supercollider-20040903-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/supercollider/supercollider-20040903-r1.ebuild,v 1.1 2007/07/29 13:22:35 drac Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A real time audio synthesis programming language"
+HOMEPAGE="http://www.audiosynth.com"
+SRC_URI="mirror://gentoo/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc ~x86"
+IUSE="emacs"
+
+RDEPEND="media-sound/jack-audio-connection-kit
+	 media-libs/alsa-lib
+	 media-libs/libsndfile"
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+S="${WORKDIR}"/SuperCollider3
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc4.patch
+	
+	# Change default config file location from /etc to /etc/supercollider
+	sed -i -e "s:/etc/sclang.cfg:/etc/supercollider/sclang.cfg:" source/lang/LangSource/SC_LanguageClient.cpp
+	sed -i -e "s:/etc/sclang.cfg:/etc/supercollider/sclang.cfg:" linux/examples/sclang.cfg.in
+
+	# Change the ridiculous default scsynth location on sample ~/.scsynth.sc file
+	sed -i -e "s:/usr/local/music/bin/scsynth:/usr/bin/scsynth:" linux/examples/sclang.sc
+
+	# Uncommenting a line per linux/examples/sclang.cfg.in
+	if ! use emacs; then
+		sed -i -e \
+			"s:#-@SC_LIB_DIR@/Common/GUI/Document.sc:-@SC_LIB_DIR@/Common/GUI/Document.sc:"	\
+			linux/examples/sclang.cfg.in
+	fi
+
+	filter-ldflags -Wl,--as-needed --as-needed
+}
+
+src_compile() {
+	local myconf
+	if use emacs; then
+		myconf="${myconf} --enable-scel"
+	else
+		myconf="${myconf} --disable-scel"
+	fi
+
+	# Do the main compilation
+	./linux/bootstrap
+	econf ${myconf} || die
+	emake || die "emake failed."
+	cd "${S}"/linux/examples
+	emake sclang.cfg
+
+	# Also compile Emacs extensions if need be
+	if use emacs; then
+		cd "${S}"/linux/scel
+		emake || die "emake on skel failed."
+	fi
+}
+
+src_install() {
+	# Main install
+	einstall || die "einstall failed."
+
+	# Install our config file
+	insinto /etc/supercollider
+	doins linux/examples/sclang.cfg
+
+	# Documentation
+	mv linux/README linux/README-linux
+	mv linux/scel/README linux/scel/README-scel
+	dodoc linux/README-linux linux/scel/README-scel
+
+	# Our documentation
+	sed -e "s:@DOCBASE@:/usr/share/doc/${PF}:" \
+		< ${FILESDIR}/README-gentoo.txt | gzip \
+		> "${D}"/usr/share/doc/${PF}/README-gentoo.txt.gz
+
+	# RTFs (don't gzip)
+	insinto /usr/share/doc/${PF}
+	doins doc/*.rtf changes.rtf
+
+	# Example files (don't gzip)
+	insinto /usr/share/doc/${PF}/examples
+	doins linux/examples/onetwoonetwo.sc linux/examples/sclang.sc
+
+	# Help files included with project (again, don't gzip)
+	cp -R "${S}"/build/Help "${D}"/usr/share/doc/${PF}
+
+	# Emacs installation
+	if use emacs; then
+		cd "${S}"/linux/scel
+		einstall || die "einstall on scel failed"
+	fi
+
+}
+
+pkg_postinst() {
+	elog
+	elog "Notice: SuperCollider is not very intuitive to get up and running."
+	elog "The best course of action to make sure that the installation was"
+	elog "successful and get you started with using SuperCollider is to take"
+	elog "a look through /usr/share/doc/${PF}/README-gentoo.txt.gz"
+	elog
+}