diff options
author | Heinz Wiesinger <pprkut@slackbuilds.org> | 2013-11-03 19:32:52 +0100 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2013-11-04 00:46:04 -0600 |
commit | 1c3f749344fc820ebfff38a183b9caece401c160 (patch) | |
tree | 8eda6dc0519654b3293ba7896d8a77b8dcdb249e | |
parent | d1190d3764e5ad3360526b39d2eb30d754862c76 (diff) |
desktop/ffmpegthumbnailer: Updated for version 2.0.8.
Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
-rw-r--r-- | desktop/ffmpegthumbnailer/ffmpeg.patch | 58 | ||||
-rw-r--r-- | desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild | 9 | ||||
-rw-r--r-- | desktop/ffmpegthumbnailer/ffmpegthumbnailer.info | 6 |
3 files changed, 6 insertions, 67 deletions
diff --git a/desktop/ffmpegthumbnailer/ffmpeg.patch b/desktop/ffmpegthumbnailer/ffmpeg.patch deleted file mode 100644 index f3167d40f322a..0000000000000 --- a/desktop/ffmpegthumbnailer/ffmpeg.patch +++ /dev/null @@ -1,58 +0,0 @@ -Index: libffmpegthumbnailer/moviedecoder.cpp -=================================================================== ---- libffmpegthumbnailer/moviedecoder.cpp (revision 240) -+++ libffmpegthumbnailer/moviedecoder.cpp (revision 241) -@@ -58,19 +58,26 @@ - void MovieDecoder::initialize(const string& filename) - { - av_register_all(); -- avcodec_init(); - avcodec_register_all(); - - string inputFile = filename == "-" ? "pipe:" : filename; - m_AllowSeek = (filename != "-") && (filename.find("rtsp://") != 0); -- -+ -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, inputFile.c_str(), NULL, 0, NULL) != 0) -+#else -+ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, inputFile.c_str(), NULL, NULL) != 0) -+#endif - { - destroy(); - throw logic_error(string("Could not open input file: ") + filename); - } - -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if (av_find_stream_info(m_pFormatContext) < 0) -+#else -+ if (avformat_find_stream_info(m_pFormatContext, NULL) < 0) -+#endif - { - destroy(); - throw logic_error(string("Could not find stream information")); -@@ -90,8 +97,12 @@ - - if ((!m_FormatContextWasGiven) && m_pFormatContext) - { -+#if LIBAVCODEC_VERSION_MAJOR < 53 - av_close_input_file(m_pFormatContext); - m_pFormatContext = NULL; -+#else -+ avformat_close_input(&m_pFormatContext); -+#endif - } - - if (m_pPacket) -@@ -159,7 +170,11 @@ - - m_pVideoCodecContext->workaround_bugs = 1; - -+#if LIBAVCODEC_VERSION_MAJOR < 53 - if (avcodec_open(m_pVideoCodecContext, m_pVideoCodec) < 0) -+#else -+ if (avcodec_open2(m_pVideoCodecContext, m_pVideoCodec, NULL) < 0) -+#endif - { - throw logic_error("Could not open video codec"); - } diff --git a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild b/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild index 45edb813552e0..91ebb861b95b2 100644 --- a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild +++ b/desktop/ffmpegthumbnailer/ffmpegthumbnailer.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for FFmpegthumbnailer # Copyright 2007-2009 Frank Caraballo <fecaraballo{at}gmail{dot}com> -# Copyright 2012 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2012-2013 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,8 +24,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ffmpegthumbnailer -VERSION=${VERSION:-2.0.7} -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.0.8} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -70,9 +70,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 -p0 -i $CWD/ffmpeg.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info b/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info index dd877b97f6fe5..82a7127427d9e 100644 --- a/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info +++ b/desktop/ffmpegthumbnailer/ffmpegthumbnailer.info @@ -1,8 +1,8 @@ PRGNAM="ffmpegthumbnailer" -VERSION="2.0.7" +VERSION="2.0.8" HOMEPAGE="http://code.google.com/p/ffmpegthumbnailer/" -DOWNLOAD="http://ffmpegthumbnailer.googlecode.com/files/ffmpegthumbnailer-2.0.7.tar.gz" -MD5SUM="2b5726894792ef484793dce9568a065a" +DOWNLOAD="http://ffmpegthumbnailer.googlecode.com/files/ffmpegthumbnailer-2.0.8.tar.gz" +MD5SUM="03e081f89778cd5e4fce30b29a4630e1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ffmpeg" |