rpms/buildsys-build-rpmfusion/F-14 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.28, 1.29 buildsys-build-rpmfusion.spec, 1.37, 1.38
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5704
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Sun Apr 24 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:14-10
- rebuild for kernel 2.6.35.12-90.fc14
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-14/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- buildsys-build-rpmfusion-kerneldevpkgs-current 4 Apr 2011 05:31:41 -0000 1.28
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 24 Apr 2011 07:05:15 -0000 1.29
@@ -1,3 +1,3 @@
-2.6.35.12-88.fc14
-2.6.35.12-88.fc14smp
-2.6.35.12-88.fc14PAE
+2.6.35.12-90.fc14
+2.6.35.12-90.fc14smp
+2.6.35.12-90.fc14PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-14/buildsys-build-rpmfusion.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- buildsys-build-rpmfusion.spec 4 Apr 2011 05:31:41 -0000 1.37
+++ buildsys-build-rpmfusion.spec 24 Apr 2011 07:05:15 -0000 1.38
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 14
-Release: 9
+Release: 10
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -86,6 +86,9 @@
%changelog
+* Sun Apr 24 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:14-10
+- rebuild for kernel 2.6.35.12-90.fc14
+
* Mon Apr 04 2011 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:14-9
- rebuild for kernel 2.6.35.12-88.fc14
13 years
rpms/transcode/devel transcode-1.1.5-videodev2.patch, NONE, 1.1 transcode.spec, 1.25, 1.26
by David Juran
Author: juran
Update of /cvs/free/rpms/transcode/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13149
Modified Files:
transcode.spec
Added Files:
transcode-1.1.5-videodev2.patch
Log Message:
Disable v4l, Bz 1700
transcode-1.1.5-videodev2.patch:
acinclude.m4 | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
--- NEW FILE transcode-1.1.5-videodev2.patch ---
diff -up transcode-1.1.5/acinclude.m4.videodev2 transcode-1.1.5/acinclude.m4
--- transcode-1.1.5/acinclude.m4.videodev2 2011-04-20 22:02:13.000000000 +0300
+++ transcode-1.1.5/acinclude.m4 2011-04-21 18:24:23.000000000 +0300
@@ -175,11 +175,8 @@ AC_ARG_ENABLE(v4l,
[enable_v4l=no])
AC_MSG_RESULT($enable_v4l)
-have_v4l=no
-if test x"$enable_v4l" = x"yes" ; then
- AC_CHECK_HEADERS([linux/videodev.h], [v4l=yes], [v4l=no])
- AC_CHECK_HEADERS([linux/videodev2.h], [v4l2=yes], [v4l2=no],
- [#include <linux/types.h>])
+AC_CHECK_HEADERS([linux/videodev2.h], [v4l2=yes], [v4l2=no],
+ [#include <linux/types.h>])
if test x"$v4l2" = x"yes" ; then
AC_MSG_CHECKING([for struct v4l2_buffer in videodev2.h])
@@ -196,6 +193,12 @@ buf.memory = V4L2_MEMORY_MMAP
[AC_MSG_RESULT([no])])
fi
+have_v4l=no
+if test x"$enable_v4l" = x"yes" ; then
+ AC_CHECK_HEADERS([linux/videodev.h], [v4l=yes], [v4l=no])
+
+
+
if test x"$v4l" = x"yes" -o x"$v4l2" = x"yes" ; then
have_v4l=yes
ifelse([$1], , :, [$1])
Index: transcode.spec
===================================================================
RCS file: /cvs/free/rpms/transcode/devel/transcode.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- transcode.spec 30 Sep 2010 07:59:00 -0000 1.25
+++ transcode.spec 21 Apr 2011 20:25:47 -0000 1.26
@@ -7,7 +7,7 @@
Name: transcode
Version: 1.1.5
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Video stream processing tool
Group: Applications/Multimedia
@@ -18,6 +18,8 @@
Patch3: transcode-1.0.4.external_dv.patch
Patch4: transcode-1.1.5-fix_v4l.patch
Patch5: transcode-1.1.5-no_video.patch
+Patch6: transcode-1.1.5-videodev2.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -74,6 +76,7 @@
%patch3 -p1 -b .external_dv
%patch4 -p1 -b .fix_v4l
%patch5 -p1 -b .no_video
+%patch6 -p1 -b .videodev2
rm filter/preview/dv_types.h
rm import/v4l/videodev.h
@@ -121,7 +124,6 @@
--enable-deprecated \
--enable-libv4l2 \
--enable-libv4lconvert \
- --enable-v4l \
--enable-libmpeg2 \
--enable-libmpeg2convert
@@ -151,6 +153,9 @@
%changelog
+* Wed Apr 20 2011 David Juran <david(a)juran.se> - 1.1.5-6
+- Disable v4l, Bz 1700
+
* Thu Sep 30 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.5-5
- rebuilt for ImageMagick
13 years
rpms/gstreamer-plugins-bad-nonfree/devel gstreamer-plugins-bad-nonfree.spec, 1.3, 1.4
by jwrdegoede
Author: jwrdegoede
Update of /cvs/nonfree/rpms/gstreamer-plugins-bad-nonfree/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12263
Modified Files:
gstreamer-plugins-bad-nonfree.spec
Log Message:
* Thu Apr 21 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.21-2
- Rebuild for proper package kit magic provides (rhbz#695730)
Index: gstreamer-plugins-bad-nonfree.spec
===================================================================
RCS file: /cvs/nonfree/rpms/gstreamer-plugins-bad-nonfree/devel/gstreamer-plugins-bad-nonfree.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gstreamer-plugins-bad-nonfree.spec 31 Jan 2011 16:58:05 -0000 1.3
+++ gstreamer-plugins-bad-nonfree.spec 21 Apr 2011 09:15:46 -0000 1.4
@@ -3,7 +3,7 @@
Summary: Non Free GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad-nonfree
Version: 0.10.21
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -64,6 +64,9 @@
%changelog
+* Thu Apr 21 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.21-2
+- Rebuild for proper package kit magic provides (rhbz#695730)
+
* Fri Jan 28 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.21-1
- New upstream release 0.10.21
13 years
rpms/gstreamer-ffmpeg/devel gstreamer-ffmpeg.spec,1.16,1.17
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11272
Modified Files:
gstreamer-ffmpeg.spec
Log Message:
* Thu Apr 21 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.11-2
- Rebuild for proper package kit magic provides (rhbz#695730, rf#1707)
Index: gstreamer-ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-ffmpeg/devel/gstreamer-ffmpeg.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gstreamer-ffmpeg.spec 16 Jul 2010 21:48:51 -0000 1.16
+++ gstreamer-ffmpeg.spec 21 Apr 2011 09:04:19 -0000 1.17
@@ -1,6 +1,6 @@
Name: gstreamer-ffmpeg
Version: 0.10.11
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GStreamer FFmpeg-based plug-ins
Group: Applications/Multimedia
# the ffmpeg plugin is LGPL, the postproc plugin is GPL
@@ -54,6 +54,9 @@
%changelog
+* Thu Apr 21 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.11-2
+- Rebuild for proper package kit magic provides (rhbz#695730, rf#1707)
+
* Sat Jul 17 2010 Hans de Goede <j.w.r.degoede(a)gmail.com> 0.10.11-1
- New upstream release 0.10.11
13 years
rpms/gstreamer-plugins-ugly/devel gstreamer-plugins-ugly.spec, 1.30, 1.31
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-ugly/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9695
Modified Files:
gstreamer-plugins-ugly.spec
Log Message:
* Thu Apr 21 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.17-3
- Rebuild for proper package kit magic provides (rhbz#695730, rf#1706)
Index: gstreamer-plugins-ugly.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-ugly/devel/gstreamer-plugins-ugly.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- gstreamer-plugins-ugly.spec 11 Mar 2011 08:44:13 -0000 1.30
+++ gstreamer-plugins-ugly.spec 21 Apr 2011 08:48:37 -0000 1.31
@@ -11,7 +11,7 @@
Summary: GStreamer streaming media framework "ugly" plug-ins
Name: gstreamer-plugins-ugly
Version: 0.10.17
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -133,6 +133,9 @@
%changelog
+* Thu Apr 21 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.17-3
+- Rebuild for proper package kit magic provides (rhbz#695730, rf#1706)
+
* Fri Mar 11 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.17-2
- Rebuilt for new x264/FFmpeg
13 years
rpms/gstreamer-plugins-bad/devel gstreamer-plugins-bad.spec, 1.41, 1.42
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-bad/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8102
Modified Files:
gstreamer-plugins-bad.spec
Log Message:
* Thu Apr 21 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.21-3
- Rebuild for proper package kit magic provides (rhbz#695730)
Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/devel/gstreamer-plugins-bad.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- gstreamer-plugins-bad.spec 8 Mar 2011 15:39:19 -0000 1.41
+++ gstreamer-plugins-bad.spec 21 Apr 2011 08:28:51 -0000 1.42
@@ -15,7 +15,7 @@
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad
Version: 0.10.21
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -110,6 +110,9 @@
%changelog
+* Thu Apr 21 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.21-3
+- Rebuild for proper package kit magic provides (rhbz#695730)
+
* Tue Mar 08 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.21-2
- Enable rtmp plugin (rf#1651)
13 years
rpms/avidemux/F-14 avidemux-2.5.4-gcc46_tmp_fix.patch, NONE, 1.1 avidemux-2.5.4-gtk_menu_crash_fix.patch, NONE, 1.1 avidemux-2.5.4-x264_fix.patch, NONE, 1.1 avidemux.spec, 1.38, 1.39
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12882
Modified Files:
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:
* Wed Apr 20 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-4
- Disabled non-working patch for experimental aac encoding with ffmpeg.
- Removed dependency on bundled javascript library. Now uses system library.
- Added optional opencore-amr decoding support.
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: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-14/avidemux.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- avidemux.spec 20 Nov 2010 23:55:16 -0000 1.38
+++ avidemux.spec 21 Apr 2011 01:59:03 -0000 1.39
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.4
-Release: 1%{?dist}
+Release: 4%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -38,8 +38,12 @@
Patch4: avidemux-2.5.3-mpeg2enc.patch
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)
+#Patch6: avidemux_2.5.4-ffmpeg-aac.patch
+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
+#Patch10: avidemux-2.5.4-ext_lib_cmake_fix.patch
# Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
ExcludeArch: ppc ppc64
@@ -80,6 +84,9 @@
BuildRequires: libogg-devel >= 1.1
BuildRequires: libvorbis-devel >= 1.0.1
BuildRequires: libdca-devel
+BuildRequires: opencore-amr-devel
+# VP8 support, decoding only?
+BuildRequires: libvpx-devel
# Video Codecs
@@ -161,6 +168,10 @@
%prep
%setup -q -n avidemux_%{version}
+# Remove unneeded external libraries
+# Currently breaks building if it doesn't exist.
+#rm -rf avidemux/ADM_script
+
# change hardcoded libdir paths
%ifarch x86_64 ppc64
sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/ADM_core/src/ADM_fileio.cpp
@@ -173,7 +184,13 @@
%patch3 -p1 -b .tmplinktarget
%patch4 -p1 -b .mpeg2enc
%patch5 -p1 -b .pluginlibs
-%patch6 -p1 -b .ffmpegaac
+# Does not work as is. Disabled for now.
+#%patch6 -p1 -b .ffmpegaac
+%patch7 -p1 -b .gcc46tmpfix
+%patch8 -b .gtk_menu
+%patch9 -p1 -b .x264fix
+# Fixes cmake configuration but build fails.
+#%patch10 -p1 -b .extlibfix
%build
# Out of source build
@@ -181,6 +198,7 @@
%cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
-DAVIDEMUX_SOURCE_DIR="%{_pkgbuilddir}" \
-DAVIDEMUX_CORECONFIG_DIR="%{_pkgbuilddir}/build/config" \
+ -DUSE_SYSTEM_SPIDERMONKEY:BOOL=ON \
..
make %{?_smp_mflags}
# Create the temp link directory manually since otherwise it happens too early
@@ -275,17 +293,24 @@
%{_includedir}/ADM_coreConfig.h
%changelog
-* Sat Nov 20 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.4-1
-- Update to 2.5.4
-- Fix Qt translations (Kevin Kofler)
-
-* Fri Nov 5 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-6
-- Remove dir /usr/share/avidemux as nothing installs there anymore
-
-* Tue Oct 26 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-5
-- Add x264 field asm patch to fix F-14 build (#1447)
-- Fix main package's dependency on the GUI subpackage (Bernie Innocentie)
-- Enable ffmpeg's AAC encoder (Kevin Kofler)
+* Wed Apr 20 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-4
+- Disabled non-working patch for experimental aac encoding with ffmpeg.
+- Removed dependency on bundled javascript library. Now uses system library.
+- Added optional opencore-amr decoding support.
+
+* Tue Apr 19 2011 Richard Shaw <hobbes1069(a)gmail.com> - 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> - 2.5.4-2
+- Upload missing patch to CVS.
+
+* Sat Apr 16 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-1
+- Updated to version 2.5.4.
+
+* Sun Mar 27 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5.3-5
+- Rebuild for x264
* Tue Jul 20 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.3-4
- Rebuild for new x264
13 years
rpms/avidemux/devel avidemux.spec,1.40,1.41
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12719
Modified Files:
avidemux.spec
Log Message:
* Wed Apr 20 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-4
- Disabled non-working patch for experimental aac encoding with ffmpeg.
- Removed dependency on bundled javascript library. Now uses system library.
- Added optional opencore-amr decoding support.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- avidemux.spec 19 Apr 2011 23:50:00 -0000 1.40
+++ avidemux.spec 21 Apr 2011 01:56:25 -0000 1.41
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -38,11 +38,12 @@
Patch4: avidemux-2.5.3-mpeg2enc.patch
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
+#Patch6: avidemux_2.5.4-ffmpeg-aac.patch
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
+#Patch10: avidemux-2.5.4-ext_lib_cmake_fix.patch
# Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
ExcludeArch: ppc ppc64
@@ -83,6 +84,9 @@
BuildRequires: libogg-devel >= 1.1
BuildRequires: libvorbis-devel >= 1.0.1
BuildRequires: libdca-devel
+BuildRequires: opencore-amr-devel
+# VP8 support, decoding only?
+BuildRequires: libvpx-devel
# Video Codecs
@@ -164,6 +168,10 @@
%prep
%setup -q -n avidemux_%{version}
+# Remove unneeded external libraries
+# Currently breaks building if it doesn't exist.
+#rm -rf avidemux/ADM_script
+
# change hardcoded libdir paths
%ifarch x86_64 ppc64
sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/ADM_core/src/ADM_fileio.cpp
@@ -176,10 +184,13 @@
%patch3 -p1 -b .tmplinktarget
%patch4 -p1 -b .mpeg2enc
%patch5 -p1 -b .pluginlibs
-%patch6 -p1 -b .ffmpegaac
+# Does not work as is. Disabled for now.
+#%patch6 -p1 -b .ffmpegaac
%patch7 -p1 -b .gcc46tmpfix
%patch8 -b .gtk_menu
%patch9 -p1 -b .x264fix
+# Fixes cmake configuration but build fails.
+#%patch10 -p1 -b .extlibfix
%build
# Out of source build
@@ -187,6 +198,7 @@
%cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
-DAVIDEMUX_SOURCE_DIR="%{_pkgbuilddir}" \
-DAVIDEMUX_CORECONFIG_DIR="%{_pkgbuilddir}/build/config" \
+ -DUSE_SYSTEM_SPIDERMONKEY:BOOL=ON \
..
make %{?_smp_mflags}
# Create the temp link directory manually since otherwise it happens too early
@@ -281,6 +293,11 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Wed Apr 20 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-4
+- Disabled non-working patch for experimental aac encoding with ffmpeg.
+- Removed dependency on bundled javascript library. Now uses system library.
+- Added optional opencore-amr decoding support.
+
* Tue Apr 19 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-3
- Fixes gcc 4.6 errors that used to be warnings.
- Fixes compile issues with x264 being too new.
13 years
rpms/avidemux/devel avidemux-2.5.4-gcc46_tmp_fix.patch, NONE, 1.1 avidemux-2.5.4-gtk_menu_crash_fix.patch, NONE, 1.1 avidemux-2.5.4-x264_fix.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 avidemux.spec, 1.39, 1.40
by Richard Shaw
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> - 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> - 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> - 2.5.4-2
- Upload missing patch to CVS.
13 years
rpms/mame/F-13 .cvsignore, 1.23, 1.24 mame-verbosebuild.patch, 1.3, 1.4 mame.spec, 1.25, 1.26 sources, 1.23, 1.24
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6264
Modified Files:
.cvsignore mame-verbosebuild.patch mame.spec sources
Log Message:
* Tue Apr 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u1-1
- Updated to 0.142u1
- Updated the verbosebuild patch
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 3 Apr 2011 16:43:06 -0000 1.23
+++ .cvsignore 19 Apr 2011 19:35:56 -0000 1.24
@@ -1 +1,2 @@
mame0142s.exe
+0142u1_diff.zip
mame-verbosebuild.patch:
makefile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
Index: mame-verbosebuild.patch
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/mame-verbosebuild.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mame-verbosebuild.patch 19 Sep 2010 15:17:39 -0000 1.3
+++ mame-verbosebuild.patch 19 Apr 2011 19:35:56 -0000 1.4
@@ -1,7 +1,7 @@
-diff -up mame-0.139u3/makefile.verbosebuild mame-0.139u3/makefile
---- mame-0.139u3/makefile.verbosebuild 2010-09-19 17:03:31.000000000 +0200
-+++ mame-0.139u3/makefile 2010-09-19 17:12:14.000000000 +0200
-@@ -294,12 +294,12 @@ BUILD_EXE = $(EXE)
+diff -up mame-0.142u1/makefile.verbosebuild mame-0.142u1/makefile
+--- mame-0.142u1/makefile.verbosebuild 2011-04-19 21:29:01.000000000 +0200
++++ mame-0.142u1/makefile 2011-04-19 21:31:40.000000000 +0200
+@@ -297,12 +297,12 @@ BUILD_EXE = $(EXE)
endif
# compiler, linker and utilities
@@ -19,7 +19,7 @@
-@@ -745,12 +745,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
+@@ -755,12 +755,12 @@ $(OBJ)/%.s: $(SRC)/%.c | $(OSPREBUILD)
$(OBJ)/%.lh: $(SRC)/%.lay $(FILE2STR_TARGET)
@echo Converting $<...
@@ -33,5 +33,5 @@
+ $(PNG2BDC) $< $(OBJ)/temp.bdc
+ $(FILE2STR) $(OBJ)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8
- $(OBJ)/%.a:
- @echo Archiving $@...
+ $(DRIVLISTOBJ): $(DRIVLISTSRC)
+ @echo Compiling $<...
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/mame.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mame.spec 3 Apr 2011 16:43:06 -0000 1.25
+++ mame.spec 19 Apr 2011 19:35:56 -0000 1.26
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 142
-#global sourceupdate 4
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -24,9 +24,9 @@
%if 0%{?sourceupdate}
#Source updates
Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
-Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
-Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
-Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
+#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
+#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
+#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
%endif
Patch0: %{name}-fortify.patch
Patch2: %{name}-verbosebuild.patch
@@ -249,6 +249,10 @@
%changelog
+* Tue Apr 19 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142u1-1
+- Updated to 0.142u1
+- Updated the verbosebuild patch
+
* Sun Apr 03 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.142-1
- Updated to 0.142
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-13/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 3 Apr 2011 16:43:06 -0000 1.23
+++ sources 19 Apr 2011 19:35:56 -0000 1.24
@@ -1 +1,2 @@
56fa8befc6bc768906e4235ba906453c mame0142s.exe
+f142bbd8c93b401b1579c06e04b4bae5 0142u1_diff.zip
13 years