[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/next] /: Support a custom suffix for FFmpeg binaries
From:       Vincent PINON <vincent.pinon () laposte ! net>
Date:       2014-04-30 20:27:54
Message-ID: E1Wfb6g-0003AX-UM () scm ! kde ! org
[Download RAW message or body]

Git commit f9a898764efde45ecdae17498326f98cd5e29a67 by Vincent PINON, on behalf of \
Alberto Villa. Committed on 10/06/2013 at 09:12.
Pushed by vpinon into branch 'next'.

Support a custom suffix for FFmpeg binaries

Just like MLT's --avformat-suffix, FFMPEG_SUFFIX allows for
definition of custom suffix to append to ffmpeg and ffplay binaries.
This is mostly useful for packagers willing to set a default version
for FFmpeg dependency, as users can already configure ffmpeg and
ffpaly paths via settings.

Conflicts:
	src/monitor/recmonitor.cpp

Conflicts:
	src/recmonitor.cpp

M  +3    -0    ChangeLog
M  +2    -0    config-kdenlive.h.cmake
M  +2    -0    src/CMakeLists.txt
M  +2    -2    src/recmonitor.cpp
M  +2    -2    src/wizard.cpp

http://commits.kde.org/kdenlive/f9a898764efde45ecdae17498326f98cd5e29a67

diff --git a/ChangeLog b/ChangeLog
index c71ffcc..d07d50b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+0.9.7
+    * Add support for a custom suffix for FFmpeg binaries (mostly for packagers)
+
 0.9.6
     * Fix keyframes when cutting a clip / undoing a clip cut
     * Warn before overwriting .mlt stabilized file
diff --git a/config-kdenlive.h.cmake b/config-kdenlive.h.cmake
index b63523d..321cc88 100644
--- a/config-kdenlive.h.cmake
+++ b/config-kdenlive.h.cmake
@@ -8,6 +8,8 @@
 #define MLT_MIN_MINOR_VERSION @MLT_MIN_MINOR_VERSION@
 #define MLT_MIN_PATCH_VERSION @MLT_MIN_PATCH_VERSION@
 
+#define FFMPEG_SUFFIX "@FFMPEG_SUFFIX@"
+
 #cmakedefine HAVE_MALLOC_H 1
 #cmakedefine HAVE_PTHREAD_H 1
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bf5b86b..8eac664 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,6 +13,8 @@ macro_optional_find_package(QJSON)
 
 option(WITH_JogShuttle "Build Jog/Shuttle support" ON)
 
+set(FFMPEG_SUFFIX "" CACHE STRING "FFmpeg custom suffix")
+
 macro_optional_find_package(LibV4L2)
 macro_log_feature(LIBV4L2_FOUND
   "libv4l"
diff --git a/src/recmonitor.cpp b/src/recmonitor.cpp
index f3d9ac7..d7a1125 100644
--- a/src/recmonitor.cpp
+++ b/src/recmonitor.cpp
@@ -17,7 +17,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-
 #include "recmonitor.h"
 #include "gentime.h"
 #include "mltdevicecapture.h"
@@ -27,6 +26,7 @@
 #include "monitor.h"
 #include "profilesdialog.h"
 #include "widgets/videosurface.h"
+#include "config-kdenlive.h"
 
 #include <KDebug>
 #include <KLocalizedString>
@@ -270,7 +270,7 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
         m_stopAction->setEnabled(false);
         m_playAction->setEnabled(false);
 	if (KdenliveSettings::ffmpegpath().isEmpty()) {
-	    QString exepath = KStandardDirs::findExe("ffmpeg");
+	    QString exepath = \
KStandardDirs::findExe(QString("ffmpeg%1").arg(FFMPEG_SUFFIX));  if \
(exepath.isEmpty()) {  // Check for libav version
 		exepath = KStandardDirs::findExe("avconv");
diff --git a/src/wizard.cpp b/src/wizard.cpp
index 929d49d..7d6d171 100644
--- a/src/wizard.cpp
+++ b/src/wizard.cpp
@@ -499,8 +499,8 @@ void Wizard::slotCheckPrograms()
     QTreeWidgetItem *item = new QTreeWidgetItem(m_check.programList, QStringList() \
                << QString() << i18n("FFmpeg & ffplay"));
     item->setData(1, Qt::UserRole, i18n("Required for proxy clips, transcoding and \
screen capture"));  item->setSizeHint(0, itemSize);
-    QString exepath = KStandardDirs::findExe("ffmpeg");
-    QString playpath = KStandardDirs::findExe("ffplay");
+    QString exepath = \
KStandardDirs::findExe(QString("ffmpeg%1").arg(FFMPEG_SUFFIX)); +    QString playpath \
= KStandardDirs::findExe(QString("ffplay%1").arg(FFMPEG_SUFFIX));  item->setIcon(0, \
m_okIcon);  if (exepath.isEmpty()) {
         // Check for libav version


[prev in list] [next in list] [prev in thread] [next in thread]