Request 5139 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 5139 (accepted)

No description set

Created by enzokiel over 4 years ago
In state accepted
Package maintainer: enzokiel

Submit avidemux3

Submit package Staging / avidemux3 to package Multimedia / avidemux3

avidemux3.changes Changed

@@ -1,4 +1,61 @@
 -------------------------------------------------------------------
+Tue Jul 07 17:59:43 UTC 2020 - enzokiel@kabelmail.de
+
+- Update to version 2.7.6
+  + New Feature:Detect and warn when cut points in HEVC video
+    streams may result in grave playback issues despite being on
+    keyframes
+  + New Video Decoder:Add libaom-based AV1 decoder
+  + New Video Encoder:Add libvpx-based VP9 encoder
+  + New Video Filter:Add hardware accelerated deinterlacer and
+    resizer based on VA-API (Linux only)
+  + FFmpeg:Update to the 4.2.3 release
+  + Core:Increase maximum supported resolution to 4096x4096
+  + Core:Fix crash on macOS with HW accel. decoding enabled and
+    H.264 video streams containing both frame- and field-encoded
+    slices
+  + Encoder:Extend configuration options for NVENC-based H.264 and
+    HEVC encoders, add 2-pass mode
+  + Demuxer:Support MPEG-TS files with duration in excess of
+    13:15:36
+  + Demuxer:Use DTS core from DTS XLL audio in MPEG-TS files
+    instead of rejecting the track
+  + Demuxer:Fix mono MP3 audio tracks in MP4 files misdetected as
+    stereo
+  + Demuxer:Try to correct timestamp jitter in MP4 files produced
+    by older Avidemux versions
+  + Muxer:Fix timestamp rounding which caused pseudo-VFR output
+    from CFR sources
+  + Muxer:Fix saving to network shares on Windows using the Mp4
+    muxer when index should be moved to the start of the file
+  + Muxer:Support LPCM audio in the Mp4 muxer by silently
+    switching to the MOV muxing mode
+  + Muxer:Add support for Vorbis audio to the Mp4 muxer
+  + Filter:Fix "Fade" and "Fade to black", broken on macOS
+  + Filter:Allow to toggle rubber band visibility in "Crop" and
+    "Blacken Borders" video filters
+  + Filter:Fix keyboard input in "Resize" video filter by
+    recalculating values only on moving focus to another field or
+    on accepting dialog
+  + Audio:Add HE-AAC and HE-AACv2 profiles to the FDK AAC encoder
+    plugin
+  + Audio:Support external audio tracks in DTS format
+  + UI:Fix navigation slider with RTL locales
+  + UI:Restore the shutdown option in encoding dialog on Windows
+  + Scripting:Add PTS query and keyframe seek methods to Python
+    interface
+  + Miscellaneous:Allow user-defined fragment size for auto-append
+    of chunked MPEG-TS files
+  + Miscellaneous:Improve handling of field-encoded video streams
+    throughout the chain
+  + Miscellaneous:Improve handling of H.264 video streams with
+    parameter sets changing on the fly
+  + Miscellaneous:Try to keep track of video time base throughout
+    the chain
+  + Miscellaneous:Numerous other fixes and polish
+- Removed avidemux-cpu-detection-fix.patch, fixed upstream.
+
+-------------------------------------------------------------------
 Tue Nov 12 10:34:59 UTC 2019 - Jiri Slaby <jslaby@suse.cz>
 
 - add avidemux-cpu-detection-fix.patch (build fix)

avidemux3.spec Changed

@@ -22,7 +22,7 @@
 
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
-Version:        2.7.4
+Version:        2.7.6
 Release:        1
 Url:            http://avidemux.sourceforge.net/
 ExclusiveArch:  %ix86 x86_64
@@ -35,8 +35,7 @@
 Patch5:         avidemux-bootStrap.patch
 Patch7:         avidemux-desktop-file.patch
 Patch8:         avidemux-backport_Fix_threads_setup.patch
-Patch9:         avidemux-cpu-detection-fix.patch
-Patch10:        avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch
+Patch9:        avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch
 License:        GPL-2.0
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 
@@ -187,15 +186,14 @@
   find . -name \*.$i -print0 | xargs -0 dos2unix -q
 done
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p0
-%patch7 -p0
+%patch7 -p1
 %patch8 -p0 -R
