Changes of Revision 60
avidemux3.spec
Changed
x
1
2
#3
# spec file for package avidemux34
#5
-# Copyright (c) 2023 SUSE LLC6
+# Copyright (c) 2024 SUSE LLC7
#8
# All modifications and additions to the file contributed by third parties9
# remain the property of their copyright owners, unless otherwise agreed10
11
#12
13
14
-%bcond_without vapoursynth15
-16
Name: avidemux317
Summary: Graphical video editing and transcoding tool18
License: GPL-2.0-only19
20
URL: http://avidemux.sourceforge.net/21
ExclusiveArch: %ix86 x86_6422
Source0: https://github.com/mean00/avidemux2/releases/download/%{version}/avidemux_%{version}.tar.gz23
-Patch0: avidemux-cmake-2.8.8.patch24
+Patch0: %name.patch25
Patch1: avidemux-linking.patch26
Patch2: avidemux-x264_plugins.patch27
Patch3: avidemux-x265_plugins.patch28
29
BuildRequires: intltool30
BuildRequires: pkg-config31
BuildRequires: yasm32
-%if %{with vapoursynth}33
BuildRequires: pkgconfig(vapoursynth)34
BuildRequires: pkgconfig(vapoursynth-script)35
-%endif36
BuildRequires: pkgconfig(ffnvcodec) > 837
BuildRequires: pkgconfig(fontconfig)38
BuildRequires: pkgconfig(freetype2)39
40
This package provides translations for package avidemux3-qt5.41
42
%prep43
-%setup -q -n avidemux_%{version}44
-for i in bash cmake cpp sh sql txt; do45
- find . -name \*.$i -print0 | xargs -0 dos2unix -q46
-done47
-%patch -P 0 -p048
-%patch -P 1 -p149
-%patch -P 2 -p150
-%patch -P 3 -p151
-%patch -P 4 -p152
-%patch -P 5 -p053
-%patch -P 7 -p054
-%patch -P 8 -p0 -R55
-%patch -P 9 -p056
-%patch -P 10 -p157
-chmod 755 bootStrap.bash58
-chmod 644 AUTHORS COPYING README59
+%autosetup -p1 -n avidemux_%{version}60
61
%build62
-test -x "$(type -P gcc)" && CC="$_"63
-test -x "$(type -P g++)" && CXX="$_"64
-test -x "$(type -P gcc-7)" && CC="$_"65
-test -x "$(type -P g++-7)" && CXX="$_"66
-export CC="$(readlink -f ${CC})"67
-export CXX="$(readlink -f ${CXX})"68
+chmod 755 bootStrap.bash69
+chmod 644 AUTHORS COPYING README70
flags+="%optflags -fno-strict-aliasing "71
%ifarch %ix8672
flags+="%optflags -march=native "73
74
%postun qt5 -p /sbin/ldconfig75
76
%files77
-%if %{with vapoursynth}78
%{_bindir}/vsProxy79
-%endif80
%{_libdir}/libADM6avcodec.so.*81
%{_libdir}/libADM6avformat.so.*82
%{_libdir}/libADM6avutil.so.*83
84
%{_libdir}/ADM_plugins6/demuxers/libADM_dm_pic.so85
%{_libdir}/ADM_plugins6/demuxers/libADM_dm_ps.so86
%{_libdir}/ADM_plugins6/demuxers/libADM_dm_ts.so87
-%if %{with vapoursynth}88
%{_libdir}/ADM_plugins6/demuxers/libADM_dm_vapoursynth.so89
-%endif90
%{_libdir}/ADM_plugins6/muxers/libADM_mx_avi.so91
%{_libdir}/ADM_plugins6/muxers/libADM_mx_dummy.so92
%{_libdir}/ADM_plugins6/muxers/libADM_mx_ffPS.so93
94
%files qt595
%{_bindir}/avidemux3_jobs_qt596
%{_bindir}/avidemux3_qt597
-%if %{with vapoursynth}98
%{_bindir}/vsProxy_gui_qt599
-%endif100
%{_libdir}/libADM_openGLQT56.so101
%{_libdir}/libADM_render6_QT5.so102
%{_libdir}/libADM_UIQT56.so103
avidemux-backport_Fix_threads_setup.patch
Changed
21
1
2
---- avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp.orig 2023-02-03 15:37:59.231645804 +01003
-+++ avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp 2023-02-03 15:37:59.219645828 +01004
+--- a/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp5
++++ b/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp6
@@ -89,8 +89,8 @@7
// Threads..8
switch(x264Settings.general.threads)9
{10
-- case 0: case 1: case 2: param.i_threads = x264Settings.general.threads;break;11
-- case 99:break; //auto12
-+ case 1: case 2: case 4: param.i_threads = x264Settings.general.threads;break;13
-+ case 0: case 99: break; //auto14
+- case 1: case 2: case 4: param.i_threads = x264Settings.general.threads;break;15
+- case 0: case 99: break; //auto16
++ case 0: case 1: case 2: param.i_threads = x264Settings.general.threads;break;17
++ case 99:break; //auto18
default: ADM_error("UNKNOWN NB OF THREADS\n");break;19
}20
param.i_width = getWidth();21
avidemux-bootStrap.patch
Changed
9
1
2
---- bootStrap.bash.orig 2023-02-03 15:28:29.196866446 +01003
-+++ bootStrap.bash 2023-02-03 15:28:29.216866401 +01004
+--- a/bootStrap.bash5
++++ b/bootStrap.bash6
@@ -30,6 +30,7 @@7
8
fail()9
avidemux-desktop-file.patch
Changed
9
1
2
---- avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop.orig 2023-02-03 15:30:58.744533274 +01003
-+++ avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop 2023-02-03 15:30:58.748533265 +01004
+--- a/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop5
++++ b/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop6
@@ -8,3 +8,5 @@7
Type=Application8
Categories=AudioVideo;AudioVideoEditing;Video;9
avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch
Changed
9
1
2
---- avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp.orig 2023-02-03 15:43:14.746986155 +01003
-+++ avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp 2023-02-03 15:43:14.750986148 +01004
+--- a/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp5
++++ b/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp6
@@ -375,6 +375,8 @@7
break;8
9
avidemux-linking.patch
Changed
80
1
2
-diff -uNr avidemux_2.8.1/avidemux/cli/CMakeLists.txt avidemux_2.8.1.new/avidemux/cli/CMakeLists.txt3
---- avidemux_2.8.1/avidemux/cli/CMakeLists.txt 2023-02-03 14:55:58.973456064 +01004
-+++ avidemux_2.8.1.new/avidemux/cli/CMakeLists.txt 2023-02-03 15:03:09.924376234 +01005
+--- a/avidemux/cli/CMakeLists.txt6
++++ b/avidemux/cli/CMakeLists.txt7
@@ -112,6 +112,10 @@8
- ADM_gui2Cli69
- ADM_toolkitCli610
- ADM_shellCli11
-+ ADM_coreSqlLight312
-+ ADM_libswscale13
-+ ADM_libpostproc14
-+ ADM_libavformat15
- )16
- 17
- ###########################################18
-diff -uNr avidemux_2.8.1/avidemux/qt4/ADM_jobs/src/CMakeLists.txt avidemux_2.8.1.new/avidemux/qt4/ADM_jobs/src/CMakeLists.txt19
---- avidemux_2.8.1/avidemux/qt4/ADM_jobs/src/CMakeLists.txt 2023-02-03 14:55:58.973456064 +010020
-+++ avidemux_2.8.1.new/avidemux/qt4/ADM_jobs/src/CMakeLists.txt 2023-02-03 15:04:25.740183295 +010021
+ ADM_gui2Cli622
+ ADM_toolkitCli623
+ ADM_shellCli24
++ ADM_coreSqlLight325
++ ADM_libswscale26
++ ADM_libpostproc27
++ ADM_libavformat28
+ )29
+ 30
+ ###########################################31
+--- a/avidemux/qt4/ADM_jobs/src/CMakeLists.txt32
++++ b/avidemux/qt4/ADM_jobs/src/CMakeLists.txt33
@@ -91,6 +91,10 @@34
- TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreJobs)35
- TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUtils6)36
- TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_core6)37
-+TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreSqlLight3)38
-+TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUI6)39
-+TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_libavcodec)40
-+TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_libavutil)41
- #42
- target_link_libraries(avidemux3_jobs_${QT_EXTENSION} "-lm -lstdc++")43
- #44
-diff -uNr avidemux_2.8.1/avidemux/qt4/CMakeLists.txt avidemux_2.8.1.new/avidemux/qt4/CMakeLists.txt45
---- avidemux_2.8.1/avidemux/qt4/CMakeLists.txt 2023-02-03 14:55:58.973456064 +010046
-+++ avidemux_2.8.1.new/avidemux/qt4/CMakeLists.txt 2023-02-03 15:05:28.836022445 +010047
+ TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreJobs)48
+ TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUtils6)49
+ TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_core6)50
++TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreSqlLight3)51
++TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUI6)52
++TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_libavcodec)53
++TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_libavutil)54
+ #55
+ target_link_libraries(avidemux3_jobs_${QT_EXTENSION} "-lm -lstdc++")56
+ #57
+--- a/avidemux/qt4/CMakeLists.txt58
++++ b/avidemux/qt4/CMakeLists.txt59
@@ -200,6 +200,10 @@60
- ADM_coreAudioDevice661
- ADM_coreVideoEncoder662
- ADM_osSupport663
-+ ADM_coreSqlLight364
-+ ADM_libswscale65
-+ ADM_libpostproc66
-+ ADM_libavformat67
- )68
- 69
- ###########################################70
+ ADM_coreAudioDevice671
+ ADM_coreVideoEncoder672
+ ADM_osSupport673
++ ADM_coreSqlLight374
++ ADM_libswscale75
++ ADM_libpostproc76
++ ADM_libavformat77
+ )78
+ 79
+ ###########################################80
avidemux-package_version.patch
Changed
104
1
2
-diff -uNr avidemux_2.8.1/avidemux/osxInstaller/CMakeLists.txt avidemux_2.8.1.new/avidemux/osxInstaller/CMakeLists.txt3
---- avidemux_2.8.1/avidemux/osxInstaller/CMakeLists.txt 2023-02-03 14:55:58.973456064 +01004
-+++ avidemux_2.8.1.new/avidemux/osxInstaller/CMakeLists.txt 2023-02-03 15:17:55.426146204 +01005
+--- a/avidemux/osxInstaller/CMakeLists.txt6
++++ b/avidemux/osxInstaller/CMakeLists.txt7
@@ -110,7 +110,7 @@8
FILE(COPY "${ORIGINAL}/Contents/Resources/avidemux.icns" DESTINATION "${RESOURCES}") 9
10
11
FOREACH(lang ${ListOfTranslationFiles})12
STRING(REGEX REPLACE ".*avidemux_" "" lang "${lang}")13
STRING(REPLACE ".qm" "" lang "${lang}")14
-diff -uNr avidemux_2.8.1/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp avidemux_2.8.1.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp15
---- avidemux_2.8.1/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp 2023-02-03 14:55:58.861456459 +010016
-+++ avidemux_2.8.1.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp 2023-02-03 15:19:18.925950730 +010017
+--- a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp18
++++ b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp19
@@ -143,7 +143,7 @@20
QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();21
#else22
23
#endif24
25
QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));26
-diff -uNr avidemux_2.8.1/avidemux/qt4/i18n/Ts.cmake avidemux_2.8.1.new/avidemux/qt4/i18n/Ts.cmake27
---- avidemux_2.8.1/avidemux/qt4/i18n/Ts.cmake 2023-02-03 14:55:58.825456588 +010028
-+++ avidemux_2.8.1.new/avidemux/qt4/i18n/Ts.cmake 2023-02-03 15:20:03.689862275 +010029
+--- a/avidemux/qt4/i18n/Ts.cmake30
++++ b/avidemux/qt4/i18n/Ts.cmake31
@@ -28,7 +28,7 @@32
- IF(WIN32)33
- SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")34
- ELSE(WIN32)35
-- SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/${QT_EXTENSION}/i18n")36
-+ SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")37
- ENDIF(WIN32)38
- INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)39
- ENDMACRO(INSTALL_I18N _files)40
-diff -uNr avidemux_2.8.1/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.8.1.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp41
---- avidemux_2.8.1/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2023-02-03 14:55:58.869456431 +010042
-+++ avidemux_2.8.1.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2023-02-03 15:21:14.569722226 +010043
+ IF(WIN32)44
+ SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")45
+ ELSE(WIN32)46
+- SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux6/${QT_EXTENSION}/i18n")47
++ SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")48
+ ENDIF(WIN32)49
+ INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)50
+ ENDMACRO(INSTALL_I18N _files)51
+--- a/avidemux_core/ADM_core/src/ADM_folder_linux.cpp52
++++ b/avidemux_core/ADM_core/src/ADM_folder_linux.cpp53
@@ -126,14 +126,14 @@54
if(isPortable)55
{56
57
58
strcat(ADM_basedir, ADM_DIR_NAME);59
strcat(ADM_basedir, ADM_SEPARATOR);60
-diff -uNr avidemux_2.8.1/avidemux_core/ADM_core/src/ADM_folder_mac.cpp avidemux_2.8.1.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp61
---- avidemux_2.8.1/avidemux_core/ADM_core/src/ADM_folder_mac.cpp 2023-02-03 14:55:58.869456431 +010062
-+++ avidemux_2.8.1.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp 2023-02-03 15:22:02.237628025 +010063
+--- a/avidemux_core/ADM_core/src/ADM_folder_mac.cpp64
++++ b/avidemux_core/ADM_core/src/ADM_folder_mac.cpp65
@@ -132,7 +132,7 @@66
strcpy(ADM_basedir, homeEnv);67
AddSeparator(ADM_basedir);68
69
#endif70
std::string r=std::string(ppath);71
delete ppath;72
-diff -uNr avidemux_2.8.1/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp avidemux_2.8.1.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp73
---- avidemux_2.8.1/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp 2023-02-03 14:55:58.925456233 +010074
-+++ avidemux_2.8.1.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp 2023-02-03 15:23:05.785502458 +010075
+--- a/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp76
++++ b/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp77
@@ -268,7 +268,7 @@78
this->callEventHandlers(IScriptEngine::Information, NULL, -1,79
(string("Executing ") + string(name) + string("...")).c_str());80
81
82
this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done");83
84
-diff -uNr avidemux_2.8.1/cmake/se_plugin.cmake avidemux_2.8.1.new/cmake/se_plugin.cmake85
---- avidemux_2.8.1/cmake/se_plugin.cmake 2023-02-03 14:55:58.829456572 +010086
-+++ avidemux_2.8.1.new/cmake/se_plugin.cmake 2023-02-03 15:24:18.253362487 +010087
+--- a/cmake/se_plugin.cmake88
++++ b/cmake/se_plugin.cmake89
@@ -16,7 +16,7 @@90
if (WIN32)91
set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}")92
93
endif (WIN32)94
95
install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins)96
-diff -uNr avidemux_2.8.1/cmake/sql/update.sh avidemux_2.8.1.new/cmake/sql/update.sh97
---- avidemux_2.8.1/cmake/sql/update.sh 2023-02-03 14:55:58.957456120 +010098
-+++ avidemux_2.8.1.new/cmake/sql/update.sh 2023-02-03 15:24:57.005288113 +010099
+--- a/cmake/sql/update.sh100
++++ b/cmake/sql/update.sh101
@@ -1,3 +1,3 @@102
-sqlite3 ~/.avidemux6/jobs.sql .d > dump103
+sqlite3 ~/.avidemux3/jobs.sql .d > dump104
avidemux-translations.patch
Changed
32
1
2
-diff -uNr avidemux_2.8.1/avidemux/qt4/i18n/Ts.cmake avidemux_2.8.1.new/avidemux/qt4/i18n/Ts.cmake3
---- avidemux_2.8.1/avidemux/qt4/i18n/Ts.cmake 2023-02-03 14:55:58.825456588 +01004
-+++ avidemux_2.8.1.new/avidemux/qt4/i18n/Ts.cmake 2023-02-03 15:47:24.542463440 +01005
+--- a/avidemux/qt4/i18n/Ts.cmake6
++++ b/avidemux/qt4/i18n/Ts.cmake7
@@ -28,7 +28,7 @@8
- IF(WIN32)9
- SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")10
- ELSE(WIN32)11
-- SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")12
-+ SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/translations")13
- ENDIF(WIN32)14
- INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)15
- ENDMACRO(INSTALL_I18N _files)16
-diff -uNr avidemux_2.8.1/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.8.1.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp17
---- avidemux_2.8.1/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2023-02-03 14:55:58.869456431 +010018
-+++ avidemux_2.8.1.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2023-02-03 15:50:10.518118861 +010019
+ IF(WIN32)20
+ SET(i18dir "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/${QT_EXTENSION}/i18n")21
+ ELSE(WIN32)22
+- SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/i18n")23
++ SET(i18dir "${CMAKE_INSTALL_PREFIX}/share/avidemux3/${QT_EXTENSION}/translations")24
+ ENDIF(WIN32)25
+ INSTALL(FILES ${ARGN} DESTINATION "${i18dir}" COMPONENT runtime)26
+ ENDMACRO(INSTALL_I18N _files)27
+--- a/avidemux_core/ADM_core/src/ADM_folder_linux.cpp28
++++ b/avidemux_core/ADM_core/src/ADM_folder_linux.cpp29
@@ -126,13 +126,13 @@30
if(isPortable)31
{32
avidemux-x264_plugins.patch
Changed
10
1
2
-diff -uNr avidemux_2.8.1/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt avidemux_2.8.1.new/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt3
---- avidemux_2.8.1/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt 2023-02-03 14:55:58.977456052 +01004
-+++ avidemux_2.8.1.new/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt 2023-02-03 15:10:38.623227685 +01005
+--- a/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt6
++++ b/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt7
@@ -34,15 +34,16 @@8
INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x264_${QT_LIBRARY_EXTENSION})9
endif(DO_QT4)10
avidemux-x265_plugins.patch
Changed
10
1
2
-diff -uNr avidemux_2.8.1/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt avidemux_2.8.1.new/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt3
---- avidemux_2.8.1/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt 2023-02-03 14:55:58.977456052 +01004
-+++ avidemux_2.8.1.new/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt 2023-02-03 15:12:32.738937846 +01005
+--- a/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt6
++++ b/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt7
@@ -32,15 +32,16 @@8
INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x265_${QT_LIBRARY_EXTENSION})9
endif(DO_QT4)10
avidemux3.patch
Added
79
1
2
+--- a/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h.patch3
++++ b/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h.patch4
+@@ -11,3 +11,74 @@5
+ 6
+ #define MAX_NEG_CROP 10247
+ 8
++From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 20019
++From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>10
++Date: Sun, 16 Jul 2023 18:18:02 +030011
++Subject: avcodec/x86/mathops: clip constants used with shift instructions12
++ within inline assembly13
++14
++Fixes assembling with binutil as >= 2.4115
++16
++Signed-off-by: James Almer <jamrial@gmail.com>17
++---18
++ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++---19
++ 1 file changed, 23 insertions(+), 3 deletions(-)20
++21
++--- libavcodec/x86/mathops.h22
+++++ libavcodec/x86/mathops.h23
++@@ -35,12 +35,20 @@24
++ static av_always_inline av_const int MULL(int a, int b, unsigned shift)25
++ {26
++ int rt, dummy;27
+++ if (__builtin_constant_p(shift))28
++ __asm__ (29
++ "imull %3 \n\t"30
++ "shrdl %4, %%edx, %%eax \n\t"31
++ :"=a"(rt), "=d"(dummy)32
++- :"a"(a), "rm"(b), "ci"((uint8_t)shift)33
+++ :"a"(a), "rm"(b), "i"(shift & 0x1F)34
++ );35
+++ else36
+++ __asm__ (37
+++ "imull %3 \n\t"38
+++ "shrdl %4, %%edx, %%eax \n\t"39
+++ :"=a"(rt), "=d"(dummy)40
+++ :"a"(a), "rm"(b), "c"((uint8_t)shift)41
+++ );42
++ return rt;43
++ }44
++ 45
++@@ -113,19 +121,31 @@ __asm__ volatile(\46
++ // avoid +32 for shift optimization (gcc should do that ...)47
++ #define NEG_SSR32 NEG_SSR3248
++ static inline int32_t NEG_SSR32( int32_t a, int8_t s){49
+++ if (__builtin_constant_p(s))50
++ __asm__ ("sarl %1, %0\n\t"51
++ : "+r" (a)52
++- : "ic" ((uint8_t)(-s))53
+++ : "i" (-s & 0x1F)54
++ );55
+++ else56
+++ __asm__ ("sarl %1, %0\n\t"57
+++ : "+r" (a)58
+++ : "c" ((uint8_t)(-s))59
+++ );60
++ return a;61
++ }62
++ 63
++ #define NEG_USR32 NEG_USR3264
++ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){65
+++ if (__builtin_constant_p(s))66
++ __asm__ ("shrl %1, %0\n\t"67
++ : "+r" (a)68
++- : "ic" ((uint8_t)(-s))69
+++ : "i" (-s & 0x1F)70
++ );71
+++ else72
+++ __asm__ ("shrl %1, %0\n\t"73
+++ : "+r" (a)74
+++ : "c" ((uint8_t)(-s))75
+++ );76
++ return a;77
++ }78
++ 79