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

[Antonio Rojas]

    Date: Monday, February 22, 2016 @ 10:01:03
  Author: arojas
Revision: 260135

Update to 2.1.1

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

---------------------------------+
 PKGBUILD                        |   15 ++-------
 ffmpegthumbnailer-ffmpeg3.patch |   62 --------------------------------------
 2 files changed, 4 insertions(+), 73 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-22 02:21:54 UTC (rev 260134)
+++ PKGBUILD	2016-02-22 09:01:03 UTC (rev 260135)
@@ -3,8 +3,8 @@
 # Contributor: boromil at gmail.com
 
 pkgname=ffmpegthumbnailer
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.1.1
+pkgrel=1
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="https://github.com/dirkvdb/ffmpegthumbnailer"
 license=('GPL2')
@@ -12,16 +12,9 @@
 depends=('ffmpeg' 'libjpeg' 'libpng')
 makedepends=('cmake')
 optdepends=('gvfs: support for gio uris')
-source=("https://github.com/dirkvdb/$pkgname/archive/$pkgver.tar.gz" ffmpegthumbnailer-ffmpeg3.patch)
-sha1sums=('5fe86d26b1d5baddc5b75c5015b8d1a1a3719285'
-          '634273e4373ec826ebc26daaadd01458a2a17df6')
+source=("https://github.com/dirkvdb/$pkgname/archive/$pkgver.tar.gz")
+sha1sums=('a5e7f15a95990349d6b54a13d723d209e19eab35')
 
-prepare() {
-  cd $pkgname-$pkgver
-# Fix build with ffmpeg 3.0 (Gentoo)
-  patch -lp1 -i ../ffmpegthumbnailer-ffmpeg3.patch
-}
-
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   mkdir -p build

Deleted: ffmpegthumbnailer-ffmpeg3.patch
===================================================================
--- ffmpegthumbnailer-ffmpeg3.patch	2016-02-22 02:21:54 UTC (rev 260134)
+++ ffmpegthumbnailer-ffmpeg3.patch	2016-02-22 09:01:03 UTC (rev 260135)
@@ -1,62 +0,0 @@
-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: