[arch-commits] Commit in ffmpegthumbnailer/trunk (2 files)

[Antonio Rojas]

    Date: Wednesday, February 17, 2016 @ 00:08:36
  Author: arojas
Revision: 259864

ffmpeg 3.0 rebuild

Added:
  ffmpegthumbnailer/trunk/ffmpegthumbnailer-ffmpeg3.patch
Modified:
  ffmpegthumbnailer/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   12 ++++---
 ffmpegthumbnailer-ffmpeg3.patch |   62 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-16 22:56:34 UTC (rev 259863)
+++ PKGBUILD	2016-02-16 23:08:36 UTC (rev 259864)
@@ -4,7 +4,7 @@
 
 pkgname=ffmpegthumbnailer
 pkgver=2.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="https://github.com/dirkvdb/ffmpegthumbnailer"
 license=('GPL2')
@@ -12,12 +12,14 @@
 depends=('ffmpeg' 'libjpeg' 'libpng')
 makedepends=('cmake')
 optdepends=('gvfs: support for gio uris')
-source=("https://github.com/dirkvdb/$pkgname/archive/$pkgver.tar.gz")
-sha1sums=('5fe86d26b1d5baddc5b75c5015b8d1a1a3719285')
+source=("https://github.com/dirkvdb/$pkgname/archive/$pkgver.tar.gz" ffmpegthumbnailer-ffmpeg3.patch)
+sha1sums=('5fe86d26b1d5baddc5b75c5015b8d1a1a3719285'
+          '634273e4373ec826ebc26daaadd01458a2a17df6')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/locale.patch"
+  cd $pkgname-$pkgver
+# Fix build with ffmpeg 3.0 (Gentoo)
+  patch -lp1 -i ../ffmpegthumbnailer-ffmpeg3.patch
 }
 
 build() {

Added: ffmpegthumbnailer-ffmpeg3.patch
===================================================================
--- ffmpegthumbnailer-ffmpeg3.patch	                        (rev 0)
+++ ffmpegthumbnailer-ffmpeg3.patch	2016-02-16 23:08:36 UTC (rev 259864)
@@ -0,0 +1,62 @@
+Index: ffmpegthumbnailer-2.0.10/libffmpegthumbnailer/moviedecoder.cpp
+===================================================================
+--- ffmpegthumbnailer-2.0.10.orig/libffmpegthumbnailer/moviedecoder.cpp
++++ ffmpegthumbnailer-2.0.10/libffmpegthumbnailer/moviedecoder.cpp
+@@ -266,7 +266,7 @@ bool MovieDecoder::decodeVideoPacket()
+         return false;
+     }
+ 
+-    avcodec_get_frame_defaults(m_pFrame);
++    av_frame_unref(m_pFrame);
+ 
+     int frameFinished;
+ 
+@@ -312,14 +312,8 @@ bool MovieDecoder::getVideoPacket()
+ 
+ void MovieDecoder::getScaledVideoFrame(int scaledSize, bool maintainAspectRatio, VideoFrame& videoFrame)
+ {
+-    if (m_pFrame->interlaced_frame)
+-    {
+-        avpicture_deinterlace((AVPicture*) m_pFrame, (AVPicture*) m_pFrame, m_pVideoCodecContext->pix_fmt,
+-                              m_pVideoCodecContext->width, m_pVideoCodecContext->height);
+-    }
+-
+     int scaledWidth, scaledHeight;
+-    convertAndScaleFrame(PIX_FMT_RGB24, scaledSize, maintainAspectRatio, scaledWidth, scaledHeight);
++    convertAndScaleFrame(AV_PIX_FMT_RGB24, scaledSize, maintainAspectRatio, scaledWidth, scaledHeight);
+ 
+     videoFrame.width = scaledWidth;
+     videoFrame.height = scaledHeight;
+@@ -330,7 +324,7 @@ void MovieDecoder::getScaledVideoFrame(i
+     memcpy((&(videoFrame.frameData.front())), m_pFrame->data[0], videoFrame.lineSize * videoFrame.height);
+ }
+ 
+-void MovieDecoder::convertAndScaleFrame(PixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight)
++void MovieDecoder::convertAndScaleFrame(AVPixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight)
+ {
+     calculateDimensions(scaledSize, maintainAspectRatio, scaledWidth, scaledHeight);
+ 
+@@ -427,7 +421,7 @@ void MovieDecoder::calculateDimensions(i
+     }
+ }
+ 
+-void MovieDecoder::createAVFrame(AVFrame** pAvFrame, uint8_t** pFrameBuffer, int width, int height, PixelFormat format)
++void MovieDecoder::createAVFrame(AVFrame** pAvFrame, uint8_t** pFrameBuffer, int width, int height, AVPixelFormat format)
+ {
+     *pAvFrame = av_frame_alloc();
+ 
+Index: ffmpegthumbnailer-2.0.10/libffmpegthumbnailer/moviedecoder.h
+===================================================================
+--- ffmpegthumbnailer-2.0.10.orig/libffmpegthumbnailer/moviedecoder.h
++++ ffmpegthumbnailer-2.0.10/libffmpegthumbnailer/moviedecoder.h
+@@ -54,8 +54,8 @@ private:
+ 
+     bool decodeVideoPacket();
+     bool getVideoPacket();
+-    void convertAndScaleFrame(PixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight);
+-    void createAVFrame(AVFrame** pAvFrame, uint8_t** pFrameBuffer, int width, int height, PixelFormat format);
++    void convertAndScaleFrame(AVPixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight);
++    void createAVFrame(AVFrame** pAvFrame, uint8_t** pFrameBuffer, int width, int height, AVPixelFormat format);
+     void calculateDimensions(int squareSize, bool maintainAspectRatio, int& destWidth, int& destHeight);
+ 
+ private: