Request 4462 (accepted)

avidemux3.changes Changed

@@ -1,4 +1,61 @@
 -------------------------------------------------------------------
+Sun Mar 17 01:39:22 UTC 2019 - enzokiel@kabelmail.de
+
+- Update to version 2.7.2
+  + Win64 version are now compiled with Visual C++, it should help
+    stability wise. You should de-install the previous version
+    first
+  + New Demuxer:Native AviSynth demuxer (MSVC++ 64 bits Windows
+    builds only), 64bits avisynth only !
+  + New Demuxer:VapourSynth demuxer to directly load .vpy scripts
+    (MSVC++, macOS with Homebrew, custom Linux builds), 64bits
+    vapoursynth only on win64!
+  + New Installer:Replace NSIS installer with Qt Installer
+    Framework for native MSVC++ 64 bits Windows builds
+  + New Encoder:Add FFmpeg-based VA-API HW accelerated H.264
+    encoder (Intel/Linux)
+  + New Encoder:Add FFmpeg-based VA-API HW accelerated HEVC
+    encoder (Intel/Linux)
+  + FFmpeg:Migrate to the 4.x branch
+  + Decoder:As a result of the FFmpeg upgrade, HW accelerated HEVC
+    decoding on macOS is now available when supported by the
+    hardware
+  + Encoder:Fix issues with image quality and skipped frames in
+    the MJPEG encoder
+  + Demuxer:Fix audio delay calculation in the Mp4 demuxer
+  + Demuxer:Fix crash loading large MP4 files with LPCM audio
+  + Demuxer:Fix multiple issues in the ASF demuxer, allow to cancel
+    indexing
+  + Demuxer:Allow to cancel indexing of MKV files
+  + Demuxer:Re-enable multiloading for MPEG-TS streams cut in
+    chunks of 256, 512 MiB, 1, 2 and 4 GiB in size only
+  + Demuxer:Fix MPEG-TS indexer to start a H.264 or HEVC frame with
+    the Access Unit Delimiter
+  + Muxer:Add Annex B to Annex B video stream filter to deal with
+    misplaced frame boundaries
+  + Muxer:Add support for setting rotation flag to the MP4 muxer
+  + Filter:Add rubber band selector to the "Blacken Borders" filter
+  + Filter:Add option to deal with anamorphic display to the
+    subtitle filter, fix issues in SRT to SSA converter
+  + UI:Autosave session on video close, add session restore feature
+  + UI:Add file name extension when saving audio for some audio
+    types
+  + Audio:Make maximum level in the "Normalize" filter customizable
+  + Audio:Improve AAC sampling frequency detection
+  + Audio:Add decoding support for multichannel Opus audio
+  + Miscellaneous:Fix regression playback stuck after going to the
+    previous picture
+  + Miscellaneous:Fix regression "Fade to black" reset when
+    starting filtered playback close to the end of video
+  + Miscellaneous:Fix regression stopping playback rewinds to the
+    start of video if seek back to the last displayed picture fails
+- Removed avidemux-cpu_armel.patch, avidemux3.desktop and
+  config.mak.diff, fixed upstream.
+- Fixed avidemux-linking.patch, avidemux-package_version.patch and
+  avidemux-x265_plugins.patch.
+- Added avidemux-desktop-file.patch to fix wrong category.
+
+-------------------------------------------------------------------
 Tue Jun 05 20:27:49 UTC 2018 - enzokiel@kabelmail.de
 
 - Update to version 2.7.1

avidemux3.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package avidemux3
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,17 @@
 #
 
 
+%if (0%{?sle_version} >= 150000 && 0%{?is_opensuse}) || 0%{?suse_version} > 1500
+%bcond_without vapoursynth
+%endif
+
 Name:           avidemux3
 Summary:        Graphical video editing and transcoding tool
-Version:        2.7.1
+Version:        2.7.2
 Release:        1
 Url:            http://avidemux.sourceforge.net/
 ExclusiveArch:  %ix86 x86_64
 Source0:        avidemux_%{version}.tar.gz
-Source1:        avidemux3.desktop
-Source3:        config.mak.diff
 Patch0:         avidemux-cmake-2.8.8.patch
 Patch1:         avidemux-linking.patch
 Patch2:         avidemux-x264_plugins.patch
