diff options
Diffstat (limited to 'media-video/avidemux/files')
7 files changed, 0 insertions, 233 deletions
diff --git a/media-video/avidemux/files/avidemux-2.5.4-build-plugins-fix.patch b/media-video/avidemux/files/avidemux-2.5.4-build-plugins-fix.patch deleted file mode 100644 index 66b44ad..0000000 --- a/media-video/avidemux/files/avidemux-2.5.4-build-plugins-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: avidemux_2.5.4/CMakeLists.txt -=================================================================== ---- avidemux_2.5.4.orig/CMakeLists.txt -+++ avidemux_2.5.4/CMakeLists.txt -@@ -205,7 +205,7 @@ ADD_SUBDIRECTORY(avidemux) - ADD_SUBDIRECTORY(po)
- ADD_SUBDIRECTORY(scripts)
- # MEANX : DOES NOT WORK ADD_SUBDIRECTORY(plugins EXCLUDE_FROM_ALL)
--
-+ADD_SUBDIRECTORY(plugins EXCLUDE_FROM_ALL) - ########################################
- # Config Summary
- ########################################
diff --git a/media-video/avidemux/files/avidemux-2.5.4-dummy-sound-fix.patch b/media-video/avidemux/files/avidemux-2.5.4-dummy-sound-fix.patch deleted file mode 100644 index e071dce..0000000 --- a/media-video/avidemux/files/avidemux-2.5.4-dummy-sound-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: avidemux_2.5.4/cmake/config.h.cmake -=================================================================== ---- avidemux_2.5.4.orig/cmake/config.h.cmake -+++ avidemux_2.5.4/cmake/config.h.cmake -@@ -76,9 +76,7 @@ - /* use Nvwa memory leak detector */
- #cmakedefine FIND_LEAKS
-
--#if defined(OSS_SUPPORT) || defined (USE_ARTS) || defined(USE_SDL) || defined(__APPLE__) || defined(__WIN32) || defined(ALSA_SUPPORT)
- #define HAVE_AUDIO
--#endif
-
- #define HAVE_ENCODER
-
diff --git a/media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch b/media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch deleted file mode 100644 index 62011a9..0000000 --- a/media-video/avidemux/files/avidemux-2.5.4-openfileqt.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Nuar avidemux_2.5_branch_gruntster.orig//avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp avidemux_2.5_branch_gruntster/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp ---- avidemux_2.5_branch_gruntster.orig//avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp 2011-04-18 11:34:58.797593384 +0200 -+++ avidemux_2.5_branch_gruntster/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp 2011-04-18 11:37:16.122645712 +0200 -@@ -210,7 +210,9 @@ - delete [] configData;
-
- fillConfigurationComboBox();
-- selectConfiguration(&QFileInfo(configFileName).completeBaseName(), CONFIG_MENU_USER);
-+
-+ QString temporary = QFileInfo(configFileName).completeBaseName();
-+ selectConfiguration(&temporary, CONFIG_MENU_USER);
- }
- }
- }
-@@ -316,7 +318,8 @@ - {
- ADM_QconfigMenu *configMenu = (ADM_QconfigMenu*)myWidget;
-
-- configMenu->selectConfiguration(&QString(configName), *configType);
-+ QString temporary2 = QString(configName);
-+ configMenu->selectConfiguration(&temporary2, *configType);
- }
-
- void diaElemConfigMenu::finalize(void)
-@@ -356,7 +359,8 @@ - }
- }
-
-- configMenu->selectConfiguration(&QString(configName), *configType);
-+ QString temporary3 = QString(configName);
-+ configMenu->selectConfiguration(&temporary3, *configType);
- }
- }
-
diff --git a/media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch b/media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch deleted file mode 100644 index c627667..0000000 --- a/media-video/avidemux/files/avidemux-2.5.4-x264-build115.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp ---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200 -@@ -488,8 +488,10 @@ - printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
- printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
- printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
-+#elif X264_BUILD > 114
-+ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
- #endif
- printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
- #if X264_BUILD > 88
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp ---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:35:36.000000000 +0200 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200 -@@ -417,7 +417,7 @@ - _param.b_cabac = cabac;
- }
-
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- unsigned int x264Options::getOpenGopMode(void)
- {
- return _param.i_open_gop;
-@@ -428,6 +428,17 @@ - if (openGopMode < 3)
- _param.i_open_gop = openGopMode;
- }
-+#elif X264_BUILD > 114
-+unsigned int x264Options::getOpenGopMode(void)
-+{
-+ return _param.b_open_gop;
-+}
-+
-+void x264Options::setOpenGopMode(unsigned int openGopMode)
-+{
-+ if (openGopMode < 3)
-+ _param.b_open_gop = openGopMode;
-+}
- #endif
-
- unsigned int x264Options::getInterlaced(void)
diff --git a/media-video/avidemux/files/avidemux-2.5.4-x264-version-fix.patch b/media-video/avidemux/files/avidemux-2.5.4-x264-version-fix.patch deleted file mode 100644 index c0825af..0000000 --- a/media-video/avidemux/files/avidemux-2.5.4-x264-version-fix.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp ---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-03-12 12:04:53.100131791 +0200 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-03-12 12:02:58.063666919 +0200 -@@ -94,6 +94,13 @@ - connect(ui.dct8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(dct8x8CheckBox_toggled(bool)));
- connect(ui.p8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(p8x8CheckBox_toggled(bool)));
-
-+#if X264_BUILD < 110
-+ ui.weightedPPredictComboBox->clear();
-+ ui.weightedPPredictComboBox->addItem(tr("Disabled"));
-+ ui.weightedPPredictComboBox->addItem(tr("Blind Offset"));
-+ ui.weightedPPredictComboBox->addItem(tr("Smart Analysis"));
-+#endif
-+
- // Frame tab
- connect(ui.loopFilterCheckBox, SIGNAL(toggled(bool)), this, SLOT(loopFilterCheckBox_toggled(bool)));
-
-diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui ---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui 2011-03-12 12:04:53.100131791 +0200 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui 2011-03-12 12:02:58.063666919 +0200 -@@ -1131,12 +1131,12 @@ - </item> - <item> - <property name="text"> -- <string>Blind Offset</string> -+ <string>Weighted References</string> - </property> - </item> - <item> - <property name="text"> -- <string>Smart Analysis</string> -+ <string>Weighted References + Duplicates</string> - </property> - </item> - </widget> -diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp ---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-03-12 12:04:53.100131791 +0200 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-03-12 12:02:58.062666914 +0200 -@@ -1386,9 +1386,15 @@ - case X264_WEIGHTP_NONE:
- strcpy((char*)xmlBuffer, "none");
- break;
-+#if X264_BUILD < 110
- case X264_WEIGHTP_BLIND:
- strcpy((char*)xmlBuffer, "blind");
- break;
-+#else
-+ case X264_WEIGHTP_SIMPLE:
-+ strcpy((char*)xmlBuffer, "simple");
-+ break;
-+#endif
- case X264_WEIGHTP_SMART:
- strcpy((char*)xmlBuffer, "smart");
- break;
-@@ -1895,8 +1901,13 @@ - {
- int weightedPredPFrames = X264_WEIGHTP_NONE;
-
-+#if X264_BUILD < 110
- if (strcmp(content, "blind") == 0)
- weightedPredPFrames = X264_WEIGHTP_BLIND;
-+#else
-+ if (strcmp(content, "simple") == 0)
-+ weightedPredPFrames = X264_WEIGHTP_SIMPLE;
-+#endif
- else if (strcmp(content, "smart") == 0)
- weightedPredPFrames = X264_WEIGHTP_SMART;
-
-diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd ---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd 2011-03-12 12:04:53.100131791 +0200 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd 2011-03-12 12:02:58.062666914 +0200 -@@ -335,7 +335,9 @@ - <xs:simpleType>
- <xs:restriction base="xs:string">
- <xs:enumeration value="none"/>
-+ <!-- blind deprecated core 110 -->
- <xs:enumeration value="blind"/>
-+ <xs:enumeration value="simple"/>
- <xs:enumeration value="smart"/>
- </xs:restriction>
- </xs:simpleType>
diff --git a/media-video/avidemux/files/avidemux-2.5.4-x264.patch b/media-video/avidemux/files/avidemux-2.5.4-x264.patch deleted file mode 100644 index 5dd3506..0000000 --- a/media-video/avidemux/files/avidemux-2.5.4-x264.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nuar avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp ---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2010-09-29 22:20:48.000000000 +0200 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-04-18 12:26:34.482304155 +0200 -@@ -343,7 +343,8 @@ - delete [] xml;
-
- fillConfigurationComboBox();
-- selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);
-+ QString temporary = QFileInfo(configFileName).completeBaseName();
-+ selectConfiguration(&temporary, PLUGIN_CONFIG_USER);
- }
-
- delete [] configDirectory;
-@@ -580,7 +581,8 @@ - disableGenericSlots = true;
- options->getPresetConfiguration(&configurationName, &configurationType);
-
-- bool foundConfig = selectConfiguration(&QString(configurationName), configurationType);
-+ QString temporary2 = QString(configurationName);
-+ bool foundConfig = selectConfiguration(&temporary2, configurationType);
-
- if (!foundConfig)
- printf("Configuration %s (type %d) could not be found. Using snapshot.\n", configurationName, configurationType);
diff --git a/media-video/avidemux/files/avidemux-2.5.4-xvid.patch b/media-video/avidemux/files/avidemux-2.5.4-xvid.patch deleted file mode 100644 index 6b1d2f0..0000000 --- a/media-video/avidemux/files/avidemux-2.5.4-xvid.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Nuar avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp ---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp 2010-06-07 01:07:37.000000000 +0200 -+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp 2011-04-18 12:12:13.640562284 +0200 -@@ -233,7 +233,8 @@ - delete [] xml;
-
- fillConfigurationComboBox();
-- selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER);
-+ QString temporary = QFileInfo(configFileName).completeBaseName();
-+ selectConfiguration(&temporary, PLUGIN_CONFIG_USER);
- }
-
- delete [] configDirectory;
-@@ -373,7 +374,8 @@ - disableGenericSlots = true;
- options->getPresetConfiguration(&configurationName, &configurationType);
-
-- bool foundConfig = selectConfiguration(&QString(configurationName), configurationType);
-+ QString temporary2 = QString(configurationName);
-+ bool foundConfig = selectConfiguration(&temporary2, configurationType);
-
- if (!foundConfig)
- printf("Configuration %s (type %d) could not be found. Using snapshot.\n", configurationName, configurationType);
|