-%patch9 -p1
-%patch10 -p1
+#%patch9 -p1
 chmod 755 bootStrap.bash
 chmod 644 AUTHORS COPYING README
 
@@ -361,6 +359,7 @@
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_libva.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_null.so
+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_vp9.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ascii.so
@@ -368,6 +367,7 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_admIvtc.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_black.so
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_blend.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_changeFps.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_denoise3d.so
@@ -401,6 +401,7 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_telecide.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_unstackField.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vaapiFilter.so
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vaapiFilterDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vflip.so

avidemux-cpu-detection-fix.patch Deleted

@@ -1,52 +0,0 @@
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Tue, 12 Nov 2019 11:28:37 +0100
-Subject: cmake: fix detection of CPUs
-Patch-mainline: yes
-Git-commit: 82ab993cbbe17c71ca20c4af7b1a4b6f9fa95c45
-References: build fix
-
-The code defines a function foo returning int, but contains no return.
-So the detection fails with "CPU not supported". As new gccs warng abotu
-missing return, it causes the detaction to fail. Switch foo to return
-void.
-
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
- cmake/cmake_compile_check/cpu_armel_check.cpp  | 2 +-
- cmake/cmake_compile_check/cpu_x86-64_check.cpp | 2 +-
- cmake/cmake_compile_check/cpu_x86_check.cpp    | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/cmake_compile_check/cpu_armel_check.cpp b/cmake/cmake_compile_check/cpu_armel_check.cpp
-index 429661add08c..02f779c71b7b 100644
---- a/cmake/cmake_compile_check/cpu_armel_check.cpp
-+++ b/cmake/cmake_compile_check/cpu_armel_check.cpp
-@@ -1,4 +1,4 @@
--int foo(void)
-+void foo(void)
- {
- 
- 	asm volatile ("mov lr,pc " : : );
-diff --git a/cmake/cmake_compile_check/cpu_x86-64_check.cpp b/cmake/cmake_compile_check/cpu_x86-64_check.cpp
-index 49c751b6fbe8..4f493bc5cdaf 100644
---- a/cmake/cmake_compile_check/cpu_x86-64_check.cpp
-+++ b/cmake/cmake_compile_check/cpu_x86-64_check.cpp
-@@ -1,4 +1,4 @@
--int foo(void)
-+void foo(void)
- {
- 	asm volatile ("movdqa %xmm8, 0");
- }
-diff --git a/cmake/cmake_compile_check/cpu_x86_check.cpp b/cmake/cmake_compile_check/cpu_x86_check.cpp
-index c4e8f7f432a5..cd00b66c0524 100644
---- a/cmake/cmake_compile_check/cpu_x86_check.cpp
-+++ b/cmake/cmake_compile_check/cpu_x86_check.cpp
-@@ -1,4 +1,4 @@
--int foo(void)
-+void foo(void)
- {
- 	asm volatile ("movdqa %xmm7, 0");
- }
--- 
-2.24.0
-

avidemux-desktop-file.patch Changed

@@ -1,17 +1,9 @@
---- avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop.orig	2019-03-16 13:53:16.346573397 +0100
-+++ avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop	2019-03-16 13:53:16.350573314 +0100
-@@ -1,5 +1,5 @@
- [Desktop Entry]
--Name=Avidemux
-+Name=Avidemux3
- GenericName=Video Editor
- Comment=Multiplatform video editor
- Exec=avidemux3_qt5
-@@ -7,4 +7,6 @@
- Icon=org.avidemux.Avidemux
- Terminal=false
+diff -uNr avidemux2-2.7.6/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop avidemux2-2.7.6.new/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop
+--- avidemux2-2.7.6/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop	2020-07-05 15:29:02.000000000 +0200
++++ avidemux2-2.7.6.new/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop	2020-07-07 18:40:34.236068158 +0200
+@@ -8,3 +8,5 @@
  Type=Application
--Categories=AudioVideo
-+Categories=AudioVideo;AudioVideoEditing;
+ Categories=AudioVideo;AudioVideoEditing;Video;
+ MimeType=video/mpeg;video/x-mpeg;video/mp4;video/x-m4v;video/quicktime;video/3gp;video/mkv;video/x-matroska;video/webm;video/flv;video/x-flv;video/dv;video/x-msvideo;video/x-ms-wmv;video/x-ms-asf;video/x-anim;
 +X-KDE-StartupNotify=true
 +X-SuSE-translate=true

avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch Changed

@@ -1,22 +1,7 @@
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Tue, 12 Nov 2019 11:47:21 +0100
-Subject: [ivtcDupeRemover] return true from ivtcDupeRemover::getNextFrame
-Patch-mainline: submitted as PR#182
-References: build fix
-
-It is declared as returning a bool, but returns nothing. But the callers
-expect something to be returned: true in case it succeeded.
-
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
- .../ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp   | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp b/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
-index 754fd3ad3807..4ba1eae90c9a 100644
---- a/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
-+++ b/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
-@@ -375,6 +375,8 @@ bool ivtcDupeRemover::getNextFrame(uint32_t *fn,ADMImage *image)
+diff -uNr avidemux2-2.7.6/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp avidemux2-2.7.6.new/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
+--- avidemux2-2.7.6/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp	2020-07-07 18:17:30.964650246 +0200
++++ avidemux2-2.7.6.new/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp	2020-07-07 18:50:38.201333556 +0200
+@@ -375,6 +375,8 @@
                break;
  
        }
