8:04 p.m.
Author: firewing
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7518/devel
Modified Files:
avidemux-2.4-pulseaudio-default.patch avidemux.spec
Added Files:
avidemux-2.4-cmake264.patch avidemux-2.4-gcc44.patch
Removed Files:
avidemux-2.4-gcc44-movq.patch
Log Message:
* Fri Jun 19 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-9
- Add patch to fix build with CMake 2.6.4
- Update gcc44 patch to match Gentoo upstream
- Update PulseAudio patch to work as expected with avidemux 2.4.4
avidemux-2.4-cmake264.patch:
--- NEW FILE avidemux-2.4-cmake264.patch ---
diff -uNr avidemux_2.4.4.orig/avidemux/CMakeLists.txt
avidemux_2.4.4/avidemux/CMakeLists.txt
--- avidemux_2.4.4.orig/avidemux/CMakeLists.txt 2009-05-06 13:00:10.000000000 +0200
+++ avidemux_2.4.4/avidemux/CMakeLists.txt 2009-05-06 13:00:49.000000000 +0200
@@ -84,7 +84,6 @@
ADM_audio
ADM_script
ADM_videoFilter
-ADM_filter
ADM_video
ADM_audiodevice
ADM_ocr
@@ -93,6 +92,24 @@
FOREACH(_current ${ADM_SUBDIR})
ADD_SUBDIRECTORY(${_current})
+ENDFOREACH(_current ${ADM_SUBDIR})
+
+SET(ADM_SUBDIR
+ADM_filter
+ADM_audiofilter
+ADM_editor
+ADM_audiocodec
+ADM_audio
+ADM_script
+ADM_videoFilter
+ADM_filter
+ADM_video
+ADM_audiodevice
+ADM_ocr
+ADM_colorspace
+)
+
+FOREACH(_current ${ADM_SUBDIR})
add_libs_all_targets(${_current})
ENDFOREACH(_current ${ADM_SUBDIR})
avidemux-2.4-gcc44.patch:
--- NEW FILE avidemux-2.4-gcc44.patch ---
--- avidemux/ADM_colorspace/ADM_rgb.h
+++ avidemux/ADM_colorspace/ADM_rgb.h
@@ -19,6 +19,8 @@
#ifndef COLYUVRGB_H
#define COLYUVRGB_H
+#include <inttypes.h>
+
#define ADM_COLOR_IS_YUV 0x1000
typedef enum
{
--- avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
+++ avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
@@ -71,7 +71,7 @@
*/
uint8_t fileParser::open( const char *filename,FP_TYPE *multi )
{
- char *dot = NULL; // pointer to the last dot in filename
+ const char *dot = NULL; // pointer to the last dot in filename
uint8_t decimals = 0; // number of decimals
char *left = NULL, *number = NULL, *right = NULL; // parts of filename (after
splitting)
--- avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc
+++ avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc
@@ -104,7 +104,7 @@
int y4m_parse_ratio(y4m_ratio_t *r, const char *s)
{
- char *t = strchr(s, ':');
+ const char *t = strchr(s, ':');
if (t == NULL) return Y4M_ERR_RANGE;
r->n = atoi(s);
r->d = atoi(t+1);
--- avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp
+++ avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp
@@ -53,7 +53,7 @@
bool LPCMStream::Probe(IBitStream &bs )
{
- char *last_dot = strrchr( bs.StreamName(), '.' );
+ const char *last_dot = strrchr( bs.StreamName(), '.' );
return
last_dot != NULL
&& strcmp( last_dot+1, "lpcm") == 0;
--- avidemux/ADM_osSupport/ADM_fileio.cpp
+++ avidemux/ADM_osSupport/ADM_fileio.cpp
@@ -543,7 +543,7 @@
*/
const char *GetFileName(const char *str)
{
- char *filename;
+ const char *filename;
char *filename2;
#ifndef ADM_WIN32
filename = strrchr(str, '/');
--- avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp
+++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp
@@ -1,6 +1,7 @@
#include <QtGui>
#include "../ADM_toolkit/qtToolkit.h"
+#include <stdint.h>
int DIA_colorSel(uint8_t *r, uint8_t *g, uint8_t *b)
{
@@ -17,4 +18,4 @@
}
return 0;
-}
\ No newline at end of file
+}
--- avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_cnr2.cpp
+++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_cnr2.cpp
@@ -16,6 +16,7 @@
***************************************************************************/
#include <math.h>
+#include <stdint.h>
#include "config.h"
#include "ui_cnr2.h"
--- avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_coloryuv.cpp
+++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_coloryuv.cpp
@@ -16,6 +16,7 @@
***************************************************************************/
#include "config.h"
+#include <stdint.h>
#include <QtGui/QDialog>
#include "ui_coloryuv.h"
--- avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp
+++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp
@@ -13,7 +13,7 @@
***************************************************************************/
#include "config.h"
-
+#include <cstdio>
#include <math.h>
#include <QPainter>
#include <QSlider>
--- avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h
+++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h
@@ -1,6 +1,6 @@
#ifndef ADM_Q_SLIDER_H
#define ADM_Q_SLIDER_H
-
+#include <inttypes.h>
class ADM_QSlider : public QSlider
{
protected:
--- avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp
+++ avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp
@@ -9,7 +9,7 @@
//
#include "config.h"
-
+#include <inttypes.h>
#include <QtGui/QApplication>
#include <QtGui/QDesktopWidget>
--- avidemux/ADM_video/mmx_macros.h
+++ avidemux/ADM_video/mmx_macros.h
@@ -353,7 +353,7 @@
#define mmx_m2r(op, mem, reg) \
__asm__ __volatile__ (#op " %0, %%" #reg \
: /* nothing */ \
- : "X" (mem))
+ : "m" (mem))
#define mmx_r2m(op, reg, mem) \
__asm__ __volatile__ (#op " %%" #reg ", %0" \
avidemux-2.4-pulseaudio-default.patch:
Index: avidemux-2.4-pulseaudio-default.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux-2.4-pulseaudio-default.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avidemux-2.4-pulseaudio-default.patch 20 Feb 2009 04:41:56 -0000 1.1
+++ avidemux-2.4-pulseaudio-default.patch 19 Jun 2009 20:04:34 -0000 1.2
@@ -1,5 +1,16 @@
---- avidemux_2.4.4.orig/avidemux/prefs.in 2008-07-23 12:47:32.000000000 -0400
-+++ avidemux_2.4.4/avidemux/prefs.in 2009-02-19 00:02:46.000000000 -0500
+--- ./avidemux/ADM_libraries/ADM_utilities/prefs.cpp.orig 2009-06-19 15:41:02.618558127
-0400
++++ ./avidemux/ADM_libraries/ADM_utilities/prefs.cpp 2009-06-19 15:41:08.552557321 -0400
+@@ -105,7 +105,7 @@
+ #else
+ {"device.audiodevice", STRING,"ALSA", NULL, NULL, NULL },
+ #endif
+- {"device.audio.alsa_device", STRING,"dmix", NULL, NULL, NULL },
++ {"device.audio.alsa_device", STRING,"pulse", NULL, NULL, NULL },
+
{"device.videodevice", UINT, "0", NULL, "0", "10" },
+
{"default.postproc_type", UINT, "3", NULL, "0", "7" },
+
{"default.postproc_value", UINT, "3", NULL, "0", "5" },
+--- avidemux/prefs.in.orig 2008-07-23 12:47:32.000000000 -0400
++++ avidemux/prefs.in 2009-06-19 15:23:43.656584530 -0400
@@ -55,7 +55,7 @@
#else
device.audiodevice, STRING, ALSA
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- avidemux.spec 3 May 2009 18:31:33 -0000 1.21
+++ avidemux.spec 19 Jun 2009 20:04:34 -0000 1.22
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.4.4
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -19,9 +19,13 @@
Patch2: avidemux-2.4-i18n.patch
#
http://ftp.ncnu.edu.tw/Linux/Gentoo/gentoo-portage/media-video/avidemux/f...
Patch3: avidemux-2.4-libdca.patch
-# https://bugzilla.rpmfusion.org/attachment.cgi?id=131
+# Our report: https://bugzilla.rpmfusion.org/attachment.cgi?id=131
# Upstream report: http://bugs.avidemux.org/index.php?do=details&task_id=592
-Patch4: avidemux-2.4-gcc44-movq.patch
+# Patch from:
http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/avidemux/file...
+Patch4: avidemux-2.4-gcc44.patch
+# Fix building with cmake 2.6.4+
+# Patch from:
http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/avidemux/file...
+Patch5: avidemux-2.4-cmake264.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -118,11 +122,12 @@
%prep
%setup -q -n avidemux_%{version}
-%patch0 -p1 -b .pulse
+%patch0 -b .pulse
%patch1 -p1 -b .qt4
%patch2 -p1 -b .i18n
%patch3 -p1 -b .libdca
-%patch4 -p1 -b .gcc44
+%patch4 -b .gcc44
+%patch5 -p1 -b .cmake
%build
%cmake
@@ -170,6 +175,11 @@
%{_datadir}/applications/*qt*.desktop
%changelog
+* Fri Jun 19 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-9
+- Add patch to fix build with CMake 2.6.4
+- Update gcc44 patch to match Gentoo upstream
+- Update PulseAudio patch to work as expected with avidemux 2.4.4
+
* Sun May 03 2009 Rex Dieter <rdieter(a)fedoraproject.org> - 2.4.4-8
- skip %%_smp_mflags in po/
--- avidemux-2.4-gcc44-movq.patch DELETED ---