Projects
Multimedia
avidemux3
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 60
View file
avidemux3.spec
Changed
@@ -1,7 +1,7 @@ # # spec file for package avidemux3 # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +16,6 @@ # -%bcond_without vapoursynth - Name: avidemux3 Summary: Graphical video editing and transcoding tool License: GPL-2.0-only @@ -27,7 +25,7 @@ URL: http://avidemux.sourceforge.net/ ExclusiveArch: %ix86 x86_64 Source0: https://github.com/mean00/avidemux2/releases/download/%{version}/avidemux_%{version}.tar.gz -Patch0: avidemux-cmake-2.8.8.patch +Patch0: %name.patch Patch1: avidemux-linking.patch Patch2: avidemux-x264_plugins.patch Patch3: avidemux-x265_plugins.patch @@ -48,10 +46,8 @@ BuildRequires: intltool BuildRequires: pkg-config BuildRequires: yasm -%if %{with vapoursynth} BuildRequires: pkgconfig(vapoursynth) BuildRequires: pkgconfig(vapoursynth-script) -%endif BuildRequires: pkgconfig(ffnvcodec) > 8 BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) @@ -182,30 +178,11 @@ This package provides translations for package avidemux3-qt5. %prep -%setup -q -n avidemux_%{version} -for i in bash cmake cpp sh sql txt; do - find . -name \*.$i -print0 | xargs -0 dos2unix -q -done -%patch -P 0 -p0 -%patch -P 1 -p1 -%patch -P 2 -p1 -%patch -P 3 -p1 -%patch -P 4 -p1 -%patch -P 5 -p0 -%patch -P 7 -p0 -%patch -P 8 -p0 -R -%patch -P 9 -p0 -%patch -P 10 -p1 -chmod 755 bootStrap.bash -chmod 644 AUTHORS COPYING README +%autosetup -p1 -n avidemux_%{version} %build -test -x "$(type -P gcc)" && CC="$_" -test -x "$(type -P g++)" && CXX="$_" -test -x "$(type -P gcc-7)" && CC="$_" -test -x "$(type -P g++-7)" && CXX="$_" -export CC="$(readlink -f ${CC})" -export CXX="$(readlink -f ${CXX})" +chmod 755 bootStrap.bash +chmod 644 AUTHORS COPYING README flags+="%optflags -fno-strict-aliasing " %ifarch %ix86 flags+="%optflags -march=native " @@ -242,9 +219,7 @@ %postun qt5 -p /sbin/ldconfig %files -%if %{with vapoursynth} %{_bindir}/vsProxy -%endif %{_libdir}/libADM6avcodec.so.* %{_libdir}/libADM6avformat.so.* %{_libdir}/libADM6avutil.so.* @@ -337,9 +312,7 @@ %{_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 @@ -482,9 +455,7 @@ %files qt5 %{_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
View file
avidemux-backport_Fix_threads_setup.patch
Changed
@@ -1,13 +1,13 @@ ---- avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp.orig 2023-02-03 15:37:59.231645804 +0100 -+++ avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp 2023-02-03 15:37:59.219645828 +0100 +--- a/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp ++++ b/avidemux_plugins/ADM_videoEncoder/x264/ADM_x264Setup.cpp @@ -89,8 +89,8 @@ // Threads.. switch(x264Settings.general.threads) { -- case 0: case 1: case 2: param.i_threads = x264Settings.general.threads;break; -- case 99:break; //auto -+ case 1: case 2: case 4: param.i_threads = x264Settings.general.threads;break; -+ case 0: case 99: break; //auto +- case 1: case 2: case 4: param.i_threads = x264Settings.general.threads;break; +- case 0: case 99: break; //auto ++ case 0: case 1: case 2: param.i_threads = x264Settings.general.threads;break; ++ case 99:break; //auto default: ADM_error("UNKNOWN NB OF THREADS\n");break; } param.i_width = getWidth();
View file
avidemux-bootStrap.patch
Changed
@@ -1,5 +1,5 @@ ---- bootStrap.bash.orig 2023-02-03 15:28:29.196866446 +0100 -+++ bootStrap.bash 2023-02-03 15:28:29.216866401 +0100 +--- a/bootStrap.bash ++++ b/bootStrap.bash @@ -30,6 +30,7 @@ fail()
View file
avidemux-desktop-file.patch
Changed
@@ -1,5 +1,5 @@ ---- avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop.orig 2023-02-03 15:30:58.744533274 +0100 -+++ avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop 2023-02-03 15:30:58.748533265 +0100 +--- a/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop ++++ b/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop @@ -8,3 +8,5 @@ Type=Application Categories=AudioVideo;AudioVideoEditing;Video;
View file
avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch
Changed
@@ -1,5 +1,5 @@ ---- avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp.orig 2023-02-03 15:43:14.746986155 +0100 -+++ avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp 2023-02-03 15:43:14.750986148 +0100 +--- a/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp ++++ b/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp @@ -375,6 +375,8 @@ break;
View file
avidemux-linking.patch
Changed
@@ -1,42 +1,39 @@ -diff -uNr avidemux_2.8.1/avidemux/cli/CMakeLists.txt avidemux_2.8.1.new/avidemux/cli/CMakeLists.txt ---- avidemux_2.8.1/avidemux/cli/CMakeLists.txt 2023-02-03 14:55:58.973456064 +0100 -+++ avidemux_2.8.1.new/avidemux/cli/CMakeLists.txt 2023-02-03 15:03:09.924376234 +0100 +--- a/avidemux/cli/CMakeLists.txt ++++ b/avidemux/cli/CMakeLists.txt @@ -112,6 +112,10 @@ - ADM_gui2Cli6 - ADM_toolkitCli6 - ADM_shellCli -+ ADM_coreSqlLight3 -+ ADM_libswscale -+ ADM_libpostproc -+ ADM_libavformat - ) - - ########################################### -diff -uNr avidemux_2.8.1/avidemux/qt4/ADM_jobs/src/CMakeLists.txt avidemux_2.8.1.new/avidemux/qt4/ADM_jobs/src/CMakeLists.txt ---- avidemux_2.8.1/avidemux/qt4/ADM_jobs/src/CMakeLists.txt 2023-02-03 14:55:58.973456064 +0100 -+++ avidemux_2.8.1.new/avidemux/qt4/ADM_jobs/src/CMakeLists.txt 2023-02-03 15:04:25.740183295 +0100 + ADM_gui2Cli6 + ADM_toolkitCli6 + ADM_shellCli ++ ADM_coreSqlLight3 ++ ADM_libswscale ++ ADM_libpostproc ++ ADM_libavformat + ) + + ########################################### +--- a/avidemux/qt4/ADM_jobs/src/CMakeLists.txt ++++ b/avidemux/qt4/ADM_jobs/src/CMakeLists.txt @@ -91,6 +91,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) -+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++") - # -diff -uNr avidemux_2.8.1/avidemux/qt4/CMakeLists.txt avidemux_2.8.1.new/avidemux/qt4/CMakeLists.txt ---- avidemux_2.8.1/avidemux/qt4/CMakeLists.txt 2023-02-03 14:55:58.973456064 +0100 -+++ avidemux_2.8.1.new/avidemux/qt4/CMakeLists.txt 2023-02-03 15:05:28.836022445 +0100 + 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) ++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++") + # +--- a/avidemux/qt4/CMakeLists.txt ++++ b/avidemux/qt4/CMakeLists.txt @@ -200,6 +200,10 @@ - ADM_coreAudioDevice6 - ADM_coreVideoEncoder6 - ADM_osSupport6 -+ ADM_coreSqlLight3 -+ ADM_libswscale -+ ADM_libpostproc -+ ADM_libavformat - ) - - ########################################### + ADM_coreAudioDevice6 + ADM_coreVideoEncoder6 + ADM_osSupport6 ++ ADM_coreSqlLight3 ++ ADM_libswscale ++ ADM_libpostproc ++ ADM_libavformat + ) + + ###########################################
View file
avidemux-package_version.patch
Changed
@@ -1,6 +1,5 @@ -diff -uNr avidemux_2.8.1/avidemux/osxInstaller/CMakeLists.txt avidemux_2.8.1.new/avidemux/osxInstaller/CMakeLists.txt ---- avidemux_2.8.1/avidemux/osxInstaller/CMakeLists.txt 2023-02-03 14:55:58.973456064 +0100 -+++ avidemux_2.8.1.new/avidemux/osxInstaller/CMakeLists.txt 2023-02-03 15:17:55.426146204 +0100 +--- a/avidemux/osxInstaller/CMakeLists.txt ++++ b/avidemux/osxInstaller/CMakeLists.txt @@ -110,7 +110,7 @@ FILE(COPY "${ORIGINAL}/Contents/Resources/avidemux.icns" DESTINATION "${RESOURCES}") @@ -10,9 +9,8 @@ FOREACH(lang ${ListOfTranslationFiles}) STRING(REGEX REPLACE ".*avidemux_" "" lang "${lang}") STRING(REPLACE ".qm" "" lang "${lang}") -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.cpp ---- avidemux_2.8.1/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp 2023-02-03 14:55:58.861456459 +0100 -+++ avidemux_2.8.1.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp 2023-02-03 15:19:18.925950730 +0100 +--- a/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp ++++ b/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp @@ -143,7 +143,7 @@ QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath(); #else @@ -22,21 +20,19 @@ #endif QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode)); -diff -uNr avidemux_2.8.1/avidemux/qt4/i18n/Ts.cmake avidemux_2.8.1.new/avidemux/qt4/i18n/Ts.cmake ---- avidemux_2.8.1/avidemux/qt4/i18n/Ts.cmake 2023-02-03 14:55:58.825456588 +0100 -+++ avidemux_2.8.1.new/avidemux/qt4/i18n/Ts.cmake 2023-02-03 15:20:03.689862275 +0100 +--- a/avidemux/qt4/i18n/Ts.cmake ++++ b/avidemux/qt4/i18n/Ts.cmake @@ -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.8.1/avidemux_core/ADM_core/src/ADM_folder_linux.cpp avidemux_2.8.1.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp ---- avidemux_2.8.1/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2023-02-03 14:55:58.869456431 +0100 -+++ avidemux_2.8.1.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2023-02-03 15:21:14.569722226 +0100 + 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) +--- a/avidemux_core/ADM_core/src/ADM_folder_linux.cpp ++++ b/avidemux_core/ADM_core/src/ADM_folder_linux.cpp @@ -126,14 +126,14 @@ if(isPortable) { @@ -63,9 +59,8 @@ strcat(ADM_basedir, ADM_DIR_NAME); strcat(ADM_basedir, ADM_SEPARATOR); -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.cpp ---- avidemux_2.8.1/avidemux_core/ADM_core/src/ADM_folder_mac.cpp 2023-02-03 14:55:58.869456431 +0100 -+++ avidemux_2.8.1.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp 2023-02-03 15:22:02.237628025 +0100 +--- a/avidemux_core/ADM_core/src/ADM_folder_mac.cpp ++++ b/avidemux_core/ADM_core/src/ADM_folder_mac.cpp @@ -132,7 +132,7 @@ strcpy(ADM_basedir, homeEnv); AddSeparator(ADM_basedir); @@ -87,9 +82,8 @@ #endif std::string r=std::string(ppath); delete ppath; -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.cpp ---- avidemux_2.8.1/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp 2023-02-03 14:55:58.925456233 +0100 -+++ avidemux_2.8.1.new/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp 2023-02-03 15:23:05.785502458 +0100 +--- a/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp ++++ b/avidemux_plugins/ADM_scriptEngines/tinyPy/src/PythonEngine.cpp @@ -268,7 +268,7 @@ this->callEventHandlers(IScriptEngine::Information, NULL, -1, (string("Executing ") + string(name) + string("...")).c_str()); @@ -99,9 +93,8 @@ this->callEventHandlers(IScriptEngine::Information, NULL, -1, "Done"); -diff -uNr avidemux_2.8.1/cmake/se_plugin.cmake avidemux_2.8.1.new/cmake/se_plugin.cmake ---- avidemux_2.8.1/cmake/se_plugin.cmake 2023-02-03 14:55:58.829456572 +0100 -+++ avidemux_2.8.1.new/cmake/se_plugin.cmake 2023-02-03 15:24:18.253362487 +0100 +--- a/cmake/se_plugin.cmake ++++ b/cmake/se_plugin.cmake @@ -16,7 +16,7 @@ if (WIN32) set(helpDir "${CMAKE_INSTALL_PREFIX}/help/${_engineName}") @@ -111,9 +104,8 @@ endif (WIN32) install(DIRECTORY "${_sourceDirectory}" DESTINATION "${helpDir}" COMPONENT plugins) -diff -uNr avidemux_2.8.1/cmake/sql/update.sh avidemux_2.8.1.new/cmake/sql/update.sh ---- avidemux_2.8.1/cmake/sql/update.sh 2023-02-03 14:55:58.957456120 +0100 -+++ avidemux_2.8.1.new/cmake/sql/update.sh 2023-02-03 15:24:57.005288113 +0100 +--- a/cmake/sql/update.sh ++++ b/cmake/sql/update.sh @@ -1,3 +1,3 @@ -sqlite3 ~/.avidemux6/jobs.sql .d > dump +sqlite3 ~/.avidemux3/jobs.sql .d > dump
View file
avidemux-translations.patch
Changed
@@ -1,18 +1,16 @@ -diff -uNr avidemux_2.8.1/avidemux/qt4/i18n/Ts.cmake avidemux_2.8.1.new/avidemux/qt4/i18n/Ts.cmake ---- avidemux_2.8.1/avidemux/qt4/i18n/Ts.cmake 2023-02-03 14:55:58.825456588 +0100 -+++ avidemux_2.8.1.new/avidemux/qt4/i18n/Ts.cmake 2023-02-03 15:47:24.542463440 +0100 +--- a/avidemux/qt4/i18n/Ts.cmake ++++ b/avidemux/qt4/i18n/Ts.cmake @@ -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) -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.cpp ---- avidemux_2.8.1/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2023-02-03 14:55:58.869456431 +0100 -+++ avidemux_2.8.1.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp 2023-02-03 15:50:10.518118861 +0100 + 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) +--- a/avidemux_core/ADM_core/src/ADM_folder_linux.cpp ++++ b/avidemux_core/ADM_core/src/ADM_folder_linux.cpp @@ -126,13 +126,13 @@ if(isPortable) {
View file
avidemux-x264_plugins.patch
Changed
@@ -1,6 +1,5 @@ -diff -uNr avidemux_2.8.1/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt avidemux_2.8.1.new/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt ---- avidemux_2.8.1/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt 2023-02-03 14:55:58.977456052 +0100 -+++ avidemux_2.8.1.new/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt 2023-02-03 15:10:38.623227685 +0100 +--- a/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt ++++ b/avidemux_plugins/ADM_videoEncoder/x264/CMakeLists.txt @@ -34,15 +34,16 @@ INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x264_${QT_LIBRARY_EXTENSION}) endif(DO_QT4)
View file
avidemux-x265_plugins.patch
Changed
@@ -1,6 +1,5 @@ -diff -uNr avidemux_2.8.1/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt avidemux_2.8.1.new/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt ---- avidemux_2.8.1/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt 2023-02-03 14:55:58.977456052 +0100 -+++ avidemux_2.8.1.new/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt 2023-02-03 15:12:32.738937846 +0100 +--- a/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt ++++ b/avidemux_plugins/ADM_videoEncoder/x265/CMakeLists.txt @@ -32,15 +32,16 @@ INSTALL_VIDEO_ENCODER_QT4(ADM_ve_x265_${QT_LIBRARY_EXTENSION}) endif(DO_QT4)
View file
avidemux3.patch
Added
@@ -0,0 +1,77 @@ +--- a/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h.patch ++++ b/avidemux_core/ffmpeg_package/patches/libavcodec_mathops.h.patch +@@ -11,3 +11,74 @@ + + #define MAX_NEG_CROP 1024 + ++From effadce6c756247ea8bae32dc13bb3e6f464f0eb Mon Sep 17 00:00:00 2001 ++From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> ++Date: Sun, 16 Jul 2023 18:18:02 +0300 ++Subject: avcodec/x86/mathops: clip constants used with shift instructions ++ within inline assembly ++ ++Fixes assembling with binutil as >= 2.41 ++ ++Signed-off-by: James Almer <jamrial@gmail.com> ++--- ++ libavcodec/x86/mathops.h | 26 +++++++++++++++++++++++--- ++ 1 file changed, 23 insertions(+), 3 deletions(-) ++ ++--- libavcodec/x86/mathops.h +++++ libavcodec/x86/mathops.h ++@@ -35,12 +35,20 @@ ++ static av_always_inline av_const int MULL(int a, int b, unsigned shift) ++ { ++ int rt, dummy; +++ if (__builtin_constant_p(shift)) ++ __asm__ ( ++ "imull %3 \n\t" ++ "shrdl %4, %%edx, %%eax \n\t" ++ :"=a"(rt), "=d"(dummy) ++- :"a"(a), "rm"(b), "ci"((uint8_t)shift) +++ :"a"(a), "rm"(b), "i"(shift & 0x1F) ++ ); +++ else +++ __asm__ ( +++ "imull %3 \n\t" +++ "shrdl %4, %%edx, %%eax \n\t" +++ :"=a"(rt), "=d"(dummy) +++ :"a"(a), "rm"(b), "c"((uint8_t)shift) +++ ); ++ return rt; ++ } ++ ++@@ -113,19 +121,31 @@ __asm__ volatile(\ ++ // avoid +32 for shift optimization (gcc should do that ...) ++ #define NEG_SSR32 NEG_SSR32 ++ static inline int32_t NEG_SSR32( int32_t a, int8_t s){ +++ if (__builtin_constant_p(s)) ++ __asm__ ("sarl %1, %0\n\t" ++ : "+r" (a) ++- : "ic" ((uint8_t)(-s)) +++ : "i" (-s & 0x1F) ++ ); +++ else +++ __asm__ ("sarl %1, %0\n\t" +++ : "+r" (a) +++ : "c" ((uint8_t)(-s)) +++ ); ++ return a; ++ } ++ ++ #define NEG_USR32 NEG_USR32 ++ static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ +++ if (__builtin_constant_p(s)) ++ __asm__ ("shrl %1, %0\n\t" ++ : "+r" (a) ++- : "ic" ((uint8_t)(-s)) +++ : "i" (-s & 0x1F) ++ ); +++ else +++ __asm__ ("shrl %1, %0\n\t" +++ : "+r" (a) +++ : "c" ((uint8_t)(-s)) +++ ); ++ return a; ++ } ++
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.