summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO28
-rw-r--r--EncodeVideo2.cpp.patch12
-rw-r--r--PKGBUILD38
-rw-r--r--cDeviceModelDef.patch39
-rw-r--r--ffdiaporama.install13
5 files changed, 130 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 00000000000..4f919f8b4c2
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,28 @@
+pkgbase = ffdiaporama
+ pkgdesc = Movie creator from photos and video clips
+ pkgver = 2.1
+ pkgrel = 3
+ url = http://ffdiaporama.tuxfamily.org
+ install = ffdiaporama.install
+ arch = i686
+ arch = x86_64
+ license = GPL2
+ depends = qt5-svg
+ depends = qt5-tools
+ depends = qt5-imageformats
+ depends = ffmpeg
+ depends = exiv2
+ depends = shared-mime-info
+ depends = ffdiaporama-rsc
+ optdepends = ffdiaporama-texturemate: Additional background-images
+ optdepends = ffdiaporama-openclipart: use the openclipart-library
+ conflicts = ffdiaporama-devel
+ source = http://download.tuxfamily.org/ffdiaporama/Packages/Stable/ffdiaporama_bin_2.1.2014.0209.tar.gz
+ source = cDeviceModelDef.patch
+ source = EncodeVideo2.cpp.patch
+ md5sums = f9f46277153cf49f6947973778516adb
+ md5sums = f4ae4748072a4ade0db2e816fbfa3dbb
+ md5sums = 5924f4a2b48968839722252ad677437d
+
+pkgname = ffdiaporama
+
diff --git a/EncodeVideo2.cpp.patch b/EncodeVideo2.cpp.patch
new file mode 100644
index 00000000000..ccad4499a56
--- /dev/null
+++ b/EncodeVideo2.cpp.patch
@@ -0,0 +1,12 @@
+--- src/ffDiaporama/engine/_EncodeVideo.cpp 2014-02-09 03:48:04.000000000 -0600
++++ _EncodeVideo2.cpp 2015-03-27 11:43:47.869064000 -0600
+@@ -412,6 +412,9 @@
+ VideoStream->codec->height =ImageHeight;
+ VideoStream->codec->pix_fmt =PIX_FMT_YUV420P;
+ VideoStream->codec->time_base =VideoFrameRate;
++ #if FFMPEGVERSIONINT>=260
++ VideoStream->time_base = VideoFrameRate; //new ffmpeg 2.6.0!!!!
++ #endif
+ VideoStream->codec->sample_aspect_ratio =PixelAspectRatio;
+ VideoStream->sample_aspect_ratio =PixelAspectRatio;
+ if ((codec->id!=AV_CODEC_ID_H264)||(!VBR)) {
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 00000000000..b0e80a29fdf
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Steffen Weber <-boenki-gmx-de->
+
+pkgname=ffdiaporama
+pkgver=2.1
+pkgrel=3
+pkgdesc="Movie creator from photos and video clips"
+arch=('i686' 'x86_64')
+url="http://ffdiaporama.tuxfamily.org"
+license=('GPL2')
+conflicts=('ffdiaporama-devel')
+depends=('qt5-svg' 'qt5-tools' 'qt5-imageformats' 'ffmpeg' 'exiv2' 'shared-mime-info' 'ffdiaporama-rsc')
+optdepends=('ffdiaporama-texturemate: Additional background-images'
+ 'ffdiaporama-openclipart: use the openclipart-library')
+install=$pkgname.install
+source=(http://download.tuxfamily.org/ffdiaporama/Packages/Stable/ffdiaporama_bin_2.1.2014.0209.tar.gz
+ cDeviceModelDef.patch
+ EncodeVideo2.cpp.patch)
+md5sums=('f9f46277153cf49f6947973778516adb'
+ 'f4ae4748072a4ade0db2e816fbfa3dbb'
+ '5924f4a2b48968839722252ad677437d')
+
+prepare() {
+ cd ffDiaporama
+ patch -p0 -i ../cDeviceModelDef.patch
+ patch -p0 -i ../EncodeVideo2.cpp.patch
+}
+
+build() {
+ cd ffDiaporama
+ qmake-qt5 ffDiaporama.pro
+ make
+}
+
+package() {
+ cd ffDiaporama
+ make install INSTALL_ROOT=$pkgdir
+ find $pkgdir/usr/share -type f -exec chmod 644 {} +
+}
diff --git a/cDeviceModelDef.patch b/cDeviceModelDef.patch
new file mode 100644
index 00000000000..6da31ba73ac
--- /dev/null
+++ b/cDeviceModelDef.patch
@@ -0,0 +1,39 @@
+--- src/ffDiaporama/engine/cDeviceModelDef.h 2014-02-09 03:48:04.000000000 -0600
++++ cDeviceModelDef2.h 2015-03-27 11:39:25.965094000 -0600
+@@ -84,13 +84,21 @@
+ #elif (LIBAVUTIL_VERSION_MICRO>=100)&&(LIBAVCODEC_VERSION_MICRO>=100)&&(LIBAVFORMAT_VERSION_MICRO>=100)&&(LIBAVDEVICE_VERSION_MICRO>=100)&&(LIBAVFILTER_VERSION_MICRO>=100)&&(LIBSWSCALE_VERSION_MICRO>=100)
+ #define FFMPEG
+ #include "libswresample/swresample.h"
+- #define RESAMPLE_MAX_CHANNELS SWR_CH_MAX
+ #include "libavfilter/avcodec.h"
+ #include "libavfilter/buffersink.h"
+ #include "libavfilter/buffersrc.h"
+- #if ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,48,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,39,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,19,104))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,5,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,90,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,5,101))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,104)))
++ #if ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(54,20,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(56,26,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(56,25,101))&& (LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(56,4,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(5,11,102))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(3,1,101))&& (LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(1,1,100)))
++ #define FFMPEGVERSIONINT 260
++ #define FFMPEGVERSION "FFmpeg 2.6 or higher"
++ #elif ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(54,15,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(56,13,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(56,15,102))&& (LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(56,3,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(5,2,103))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(3,1,101))&& (LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(1,1,100)))
++ #define FFMPEGVERSIONINT 250
++ #define FFMPEGVERSION "FFmpeg 2.5"
++ #elif ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(54,7,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(56,1,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(56,4,101))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(56,0,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(5,1,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(3,0,100))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(1,1,100)))
++ #define FFMPEGVERSIONINT 247
++ #define FFMPEGVERSION "FFmpeg 2.4.7"
++ #elif ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,48,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,39,100))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,19,104))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,5,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,90,100))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,5,101))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,104)))
+ #define FFMPEGVERSIONINT 210
+- #define FFMPEGVERSION "FFmpeg 2.1 or higher"
++ #define FFMPEGVERSION "FFmpeg 2.1"
+ #elif ((LIBAVUTIL_VERSION_INT>=AV_VERSION_INT(52,38,100))&&(LIBAVCODEC_VERSION_INT>=AV_VERSION_INT(55,18,102))&&(LIBAVFORMAT_VERSION_INT>=AV_VERSION_INT(55,12,100))&&(LIBAVDEVICE_VERSION_INT>=AV_VERSION_INT(55,3,100))&&(LIBAVFILTER_VERSION_INT>=AV_VERSION_INT(3,79,101))&&(LIBSWSCALE_VERSION_INT>=AV_VERSION_INT(2,3,100))&&(LIBSWRESAMPLE_VERSION_INT>=AV_VERSION_INT(0,17,102)))
+ #define FFMPEGVERSIONINT 201
+ #define FFMPEGVERSION "FFmpeg 2.0.1 or higher"
+@@ -103,6 +111,11 @@
+ #else
+ // unsupported version
+ #endif
++#if (FFMPEGVERSIONINT >=247)
++ #define RESAMPLE_MAX_CHANNELS 32
++ #else
++ #define RESAMPLE_MAX_CHANNELS SWR_CH_MAX
++ #endif
+ #endif
+ }
+
diff --git a/ffdiaporama.install b/ffdiaporama.install
new file mode 100644
index 00000000000..7cb5de249aa
--- /dev/null
+++ b/ffdiaporama.install
@@ -0,0 +1,13 @@
+post_install() {
+ update-desktop-database -q
+ update-mime-database usr/share/mime > /dev/null
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+} \ No newline at end of file