git » ffmpegthumbnailer.git » commit 6031e1c

libpng 1.6 rebuild.

author Evangelos Foutras
2013-04-29 10:42:29 UTC
committer Evangelos Foutras
2013-04-29 10:42:29 UTC
parent 6ae885cdef65ea13075084fd9f7734ed99bc15ba

libpng 1.6 rebuild.

PKGBUILD +10 -4
ffmpegthumbnailer-2.0.8-memcpy.patch +13 -0

diff --git a/PKGBUILD b/PKGBUILD
index 211b321..6cb6320 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,26 @@
-# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: boromil@gmail.com
 
 pkgname=ffmpegthumbnailer
 pkgver=2.0.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Lightweight video thumbnailer that can be used by file managers."
 url="http://code.google.com/p/ffmpegthumbnailer/"
 license=('GPL2')
 arch=('i686' 'x86_64')
 depends=('ffmpeg' 'libjpeg' 'libpng')
 optdepends=('gvfs: support for gio uris')
-source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz")
+source=("http://ffmpegthumbnailer.googlecode.com/files/$pkgname-$pkgver.tar.gz"
+        "ffmpegthumbnailer-2.0.8-memcpy.patch")
 options=('!libtool')
-sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533')
+sha1sums=('2c54ca16efd953f46547e22799cfc40bd9c24533'
+          'c23ef173f98c928fcacacd6e6060dab2e56f1239')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np0 -i "${srcdir}/ffmpegthumbnailer-2.0.8-memcpy.patch"
+}
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
diff --git a/ffmpegthumbnailer-2.0.8-memcpy.patch b/ffmpegthumbnailer-2.0.8-memcpy.patch
new file mode 100644
index 0000000..5b9c686
--- /dev/null
+++ b/ffmpegthumbnailer-2.0.8-memcpy.patch
@@ -0,0 +1,13 @@
+libffmpegthumbnailer/pngwriter.cpp: In function 'void ffmpegthumbnailer::writeDataCallback(png_structp, png_bytep, png_size_t)':
+libffmpegthumbnailer/pngwriter.cpp:111:52: error: 'memcpy' was not declared in this scope
+
+--- libffmpegthumbnailer/pngwriter.cpp
++++ libffmpegthumbnailer/pngwriter.cpp
+@@ -17,6 +17,7 @@
+ #include "pngwriter.h"
+ #include <stdexcept>
+ #include <cassert>
++#include <cstring>
+ 
+ using namespace std;
+