# HG changeset patch # User Christophe Lincoln # Date 1249561196 -7200 # Node ID 638946a9f1124b9e839b989c557cadf0a38bdeaa # Parent 996a788dda09e19a1697ba594806627dd94978e6 Fix: alsaplayer cook with gcc 4.4 serie diff -r 996a788dda09 -r 638946a9f112 alsaplayer/receipt --- a/alsaplayer/receipt Thu Aug 06 14:18:28 2009 +0200 +++ b/alsaplayer/receipt Thu Aug 06 14:19:56 2009 +0200 @@ -5,8 +5,8 @@ CATEGORY="multimedia" SHORT_DESC="Alsa GTK+ PCM player." MAINTAINER="pankso@slitaz.org" -DEPENDS="gtk+ alsa-lib libmad libvorbis xorg-libXdamage" -BUILD_DEPENDS="gtk+-dev alsa-lib-dev libmad-dev flac-dev" +DEPENDS="gtk+ alsa-lib libmad libogg libvorbis xorg-libXdamage" +BUILD_DEPENDS="gtk+-dev alsa-lib-dev libmad-dev flac-dev libogg-dev libvorbis-dev" SUGGESTED="alsaplayer-scopes libid3tag flac" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.alsaplayer.org/" @@ -17,6 +17,7 @@ compile_rules() { cd $src + patch -p0 < ../stuff/gcc44.patch || exit 1 ./configure \ --enable-nls \ --prefix=/usr \ @@ -33,11 +34,11 @@ genpkg_rules() { mkdir -p $fs/usr/lib - + cp -a $_pkg/usr/bin $fs/usr cp -a $_pkg/usr/lib/*.so* $fs/usr/lib cp -a $_pkg/usr/lib/alsaplayer $fs/usr/lib - + # Remove devel files and scopes. rm $fs/usr/lib/alsaplayer/*/*.*a rm -rf $fs/usr/lib/alsaplayer/scopes2 diff -r 996a788dda09 -r 638946a9f112 alsaplayer/stuff/gcc44.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/alsaplayer/stuff/gcc44.patch Thu Aug 06 14:19:56 2009 +0200 @@ -0,0 +1,31 @@ +--- app/ControlSocket.cpp 2009-07-04 22:34:38.000000000 +0200 ++++ app/ControlSocket.cpp 2009-07-04 22:35:53.000000000 +0200 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include "control.h" + #include "message.h" + #include "Playlist.h" + +--- input/flac/FlacPlugin.cpp Mon Oct 29 22:00:16 2007 ++++ input/flac/FlacPlugin.cpp Thu Aug 6 13:42:44 2009 +@@ -239,7 +239,7 @@ + else + { + // use stream name +- char * fname = strrchr (f->name ().c_str (), '/'); ++ const char * fname = strrchr (f->name ().c_str (), '/'); + if (fname) + { + fname++; +@@ -270,7 +270,7 @@ + if (strncmp(name, "http://", 7) == 0) { + return 0.0; + } +- char *ext = strrchr(name, '.'); ++ const char *ext = strrchr(name, '.'); + if (!ext) + return 0.0; + ext++;