summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Loeser <halcy0n@gentoo.org>2009-06-29 01:32:26 +0000
committerMark Loeser <halcy0n@gentoo.org>2009-06-29 01:32:26 +0000
commit3d5bd9a5bdb3b54c322d1c248c837aa2896ca011 (patch)
tree1cc19b7f6771643abbb03009f75017390a91541e /media-sound
parentVersion bump (diff)
downloadgentoo-2-3d5bd9a5bdb3b54c322d1c248c837aa2896ca011.tar.gz
gentoo-2-3d5bd9a5bdb3b54c322d1c248c837aa2896ca011.tar.bz2
gentoo-2-3d5bd9a5bdb3b54c322d1c248c837aa2896ca011.zip
Fix compilation with gcc-4.3 and 4.4 by Gene Seto <geneseto AT hotmail DOT com>; bug #251223
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/miniaudicle/ChangeLog9
-rw-r--r--media-sound/miniaudicle/files/miniaudicle-0.1.3.8-gcc44.patch159
-rw-r--r--media-sound/miniaudicle/miniaudicle-0.1.3.8.ebuild7
3 files changed, 170 insertions, 5 deletions
diff --git a/media-sound/miniaudicle/ChangeLog b/media-sound/miniaudicle/ChangeLog
index 0ea947ea9745..1c22afd7ad51 100644
--- a/media-sound/miniaudicle/ChangeLog
+++ b/media-sound/miniaudicle/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/miniaudicle
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/ChangeLog,v 1.1 2008/03/29 23:21:04 cedk Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/ChangeLog,v 1.2 2009/06/29 01:32:26 halcy0n Exp $
+
+ 28 Jun 2009; Mark Loeser <halcy0n@gentoo.org> miniaudicle-0.1.3.8.ebuild,
+ +files/miniaudicle-0.1.3.8-gcc44.patch:
+ Fix compilation with gcc-4.3 and 4.4 by Gene Seto <geneseto AT hotmail DOT
+ com>; bug #251223
*miniaudicle-0.1.3.8 (29 Mar 2008)
diff --git a/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-gcc44.patch b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-gcc44.patch
new file mode 100644
index 000000000000..7b1bc9c06d3e
--- /dev/null
+++ b/media-sound/miniaudicle/files/miniaudicle-0.1.3.8-gcc44.patch
@@ -0,0 +1,159 @@
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/chuck_vm.cpp miniAudicle-0.1.3.8/chuck/src/chuck_vm.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/chuck_vm.cpp 2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/chuck_vm.cpp 2009-06-27 21:15:00.000000000 -0400
+@@ -47,6 +47,7 @@
+ #else
+ #include <unistd.h>
+ #include <pthread.h>
++ #include <algorithm>
+ #endif
+
+
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/rtaudio.cpp miniAudicle-0.1.3.8/chuck/src/rtaudio.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/rtaudio.cpp 2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/rtaudio.cpp 2009-06-27 21:15:00.000000000 -0400
+@@ -50,6 +50,7 @@
+ #include "chuck_errmsg.h"
+ #include "digiio_rtaudio.h"
+ #include <stdio.h>
++#include <climits>
+ // old
+ // #include "RtAudio.h"
+ // #include <iostream>
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/ugen_stk.cpp miniAudicle-0.1.3.8/chuck/src/ugen_stk.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/ugen_stk.cpp 2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/ugen_stk.cpp 2009-06-27 21:15:00.000000000 -0400
+@@ -41,6 +41,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <float.h>
++#include <climits>
+
+
+
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/ugen_xxx.cpp miniAudicle-0.1.3.8/chuck/src/ugen_xxx.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/ugen_xxx.cpp 2009-06-27 21:11:20.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/ugen_xxx.cpp 2009-06-27 21:15:31.000000000 -0400
+@@ -2587,7 +2587,7 @@
+ // open it
+ SF_INFO info;
+ info.format = 0;
+- char * format = strrchr( filename, '.');
++ const char * format = strrchr( filename, '.');
+ if( format && strcmp( format, ".raw" ) == 0 )
+ {
+ fprintf( stderr, "[chuck](via SndBuf) %s :: type is '.raw'...\n assuming 16 bit signed mono (PCM)\n", filename );
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/util_hid.cpp miniAudicle-0.1.3.8/chuck/src/util_hid.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/util_hid.cpp 2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/util_hid.cpp 2009-06-27 21:15:00.000000000 -0400
+@@ -37,6 +37,7 @@
+
+ #include <vector>
+ #include <map>
++#include <climits>
+
+ using namespace std;
+
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/util_opsc.cpp miniAudicle-0.1.3.8/chuck/src/util_opsc.cpp
+--- miniAudicle-0.1.3.8-orig/chuck/src/util_opsc.cpp 2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/util_opsc.cpp 2009-06-27 21:15:00.000000000 -0400
+@@ -56,6 +56,7 @@
+ #include <netinet/tcp.h>
+ #include <arpa/inet.h>
+ #include <netdb.h>
++#include <algorithm>
+ #endif
+
+ #if defined(__MACOSX_CORE__)
+diff -ur miniAudicle-0.1.3.8-orig/chuck/src/util_string.h miniAudicle-0.1.3.8/chuck/src/util_string.h
+--- miniAudicle-0.1.3.8-orig/chuck/src/util_string.h 2009-06-27 21:11:20.000000000 -0400
++++ miniAudicle-0.1.3.8/chuck/src/util_string.h 2009-06-27 21:16:12.000000000 -0400
+@@ -36,6 +36,7 @@
+ #include "chuck_def.h"
+ #include <string>
+ #include <vector>
++#include <cstdio>
+
+
+ // itoa
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/add.xpm miniAudicle-0.1.3.8/wxw/icons/add.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/add.xpm 2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/add.xpm 2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * add_xpm[] = {
++static const char * add_xpm[] = {
+ "32 32 47 1",
+ " c None",
+ ". c #C3F8BE",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-blue.xpm miniAudicle-0.1.3.8/wxw/icons/led-blue.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/led-blue.xpm 2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/led-blue.xpm 2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * led_blue_xpm[] = {
++static const char * led_blue_xpm[] = {
+ "28 28 431 2",
+ " c None",
+ ". c #949394",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-green.xpm miniAudicle-0.1.3.8/wxw/icons/led-green.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/led-green.xpm 2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/led-green.xpm 2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * led_green_xpm[] = {
++static const char * led_green_xpm[] = {
+ "28 28 443 2",
+ " c None",
+ ". c #959696",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-off.xpm miniAudicle-0.1.3.8/wxw/icons/led-off.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/led-off.xpm 2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/led-off.xpm 2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * led_off_xpm[] = {
++static const char * led_off_xpm[] = {
+ "28 28 143 2",
+ " c None",
+ ". c #959595",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/led-red.xpm miniAudicle-0.1.3.8/wxw/icons/led-red.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/led-red.xpm 2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/led-red.xpm 2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * led_red_xpm[] = {
++static const char * led_red_xpm[] = {
+ "28 28 434 2",
+ " c None",
+ ". c #959594",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/miniAudicle.xpm miniAudicle-0.1.3.8/wxw/icons/miniAudicle.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/miniAudicle.xpm 2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/miniAudicle.xpm 2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * miniAudicle_xpm[] = {
++static const char * miniAudicle_xpm[] = {
+ "128 128 1543 2",
+ " c None",
+ ". c #FF9D20",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/remove.xpm miniAudicle-0.1.3.8/wxw/icons/remove.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/remove.xpm 2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/remove.xpm 2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * remove_xpm[] = {
++static const char * remove_xpm[] = {
+ "32 32 177 2",
+ " c None",
+ ". c #FFB6B5",
+diff -ur miniAudicle-0.1.3.8-orig/wxw/icons/replace.xpm miniAudicle-0.1.3.8/wxw/icons/replace.xpm
+--- miniAudicle-0.1.3.8-orig/wxw/icons/replace.xpm 2009-06-27 21:15:03.000000000 -0400
++++ miniAudicle-0.1.3.8/wxw/icons/replace.xpm 2009-06-27 21:15:00.000000000 -0400
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * replace_xpm[] = {
++static const char * replace_xpm[] = {
+ "32 32 114 2",
+ " c None",
+ ". c #5764FF",
+
diff --git a/media-sound/miniaudicle/miniaudicle-0.1.3.8.ebuild b/media-sound/miniaudicle/miniaudicle-0.1.3.8.ebuild
index cf69f6cc09e2..b4ed423f9aa3 100644
--- a/media-sound/miniaudicle/miniaudicle-0.1.3.8.ebuild
+++ b/media-sound/miniaudicle/miniaudicle-0.1.3.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/miniaudicle-0.1.3.8.ebuild,v 1.1 2008/03/29 23:21:04 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/miniaudicle/miniaudicle-0.1.3.8.ebuild,v 1.2 2009/06/29 01:32:26 halcy0n Exp $
inherit eutils toolchain-funcs flag-o-matic
@@ -41,7 +41,8 @@ pkg_setup() {
src_unpack() {
unpack ${A}
cd "${S}"
- epatch "$FILESDIR/${P}-hid-smc.patch"
+ epatch "${FILESDIR}/${P}-hid-smc.patch"
+ epatch "${FILESDIR}/${P}-gcc44.patch"
}
src_compile() {