summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrocket <crockabiscuit@gmail.com>2011-11-15 16:32:12 -0600
committerRobby Workman <rworkman@slackbuilds.org>2011-11-26 09:08:08 -0600
commit7a6800c69c8d58cd96776c6f004cac5cc6f2fc3c (patch)
tree769c725d553d916156364639beb32a0b7fc9fb06
parent1d4433cbf26625d8b4c9e0dfce786eb4349c8954 (diff)
downloadslackbuilds-7a6800c69c8d58cd96776c6f004cac5cc6f2fc3c.tar.gz
audio/kradio: Add patch for ffmpeg 0.8.
I did not test build this against ffmpeg 0.8, only against what's in the repo at the time: ffmpeg 0.6.1. It compiles, no idea if it works. Signed-off-by: Erik Hanson <erik@slackbuilds.org>
-rw-r--r--audio/kradio/kradio-4.0.2-ffmpeg08.patch11
-rw-r--r--audio/kradio/kradio.SlackBuild5
-rw-r--r--audio/kradio/kradio.info2
3 files changed, 16 insertions, 2 deletions
diff --git a/audio/kradio/kradio-4.0.2-ffmpeg08.patch b/audio/kradio/kradio-4.0.2-ffmpeg08.patch
new file mode 100644
index 0000000000..c6cbf90ed0
--- /dev/null
+++ b/audio/kradio/kradio-4.0.2-ffmpeg08.patch
@@ -0,0 +1,11 @@
+--- plugins/internetradio/decoder_thread.cpp.ffmpeg 2011-06-26 02:14:41.000000000 +0200
++++ plugins/internetradio/decoder_thread.cpp 2011-06-26 02:14:55.000000000 +0200
+@@ -535,7 +535,7 @@
+ m_av_audioStream = -1;
+ for (unsigned int i = 0; i < m_av_pFormatCtx->nb_streams; i++) {
+ // if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO && m_av_audioStream < 0) {
+- if (m_av_pFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) { // take last stream
++ if (m_av_pFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) { // take last stream
+ m_av_audioStream = i;
+ }
+ }
diff --git a/audio/kradio/kradio.SlackBuild b/audio/kradio/kradio.SlackBuild
index 82a83347c5..e025e5e48e 100644
--- a/audio/kradio/kradio.SlackBuild
+++ b/audio/kradio/kradio.SlackBuild
@@ -7,7 +7,7 @@
PRGNAM=kradio
SRCNAM=kradio4
VERSION=${VERSION:-4.0.2}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -53,6 +53,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# Fix building against newer ffmpeg versions
+patch -p0 -i $CWD/kradio-4.0.2-ffmpeg08.patch
+
mkdir -p build
cd build
cmake \
diff --git a/audio/kradio/kradio.info b/audio/kradio/kradio.info
index e47644b3b4..edbb24ac84 100644
--- a/audio/kradio/kradio.info
+++ b/audio/kradio/kradio.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="crocket"
EMAIL="crockabiscuit@gmail.com"
-APPROVED="dsomero"
+APPROVED="dsomero,Erik Hanson"