Packman Build Service PMBS

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 9

project.diff Deleted

@@ -1,407 +0,0 @@
---- avidemux-desktop-file.patch.orig
-+++ avidemux-desktop-file.patch
-@@ -1,17 +1,9 @@
----- avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop.orig	2019-03-16 13:53:16.346573397 +0100
--+++ avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop	2019-03-16 13:53:16.350573314 +0100
--@@ -1,5 +1,5 @@
-- [Desktop Entry]
---Name=Avidemux
--+Name=Avidemux3
-- GenericName=Video Editor
-- Comment=Multiplatform video editor
-- Exec=avidemux3_qt5
--@@ -7,4 +7,6 @@
-- Icon=org.avidemux.Avidemux
-- Terminal=false
-+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
-+--- avidemux2-2.7.6/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop	2020-07-05 15:29:02.000000000 +0200
-++++ avidemux2-2.7.6.new/avidemux/qt4/xdg_data/org.avidemux.Avidemux.desktop	2020-07-07 18:40:34.236068158 +0200
-+@@ -8,3 +8,5 @@
-  Type=Application
---Categories=AudioVideo
--+Categories=AudioVideo;AudioVideoEditing;
-+ Categories=AudioVideo;AudioVideoEditing;Video;
-+ 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;
- +X-KDE-StartupNotify=true
- +X-SuSE-translate=true
---- avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch.orig
-+++ avidemux-ivtcDupeRemover-return-true-from-ivtcDupeRemover-get.patch
-@@ -1,22 +1,7 @@
--From: Jiri Slaby <jslaby@suse.cz>
--Date: Tue, 12 Nov 2019 11:47:21 +0100
--Subject: [ivtcDupeRemover] return true from ivtcDupeRemover::getNextFrame
--Patch-mainline: submitted as PR#182
--References: build fix
--
--It is declared as returning a bool, but returns nothing. But the callers
--expect something to be returned: true in case it succeeded.
--
--Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-----
-- .../ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp   | 2 ++
-- 1 file changed, 2 insertions(+)
--
--diff --git a/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp b/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
--index 754fd3ad3807..4ba1eae90c9a 100644
----- a/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
--+++ b/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp
--@@ -375,6 +375,8 @@ bool ivtcDupeRemover::getNextFrame(uint32_t *fn,ADMImage *image)
-+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
-+--- avidemux2-2.7.6/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp	2020-07-07 18:17:30.964650246 +0200
-++++ avidemux2-2.7.6.new/avidemux_plugins/ADM_videoFilters6/ivtcDupeRemover/ADM_ivtcDupeRemover.cpp	2020-07-07 18:50:38.201333556 +0200
-+@@ -375,6 +375,8 @@
-                break;
-  
-        }
-@@ -25,6 +10,3 @@ index 754fd3ad3807..4ba1eae90c9a 100644
-  }
-  /**
-      \fn getCoupledConf
---- 
--2.24.0
--
---- avidemux-linking.patch.orig
-+++ avidemux-linking.patch
-@@ -1,5 +1,6 @@
----- 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
-+diff -uNr avidemux2-2.7.6/avidemux/cli/CMakeLists.txt avidemux2-2.7.6.new/avidemux/cli/CMakeLists.txt
-+--- avidemux2-2.7.6/avidemux/cli/CMakeLists.txt	2020-07-07 18:17:32.192628426 +0200
-++++ avidemux2-2.7.6.new/avidemux/cli/CMakeLists.txt	2020-07-07 18:56:56.422604385 +0200
- @@ -110,6 +110,10 @@
-  	ADM_gui2Cli6
-  	ADM_toolkitCli6
-@@ -11,21 +12,9 @@
-  )
-  
-  ###########################################
----- 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
-- )
-- 
-- ###########################################
----- 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
-+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
-+--- avidemux2-2.7.6/avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2020-07-07 18:17:32.552622028 +0200
-++++ avidemux2-2.7.6.new/avidemux/qt4/ADM_jobs/src/CMakeLists.txt	2020-07-07 18:58:28.652963131 +0200
- @@ -86,6 +86,10 @@
-  TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreJobs)
-  TARGET_LINK_LIBRARIES(avidemux3_jobs_${QT_EXTENSION} ADM_coreUtils6)
-@@ -37,3 +26,17 @@
-  #
-  target_link_libraries(avidemux3_jobs_${QT_EXTENSION} "-lm -lstdc++")
-  #
-+diff -uNr avidemux2-2.7.6/avidemux/qt4/CMakeLists.txt avidemux2-2.7.6.new/avidemux/qt4/CMakeLists.txt
-+--- avidemux2-2.7.6/avidemux/qt4/CMakeLists.txt	2020-07-07 18:17:32.648620323 +0200
-++++ avidemux2-2.7.6.new/avidemux/qt4/CMakeLists.txt	2020-07-07 18:56:20.383245712 +0200
-+@@ -184,6 +184,10 @@
-+ 	ADM_coreAudioDevice6
-+ 	ADM_coreVideoEncoder6
-+ 	ADM_osSupport6
-++	ADM_coreSqlLight3
-++	ADM_libswscale
-++	ADM_libpostproc
-++	ADM_libavformat
-+ )
-+ 
-+ ###########################################
---- avidemux-package_version.patch.orig
-+++ avidemux-package_version.patch
-@@ -1,6 +1,18 @@
--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
----- avidemux_2.7.4/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-08-18 16:55:06.191443864 +0200
--+++ avidemux_2.7.4.new/avidemux/qt4/ADM_userInterfaces/ADM_gui/Q_gui2_menu.cpp	2019-08-18 17:02:34.575044048 +0200
-+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 @@
-+ 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")
-+ 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
- @@ -143,7 +143,7 @@
-      QString referenceFile = QCoreApplication::applicationDirPath() + "/help/" + ((FileAction*)sender())->filePath();
-  #else
-@@ -10,10 +22,22 @@ diff -uNr avidemux_2.7.4/avidemux/qt4/AD
-  #endif
-  
-      QDesktopServices::openUrl(QUrl("file:///" + referenceFile, QUrl::TolerantMode));
--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
----- avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-08-18 16:55:06.139443411 +0200
--+++ avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_linux.cpp	2019-08-18 17:02:31.303019793 +0200
--@@ -103,14 +103,14 @@
-+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
-+@@ -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.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 @@
-      if(isPortable)
-      {
-          std::string i18n=pluginDir;
-@@ -30,7 +54,7 @@ diff -uNr avidemux_2.7.4/avidemux_core/A
-          ADM_i18nDir=std::string(ppath);
-          delete [] ppath;
-          ppath=NULL;
--@@ -142,7 +142,7 @@
-+@@ -163,7 +163,7 @@
-      strcpy(ADM_basedir, homeEnv);
-      AddSeparator(ADM_basedir);
-  
-@@ -39,10 +63,10 @@ diff -uNr avidemux_2.7.4/avidemux_core/A
-  
-      strcat(ADM_basedir, ADM_DIR_NAME);
-      strcat(ADM_basedir, ADM_SEPARATOR);
--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
----- avidemux_2.7.4/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-08-18 16:55:06.139443411 +0200
--+++ avidemux_2.7.4.new/avidemux_core/ADM_core/src/ADM_folder_mac.cpp	2019-08-18 17:02:31.307019824 +0200
--@@ -124,7 +124,7 @@
-+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
-+@@ -132,7 +132,7 @@
-      strcpy(ADM_basedir, homeEnv);
-      AddSeparator(ADM_basedir);
-  
-@@ -51,7 +75,7 @@ diff -uNr avidemux_2.7.4/avidemux_core/A
-  
-      strcat(ADM_basedir, ADM_DIR_NAME);
-      strcat(ADM_basedir, ADM_SEPARATOR);
--@@ -146,9 +146,9 @@
-+@@ -154,9 +154,9 @@
-      
-      std::string partialPath=flavor+std::string("/i18n");

_link Changed

avidemux_2.7.6.tar.gz Deleted