diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-09 16:24:38 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-09 16:24:38 +0200 |
commit | cdbd7308d16cb249715cce9bedf8b809f2576804 (patch) | |
tree | bfdb3a816cf96988dc788e2678acdb294b032811 /extra/ffmpegthumbnailer | |
parent | a86ff663185661ee304bb1f6d00d982102dd706d (diff) | |
parent | 648599b08776ea788a3ddb0365eb30fda03efe7b (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/bwbar/PKGBUILD
community/dosbox/PKGBUILD
community/extremetuxracer/PKGBUILD
community/fbgrab/PKGBUILD
community/fbv/PKGBUILD
community/flam3/PKGBUILD
community/freedroidrpg/PKGBUILD
community/gdk-pixbuf/PKGBUILD
community/ghemical/PKGBUILD
community/gmic/PKGBUILD
community/gnash/PKGBUILD
community/gnustep-base/PKGBUILD
community/guvcview/PKGBUILD
community/keepassx/PKGBUILD
community/kvpnc/PKGBUILD
community/libghemical/PKGBUILD
community/liboglappth/PKGBUILD
community/png2ico/PKGBUILD
community/shapelib/PKGBUILD
community/sloccount/PKGBUILD
community/tmw/PKGBUILD
community/xmoto/PKGBUILD
core/links/PKGBUILD
extra/amule/PKGBUILD
extra/cairomm/PKGBUILD
extra/calligra/PKGBUILD
extra/evas/PKGBUILD
extra/fltk/PKGBUILD
extra/gd/PKGBUILD
extra/gif2png/PKGBUILD
extra/glhack/PKGBUILD
extra/graphviz/PKGBUILD
extra/gstreamer0.10-good/PKGBUILD
extra/imlib/PKGBUILD
extra/imlib2/PKGBUILD
extra/lbreakout2/PKGBUILD
extra/libgdiplus/PKGBUILD
extra/libkate/PKGBUILD
extra/libpano13/PKGBUILD
extra/libwebp/PKGBUILD
extra/libwmf/PKGBUILD
extra/libxslt/PKGBUILD
extra/mjpegtools/PKGBUILD
extra/ntp/PKGBUILD
extra/nx/PKGBUILD
extra/openjpeg/PKGBUILD
extra/php/PKGBUILD
extra/plotutils/PKGBUILD
extra/poppler/PKGBUILD
extra/qrencode/PKGBUILD
extra/qt4/PKGBUILD
extra/qt5/PKGBUILD
extra/qtiplot/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/samba/PKGBUILD
extra/sdl_image/PKGBUILD
extra/vice/PKGBUILD
extra/vigra/PKGBUILD
extra/vlc/PKGBUILD
extra/webkitgtk/PKGBUILD
extra/webkitgtk2/PKGBUILD
extra/wv/PKGBUILD
extra/wxgtk/PKGBUILD
extra/xaos/PKGBUILD
extra/xsane/PKGBUILD
extra/zvbi/PKGBUILD
Diffstat (limited to 'extra/ffmpegthumbnailer')
-rw-r--r-- | extra/ffmpegthumbnailer/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8-memcpy.patch | 13 |
2 files changed, 24 insertions, 4 deletions
diff --git a/extra/ffmpegthumbnailer/PKGBUILD b/extra/ffmpegthumbnailer/PKGBUILD index 068bb2f74..1ae9e16e0 100644 --- a/extra/ffmpegthumbnailer/PKGBUILD +++ b/extra/ffmpegthumbnailer/PKGBUILD @@ -1,20 +1,27 @@ -# $Id: PKGBUILD 23110 2010-08-06 11:01:51Z rvanharen $ +# $Id: PKGBUILD 184375 2013-05-06 19:37:03Z foutrelis $ # 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' 'mips64el') 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/extra/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8-memcpy.patch b/extra/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8-memcpy.patch new file mode 100644 index 000000000..5b9c68613 --- /dev/null +++ b/extra/ffmpegthumbnailer/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; + |