diff options
| author | Roberto Neri <rneri@libero.it> | 2011-12-16 20:02:46 -0200 |
|---|---|---|
| committer | Niels Horn <niels.horn@slackbuilds.org> | 2011-12-16 20:02:46 -0200 |
| commit | dbe996e4b04aa6eb38595904e7deebe968ad444d (patch) | |
| tree | 3143b58f1ce1a460a0b9bd2f8d0557bdf8a0340c | |
| parent | 85572e84078b339f7b753c101d30f7427f55ddf7 (diff) | |
| download | slackbuilds-dbe996e4b04aa6eb38595904e7deebe968ad444d.tar.gz | |
multimedia/k9copy: Added patch for new ffmpeg.
Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
| -rw-r--r-- | multimedia/k9copy/k9copy-2.3.7-ffmpeg.patch | 15 | ||||
| -rw-r--r-- | multimedia/k9copy/k9copy.SlackBuild | 5 |
2 files changed, 19 insertions, 1 deletions
diff --git a/multimedia/k9copy/k9copy-2.3.7-ffmpeg.patch b/multimedia/k9copy/k9copy-2.3.7-ffmpeg.patch new file mode 100644 index 0000000000..c92582a8dd --- /dev/null +++ b/multimedia/k9copy/k9copy-2.3.7-ffmpeg.patch @@ -0,0 +1,15 @@ +Fix build with ffmpeg/libav trunk after the big bump. + +Index: k9copy-2.3.7-Source/src/import/k9avidecode.cpp +=================================================================== +--- k9copy-2.3.7-Source.orig/src/import/k9avidecode.cpp ++++ k9copy-2.3.7-Source/src/import/k9avidecode.cpp +@@ -145,7 +145,7 @@ bool k9AviDecode::open(const QString & _ + // Find the first video stream + m_videoStream=-1; + for (i=0; i<m_FormatCtx->nb_streams; i++) +- if (m_FormatCtx->streams[i]->codec->codec_type==CODEC_TYPE_VIDEO) { ++ if (m_FormatCtx->streams[i]->codec->codec_type==AVMEDIA_TYPE_VIDEO) { + m_videoStream=i; + break; + } diff --git a/multimedia/k9copy/k9copy.SlackBuild b/multimedia/k9copy/k9copy.SlackBuild index faaa4fe56a..00e5c071f5 100644 --- a/multimedia/k9copy/k9copy.SlackBuild +++ b/multimedia/k9copy/k9copy.SlackBuild @@ -27,7 +27,7 @@ PRGNAM=k9copy VERSION=${VERSION:-2.3.7} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -72,6 +72,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 -p1 -i $CWD/k9copy-2.3.7-ffmpeg.patch + mkdir -p build cd build cmake \ |