Projects
home:Aloysius:branches:Multimedia
avidemux
Sign Up
Log In
Username
Password
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
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 4
View file
qt5.patch
Changed
@@ -1,6 +1,18 @@ +diff -udpr avidemux_2.5.6.orig/avidemux/ADM_audiofilter/audiofilter_normalize.cpp avidemux_2.5.6/avidemux/ADM_audiofilter/audiofilter_normalize.cpp +--- avidemux_2.5.6.orig/avidemux/ADM_audiofilter/audiofilter_normalize.cpp 2008-07-16 19:39:56.000000000 +0200 ++++ avidemux_2.5.6/avidemux/ADM_audiofilter/audiofilter_normalize.cpp 2021-06-10 08:12:14.252817477 +0200 +@@ -39,7 +39,7 @@ extern AVDMGenericAudioStream *currentau + #elif defined(ADM_BSD_FAMILY) + #define POW10(x) powf(10.0,x) + #else +-#define POW10(x) pow10f(x) ++#define POW10(x) exp10f(x) + #endif + + #define LINEAR_TO_DB(x) (20.*log10(x)) diff -udpr avidemux_2.5.6.orig/avidemux/ADM_coreImage/include/DIA_flyDialog.h avidemux_2.5.6/avidemux/ADM_coreImage/include/DIA_flyDialog.h --- avidemux_2.5.6.orig/avidemux/ADM_coreImage/include/DIA_flyDialog.h 2008-09-14 03:19:29.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_coreImage/include/DIA_flyDialog.h 2021-06-10 08:00:38.360001575 +0200 ++++ avidemux_2.5.6/avidemux/ADM_coreImage/include/DIA_flyDialog.h 2021-06-10 08:11:43.732922381 +0200 @@ -31,8 +31,8 @@ #include "DIA_uiTypes.h" @@ -14,7 +26,7 @@ #include "ADM_default.h" diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/include/ADM_toolkitQt.h avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/include/ADM_toolkitQt.h --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/include/ADM_toolkitQt.h 2010-01-24 21:07:35.000000000 +0100 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/include/ADM_toolkitQt.h 2021-06-10 08:00:38.243986764 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/include/ADM_toolkitQt.h 2021-06-10 08:11:43.748924423 +0200 @@ -1,6 +1,6 @@ #ifndef QT_TOOLKIT_H #define QT_TOOLKIT_H @@ -25,7 +37,7 @@ diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/include/Q_mswin.h avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/include/Q_mswin.h --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/include/Q_mswin.h 2011-10-11 23:52:22.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/include/Q_mswin.h 2021-06-10 08:00:38.243986764 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/include/Q_mswin.h 2021-06-10 08:11:43.748924423 +0200 @@ -1,7 +1,7 @@ #ifndef Q_MSWIN_H #define Q_MSWIN_H @@ -37,7 +49,7 @@ class Q_mswin diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/DIA_color.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/DIA_color.cpp --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/DIA_color.cpp 2009-07-28 23:35:56.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/DIA_color.cpp 2021-06-10 08:00:42.940586341 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/DIA_color.cpp 2021-06-10 08:11:43.752924933 +0200 @@ -1,4 +1,4 @@ -#include <QtGui/QColorDialog> +#include <QtWidgets/QColorDialog> @@ -46,7 +58,7 @@ #include "ADM_default.h" diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_aspectRatio.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_aspectRatio.cpp --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_aspectRatio.cpp 2009-07-24 20:32:40.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_aspectRatio.cpp 2021-06-10 08:00:42.928584808 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_aspectRatio.cpp 2021-06-10 08:11:43.756925444 +0200 @@ -13,10 +13,10 @@ * * ***************************************************************************/ @@ -64,7 +76,7 @@ #include "DIA_factory.h" diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_bar.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_bar.cpp --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_bar.cpp 2009-07-24 20:32:40.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_bar.cpp 2021-06-10 08:00:42.928584808 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_bar.cpp 2021-06-10 08:11:43.768926975 +0200 @@ -14,9 +14,9 @@ ***************************************************************************/ @@ -80,7 +92,7 @@ #include "DIA_factory.h" diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_float.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_float.cpp --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_float.cpp 2009-07-24 20:32:40.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_float.cpp 2021-06-10 08:00:42.956588383 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_float.cpp 2021-06-10 08:11:43.776927996 +0200 @@ -14,9 +14,9 @@ ***************************************************************************/ @@ -96,7 +108,7 @@ #include "DIA_factory.h" diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_frame.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_frame.cpp --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_frame.cpp 2009-07-24 20:32:40.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_frame.cpp 2021-06-10 08:00:42.928584808 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_frame.cpp 2021-06-10 08:11:43.776927996 +0200 @@ -14,9 +14,9 @@ ***************************************************************************/ @@ -112,7 +124,7 @@ #include "DIA_factory.h" diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_integer.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_integer.cpp --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_integer.cpp 2009-07-24 20:32:40.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_integer.cpp 2021-06-10 08:00:42.960588894 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_integer.cpp 2021-06-10 08:11:43.784929017 +0200 @@ -14,9 +14,9 @@ ***************************************************************************/ @@ -128,7 +140,7 @@ #include "DIA_factory.h" diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_matrix.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_matrix.cpp --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_matrix.cpp 2009-07-24 20:32:40.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_matrix.cpp 2021-06-10 08:00:42.948587361 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_matrix.cpp 2021-06-10 08:11:43.792930038 +0200 @@ -14,9 +14,9 @@ ***************************************************************************/ @@ -144,7 +156,7 @@ #include "DIA_factory.h" diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_readOnlyText.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_readOnlyText.cpp --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/FAC_readOnlyText.cpp 2009-07-24 20:32:40.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_readOnlyText.cpp 2021-06-10 08:00:42.928584808 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/FAC_readOnlyText.cpp 2021-06-10 08:11:43.912945357 +0200 @@ -14,9 +14,9 @@ ***************************************************************************/ @@ -160,7 +172,7 @@ #include "DIA_factory.h" diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_bitrate.h avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_bitrate.h --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_bitrate.h 2009-07-24 20:32:40.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_bitrate.h 2021-06-10 08:00:38.243986764 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_bitrate.h 2021-06-10 08:11:43.944949441 +0200 @@ -1,10 +1,10 @@ #ifndef T_bitrate_h #define T_bitrate_h @@ -178,7 +190,7 @@ #include "ADM_encoder/ADM_vidEncode.hxx" diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_button.h avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_button.h --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_button.h 2008-05-24 21:16:19.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_button.h 2021-06-10 08:00:38.243986764 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_button.h 2021-06-10 08:11:44.060964246 +0200 @@ -1,9 +1,9 @@ #ifndef T_button_h #define T_button_h @@ -194,7 +206,7 @@ #include "DIA_factory.h" diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp 2011-04-23 21:56:47.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp 2021-06-10 08:00:42.932585319 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp 2021-06-10 08:11:44.120971904 +0200 @@ -13,8 +13,8 @@ Handle dialog factory element : Config M * * ***************************************************************************/ @@ -208,7 +220,7 @@ #include "ADM_dialogFactoryQt4.h" diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h 2009-07-30 20:38:30.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h 2021-06-10 08:00:38.243986764 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h 2021-06-10 08:11:44.144974968 +0200 @@ -1,9 +1,9 @@ #ifndef T_configMenu_h #define T_configMenu_h @@ -225,7 +237,7 @@ namespace ADM_Qt4Factory diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_dialogFactory.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_dialogFactory.cpp --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_dialogFactory.cpp 2009-07-30 20:38:30.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_dialogFactory.cpp 2021-06-10 08:00:42.948587361 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_dialogFactory.cpp 2021-06-10 08:11:44.144974968 +0200 @@ -12,10 +12,10 @@ * * ***************************************************************************/ @@ -243,7 +255,7 @@ #include "ADM_default.h" diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_dialogFactory.h avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_dialogFactory.h --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_dialogFactory.h 2008-05-24 21:16:19.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_dialogFactory.h 2021-06-10 08:00:38.243986764 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_dialogFactory.h 2021-06-10 08:11:44.152975989 +0200 @@ -1,7 +1,7 @@ #ifndef T_dialogFactory_h #define T_dialogFactory_h @@ -255,7 +267,7 @@ { diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_filesel.h avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_filesel.h --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_filesel.h 2008-10-01 11:42:52.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_filesel.h 2021-06-10 08:00:38.243986764 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_filesel.h 2021-06-10 08:11:44.152975989 +0200 @@ -1,12 +1,12 @@ #ifndef T_filesel_h #define T_filesel_h @@ -277,7 +289,7 @@ { diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_flyDialogQt4.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_flyDialogQt4.cpp --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_flyDialogQt4.cpp 2008-10-01 18:06:48.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_flyDialogQt4.cpp 2021-06-10 08:00:42.940586341 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_flyDialogQt4.cpp 2021-06-10 08:11:44.164977520 +0200 @@ -15,8 +15,8 @@ #include <QtCore/QEvent> @@ -291,7 +303,7 @@ diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_menu.cpp avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_menu.cpp --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_menu.cpp 2009-08-01 00:24:31.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_menu.cpp 2021-06-10 08:00:42.944586851 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_menu.cpp 2021-06-10 08:11:44.172978542 +0200 @@ -17,8 +17,8 @@ #include "ADM_default.h" #include "ADM_dialogFactoryQt4.h" @@ -305,7 +317,7 @@ diff -udpr avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_menu.h avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_menu.h --- avidemux_2.5.6.orig/avidemux/ADM_UIs/ADM_QT4/src/T_menu.h 2009-07-27 22:46:59.000000000 +0200 -+++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_menu.h 2021-06-10 08:00:38.239986254 +0200 ++++ avidemux_2.5.6/avidemux/ADM_UIs/ADM_QT4/src/T_menu.h 2021-06-10 08:11:44.172978542 +0200 @@ -1,7 +1,7 @@ #ifndef T_menu_h #define T_menu_h
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
.