Request 5480 (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 5480 (accepted)

No description set

Created by enzokiel almost 3 years ago
In state accepted
Package maintainer: enzokiel

Submit avidemux3

Submit package Staging / avidemux3 to package Multimedia / avidemux3

avidemux3.changes Changed

@@ -1,9 +1,106 @@
 -------------------------------------------------------------------
+Mon Dec 27 17:14:17 UTC 2021 - enzokiel@kabelmail.de
+
+- Update to version 2.8.0
+  - Behavior
+    * The part of video preceding the presentation time of the first
+      frame is now excluded from created segment, making all videos
+      appear as if they "start at zero". When saving video, the frame
+      matching the B marker is now excluded from the exported range.
+      Therefore, if the B marker is set to the last frame of the
+      video, it needs to be reset to the full duration for the last
+      frame to be included into the output. Loading Matroska files
+      with HEVC video tracks takes longer as slice headers are
+      decoded to detect the frame type.
+  - New Video Filters
+    * Analyzer
+    * Blur (on selected area)
+    * Cartoon
+    * Color balance (adjust shadow, midtone and highlight)
+    * Chroma hold (monochrome effect with kept colors)
+    * Chroma key (replace "green screen" with an image)
+    * Deband (reduce banding artifacts)
+    * DelogoHQ (clean up arbitrary shaped logo)
+    * Dynamic threshold
+    * Fade from first image
+    * Fade in (combination of multiple effects)
+    * Fade out (combination of multiple effects)
+    * Fade through (combination of multiple effects)
+    * Fit to size (resize and pad to the specified size)
+    * Flip (vertically/horizontally flip the image)
+    * Grid (video wall effect)
+    * Image stabilizer (reduce camera shakiness)
+    * Luma stabilizer (reduce flickering)
+    * Mirror
+    * Posterize
+    * Quadrilateral transformation (four point transform)
+    * Wavelet denoiser
+    * Wavelet sharpener
+    * Zoom (partializable crop filter)
+  - New Features
+    * HDR video can be converted to SDR with tone mapping using a
+      variety of methods.
+    * FFV1 encoder is back (it was available in Avidemux 2.5.x).
+    * TrueHD audio tracks can be decoded and are supported for
+      Matroska containers.
+    * Decoding support for WMA9 Lossless codec.
+    * Filter previews have got a unified method to quickly compare
+      filtered and unfiltered inputs via the "Peek Original" button.
+    * Blend and motion interpolation options added to "Resample FPS"
+      filter.
+    * Mark cut points (segment boundaries) on the navigation slider.
+      New buttons and shortcuts are provided to jump to these cut
+      points.
+    * In the Video Filter Manager, active filters can be temporarily
+      disabled.
+    * Preference added to load sequentially named pictures in reverse
+      order, allowing to reverse video by exporting selection as JPEG
+      images and loading the first one.
+    * During playback navigation is possible via keys or by dragging
+      the navigation slider.
+  - Other Enhancements
+    * "Resample FPS" and "Change FPS" filters can handle up to 1000
+      fps.
+    * "Crop" filter's preview has got a translucent green masking.
+    * "Crop" filter's Auto Crop function can achieve perfect crops
+      (if the selected frame is not too dark).
+    * The maximum output resolution of the "Resize" filter has been
+      increased to 8192x8192
+    * The "Resize" filter has got a nearest neighbour scaling option.
+    * Improved HiDPI scaling in previews.
+    * x264 video encoder plugin now allows to specify color properties.
+    * Maximized window state, widget visibility and toolbar position
+      are preserved after application restart.
+    * Timestamps in format 00:00:00.000 like copied to clipboard by
+      pressing CTRL+SHIFT+C can be pasted into the "Go to Time"
+      dialog using CTRL+V.
+    * PulseAudioSimple audio device has been replaced with full
+      PulseAudio, making an in-application volume control available
+      (Linux only).
+    * ALSA audio device plugin has been modified to use soft volume,
+      providing application-specific volume control which works with
+      every ALSA device.
+    * In the Video Filter Manager, navigation by keyboard has been
+      enhanced.
+    * The VU meter ("Audio Metre") has been redesigned.
+  - Bugfixes
+    * Occasional UI unrepsonsiveness during playback should be fixed.
+    * Prevent navigation key events piling up.
+    * Thumb slider, displaced by mouse wheel, is now automatically
+      reset if the end of video is reached, stopping Avidemux log
+      file from filling disk space.
+    * Purple tint in old "Fade to" and "Fade to black" filters on
+      macOS fixed.
+    * Green tint in "MPlayer eq2" filter is fixed.
+  - Miscellaneous
+    * Bundled FFmpeg libraries have been updated to 4.4.1 release.
+
+-------------------------------------------------------------------
 Tue Mar 09 15:06:42 UTC 2021 - enzokiel@kabelmail.de
 
 - Update to version 2.7.8
   - New Features
-Many new video filters added by courtesy of szlldm
+    * Many new video filters added by courtesy of szlldm
     * A dedicated MOV muxer is now available, replacing silent
       fallback to MOV muxing mode within the MP4 muxer.
     * A subset of color info relevant for HDR support is retained

avidemux3.spec Changed

@@ -22,11 +22,11 @@
 Summary:        Graphical video editing and transcoding tool
 License:        GPL-2.0-only
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Version:        2.7.8
+Version:        2.8.0
 Release:        0
 URL:            http://avidemux.sourceforge.net/
 ExclusiveArch:  %ix86 x86_64
-Source0:        https://www.fosshub.com/Avidemux.html?dwl=avidemux_%{version}.tar.gz
+Source0:        https://github.com/mean00/avidemux2/releases/download/%{version}/avidemux_%{version}.tar.gz
 Patch0:         avidemux-cmake-2.8.8.patch
 Patch1:         avidemux-linking.patch
 Patch2:         avidemux-x264_plugins.patch
@@ -36,6 +36,7 @@
 Patch7:         avidemux-desktop-file.patch
 Patch8:         avidemux-backport_Fix_threads_setup.patch
 Patch9:         avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch
+Patch10:        avidemux-translations.patch
 
 # Utilities / Libraries
 BuildRequires:  cmake
@@ -198,6 +199,7 @@
 %patch7 -p1
 %patch8 -p0 -R
 %patch9 -p1
+%patch10 -p1
 chmod 755 bootStrap.bash
 chmod 644 AUTHORS COPYING README
 
@@ -212,7 +214,6 @@
 export CXXFLAGS="$flags"
 
 options+="--with-cli "
-options+="--with-qt "
 ./bootStrap.bash $options
 
 %install
@@ -220,10 +221,13 @@
 
 # Install man
 install -D -m644 man/avidemux.1 %{buildroot}%{_mandir}/man1/avidemux.1
+rm -f %{buildroot}%{_datadir}/avidemux3/qt5/translations/qtbase_*.qm
 
 # delete devel file (only needed for build)
 rm -rf %{buildroot}%{_includedir}
 
+%find_lang avidemux %{name}-qt5.lang --with-qt
+
 %fdupes %buildroot
 
 %post -p /sbin/ldconfig
@@ -234,13 +238,9 @@
 
 %postun cli -p /sbin/ldconfig
 
-%post qt5
-/sbin/ldconfig
-%desktop_database_post
+%post qt5 -p /sbin/ldconfig 
 
-%postun qt5
-/sbin/ldconfig
-%desktop_database_postun
+%postun qt5 -p /sbin/ldconfig
 
 %files
 %if %{with vapoursynth}
@@ -306,7 +306,7 @@
 %{_libdir}/ADM_plugins6/audioDevices/libADM_av_alsaHw.so
 %{_libdir}/ADM_plugins6/audioDevices/libADM_av_jack.so
 %{_libdir}/ADM_plugins6/audioDevices/libADM_av_oss.so
-%{_libdir}/ADM_plugins6/audioDevices/libADM_av_pulseAudioSimple.so
+%{_libdir}/ADM_plugins6/audioDevices/libADM_av_pulseAudio.so
 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_aften.so
 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_dcaenc.so
 %{_libdir}/ADM_plugins6/audioEncoders/libADM_ae_faac.so
@@ -358,10 +358,8 @@
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/ultraFast.json
 %{_libdir}/ADM_plugins6/pluginSettings/x264/3/veryFast.json
 %{_libdir}/ADM_plugins6/scriptEngines/libADM_script_tinyPy.so
-%if 0%{?is_opensuse}
 %dir %{_libdir}/ADM_plugins6/videoDecoders
 %{_libdir}/ADM_plugins6/videoDecoders/libADM_vd_aom.so
-%endif
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffDv.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffFlv1.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_ffMpeg2.so
@@ -370,6 +368,7 @@
 %{_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_ffv1.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
@@ -394,7 +393,6 @@
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_fadeToBlack.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_FluxSmooth.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_gauss.so
-%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_hflip.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_hzstackField.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ivtcDupeRemover.so
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_kernelDeint.so
@@ -421,7 +419,6 @@
 %{_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
 %{_libdir}/ADM_plugins6/videoFilters/libADM_vf_yadif.so
 %dir %{_datadir}/ADM6_addons
 %dir %{_datadir}/ADM6_addons/avsfilter
@@ -438,22 +435,46 @@
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x264_cli.so
 %{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_x265_cli.so
 %dir %{_libdir}/ADM_plugins6/videoFilters/cli
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_analyzerCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artCartoonCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artCharcoalCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artChromaHoldCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artChromaKeyCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artColorEffectCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artDynThresholdCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artGridCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artMirrorCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artPixelizeCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artPosterizeCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artVHSCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_artVignetteCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_blackenBordersCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_blurCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_chromaShiftCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_colorBalanceCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_colorTempCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_contrastCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_CropCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_debandCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_delogoHQCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_eq2Cli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_fadeFromImageCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_fadeInCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_fadeOutCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_fadeThroughCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_fitToSizeCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_flipCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_HueCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_imageStabCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_logoCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_lumaStabCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_mpdelogoCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_msharpenCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_quadTransCli.so
 %{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_swscaleResize_cli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_waveletDenoiseCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_waveletSharpCli.so
+%{_libdir}/ADM_plugins6/videoFilters/cli/libADM_vf_ZoomCli.so
 
 %files qt5
 %{_bindir}/avidemux3_jobs_qt5
@@ -474,38 +495,61 @@
 %{_libdir}/ADM_plugins6/shaderDemo/1/zigzag.shader
 %{_libdir}/ADM_plugins6/videoEncoders/qt5/libADM_ve_x264_QT5.so
 %{_libdir}/ADM_plugins6/videoEncoders/qt5/libADM_ve_x265_QT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_analyzerQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artCartoonQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artCharcoalQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artChromaHoldQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artChromaKeyQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artColorEffectQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artDynThresholdQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artGridQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artMirrorQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artPixelizeQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artPosterizeQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artVHSQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_artVignetteQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_asharpQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_blackenBordersQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_blurQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_chromaShiftQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_colorBalanceQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_colorTempQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_contrastQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_cropQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_debandQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_delogoHQQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_eq2QT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fadeFromImageQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fadeInQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fadeOutQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fadeThroughQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_fitToSizeQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_flipQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_glBenchmark.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_glResize.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_HueQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_imageStabQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_lumaStabQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_logoQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_mpdelogoQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_msharpenQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_quadTransQT5.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_rotateGlFrag2.so
 %{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_sampleGlFrag2.so
 %{_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
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_waveletDenoiseQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_waveletSharpQT5.so
+%{_libdir}/ADM_plugins6/videoFilters/qt5/libADM_vf_zoomQT5.so
 %{_datadir}/applications/org.avidemux.Avidemux.desktop
 %{_datadir}/icons/hicolor/128x128/apps/org.avidemux.Avidemux.png
 %dir %{_datadir}/metainfo
 %{_datadir}/metainfo/org.avidemux.Avidemux.appdata.xml
 
-%files qt5-lang
+%files qt5-lang -f %{name}-qt5.lang
 %dir %{_datadir}/avidemux3
 %dir %{_datadir}/avidemux3/qt5
-%dir %{_datadir}/avidemux3/qt5/i18n
-%{_datadir}/avidemux3/qt5/i18n/*.qm
+%dir %{_datadir}/avidemux3/qt5/translations
 
 %changelog

avidemux-package_version.patch Changed

@@ -1,18 +1,18 @@
-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 @@
+diff -uNr avidemux_2.8.0/avidemux/osxInstaller/CMakeLists.txt avidemux_2.8.0.new/avidemux/osxInstaller/CMakeLists.txt
+--- avidemux_2.8.0/avidemux/osxInstaller/CMakeLists.txt	2021-12-27 13:09:51.167627817 +0100
++++ avidemux_2.8.0.new/avidemux/osxInstaller/CMakeLists.txt	2021-12-27 13:23:47.647736836 +0100
+@@ -110,7 +110,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")
+-FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux6/qt${ADM_QT_VERSION}/i18n/avidemux_*.qm")
++FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux3/qt${ADM_QT_VERSION}/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
+diff -uNr avidemux_2.8.0/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.8.0.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp
+--- avidemux_2.8.0/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2021-12-27 13:09:51.007630769 +0100
++++ avidemux_2.8.0.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2021-12-27 13:23:47.507739558 +0100
 @@ -143,7 +143,7 @@
      QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
  #else
@@ -22,9 +22,9 @@
  #endif
  
      QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
-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
+diff -uNr avidemux_2.8.0/avidemux/qt4/i18n/Ts.cmake avidemux_2.8.0.new/avidemux/qt4/i18n/Ts.cmake
+--- avidemux_2.8.0/avidemux/qt4/i18n/Ts.cmake	2021-12-27 13:09:50.771635121 +0100
++++ avidemux_2.8.0.new/avidemux/qt4/i18n/Ts.cmake	2021-12-27 13:23:47.423741191 +0100
 @@ -28,7 +28,7 @@
          IF(WIN32)
                  SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
@@ -34,10 +34,10 @@
          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 @@
+diff -uNr avidemux_2.8.0/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.8.0.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp
+--- avidemux_2.8.0/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2021-12-27 13:09:51.027630400 +0100
++++ avidemux_2.8.0.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2021-12-27 13:23:47.867732558 +0100
+@@ -126,14 +126,14 @@
      if(isPortable)
      {
          std::string i18n=pluginDir;
@@ -54,7 +54,7 @@
          ADM_i18nDir=std::string(ppath);
          delete [] ppath;
          ppath=NULL;
-@@ -163,7 +163,7 @@
+@@ -165,7 +165,7 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
  
@@ -63,9 +63,9 @@
  
      strcat(ADM_basedir, ADM_DIR_NAME);
      strcat(ADM_basedir, ADM_SEPARATOR);
-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
+diff -uNr avidemux_2.8.0/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.8.0.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp
+--- avidemux_2.8.0/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2021-12-27 13:09:51.027630400 +0100
++++ avidemux_2.8.0.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2021-12-27 13:23:47.859732714 +0100
 @@ -132,7 +132,7 @@
      strcpy(ADM_basedir, homeEnv);
      AddSeparator(ADM_basedir);
@@ -87,10 +87,10 @@
  #endif
      std::string r=std::string(ppath);
      delete [] ppath;
-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 @@
+diff -uNr avidemux_2.8.0/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.8.0.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp
+--- avidemux_2.8.0/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2021-12-27 13:09:50.887632982 +0100
++++ avidemux_2.8.0.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp	2021-12-27 13:23:42.655833895 +0100
+@@ -268,7 +268,7 @@
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1,
  			(string("Executing ") + string(name) + string("...")).c_str());
  
@@ -99,9 +99,9 @@
  
  		this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
  
-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
+diff -uNr avidemux_2.8.0/cmake/se_plugin.cmake avidemux_2.8.0.new/cmake/se_plugin.cmake
+--- avidemux_2.8.0/cmake/se_plugin.cmake	2021-12-27 13:09:50.787634826 +0100
++++ avidemux_2.8.0.new/cmake/se_plugin.cmake	2021-12-27 13:23:48.491720427 +0100
 @@ -16,7 +16,7 @@
  if (WIN32)
      set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
@@ -111,9 +111,9 @@
  endif (WIN32)
  
      install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
-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
+diff -uNr avidemux_2.8.0/cmake/sql/update.sh avidemux_2.8.0.new/cmake/sql/update.sh
+--- avidemux_2.8.0/cmake/sql/update.sh	2021-12-27 13:09:51.087629294 +0100
++++ avidemux_2.8.0.new/cmake/sql/update.sh	2021-12-27 13:23:48.407722059 +0100
 @@ -1,3 +1,3 @@
 -sqlite3 ~/.avidemux6/jobs.sql .d > dump
 +sqlite3 ~/.avidemux3/jobs.sql .d > dump

avidemux-translations.patch Added

@@ -0,0 +1,29 @@
+--- avidemux_2.8.0/avidemux/qt4/i18n/Ts.cmake	2021-12-27 13:09:50.771635121 +0100
++++ avidemux_2.8.0.new/avidemux/qt4/i18n/Ts.cmake	2021-12-27 15:19:33.950945751 +0100
+@@ -28,7 +28,7 @@
+         IF(WIN32)
+                 SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
+         ELSE(WIN32)
+-                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")
++                SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/translations")
+         ENDIF(WIN32)
+         INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)
+ ENDMACRO(INSTALL_I18N _files)
+--- avidemux_2.8.0/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2021-12-27 13:09:51.027630400 +0100
++++ avidemux_2.8.0.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2021-12-27 16:53:46.698272503 +0100
+@@ -126,13 +126,13 @@
+     if(isPortable)
+     {
+         std::string i18n=pluginDir;
+-        i18n+=std::string("/../../share/avidemux3/")+flavor+std::string("/i18n");
++        i18n+=std::string("/../../share/avidemux3/")+flavor+std::string("/translations");
+         ADM_i18nDir=canonize(i18n);
+         ADM_info("Relative to install i18n mode : <%s>\n",ADM_i18nDir.c_str());
+         // 181n
+     }else
+     {        
+-        std::string partialPath=flavor+std::string("/i18n");
++        std::string partialPath=flavor+std::string("/translations");
+         char *ppath=ADM_getInstallRelativePath("share","avidemux3",partialPath.c_str());
+         ADM_i18nDir=std::string(ppath);
+         delete [] ppath;

avidemux_2.7.8.tar.gz -> avidemux_2.8.0.tar.gz Changed

Build Results
RPM Lint

Refresh

Comments for request 5480 0

Request History

enzokiel created request almost 3 years ago

enzokiel accepted request almost 3 years ago