@@ -25,6 +10,3 @@
  }
  /**
      \fn getCoupledConf
--- 
-2.24.0
-

avidemux-linking.patch Changed

@@ -1,5 +1,6 @@
---- avidemux/cli/CMakeLists.txt.orig	2019-03-16 11:52:18.201947710 +0100
-+++ avidemux/cli/CMakeLists.txt	2019-03-16 11:52:18.173948283 +0100
+diff -uNr avidemux2-2.7.6/avidemux/cli/CMakeLists.txt avidemux2-2.7.6.new/avidemux/cli/CMakeLists.txt
+--- avidemux2-2.7.6/avidemux/cli/CMakeLists.txt	2020-07-07 18:17:32.192628426 +0200
++++ avidemux2-2.7.6.new/avidemux/cli/CMakeLists.txt	2020-07-07 18:56:56.422604385 +0200
 @@ -110,6 +110,10 @@
  	ADM_gui2Cli6
  	ADM_toolkitCli6
@@ -11,21 +12,9 @@
  )
  
  ###########################################
---- avidemux/qt4/CMakeLists.txt.orig	2019-03-16 11:52:18.201947710 +0100
-+++ avidemux/qt4/CMakeLists.txt	2019-03-16 11:52:18.173948283 +0100
-@@ -183,6 +183,10 @@
- 	ADM_coreAudio6
- 	ADM_coreAudioDevice6
- 	ADM_osSupport6
-+	ADM_coreSqlLight3
-+	ADM_libswscale
-+	ADM_libpostproc
-+	ADM_libavformat
- )
- 
- ###########################################
---- avidemux/qt4/ADM_jobs/src/CMakeLists.txt.orig	2019-03-16 11:52:18.201947710 +0100
-+++ avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2019-03-16 11:52:18.173948283 +0100
+diff -uNr avidemux2-2.7.6/avidemux/qt4/ADM_jobs/src/CMakeLists.txt avidemux2-2.7.6.new/avidemux/qt4/ADM_jobs/src/CMakeLists.txt
+--- avidemux2-2.7.6/avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2020-07-07 18:17:32.552622028 +0200
++++ avidemux2-2.7.6.new/avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2020-07-07 18:58:28.652963131 +0200
 @@ -86,6 +86,10 @@
  TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreJobs)
  TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUtils6)
@@ -37,3 +26,17 @@
  #
  target_link_libraries(avidemux3_jobs_${QT_EXTENSION} "-lm -lstdc++")
  #
+diff -uNr avidemux2-2.7.6/avidemux/qt4/CMakeLists.txt avidemux2-2.7.6.new/avidemux/qt4/CMakeLists.txt
+--- avidemux2-2.7.6/avidemux/qt4/CMakeLists.txt	2020-07-07 18:17:32.648620323 +0200
++++ avidemux2-2.7.6.new/avidemux/qt4/CMakeLists.txt	2020-07-07 18:56:20.383245712 +0200
+@@ -184,6 +184,10 @@
+ 	ADM_coreAudioDevice6
+ 	ADM_coreVideoEncoder6
+ 	ADM_osSupport6
++	ADM_coreSqlLight3
++	ADM_libswscale
++	ADM_libpostproc
++	ADM_libavformat
+ )
+ 
+ ###########################################

avidemux-package_version.patch Changed

@@ -1,6 +1,18 @@
-diff -uNr avidemux_2.7.4/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.7.4.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
---- avidemux_2.7.4/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-08-18 16:55:06.191443864 +0200
-+++ avidemux_2.7.4.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-08-18 17:02:34.575044048 +0200
+diff -uNr avidemux_2.7.6/avidemux/osxInstaller/CMakeLists.txt avidemux_2.7.6.new/avidemux/osxInstaller/CMakeLists.txt
+--- avidemux_2.7.6/avidemux/osxInstaller/CMakeLists.txt	2020-07-07 21:09:46.344578674 +0200
++++ avidemux_2.7.6.new/avidemux/osxInstaller/CMakeLists.txt	2020-07-07 21:10:47.459492742 +0200
+@@ -127,7 +127,7 @@
+ FILE(COPY "${ORIGINAL}/Contents/Resources/avidemux.icns" DESTINATION "${RESOURCES}") 
+ 
+ # Entice macOS to return correct system language (QTBUG-72491)
+-FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux6/qt5/i18n/avidemux_*.qm")
++FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux3/qt5/i18n/avidemux_*.qm")
+ FOREACH(lang ${ListOfTranslationFiles})
+     STRING(REGEX REPLACE ".*avidemux_" "" lang "${lang}")
+     STRING(REPLACE ".qm" "" lang "${lang}")
+diff -uNr avidemux_2.7.6/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.7.6.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
+--- avidemux_2.7.6/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2020-07-07 21:09:45.948585710 +0200
++++ avidemux_2.7.6.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2020-07-07 21:10:47.107498996 +0200
 @@ -143,7 +143,7 @@
      QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
  #else
@@ -10,10 +22,22 @@
  #endif
  
      QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
-diff -uNr avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
---- avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-08-18 16:55:06.139443411 +0200
-+++ avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-08-18 17:02:31.303019793 +0200
-@@ -103,14 +103,14 @@
+diff -uNr avidemux_2.7.6/avidemux/qt4/i18n/Ts.cmake avidemux_2.7.6.new/avidemux/qt4/i18n/Ts.cmake
+--- avidemux_2.7.6/avidemux/qt4/i18n/Ts.cmake	2020-07-07 21:09:45.532593101 +0200
++++ avidemux_2.7.6.new/avidemux/qt4/i18n/Ts.cmake	2020-07-07 21:10:46.671506743 +0200
+@@ -28,7 +28,7 @@
+         IF(WIN32)
+                 SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
+         ELSE(WIN32)
+-                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/${QT_EXTENSION}/i18n")
++                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")
+         ENDIF(WIN32)
+         INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)
+ ENDMACRO(INSTALL_I18N _files)
+diff -uNr avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
+--- avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2020-07-07 21:09:46.264580095 +0200
++++ avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2020-07-07 21:10:48.919466800 +0200
+@@ -124,14 +124,14 @@
      if(isPortable)
      {
          std::string i18n=pluginDir;
@@ -30,7 +54,7 @@
          ADM_i18nDir=std::string(ppath);
          delete [] ppath;
          ppath=NULL;
-@@ -142,7 +142,7 @@
+@@ -163,7 +163,7 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
  
@@ -39,10 +63,10 @@
  
      strcat(ADM_basedir, ADM_DIR_NAME);
      strcat(ADM_basedir, ADM_SEPARATOR);
-diff -uNr avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
---- avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-08-18 16:55:06.139443411 +0200
-+++ avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-08-18 17:02:31.307019824 +0200
-@@ -124,7 +124,7 @@
+diff -uNr avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
+--- avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2020-07-07 21:09:46.260580166 +0200
++++ avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2020-07-07 21:10:48.903467083 +0200
+@@ -132,7 +132,7 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
  
@@ -51,7 +75,7 @@
  
      strcat(ADM_basedir, ADM_DIR_NAME);
      strcat(ADM_basedir, ADM_SEPARATOR);
-@@ -146,9 +146,9 @@
+@@ -154,9 +154,9 @@
      
      std::string partialPath=flavor+std::string("/i18n");
  #ifdef CREATE_BUNDLE
@@ -63,9 +87,9 @@
  #endif
      std::string r=std::string(ppath);
      delete [] ppath;
-diff -uNr avidemux_2.7.4/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.7.4.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
---- avidemux_2.7.4/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2019-08-18 16:55:05.887441210 +0200
-+++ avidemux_2.7.4.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2019-08-18 17:02:27.818993969 +0200
+diff -uNr avidemux_2.7.6/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.7.6.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
+--- avidemux_2.7.6/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2020-07-07 21:09:45.612591680 +0200
++++ avidemux_2.7.6.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2020-07-07 21:10:39.679630980 +0200
 @@ -265,7 +265,7 @@
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1,
  			(string("Executing ") + string(name) + string("...")).c_str());
@@ -75,9 +99,9 @@
  
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
  
-diff -uNr avidemux_2.7.4/cmake/se_plugin.cmake avidemux_2.7.4.new/cmake/se_plugin.cmake
---- avidemux_2.7.4/cmake/se_plugin.cmake	2019-08-18 16:55:05.295436042 +0200
-+++ avidemux_2.7.4.new/cmake/se_plugin.cmake	2019-08-18 17:02:36.735060059 +0200
+diff -uNr avidemux_2.7.6/cmake/se_plugin.cmake avidemux_2.7.6.new/cmake/se_plugin.cmake
+--- avidemux_2.7.6/cmake/se_plugin.cmake	2020-07-07 21:09:45.540592960 +0200
++++ avidemux_2.7.6.new/cmake/se_plugin.cmake	2020-07-07 21:10:50.103445762 +0200
 @@ -16,7 +16,7 @@
  if (WIN32)
      set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
@@ -87,23 +111,11 @@
  endif (WIN32)
  
      install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
-diff -uNr avidemux_2.7.4/cmake/sql/update.sh avidemux_2.7.4.new/cmake/sql/update.sh
---- avidemux_2.7.4/cmake/sql/update.sh	2019-08-18 16:55:06.235444248 +0200
-+++ avidemux_2.7.4.new/cmake/sql/update.sh	2019-08-18 17:02:36.499058309 +0200
+diff -uNr avidemux_2.7.6/cmake/sql/update.sh avidemux_2.7.6.new/cmake/sql/update.sh
+--- avidemux_2.7.6/cmake/sql/update.sh	2020-07-07 21:09:46.300579456 +0200
++++ avidemux_2.7.6.new/cmake/sql/update.sh	2020-07-07 21:10:49.887449600 +0200
 @@ -1,3 +1,3 @@
 -sqlite3 ~/.avidemux6/jobs.sql .d > dump
 +sqlite3 ~/.avidemux3/jobs.sql .d > dump
  #sql2class -sqlite -global -license -wrapped  -lib $PWD dump
  sql2class -sqlite -build -global -prefix $PWD -lib sqlJobs -namespace db -overwrite dump
-diff -uNr avidemux_2.7.4/cmake/Ts.cmake avidemux_2.7.4.new/cmake/Ts.cmake
---- avidemux_2.7.4/cmake/Ts.cmake	2019-08-18 16:55:05.283435938 +0200
-+++ avidemux_2.7.4.new/cmake/Ts.cmake	2019-08-18 17:02:36.523058487 +0200
-@@ -28,7 +28,7 @@
-         IF(WIN32)
-                 SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
-         ELSE(WIN32)
--                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/${QT_EXTENSION}/i18n")
-+                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")
-         ENDIF(WIN32)
-         INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)
- ENDMACRO(INSTALL_I18N _files)

avidemux-x264_plugins.patch Changed

avidemux-x265_plugins.patch Changed

avidemux_2.7.4.tar.gz -> avidemux_2.7.6.tar.gz Changed

Build Results
RPM Lint

Refresh

Comments for request 5139 0

Request History

enzokiel created request over 4 years ago

enzokiel accepted request over 4 years ago