wok rev 3816

Fix: alsaplayer cook with gcc 4.4 serie
author Christophe Lincoln <pankso@slitaz.org>
date Thu Aug 06 14:19:56 2009 +0200 (2009-08-06)
parents 996a788dda09
children 10d48900582c
files alsaplayer/receipt alsaplayer/stuff/gcc44.patch
line diff
     1.1 --- a/alsaplayer/receipt	Thu Aug 06 14:18:28 2009 +0200
     1.2 +++ b/alsaplayer/receipt	Thu Aug 06 14:19:56 2009 +0200
     1.3 @@ -5,8 +5,8 @@
     1.4  CATEGORY="multimedia"
     1.5  SHORT_DESC="Alsa GTK+ PCM player."
     1.6  MAINTAINER="pankso@slitaz.org"
     1.7 -DEPENDS="gtk+ alsa-lib libmad libvorbis xorg-libXdamage"
     1.8 -BUILD_DEPENDS="gtk+-dev alsa-lib-dev libmad-dev flac-dev"
     1.9 +DEPENDS="gtk+ alsa-lib libmad libogg libvorbis xorg-libXdamage"
    1.10 +BUILD_DEPENDS="gtk+-dev alsa-lib-dev libmad-dev flac-dev libogg-dev libvorbis-dev"
    1.11  SUGGESTED="alsaplayer-scopes libid3tag flac"
    1.12  TARBALL="$PACKAGE-$VERSION.tar.gz"
    1.13  WEB_SITE="http://www.alsaplayer.org/"
    1.14 @@ -17,6 +17,7 @@
    1.15  compile_rules()
    1.16  {
    1.17  	cd $src
    1.18 +	patch -p0 < ../stuff/gcc44.patch || exit 1
    1.19  	./configure \
    1.20  		--enable-nls \
    1.21  		--prefix=/usr \
    1.22 @@ -33,11 +34,11 @@
    1.23  genpkg_rules()
    1.24  {
    1.25  	mkdir -p $fs/usr/lib
    1.26 -	
    1.27 +
    1.28  	cp -a $_pkg/usr/bin $fs/usr
    1.29  	cp -a $_pkg/usr/lib/*.so* $fs/usr/lib
    1.30  	cp -a $_pkg/usr/lib/alsaplayer $fs/usr/lib
    1.31 -	
    1.32 +
    1.33  	# Remove devel files and scopes.
    1.34  	rm $fs/usr/lib/alsaplayer/*/*.*a
    1.35  	rm -rf $fs/usr/lib/alsaplayer/scopes2
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/alsaplayer/stuff/gcc44.patch	Thu Aug 06 14:19:56 2009 +0200
     2.3 @@ -0,0 +1,31 @@
     2.4 +--- app/ControlSocket.cpp	2009-07-04 22:34:38.000000000 +0200
     2.5 ++++ app/ControlSocket.cpp	2009-07-04 22:35:53.000000000 +0200
     2.6 +@@ -28,6 +28,7 @@
     2.7 + #include <sys/un.h>
     2.8 + #include <csignal>
     2.9 + #include <pwd.h>
    2.10 ++#include <climits>
    2.11 + #include "control.h"
    2.12 + #include "message.h"
    2.13 + #include "Playlist.h"
    2.14 +
    2.15 +--- input/flac/FlacPlugin.cpp	Mon Oct 29 22:00:16 2007
    2.16 ++++ input/flac/FlacPlugin.cpp	Thu Aug  6 13:42:44 2009
    2.17 +@@ -239,7 +239,7 @@
    2.18 +     else
    2.19 +     {
    2.20 + 	// use stream name
    2.21 +-	char * fname = strrchr (f->name ().c_str (), '/');
    2.22 ++	const char * fname = strrchr (f->name ().c_str (), '/');
    2.23 + 	if (fname)
    2.24 + 	{
    2.25 + 	    fname++;
    2.26 +@@ -270,7 +270,7 @@
    2.27 + 	if (strncmp(name, "http://", 7) == 0) {
    2.28 + 		return 0.0;
    2.29 + 	}
    2.30 +-	char *ext = strrchr(name, '.');
    2.31 ++	const char *ext = strrchr(name, '.');
    2.32 + 	if (!ext)
    2.33 + 		return 0.0;
    2.34 + 	ext++;