summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortnut <thierryn1 at hispeed dot ch>2010-11-04 16:43:24 +0100
committertnut <thierryn1 at hispeed dot ch>2010-11-04 16:43:24 +0100
commit9ebe00fab62f85c3fe605413068f5e036f221f4b (patch)
treedfeb603cbe4935cbb543d8126e4113cd15403b17
parentf8ca3523697ec59b5ae411c786fe495768ce0d7d (diff)
downloadnutyx-extra-9ebe00fab62f85c3fe605413068f5e036f221f4b.tar.gz
nutyx-extra-9ebe00fab62f85c3fe605413068f5e036f221f4b.tar.bz2
nutyx-extra-9ebe00fab62f85c3fe605413068f5e036f221f4b.tar.xz
nutyx-extra-9ebe00fab62f85c3fe605413068f5e036f221f4b.zip
akode, port nettoyé
-rw-r--r--extra/akode/.md5sum1
-rw-r--r--extra/akode/Pkgfile3
-rw-r--r--extra/akode/akode-2.0.2-flac14.patch12
-rw-r--r--extra/akode/gcc43.patch47
4 files changed, 1 insertions, 62 deletions
diff --git a/extra/akode/.md5sum b/extra/akode/.md5sum
index cf5e441ae..12fddaff2 100644
--- a/extra/akode/.md5sum
+++ b/extra/akode/.md5sum
@@ -1,3 +1,2 @@
659ced0c9c735cb3e55b9138ff02342c 30375-akode-2.0.2.tar.bz2
-41823c2df53a91044f6de9b3b2c1231e akode-2.0.2-flac14.patch
6e22d4a54a06443b1a63437932a633d6 gcc43.patch
diff --git a/extra/akode/Pkgfile b/extra/akode/Pkgfile
index d28a9313d..e1955f477 100644
--- a/extra/akode/Pkgfile
+++ b/extra/akode/Pkgfile
@@ -8,10 +8,9 @@ name=akode
version=2.0.2
release=2
source=(http://www.kde-apps.org/CONTENT/content-files/30375-akode-$version.tar.bz2 \
- akode-2.0.2-flac14.patch gcc43.patch)
+ http://nutyx.meticul.eu/files/patchs/$name/gcc43.patch)
build() {
cd $name-$version
-# patch -Np0 -i ../akode-2.0.2-flac14.patch
patch -Np0 -i ../gcc43.patch
./configure --prefix=/usr \
--without-flac \
diff --git a/extra/akode/akode-2.0.2-flac14.patch b/extra/akode/akode-2.0.2-flac14.patch
deleted file mode 100644
index b50b8e56f..000000000
--- a/extra/akode/akode-2.0.2-flac14.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- akode/plugins/xiph_decoder/flac113_decoder.cpp.orig 2007-06-12 06:59:28.000000000 +0000
-+++ akode/plugins/xiph_decoder/flac113_decoder.cpp 2007-06-12 07:07:23.000000000 +0000
-@@ -108,7 +108,7 @@
- static FLAC__StreamDecoderReadStatus flac_read_callback(
- const FLAC__StreamDecoder *,
- FLAC__byte buffer[],
-- unsigned *bytes,
-+ size_t *bytes,
- void *client_data)
- {
- FLACDecoder::private_data *data = (FLACDecoder::private_data*)client_data;
-
diff --git a/extra/akode/gcc43.patch b/extra/akode/gcc43.patch
deleted file mode 100644
index 0f763082f..000000000
--- a/extra/akode/gcc43.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- akode/lib/auto_sink.cpp~ 2007-04-01 14:45:16.000000000 +0000
-+++ akode/lib/auto_sink.cpp 2007-04-01 14:45:23.000000000 +0000
-@@ -21,6 +21,7 @@
- #include "audioframe.h"
- #include "auto_sink.h"
-
-+#include <cstdlib>
- #include <iostream>
-
- namespace aKode {
---- akode/akodeplay/akodeplay.cpp~ 2007-04-01 14:45:59.000000000 +0000
-+++ akode/akodeplay/akodeplay.cpp 2007-04-01 14:46:06.000000000 +0000
-@@ -25,6 +25,8 @@
- #include "../lib/sink.h"
- #include "../lib/decoder.h"
-
-+#include <cstdlib>
-+
- #ifdef HAVE_GNU_GETOPT
- #include <getopt.h>
- #else
-
---- akode/lib/player.cpp~ 2006-11-05 14:37:48.000000000 +0000
-+++ akode/lib/player.cpp 2008-12-24 09:57:03.000000000 +0000
-@@ -34,10 +34,12 @@
- #include "converter.h"
- #include "resampler.h"
- #include "magic.h"
-+#include <cstring>
-
- #include "player.h"
-
- #ifndef NDEBUG
-+#include <cstdlib>
- #include <iostream>
- #define AKODE_DEBUG(x) {std::cerr << "akode: " << x << "\n";}
- #else
---- akode/lib/magic.cpp~ 2005-10-20 20:47:17.000000000 +0000
-+++ akode/lib/magic.cpp 2008-12-24 09:58:30.000000000 +0000
-@@ -22,6 +22,7 @@
- #include "magic.h"
- #include "file.h"
- #include <iostream>
-+#include <cstring>
- using std::cerr;
-
- namespace aKode {