version 2.1-3

3 files changed, 28 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5463b2b28c9..3a734dc29f82 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = ffdiaporama
 	pkgdesc = Movie creator from photos and video clips
 	pkgver = 2.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://ffdiaporama.tuxfamily.org
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	depends = ffmpeg21
+	depends = ffmpeg2.1
 	depends = sdl
 	depends = sdl_mixer
 	depends = qt5-base
@@ -17,6 +17,7 @@ pkgbase = ffdiaporama
 	depends = exiv2
 	depends = taglib
         source = patchfile.patch
+        source = cBaseMediaFile.cpp.patch
 	source = http://download.tuxfamily.org/ffdiaporama/Packages/Stable/ffdiaporama_bin_2.1.2014.0209.tar.gz
 	md5sums = f9f46277153cf49f6947973778516adb
 
diff --git a/PKGBUILD b/PKGBUILD
index a065f7437015..bf9534bbc80f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,12 @@
 pkgname=ffdiaporama
 _pkgdir="ffDiaporama"
 pkgver=2.1
-pkgrel=2
+pkgrel=3
 pkgdesc='application for creating video sequences consisting of photos, movies, music'
 arch=(x86_64)
 url=http://ffdiaporama.tuxfamily.org
 license=(GPL2)
-depends=('ffmpeg21' 'sdl' 'sdl_mixer' 'qt5-base' 'qt5-tools' 'qt5-svg' 'sqlite' 'qt5-imageformats' 'exiv2' 'taglib')
+depends=('ffmpeg2.1' 'sdl' 'sdl_mixer' 'qt5-base' 'qt5-tools' 'qt5-svg' 'sqlite' 'qt5-imageformats' 'exiv2' 'taglib')
 provides=(
 
 )
@@ -17,23 +17,30 @@ makedepends=(
   gcc
 )
 source=('http://download.tuxfamily.org/ffdiaporama/Packages/Stable/ffdiaporama_bin_2.1.2014.0209.tar.gz'
-        'patchfile.patch')
+        'patchfile.patch'
+        'cBaseMediaFile.cpp.patch'
+        )
 md5sums=('f9f46277153cf49f6947973778516adb'
-         '6269400e6c9805f57ddb0202035cc7c7')
+         '6269400e6c9805f57ddb0202035cc7c7'
+         'SKIP'
+         )
+
+options=('debug')
 
 prepare() {
   #cd "$pkgname-pkgver"
   cd "$_pkgdir"
   patch --forward --strip=1 --input="${srcdir}/patchfile.patch"
+  patch --forward --strip=1 --input="${srcdir}/cBaseMediaFile.cpp.patch"
   #patch ${srcdir}/ffDiaporama/src/ffDiaporama/wgt_QMultimediaBrowser/QCustomFolderTable.cpp ${startdir}/patchfile.patch
 }
 
 build() {
-  LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/ffmpeg21/lib:/opt/lib
+  LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/lib/ffmpeg2.1:/opt/lib
   export LD_LIBRARY_PATH
   cd "$_pkgdir"
   sed -i 's@GTK;GNOME;Qt;KDE;AudioVideo;@AudioVideo;Player;X-Red-Hat-Base;@g' ffDiaporama.desktop
-  qmake-qt5 'QMAKE_CFLAGS_ISYSTEM=-I' 'INCLUDEPATH += /opt/ffmpeg21/include' 'LIBPATH += /opt/ffmpeg21/lib' ffDiaporama.pro PREFIX=/usr
+  qmake-qt5 'QMAKE_CFLAGS_ISYSTEM=-I' 'INCLUDEPATH += /opt/include/ffmpeg2.1 /opt/include' 'LIBPATH += /opt/lib/ffmpeg2.1 /opt/lib' ffDiaporama.pro PREFIX=/usr
   
   make "-j$(nproc)" || return 1
 }
diff --git a/cBaseMediaFile.cpp.patch b/cBaseMediaFile.cpp.patch
new file mode 100644
index 000000000000..96e807ce4fc6
--- /dev/null
+++ b/cBaseMediaFile.cpp.patch
@@ -0,0 +1,12 @@
+diff --git a/src/ffDiaporama/engine/cBaseMediaFile.cpp c/src/ffDiaporama/engine/cBaseMediaFile.cpp
+--- a/src/ffDiaporama/engine/cBaseMediaFile.cpp	2014-02-09 09:48:04.000000000 +0000
++++ c/src/ffDiaporama/engine/cBaseMediaFile.cpp	2024-02-29 15:46:28.819678562 +0000
+@@ -1019,7 +1019,7 @@
+         // ******************************************************************************************************
+         // Try to load EXIF information using library exiv2
+         // ******************************************************************************************************
+-        Exiv2::Image::AutoPtr ImageFile;
++        Exiv2::Image::UniquePtr ImageFile;
+         try {
+             #ifdef Q_OS_WIN
+                 ImageFile=Exiv2::ImageFactory::open(FileName().toLocal8Bit().data());