Author: hobbes1069 Update of /cvs/free/rpms/avidemux/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv30695 Modified Files: .cvsignore avidemux.spec Added Files: avidemux-2.5.4-gcc46_tmp_fix.patch avidemux-2.5.4-gtk_menu_crash_fix.patch avidemux-2.5.4-x264_fix.patch Log Message: * Tue Apr 19 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.4-3 - Fixes gcc 4.6 errors that used to be warnings. - Fixes compile issues with x264 being too new. - Fixes potential crash betwen gtk and opengl. avidemux-2.5.4-gcc46_tmp_fix.patch: avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp | 8 ++++---- avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h | 2 +- plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp | 6 +++--- plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h | 2 +- plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp | 6 +++--- plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) --- NEW FILE avidemux-2.5.4-gcc46_tmp_fix.patch --- diff -Naur avidemux_2.5.4.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp avidemux_2.5.4/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp --- avidemux_2.5.4.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp 2010-06-06 18:04:21.000000000 -0500 +++ avidemux_2.5.4/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.cpp 2011-04-19 14:15:09.330729997 -0500 @@ -138,7 +138,7 @@ *configType = (ConfigMenuType)combobox->itemData(combobox->currentIndex()).toInt(); } - bool ADM_QconfigMenu::selectConfiguration(QString *selectFile, ConfigMenuType configurationType) + bool ADM_QconfigMenu::selectConfiguration(const QString &selectFile, ConfigMenuType configurationType) { bool success = false; bool origDisableGenericSlots = disableGenericSlots; @@ -210,7 +210,7 @@ delete [] configData; fillConfigurationComboBox(); - selectConfiguration(&QFileInfo(configFileName).completeBaseName(), CONFIG_MENU_USER); + selectConfiguration(QFileInfo(configFileName).completeBaseName(), CONFIG_MENU_USER); } } } @@ -316,7 +316,7 @@ { ADM_QconfigMenu *configMenu = (ADM_QconfigMenu*)myWidget; - configMenu->selectConfiguration(&QString(configName), *configType); + configMenu->selectConfiguration(QString(configName), *configType); } void diaElemConfigMenu::finalize(void) @@ -356,7 +356,7 @@ } } - configMenu->selectConfiguration(&QString(configName), *configType); + configMenu->selectConfiguration(QString(configName), *configType); } } diff -Naur avidemux_2.5.4.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h avidemux_2.5.4/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h --- avidemux_2.5.4.orig/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h 2009-07-30 13:38:30.000000000 -0500 +++ avidemux_2.5.4/avidemux/ADM_UIs/ADM_QT4/src/T_configMenu.h 2011-04-19 14:15:38.299090636 -0500 @@ -46,7 +46,7 @@ ~ADM_QconfigMenu(); void getConfiguration(char *configName, ConfigMenuType *configType); - bool selectConfiguration(QString *selectFile, ConfigMenuType configurationType); + bool selectConfiguration(const QString &selectFile, ConfigMenuType configurationType); }; } #endif // T_configMenu_h diff -Naur 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 15:20:48.000000000 -0500 +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-04-19 15:03:33.459339339 -0500 @@ -209,7 +209,7 @@ disableGenericSlots = origDisableGenericSlots; } -bool x264ConfigDialog::selectConfiguration(QString *selectFile, PluginConfigType configurationType) +bool x264ConfigDialog::selectConfiguration(const QString &selectFile, PluginConfigType configurationType) { bool success = false; bool origDisableGenericSlots = disableGenericSlots; @@ -343,7 +343,7 @@ delete [] xml; fillConfigurationComboBox(); - selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER); + selectConfiguration(QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER); } delete [] configDirectory; @@ -580,7 +580,7 @@ disableGenericSlots = true; options->getPresetConfiguration(&configurationName, &configurationType); - bool foundConfig = selectConfiguration(&QString(configurationName), configurationType); + bool foundConfig = selectConfiguration(QString(configurationName), configurationType); if (!foundConfig) printf("Configuration %s (type %d) could not be found. Using snapshot.\n", configurationName, configurationType); diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h --- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h 2010-09-29 15:20:48.000000000 -0500 +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h 2011-04-19 15:03:52.825582656 -0500 @@ -46,7 +46,7 @@ uint8_t intra8x8Luma[64], inter8x8Luma[64]; void fillConfigurationComboBox(void); - bool selectConfiguration(QString *selectFile, PluginConfigType configurationType); + bool selectConfiguration(const QString &selectFile, PluginConfigType configurationType); bool loadPresetSettings(vidEncOptions *encodeOptions, x264Options *options); void loadSettings(vidEncOptions *encodeOptions, x264Options *options); int getValueIndexInArray(uint8_t value, const uint8_t valueArray[], int elementCount); diff -Naur 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-06 18:07:37.000000000 -0500 +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.cpp 2011-04-19 14:36:49.467456165 -0500 @@ -129,7 +129,7 @@ disableGenericSlots = origDisableGenericSlots; } -bool XvidConfigDialog::selectConfiguration(QString *selectFile, PluginConfigType configurationType) +bool XvidConfigDialog::selectConfiguration(const QString &selectFile, PluginConfigType configurationType) { bool success = false; bool origDisableGenericSlots = disableGenericSlots; @@ -233,7 +233,7 @@ delete [] xml; fillConfigurationComboBox(); - selectConfiguration(&QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER); + selectConfiguration(QFileInfo(configFileName).completeBaseName(), PLUGIN_CONFIG_USER); } delete [] configDirectory; @@ -373,7 +373,7 @@ disableGenericSlots = true; options->getPresetConfiguration(&configurationName, &configurationType); - bool foundConfig = selectConfiguration(&QString(configurationName), configurationType); + bool foundConfig = selectConfiguration(QString(configurationName), configurationType); if (!foundConfig) printf("Configuration %s (type %d) could not be found. Using snapshot.\n", configurationName, configurationType); diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h --- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h 2009-08-03 11:24:09.000000000 -0500 +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/qt4/xvidConfigDialog.h 2011-04-19 14:38:00.253653291 -0500 @@ -26,7 +26,7 @@ unsigned char intraMatrix[64], interMatrix[64]; void fillConfigurationComboBox(void); - bool selectConfiguration(QString *selectFile, PluginConfigType configurationType); + bool selectConfiguration(const QString &selectFile, PluginConfigType configurationType); bool loadPresetSettings(vidEncOptions *encodeOptions, XvidOptions *options); void loadSettings(vidEncOptions *encodeOptions, XvidOptions *options); avidemux-2.5.4-gtk_menu_crash_fix.patch: FAC_menu.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- NEW FILE avidemux-2.5.4-gtk_menu_crash_fix.patch --- Index: avidemux/ADM_UIs/ADM_GTK/src/FAC_menu.cpp =================================================================== --- avidemux/ADM_UIs/ADM_GTK/src/FAC_menu.cpp (revision 6713) +++ avidemux/ADM_UIs/ADM_GTK/src/FAC_menu.cpp (working copy) @@ -183,7 +183,7 @@ { GtkWidget *widget=(GtkWidget *)myWidget; int rank = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); - + if(rank==-1) rank=0; if (!nbMenu) return; @@ -226,6 +226,7 @@ rank=gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); + if(-1==rank) rank=0; ADM_assert(rank<this->nbMenu); val=this->menu[rank]->val; /* Now search through the linked list to see if something happens ...*/ avidemux-2.5.4-x264_fix.patch: qt4/x264ConfigDialog.cpp | 7 +++++++ x264Options.cpp | 11 +++++++++++ x264Param.xsd | 2 ++ 3 files changed, 20 insertions(+) --- NEW FILE avidemux-2.5.4-x264_fix.patch --- diff -Naur 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 15:20:48.000000000 -0500 +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-04-17 16:10:58.327555878 -0500 @@ -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 -Naur 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-17 16:17:26.318246984 -0500 +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-17 16:17:48.213370981 -0500 @@ -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 -Naur 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 2010-09-29 14:48:29.000000000 -0500 +++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd 2011-04-17 16:19:10.877113040 -0500 @@ -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> Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 27 May 2010 02:05:51 -0000 1.7 +++ .cvsignore 19 Apr 2011 23:50:00 -0000 1.8 @@ -1 +1,2 @@ avidemux_2.5.3.tar.gz +avidemux.spec.old Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- avidemux.spec 16 Apr 2011 23:50:19 -0000 1.39 +++ avidemux.spec 19 Apr 2011 23:50:00 -0000 1.40 @@ -2,7 +2,7 @@ Name: avidemux Version: 2.5.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia @@ -39,7 +39,10 @@ Patch5: avidemux-2.5.3-pluginlibs.patch # Patch8 obtained from http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2010-October/00... Patch6: avidemux_2.5.4-ffmpeg-aac.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch7: avidemux-2.5.4-gcc46_tmp_fix.patch +Patch8: avidemux-2.5.4-gtk_menu_crash_fix.patch +# Patch needed for version of x264 in F15/rawhide. +Patch9: avidemux-2.5.4-x264_fix.patch # Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447 ExcludeArch: ppc ppc64 @@ -174,6 +177,9 @@ %patch4 -p1 -b .mpeg2enc %patch5 -p1 -b .pluginlibs %patch6 -p1 -b .ffmpegaac +%patch7 -p1 -b .gcc46tmpfix +%patch8 -b .gtk_menu +%patch9 -p1 -b .x264fix %build # Out of source build @@ -275,6 +281,11 @@ %{_includedir}/ADM_coreConfig.h %changelog +* Tue Apr 19 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.4-3 +- Fixes gcc 4.6 errors that used to be warnings. +- Fixes compile issues with x264 being too new. +- Fixes potential crash betwen gtk and opengl. + * Sat Apr 16 2011 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.5.4-2 - Upload missing patch to CVS.