@@ -32,7 +34,7 @@
 Patch4:         avidemux-package_version.patch
 Patch5:         avidemux-bootStrap.patch
 Patch6:         avidemux-cmake-permissions.patch
-Patch7:         avidemux-cpu_armel.patch
+Patch7:         avidemux-desktop-file.patch
 Patch8:         avidemux-backport_Fix_threads_setup.patch
 License:        GPL-2.0
 Group:          Productivity/Multimedia/Video/Editors and Convertors
@@ -46,8 +48,10 @@
 BuildRequires:  fdupes
 BuildRequires:  dos2unix
 BuildRequires:  yasm
+%if %{with vapoursynth}
 BuildRequires:  pkgconfig(vapoursynth)
 BuildRequires:  pkgconfig(vapoursynth-script)
+%endif
 BuildRequires:  pkgconfig(fribidi)
 BuildRequires:  pkgconfig(libxslt)
 BuildRequires:  pkgconfig(libxml-2.0)
@@ -55,6 +59,7 @@
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(ffnvcodec)
 
 # Sound out
 BuildRequires:  arts-devel
@@ -190,7 +195,6 @@
 %patch6 -p0
 %patch7 -p0
 %patch8 -p0 -R
-cp -f %{S:3} avidemux_core/ffmpeg_package/patches/
 chmod 755 bootStrap.bash
 chmod 644 AUTHORS COPYING README
 
