diff options
| -rw-r--r-- | multimedia/k9copy/k9copy-2.3.7-ffmpeg.patch | 15 | ||||
| -rw-r--r-- | multimedia/k9copy/k9copy.SlackBuild | 12 | ||||
| -rw-r--r-- | multimedia/k9copy/k9copy.info | 8 |
3 files changed, 8 insertions, 27 deletions
diff --git a/multimedia/k9copy/k9copy-2.3.7-ffmpeg.patch b/multimedia/k9copy/k9copy-2.3.7-ffmpeg.patch deleted file mode 100644 index c92582a8dd..0000000000 --- a/multimedia/k9copy/k9copy-2.3.7-ffmpeg.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 00e5c071f5..244e8526bc 100644 --- a/multimedia/k9copy/k9copy.SlackBuild +++ b/multimedia/k9copy/k9copy.SlackBuild @@ -3,6 +3,8 @@ # Slackware build script for k9copy # Copyright 2007 Brian Reichert <rignes@pobox.com> +# Copyright 2010-2012 Roberto Neri, Palermo, Italy +# # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,12 +24,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified by Roberto Neri <rneri@libero.it> for version 2 (KDE 4) -# Project Homepage: http://k9copy.sourceforge.net/ - PRGNAM=k9copy -VERSION=${VERSION:-2.3.7} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.3.8} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -72,9 +71,6 @@ 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 \ diff --git a/multimedia/k9copy/k9copy.info b/multimedia/k9copy/k9copy.info index bb69b31b3f..61e40636bb 100644 --- a/multimedia/k9copy/k9copy.info +++ b/multimedia/k9copy/k9copy.info @@ -1,10 +1,10 @@ PRGNAM="k9copy" -VERSION="2.3.7" +VERSION="2.3.8" HOMEPAGE="http://k9copy.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/k9copy/k9copy-2.3.7-Source.tar.gz" -MD5SUM="bbfda2937f5027d31495df67dc29efa4" +DOWNLOAD="http://downloads.sourceforge.net/k9copy/k9copy-2.3.8-Source.tar.gz" +MD5SUM="584f6cc50f28befbeb0d5c1ec9476456" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Roberto Neri" EMAIL="rneri@libero.it" -APPROVED="Niels Horn" +APPROVED="dsomero" |