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.
Changes of Revision 49
avidemux3.changes
Changed
x
1
2
-------------------------------------------------------------------
3
+Tue Jul 07 17:59:43 UTC 2020 - enzokiel@kabelmail.de
4
+
5
+- Update to version 2.7.6
6
+ + New Feature:Detect and warn when cut points in HEVC video
7
+ streams may result in grave playback issues despite being on
8
+ keyframes
9
+ + New Video Decoder:Add libaom-based AV1 decoder
10
+ + New Video Encoder:Add libvpx-based VP9 encoder
11
+ + New Video Filter:Add hardware accelerated deinterlacer and
12
+ resizer based on VA-API (Linux only)
13
+ + FFmpeg:Update to the 4.2.3 release
14
+ + Core:Increase maximum supported resolution to 4096x4096
15
+ + Core:Fix crash on macOS with HW accel. decoding enabled and
16
+ H.264 video streams containing both frame- and field-encoded
17
+ slices
18
+ + Encoder:Extend configuration options for NVENC-based H.264 and
19
+ HEVC encoders, add 2-pass mode
20
+ + Demuxer:Support MPEG-TS files with duration in excess of
21
+ 13:15:36
22
+ + Demuxer:Use DTS core from DTS XLL audio in MPEG-TS files
23
+ instead of rejecting the track
24
+ + Demuxer:Fix mono MP3 audio tracks in MP4 files misdetected as
25
+ stereo
26
+ + Demuxer:Try to correct timestamp jitter in MP4 files produced
27
+ by older Avidemux versions
28
+ + Muxer:Fix timestamp rounding which caused pseudo-VFR output
29
+ from CFR sources
30
+ + Muxer:Fix saving to network shares on Windows using the Mp4
31
+ muxer when index should be moved to the start of the file
32
+ + Muxer:Support LPCM audio in the Mp4 muxer by silently
33
+ switching to the MOV muxing mode
34
+ + Muxer:Add support for Vorbis audio to the Mp4 muxer
35
+ + Filter:Fix "Fade" and "Fade to black", broken on macOS
36
+ + Filter:Allow to toggle rubber band visibility in "Crop" and
37
+ "Blacken Borders" video filters
38
+ + Filter:Fix keyboard input in "Resize" video filter by
39
+ recalculating values only on moving focus to another field or
40
+ on accepting dialog
41
+ + Audio:Add HE-AAC and HE-AACv2 profiles to the FDK AAC encoder
42
+ plugin
43
+ + Audio:Support external audio tracks in DTS format
44
+ + UI:Fix navigation slider with RTL locales
45
+ + UI:Restore the shutdown option in encoding dialog on Windows
46
+ + Scripting:Add PTS query and keyframe seek methods to Python
47
+ interface
48
+ + Miscellaneous:Allow user-defined fragment size for auto-append
49
+ of chunked MPEG-TS files
50
+ + Miscellaneous:Improve handling of field-encoded video streams
51
+ throughout the chain
52
+ + Miscellaneous:Improve handling of H.264 video streams with
53
+ parameter sets changing on the fly
54
+ + Miscellaneous:Try to keep track of video time base throughout
55
+ the chain
56
+ + Miscellaneous:Numerous other fixes and polish
57
+- Removed avidemux-cpu-detection-fix.patch, fixed upstream.
58
+
59
+-------------------------------------------------------------------
60
Tue Nov 12 10:34:59 UTC 2019 - Jiri Slaby <jslaby@suse.cz>
61
62
- add avidemux-cpu-detection-fix.patch (build fix)
63
avidemux3.spec
Changed
65
1
2
3
Name: avidemux3
4
Summary: Graphical video editing and transcoding tool
5
-Version: 2.7.4
6
+Version: 2.7.6
7
Release: 1
8
Url: http://avidemux.sourceforge.net/
9
ExclusiveArch: %ix86 x86_64
10
11
Patch5: avidemux-bootStrap.patch
12
Patch7: avidemux-desktop-file.patch
13
Patch8: avidemux-backport_Fix_threads_setup.patch
14
-Patch9: avidemux-cpu-detection-fix.patch
15
-Patch10: avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch
16
+Patch9: avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch
17
License: GPL-2.0
18
Group: Productivity/Multimedia/Video/Editors and Convertors
19
20
21
find . -name \*.$i -print0 | xargs -0 dos2unix -q
22
done
23
%patch0 -p0
24
-%patch1 -p0
25
-%patch2 -p0
26
-%patch3 -p0
27
+%patch1 -p1
28
+%patch2 -p1
29
+%patch3 -p1
30
%patch4 -p1
31
%patch5 -p0
32
-%patch7 -p0
33
+%patch7 -p1
34
%patch8 -p0 -R
35
-%patch9 -p1
36
-%patch10 -p1
37
+#%patch9 -p1
38
chmod 755 bootStrap.bash
39
chmod 644 AUTHORS COPYING README
40
41
42
%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_jpeg.so
43
%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_libva.so
44
%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_null.so
45
+%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_vp9.so
46
%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_xvid4.so
47
%{_libdir}/ADM_plugins6/videoEncoders/libADM_ve_yv12.so
48
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_ascii.so
49
50
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_addBorders.so
51
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_admIvtc.so
52
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_black.so
53
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_blend.so
54
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_changeFps.so
55
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_colorYuv.so
56
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_denoise3d.so
57
58
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_telecide.so
59
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_unstackField.so
60
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vaapiFilter.so
61
+%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vaapiFilterDeint.so
62
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilter.so
63
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vdpauFilterDeint.so
64
%{_libdir}/ADM_plugins6/videoFilters/libADM_vf_vflip.so
65
avidemux-cpu-detection-fix.patch
Deleted
54
1
2
-From: Jiri Slaby <jslaby@suse.cz>
3
-Date: Tue, 12 Nov 2019 11:28:37 +0100
4
-Subject: cmake: fix detection of CPUs
5
-Patch-mainline: yes
6
-Git-commit: 82ab993cbbe17c71ca20c4af7b1a4b6f9fa95c45
7
-References: build fix
8
-
9
-The code defines a function foo returning int, but contains no return.
10
-So the detection fails with "CPU not supported". As new gccs warng abotu
11
-missing return, it causes the detaction to fail. Switch foo to return
12
-void.
13
-
14
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
15
----
16
- cmake/cmake_compile_check/cpu_armel_check.cpp | 2 +-
17
- cmake/cmake_compile_check/cpu_x86-64_check.cpp | 2 +-
18
- cmake/cmake_compile_check/cpu_x86_check.cpp | 2 +-
19
- 3 files changed, 3 insertions(+), 3 deletions(-)
20
-
21
-diff --git a/cmake/cmake_compile_check/cpu_armel_check.cpp b/cmake/cmake_compile_check/cpu_armel_check.cpp
22
-index 429661add08c..02f779c71b7b 100644
23
---- a/cmake/cmake_compile_check/cpu_armel_check.cpp
24
-+++ b/cmake/cmake_compile_check/cpu_armel_check.cpp
25
-@@ -1,4 +1,4 @@
26
--int foo(void)
27
-+void foo(void)
28
- {
29
-
30
- asm volatile ("mov lr,pc " : : );
31
-diff --git a/cmake/cmake_compile_check/cpu_x86-64_check.cpp b/cmake/cmake_compile_check/cpu_x86-64_check.cpp
32
-index 49c751b6fbe8..4f493bc5cdaf 100644
33
---- a/cmake/cmake_compile_check/cpu_x86-64_check.cpp
34
-+++ b/cmake/cmake_compile_check/cpu_x86-64_check.cpp
35
-@@ -1,4 +1,4 @@
36
--int foo(void)
37
-+void foo(void)
38
- {
39
- asm volatile ("movdqa %xmm8, 0");
40
- }
41
-diff --git a/cmake/cmake_compile_check/cpu_x86_check.cpp b/cmake/cmake_compile_check/cpu_x86_check.cpp
42
-index c4e8f7f432a5..cd00b66c0524 100644
43
---- a/cmake/cmake_compile_check/cpu_x86_check.cpp
44
-+++ b/cmake/cmake_compile_check/cpu_x86_check.cpp
45
-@@ -1,4 +1,4 @@
46
--int foo(void)
47
-+void foo(void)
48
- {
49
- asm volatile ("movdqa %xmm7, 0");
50
- }
51
---
52
-2.24.0
53
-
54
avidemux-desktop-file.patch
Changed
25
1
2
---- avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop.orig 2019-03-16 13:53:16.346573397 +0100
3
-+++ avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop 2019-03-16 13:53:16.350573314 +0100
4
-@@ -1,5 +1,5 @@
5
- [Desktop Entry]
6
--Name=Avidemux
7
-+Name=Avidemux3
8
- GenericName=Video Editor
9
- Comment=Multiplatform video editor
10
- Exec=avidemux3_qt5
11
-@@ -7,4 +7,6 @@
12
- Icon=org.avidemux.Avidemux
13
- Terminal=false
14
+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
15
+--- avidemux2-2.7.6/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop 2020-07-05 15:29:02.000000000 +0200
16
++++ avidemux2-2.7.6.new/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop 2020-07-07 18:40:34.236068158 +0200
17
+@@ -8,3 +8,5 @@
18
Type=Application
19
--Categories=AudioVideo
20
-+Categories=AudioVideo;AudioVideoEditing;
21
+ Categories=AudioVideo;AudioVideoEditing;Video;
22
+ 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;
23
+X-KDE-StartupNotify=true
24
+X-SuSE-translate=true
25
avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch
Changed
35
1
2
-From: Jiri Slaby <jslaby@suse.cz>
3
-Date: Tue, 12 Nov 2019 11:47:21 +0100
4
-Subject: [ivtcDupeRemover] return true from ivtcDupeRemover::getNextFrame
5
-Patch-mainline: submitted as PR#182
6
-References: build fix
7
-
8
-It is declared as returning a bool, but returns nothing. But the callers
9
-expect something to be returned: true in case it succeeded.
10
-
11
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
12
----
13
- .../ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp | 2 ++
14
- 1 file changed, 2 insertions(+)
15
-
16
-diff --git a/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp b/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
17
-index 754fd3ad3807..4ba1eae90c9a 100644
18
---- a/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
19
-+++ b/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
20
-@@ -375,6 +375,8 @@ bool ivtcDupeRemover::getNextFrame(uint32_t *fn,ADMImage *image)
21
+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
22
+--- avidemux2-2.7.6/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp 2020-07-07 18:17:30.964650246 +0200
23
++++ avidemux2-2.7.6.new/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp 2020-07-07 18:50:38.201333556 +0200
24
+@@ -375,6 +375,8 @@
25
break;
26
27
}
28
29
}
30
/**
31
\fn getCoupledConf
32
---
33
-2.24.0
34
-
35
avidemux-linking.patch
Changed
53
1
2
---- avidemux/cli/CMakeLists.txt.orig 2019-03-16 11:52:18.201947710 +0100
3
-+++ avidemux/cli/CMakeLists.txt 2019-03-16 11:52:18.173948283 +0100
4
+diff -uNr avidemux2-2.7.6/avidemux/cli/CMakeLists.txt avidemux2-2.7.6.new/avidemux/cli/CMakeLists.txt
5
+--- avidemux2-2.7.6/avidemux/cli/CMakeLists.txt 2020-07-07 18:17:32.192628426 +0200
6
++++ avidemux2-2.7.6.new/avidemux/cli/CMakeLists.txt 2020-07-07 18:56:56.422604385 +0200
7
@@ -110,6 +110,10 @@
8
ADM_gui2Cli6
9
ADM_toolkitCli6
10
11
)
12
13
###########################################
14
---- avidemux/qt4/CMakeLists.txt.orig 2019-03-16 11:52:18.201947710 +0100
15
-+++ avidemux/qt4/CMakeLists.txt 2019-03-16 11:52:18.173948283 +0100
16
-@@ -183,6 +183,10 @@
17
- ADM_coreAudio6
18
- ADM_coreAudioDevice6
19
- ADM_osSupport6
20
-+ ADM_coreSqlLight3
21
-+ ADM_libswscale
22
-+ ADM_libpostproc
23
-+ ADM_libavformat
24
- )
25
-
26
- ###########################################
27
---- avidemux/qt4/ADM_jobs/src/CMakeLists.txt.orig 2019-03-16 11:52:18.201947710 +0100
28
-+++ avidemux/qt4/ADM_jobs/src/CMakeLists.txt 2019-03-16 11:52:18.173948283 +0100
29
+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
30
+--- avidemux2-2.7.6/avidemux/qt4/ADM_jobs/src/CMakeLists.txt 2020-07-07 18:17:32.552622028 +0200
31
++++ avidemux2-2.7.6.new/avidemux/qt4/ADM_jobs/src/CMakeLists.txt 2020-07-07 18:58:28.652963131 +0200
32
@@ -86,6 +86,10 @@
33
TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreJobs)
34
TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUtils6)
35
36
#
37
target_link_libraries(avidemux3_jobs_${QT_EXTENSION} "-lm -lstdc++")
38
#
39
+diff -uNr avidemux2-2.7.6/avidemux/qt4/CMakeLists.txt avidemux2-2.7.6.new/avidemux/qt4/CMakeLists.txt
40
+--- avidemux2-2.7.6/avidemux/qt4/CMakeLists.txt 2020-07-07 18:17:32.648620323 +0200
41
++++ avidemux2-2.7.6.new/avidemux/qt4/CMakeLists.txt 2020-07-07 18:56:20.383245712 +0200
42
+@@ -184,6 +184,10 @@
43
+ ADM_coreAudioDevice6
44
+ ADM_coreVideoEncoder6
45
+ ADM_osSupport6
46
++ ADM_coreSqlLight3
47
++ ADM_libswscale
48
++ ADM_libpostproc
49
++ ADM_libavformat
50
+ )
51
+
52
+ ###########################################
53
avidemux-package_version.patch
Changed
136
1
2
-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
3
---- avidemux_2.7.4/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp 2019-08-18 16:55:06.191443864 +0200
4
-+++ avidemux_2.7.4.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp 2019-08-18 17:02:34.575044048 +0200
5
+diff -uNr avidemux_2.7.6/avidemux/osxInstaller/CMakeLists.txt avidemux_2.7.6.new/avidemux/osxInstaller/CMakeLists.txt
6
+--- avidemux_2.7.6/avidemux/osxInstaller/CMakeLists.txt 2020-07-07 21:09:46.344578674 +0200
7
++++ avidemux_2.7.6.new/avidemux/osxInstaller/CMakeLists.txt 2020-07-07 21:10:47.459492742 +0200
8
+@@ -127,7 +127,7 @@
9
+ FILE(COPY "${ORIGINAL}/Contents/Resources/avidemux.icns" DESTINATION "${RESOURCES}")
10
+
11
+ # Entice macOS to return correct system language (QTBUG-72491)
12
+-FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux6/qt5/i18n/avidemux_*.qm")
13
++FILE(GLOB ListOfTranslationFiles "${RESOURCES}/share/avidemux3/qt5/i18n/avidemux_*.qm")
14
+ FOREACH(lang ${ListOfTranslationFiles})
15
+ STRING(REGEX REPLACE ".*avidemux_" "" lang "${lang}")
16
+ STRING(REPLACE ".qm" "" lang "${lang}")
17
+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
18
+--- avidemux_2.7.6/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp 2020-07-07 21:09:45.948585710 +0200
19
++++ avidemux_2.7.6.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp 2020-07-07 21:10:47.107498996 +0200
20
@@ -143,7 +143,7 @@
21
QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
22
#else
23
24
#endif
25
26
QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
27
-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
28
---- avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2019-08-18 16:55:06.139443411 +0200
29
-+++ avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2019-08-18 17:02:31.303019793 +0200
30
-@@ -103,14 +103,14 @@
31
+diff -uNr avidemux_2.7.6/avidemux/qt4/i18n/Ts.cmake avidemux_2.7.6.new/avidemux/qt4/i18n/Ts.cmake
32
+--- avidemux_2.7.6/avidemux/qt4/i18n/Ts.cmake 2020-07-07 21:09:45.532593101 +0200
33
++++ avidemux_2.7.6.new/avidemux/qt4/i18n/Ts.cmake 2020-07-07 21:10:46.671506743 +0200
34
+@@ -28,7 +28,7 @@
35
+ IF(WIN32)
36
+ SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
37
+ ELSE(WIN32)
38
+- SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/${QT_EXTENSION}/i18n")
39
++ SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")
40
+ ENDIF(WIN32)
41
+ INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)
42
+ ENDMACRO(INSTALL_I18N _files)
43
+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
44
+--- avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2020-07-07 21:09:46.264580095 +0200
45
++++ avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2020-07-07 21:10:48.919466800 +0200
46
+@@ -124,14 +124,14 @@
47
if(isPortable)
48
{
49
std::string i18n=pluginDir;
50
51
ADM_i18nDir=std::string(ppath);
52
delete [] ppath;
53
ppath=NULL;
54
-@@ -142,7 +142,7 @@
55
+@@ -163,7 +163,7 @@
56
strcpy(ADM_basedir, homeEnv);
57
AddSeparator(ADM_basedir);
58
59
60
61
strcat(ADM_basedir, ADM_DIR_NAME);
62
strcat(ADM_basedir, ADM_SEPARATOR);
63
-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
64
---- avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_mac.cpp 2019-08-18 16:55:06.139443411 +0200
65
-+++ avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp 2019-08-18 17:02:31.307019824 +0200
66
-@@ -124,7 +124,7 @@
67
+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
68
+--- avidemux_2.7.6/avidemux_core/ADM_core/src/ADM_folder_mac.cpp 2020-07-07 21:09:46.260580166 +0200
69
++++ avidemux_2.7.6.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp 2020-07-07 21:10:48.903467083 +0200
70
+@@ -132,7 +132,7 @@
71
strcpy(ADM_basedir, homeEnv);
72
AddSeparator(ADM_basedir);
73
74
75
76
strcat(ADM_basedir, ADM_DIR_NAME);
77
strcat(ADM_basedir, ADM_SEPARATOR);
78
-@@ -146,9 +146,9 @@
79
+@@ -154,9 +154,9 @@
80
81
std::string partialPath=flavor+std::string("/i18n");
82
#ifdef CREATE_BUNDLE
83
84
#endif
85
std::string r=std::string(ppath);
86
delete [] ppath;
87
-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
88
---- avidemux_2.7.4/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp 2019-08-18 16:55:05.887441210 +0200
89
-+++ avidemux_2.7.4.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp 2019-08-18 17:02:27.818993969 +0200
90
+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
91
+--- avidemux_2.7.6/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp 2020-07-07 21:09:45.612591680 +0200
92
++++ avidemux_2.7.6.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp 2020-07-07 21:10:39.679630980 +0200
93
@@ -265,7 +265,7 @@
94
this->callEventHandlers(IScriptEngine::Information, NULL, -1,
95
(string("Executing ") + string(name) + string("...")).c_str());
96
97
98
this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");
99
100
-diff -uNr avidemux_2.7.4/cmake/se_plugin.cmake avidemux_2.7.4.new/cmake/se_plugin.cmake
101
---- avidemux_2.7.4/cmake/se_plugin.cmake 2019-08-18 16:55:05.295436042 +0200
102
-+++ avidemux_2.7.4.new/cmake/se_plugin.cmake 2019-08-18 17:02:36.735060059 +0200
103
+diff -uNr avidemux_2.7.6/cmake/se_plugin.cmake avidemux_2.7.6.new/cmake/se_plugin.cmake
104
+--- avidemux_2.7.6/cmake/se_plugin.cmake 2020-07-07 21:09:45.540592960 +0200
105
++++ avidemux_2.7.6.new/cmake/se_plugin.cmake 2020-07-07 21:10:50.103445762 +0200
106
@@ -16,7 +16,7 @@
107
if (WIN32)
108
set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")
109
110
endif (WIN32)
111
112
install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)
113
-diff -uNr avidemux_2.7.4/cmake/sql/update.sh avidemux_2.7.4.new/cmake/sql/update.sh
114
---- avidemux_2.7.4/cmake/sql/update.sh 2019-08-18 16:55:06.235444248 +0200
115
-+++ avidemux_2.7.4.new/cmake/sql/update.sh 2019-08-18 17:02:36.499058309 +0200
116
+diff -uNr avidemux_2.7.6/cmake/sql/update.sh avidemux_2.7.6.new/cmake/sql/update.sh
117
+--- avidemux_2.7.6/cmake/sql/update.sh 2020-07-07 21:09:46.300579456 +0200
118
++++ avidemux_2.7.6.new/cmake/sql/update.sh 2020-07-07 21:10:49.887449600 +0200
119
@@ -1,3 +1,3 @@
120
-sqlite3 ~/.avidemux6/jobs.sql .d > dump
121
+sqlite3 ~/.avidemux3/jobs.sql .d > dump
122
#sql2class -sqlite -global -license -wrapped -lib $PWD dump
123
sql2class -sqlite -build -global -prefix $PWD -lib sqlJobs -namespace db -overwrite dump
124
-diff -uNr avidemux_2.7.4/cmake/Ts.cmake avidemux_2.7.4.new/cmake/Ts.cmake
125
---- avidemux_2.7.4/cmake/Ts.cmake 2019-08-18 16:55:05.283435938 +0200
126
-+++ avidemux_2.7.4.new/cmake/Ts.cmake 2019-08-18 17:02:36.523058487 +0200
127
-@@ -28,7 +28,7 @@
128
- IF(WIN32)
129
- SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")
130
- ELSE(WIN32)
131
-- SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/${QT_EXTENSION}/i18n")
132
-+ SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")
133
- ENDIF(WIN32)
134
- INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)
135
- ENDMACRO(INSTALL_I18N _files)
136
avidemux-x264_plugins.patch
Changed
12
1
2
---- avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt.orig 2016-08-18 21:32:39.405562081 +0200
3
-+++ avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt 2016-08-18 21:32:38.945570353 +0200
4
-@@ -27,15 +27,16 @@
5
+diff -uNr avidemux2-2.7.6/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt avidemux2-2.7.6.new/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt
6
+--- avidemux2-2.7.6/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt 2020-07-07 18:17:33.564604046 +0200
7
++++ avidemux2-2.7.6.new/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt 2020-07-07 19:04:27.070585031 +0200
8
+@@ -33,15 +33,16 @@
9
INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x264_${QT_LIBRARY_EXTENSION})
10
endif(DO_QT4)
11
#-----------------------/QT4 VERSION---------------------
12
avidemux-x265_plugins.patch
Changed
10
1
2
---- avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt.orig 2019-03-16 11:52:18.201947710 +0100
3
-+++ avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt 2019-03-16 11:52:17.953952781 +0100
4
+diff -uNr avidemux2-2.7.6/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt avidemux2-2.7.6.new/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt
5
+--- avidemux2-2.7.6/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt 2020-07-07 18:17:33.564604046 +0200
6
++++ avidemux2-2.7.6.new/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt 2020-07-07 19:08:24.738355694 +0200
7
@@ -31,15 +31,16 @@
8
INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x265_${QT_LIBRARY_EXTENSION})
9
endif(DO_QT4)
10
avidemux_2.7.4.tar.gz -> avidemux_2.7.6.tar.gz
Changed