@@ -205,12 +209,6 @@
 %install
 cp -r install/* %{buildroot}
 
-# Install desktop file
-install -D -m644 %{S:1} %{buildroot}%{_datadir}/applications/avidemux3.desktop
-
-# Install icon
-install -D -m644 avidemux_icon.png %{buildroot}%{_datadir}/pixmaps/avidemux3.png
-
 # Install man
 install -D -m644 man/avidemux.1 %{buildroot}%{_mandir}/man1/avidemux.1
 
@@ -237,6 +235,9 @@
 
 %files
 %defattr(-,root,root)
+%if %{with vapoursynth}
+%{_bindir}/vsProxy
+%endif
 %{_libdir}/libADM6avcodec.so.*
 %{_libdir}/libADM6avformat.so.*
 %{_libdir}/libADM6avutil.so.*
@@ -259,7 +260,7 @@
 %{_libdir}/libADM_coreScript.so
 %{_libdir}/libADM_coreSocket6.so
 %{_libdir}/libADM_coreSqlLight3.so
-%{_libdir}/libADM_coreSubtitle.so
+%{_libdir}/libADM_coreSubtitles6.so
 %{_libdir}/libADM_coreUI6.so
 %{_libdir}/libADM_coreUtils6.so
 %{_libdir}/libADM_coreVDPAU6.so
@@ -328,6 +329,9 @@
 %{_libdir}/ADM_plugins6/demuxers/libADM_dm_pic.so
 %{_libdir}/ADM_plugins6/demuxers/libADM_dm_ps.so
 %{_libdir}/ADM_plugins6/demuxers/libADM_dm_ts.so
+%if %{with vapoursynth}
+%{_libdir}/ADM_plugins6/demuxers/libADM_dm_vapoursynth.so
+%endif
 %{_libdir}/ADM_plugins6/muxers/libADM_mx_avi.so
 %{_libdir}/ADM_plugins6/muxers/libADM_mx_dummy.so
 %{_libdir}/ADM_plugins6/muxers/libADM_mx_ffPS.so
@@ -348,6 +352,10 @@
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffFlv1.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg2.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg4.so
+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffNvenc.so
+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffNvencHEVC.so
+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncH264.so
+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffVaEncHEVC.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_huff.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_libva.so
@@ -401,7 +409,8 @@
 %{_datadir}/ADM6_addons/avsfilter/avsload.exe
 %{_datadir}/ADM6_addons/avsfilter/pipe_source.dll
 %{_mandir}/man1/avidemux.1.gz
-%doc AUTHORS COPYING README
+%doc AUTHORS README
+%license COPYING
 
 %files cli
 %defattr(-,root,root)
@@ -426,6 +435,9 @@
 %defattr(-,root,root)
 %{_bindir}/avidemux3_jobs_qt5
 %{_bindir}/avidemux3_qt5
+%if %{with vapoursynth}
+%{_bindir}/vsProxy_gui_qt5
+%endif
 %{_libdir}/libADM_openGLQT56.so
 %{_libdir}/libADM_render6_QT5.so
 %{_libdir}/libADM_UIQT56.so
@@ -456,8 +468,12 @@
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_sampleGlVertex.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_shaderLoaderGl.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_swscaleResizeQT5.so
-%{_datadir}/applications/avidemux3.desktop
-%{_datadir}/pixmaps/avidemux3.png
+%{_datadir}/applications/org.avidemux.Avidemux.desktop
+%{_datadir}/icons/hicolor/128x128/apps/org.avidemux.Avidemux.png
+%if (0%{?sle_version} == 120300 && 0%{?is_opensuse}) || (0%{?suse_version} == 1315 && !0%{?is_opensuse})
+%dir %{_datadir}/metainfo
+%endif
+%{_datadir}/metainfo/org.avidemux.Avidemux.appdata.xml
 
 %files qt5-lang
 %defattr(-,root,root)

avidemux-cpu_armel.patch Deleted

avidemux-desktop-file.patch Added

avidemux-linking.patch Changed

@@ -1,57 +1,39 @@
---- avidemux/cli/CMakeLists.txt.orig	2016-08-18 21:32:46.369436856 +0200
-+++ avidemux/cli/CMakeLists.txt	2016-08-18 21:32:46.325437648 +0200
-@@ -111,6 +111,16 @@
- )
- 
- ###########################################
-+# Missing libs
-+###########################################
-+TARGET_LINK_LIBRARIES(avidemux3_cli
+--- 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
+@@ -110,6 +110,10 @@
+ 	ADM_gui2Cli6
+ 	ADM_toolkitCli6
+ 	ADM_shellCli
 +	ADM_coreSqlLight3
 +	ADM_libswscale
 +	ADM_libpostproc
 +	ADM_libavformat
-+)
-+
-+###########################################
- # External libs
- ###########################################
- # gettext
---- avidemux/qt4/CMakeLists.txt.orig	2016-08-18 21:32:46.309437935 +0200
-+++ avidemux/qt4/CMakeLists.txt	2016-08-18 21:32:45.809446926 +0200
-@@ -161,6 +161,16 @@
  )
  
  ###########################################
-+# Missing libs
-+###########################################
-+TARGET_LINK_LIBRARIES(avidemux3_${QT_EXTENSION}
+--- 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
-+)
-+
-+###########################################
- # External libs
+ )
+ 
  ###########################################
- # gettext
---- avidemux/qt4/ADM_jobs/src/CMakeLists.txt.orig	2016-08-18 21:32:45.845446279 +0200
-+++ avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2016-08-18 21:32:45.825446639 +0200
-@@ -67,6 +67,16 @@
+--- 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
+@@ -86,6 +86,10 @@
  TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreJobs)
  TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUtils6)
  TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_core6)
-+###########################################
-+# Missing libs
-+###########################################
-+TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION}
-+	ADM_coreSqlLight3
-+	ADM_coreUI6
-+	ADM_libavcodec
-+	ADM_libavutil
-+)
-+
++TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreSqlLight3)
++TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUI6)
++TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_libavcodec)
++TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_libavutil)
  #
  target_link_libraries(avidemux3_jobs_${QT_EXTENSION} "-lm -lstdc++")
  #

avidemux-package_version.patch Changed

@@ -1,6 +1,6 @@
-diff -uNr avidemux_2.7.0/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.7.0.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
---- avidemux_2.7.0/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2017-08-14 19:48:01.481407444 +0200
-+++ avidemux_2.7.0.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2017-08-14 20:01:48.190879204 +0200
+diff -uNr avidemux_2.7.2/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.7.2.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
+--- avidemux_2.7.2/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-03-16 11:52:17.881954253 +0100
++++ avidemux_2.7.2.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-03-16 11:56:10.833191154 +0100
 @@ -143,7 +143,7 @@
      QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
  #else
@@ -10,9 +10,9 @@
  #endif
  
      QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
-diff -uNr avidemux_2.7.0/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.7.0.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
---- avidemux_2.7.0/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2017-08-14 19:48:01.433408213 +0200
-+++ avidemux_2.7.0.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2017-08-14 20:01:48.022882248 +0200
+diff -uNr avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
+--- avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-03-16 11:52:17.853954826 +0100
++++ avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-03-16 11:56:07.877251594 +0100
 @@ -103,14 +103,14 @@
      if(isPortable)
      {
@@ -39,9 +39,9 @@
  
      strcat(ADM_basedir, ADM_DIR_NAME);
      strcat(ADM_basedir, ADM_SEPARATOR);
-diff -uNr avidemux_2.7.0/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.7.0.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
---- avidemux_2.7.0/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2017-08-14 19:48:01.433408213 +0200
-+++ avidemux_2.7.0.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2017-08-14 20:01:48.022882248 +0200
+diff -uNr avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
+--- avidemux_2.7.2/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-03-16 11:52:17.853954826 +0100
++++ avidemux_2.7.2.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-03-16 11:56:07.877251594 +0100
 @@ -124,7 +124,7 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
@@ -63,9 +63,9 @@
  #endif
      std::string r=std::string(ppath);
      delete [] ppath;
-diff -uNr avidemux_2.7.0/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.7.0.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
---- avidemux_2.7.0/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2017-08-14 19:48:01.357409430 +0200
-+++ avidemux_2.7.0.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2017-08-14 20:01:47.582890218 +0200
+diff -uNr avidemux_2.7.2/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.7.2.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
+--- avidemux_2.7.2/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2019-03-16 11:52:17.737957198 +0100
++++ avidemux_2.7.2.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2019-03-16 11:56:04.405322583 +0100
 @@ -265,7 +265,7 @@
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1,
  			(string("Executing ") + string(name) + string("...")).c_str());
@@ -75,10 +75,10 @@
  
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
  
-diff -uNr avidemux_2.7.0/cmake/se_plugin.cmake avidemux_2.7.0.new/cmake/se_plugin.cmake
---- avidemux_2.7.0/cmake/se_plugin.cmake	2017-08-14 19:47:33.749847944 +0200
-+++ avidemux_2.7.0.new/cmake/se_plugin.cmake	2017-08-14 20:01:14.587487760 +0200
-@@ -15,7 +15,7 @@
+diff -uNr avidemux_2.7.2/cmake/se_plugin.cmake avidemux_2.7.2.new/cmake/se_plugin.cmake
+--- avidemux_2.7.2/cmake/se_plugin.cmake	2019-03-16 11:52:17.401964068 +0100
++++ avidemux_2.7.2.new/cmake/se_plugin.cmake	2019-03-16 11:56:12.493157213 +0100
+@@ -16,7 +16,7 @@
  if (WIN32)
      set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
  else (WIN32)
@@ -87,17 +87,17 @@
  endif (WIN32)
  
      install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
-diff -uNr avidemux_2.7.0/cmake/sql/update.sh avidemux_2.7.0.new/cmake/sql/update.sh
---- avidemux_2.7.0/cmake/sql/update.sh	2017-08-14 19:48:19.685114476 +0200
-+++ avidemux_2.7.0.new/cmake/sql/update.sh	2017-08-14 20:02:01.410639682 +0200
+diff -uNr avidemux_2.7.2/cmake/sql/update.sh avidemux_2.7.2.new/cmake/sql/update.sh
+--- avidemux_2.7.2/cmake/sql/update.sh	2019-03-16 11:52:17.921953435 +0100
++++ avidemux_2.7.2.new/cmake/sql/update.sh	2019-03-16 11:56:12.229162611 +0100
 @@ -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.0/cmake/Ts.cmake avidemux_2.7.0.new/cmake/Ts.cmake
---- avidemux_2.7.0/cmake/Ts.cmake	2017-08-14 19:47:33.737848134 +0200
-+++ avidemux_2.7.0.new/cmake/Ts.cmake	2017-08-14 20:01:14.567488123 +0200
+diff -uNr avidemux_2.7.2/cmake/Ts.cmake avidemux_2.7.2.new/cmake/Ts.cmake
+--- avidemux_2.7.2/cmake/Ts.cmake	2019-03-16 11:52:17.393964231 +0100
++++ avidemux_2.7.2.new/cmake/Ts.cmake	2019-03-16 11:56:12.265161875 +0100
 @@ -28,7 +28,7 @@
          IF(WIN32)
                  SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")

avidemux-x265_plugins.patch Changed

config.mak.diff Deleted

avidemux3.desktop Deleted

avidemux_2.7.1.tar.gz -> avidemux_2.7.2.tar.gz Changed

Overview

Request 4462 (accepted)

Request History