[arch-commits] Commit in avidemux/trunk (4 files)
Eric Bélanger
eric at archlinux.org
Sat Jun 13 06:10:06 UTC 2009
Date: Saturday, June 13, 2009 @ 02:10:06
Author: eric
Revision: 42319
Added patches to build with cmake 2.6.4 and gcc 4.4 (close FS#15082)
Added:
avidemux/trunk/avidemux-2.4-cmake264.patch
avidemux/trunk/avidemux-2.4.4-gcc-4.4.patch
Modified:
avidemux/trunk/ChangeLog
avidemux/trunk/PKGBUILD
------------------------------+
ChangeLog | 4 +
PKGBUILD | 11 ++-
avidemux-2.4-cmake264.patch | 36 ++++++++++
avidemux-2.4.4-gcc-4.4.patch | 135 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 183 insertions(+), 3 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2009-06-13 02:49:00 UTC (rev 42318)
+++ ChangeLog 2009-06-13 06:10:06 UTC (rev 42319)
@@ -1,3 +1,7 @@
+2009-06-12 Eric Belanger <eric at archlinux.org>
+
+ * Added patches to build with cmake 2.6.4 and gcc 4.4 (close FS#15082)
+
2009-04-18 Eric Belanger <eric at archlinux.org>
* avidemux 2.4.4-3
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-06-13 02:49:00 UTC (rev 42318)
+++ PKGBUILD 2009-06-13 06:10:06 UTC (rev 42319)
@@ -14,16 +14,21 @@
optdepends=('gtk2: for using the GTK GUI' 'qt: for using the QT4 GUI')
options=('!makeflags')
source=(http://download.berlios.de/avidemux/${pkgname}_${pkgver}.tar.gz avidemux.desktop \
- avidemux-2.4-i18n.patch)
+ avidemux-2.4-i18n.patch avidemux-2.4-cmake264.patch avidemux-2.4.4-gcc-4.4.patch)
md5sums=('503dfd25842ef81be7c769811e7bc54e' 'a9cf864c209782307afda5bc6a33a0cd'\
- 'c76ab4a1434689b5be2084c4af66298c')
+ 'c76ab4a1434689b5be2084c4af66298c' 'bc1e21d62ed9b46f5727d692b1130adb'\
+ 'f54b663879ae8331883a2bb2d252d837')
sha1sums=('c50a00caf13a8ea1053e5994edeb59354192e18e'
'e575817d59cd992c2b056c1ff978c23f7fa0e50b'
- '32557519caeed3b236f48b40d5ee8953b2d03197')
+ '32557519caeed3b236f48b40d5ee8953b2d03197'
+ '387804ad24a816a24a036b57692cee9ff13e728f'
+ '63de9ce7999af1b9f94c01b14ccd049c2b27f32a')
build() {
cd ${srcdir}/${pkgname}_${pkgver}
patch -p1 < ../avidemux-2.4-i18n.patch || return 1
+ patch -p1 < ../avidemux-2.4-cmake264.patch || return 1
+ patch -p0 < ../avidemux-2.4.4-gcc-4.4.patch || return 1
mkdir build
cd build
Added: avidemux-2.4-cmake264.patch
===================================================================
--- avidemux-2.4-cmake264.patch (rev 0)
+++ avidemux-2.4-cmake264.patch 2009-06-13 06:10:06 UTC (rev 42319)
@@ -0,0 +1,36 @@
+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})
+
Added: avidemux-2.4.4-gcc-4.4.patch
===================================================================
--- avidemux-2.4.4-gcc-4.4.patch (rev 0)
+++ avidemux-2.4.4-gcc-4.4.patch 2009-06-13 06:10:06 UTC (rev 42319)
@@ -0,0 +1,135 @@
+--- 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" \
More information about the arch-commits
mailing list