[arch-commits] Commit in avidemux/trunk (12 files)
Eric Bélanger
eric at archlinux.org
Tue Jul 21 01:12:25 UTC 2009
Date: Monday, July 20, 2009 @ 21:12:24
Author: eric
Revision: 46896
upgpkg: avidemux 2.5.0-1
Upstream update, Added optdepends for plugins, Updated patches
Added:
avidemux/trunk/avidemux-2.5-i18n.patch
avidemux/trunk/avidemux-2.5.0-format-strings.patch
avidemux/trunk/avidemux-2.5.0-gcc-4.4.patch
avidemux/trunk/avidemux-plugins-2.5.0-gcc-4.4.patch
avidemux/trunk/avidemux_2.5.0-typecast.patch
avidemux/trunk/avidemux_2.5.0-underlinking.patch
avidemux/trunk/avidemux_2.5.0-wrong-include.patch
Modified:
avidemux/trunk/ChangeLog
avidemux/trunk/PKGBUILD
Deleted:
avidemux/trunk/avidemux-2.4-cmake264.patch
avidemux/trunk/avidemux-2.4-i18n.patch
avidemux/trunk/avidemux-2.4.4-gcc-4.4.patch
--------------------------------------+
ChangeLog | 7 +
PKGBUILD | 73 +++++++++-----
avidemux-2.4-cmake264.patch | 36 ------
avidemux-2.4-i18n.patch | 33 ------
avidemux-2.4.4-gcc-4.4.patch | 135 --------------------------
avidemux-2.5-i18n.patch | 40 +++++++
avidemux-2.5.0-format-strings.patch | 44 ++++++++
avidemux-2.5.0-gcc-4.4.patch | 170 +++++++++++++++++++++++++++++++++
avidemux-plugins-2.5.0-gcc-4.4.patch | 116 ++++++++++++++++++++++
avidemux_2.5.0-typecast.patch | 59 +++++++++++
avidemux_2.5.0-underlinking.patch | 103 +++++++++++++++++++
avidemux_2.5.0-wrong-include.patch | 12 ++
12 files changed, 602 insertions(+), 226 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2009-07-20 23:30:42 UTC (rev 46895)
+++ ChangeLog 2009-07-21 01:12:24 UTC (rev 46896)
@@ -1,3 +1,10 @@
+2009-07-17 Eric Belanger <eric at archlinux.org>
+
+ * avidemux 2.5.0-1
+ * Upstream update
+ * Added optdepends for plugins
+ * Updated patches
+
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)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-07-20 23:30:42 UTC (rev 46895)
+++ PKGBUILD 2009-07-21 01:12:24 UTC (rev 46896)
@@ -3,40 +3,69 @@
# Contributor: damir <damir at archlinux.org>
pkgname=avidemux
-pkgver=2.4.4
-pkgrel=3
+pkgver=2.5.0
+pkgrel=1
pkgdesc="A graphical tool to edit video (filter/re-encode/split)"
arch=('i686' 'x86_64')
license=('GPL')
url="http://fixounet.free.fr/avidemux/"
-depends=('libxv' 'libvorbis' 'libxml2' 'alsa-lib' 'lame' 'xvidcore' 'faad2>=2.7' 'faac' 'sdl' 'x264>=20090416')
-makedepends=('cmake' 'libxslt' 'gtk2' 'qt')
-optdepends=('gtk2: for using the GTK GUI' 'qt: for using the QT4 GUI')
+depends=( 'libxv' 'libxml2' 'sdl')
+makedepends=('cmake' 'libxslt' 'gtk2' 'qt' 'jack-audio-connection-kit' 'libdca' 'esound' \
+ 'libvorbis' 'alsa-lib' 'lame' 'xvidcore' 'faad2' 'faac' 'x264' 'libsamplerate')
+optdepends=('gtk2: for using the GTK GUI' \
+ 'qt: for using the QT4 GUI' \
+ 'lame, faac: for the corresponding audio encoder plugin' \
+ 'faad2, libdca : for the corresponding audio decoder plugin' \
+ 'esound, jack-audio-connection-kit: for the corresponding audio device plugin' \
+ 'x264, xvidcore: for the corresponding video encoder plugin')
options=('!makeflags')
-source=(http://download.berlios.de/avidemux/${pkgname}_${pkgver}.tar.gz avidemux.desktop \
- avidemux-2.4-i18n.patch avidemux-2.4-cmake264.patch avidemux-2.4.4-gcc-4.4.patch)
-md5sums=('503dfd25842ef81be7c769811e7bc54e' 'a9cf864c209782307afda5bc6a33a0cd'\
- 'c76ab4a1434689b5be2084c4af66298c' 'bc1e21d62ed9b46f5727d692b1130adb'\
- 'f54b663879ae8331883a2bb2d252d837')
-sha1sums=('c50a00caf13a8ea1053e5994edeb59354192e18e'
+source=(http://download.berlios.de/avidemux/${pkgname}_${pkgver}.tar.gz \
+ avidemux.desktop avidemux-2.5.0-gcc-4.4.patch avidemux-plugins-2.5.0-gcc-4.4.patch \
+ avidemux-2.5-i18n.patch avidemux-2.5.0-format-strings.patch \
+ avidemux_2.5.0-underlinking.patch avidemux_2.5.0-wrong-include.patch)
+md5sums=('69624352ac4e4cbb507e02b2bace5f56' 'a9cf864c209782307afda5bc6a33a0cd'\
+ 'ba2a8dccd6f9feaa0edf70dd341cea5b' 'cfda32c031dedc9c1ea1ec1e5d61a7f6'\
+ '0adb7cee81e06bfc454baf1d8fbcdd64' 'd78352e32ba2544a51f34ba9858de28e'\
+ '65d9ac8381b5db24a64edf23ea843c49' '37feb1fcdc3323e8b3734c209e9c0fa3')
+sha1sums=('9697f1a54006e362a361aa609d3bdc1065676fb2'
'e575817d59cd992c2b056c1ff978c23f7fa0e50b'
- '32557519caeed3b236f48b40d5ee8953b2d03197'
- '387804ad24a816a24a036b57692cee9ff13e728f'
- '63de9ce7999af1b9f94c01b14ccd049c2b27f32a')
+ '98919d1779ede3d739cd7fc7292d42d1a89f5a7e'
+ 'c1ff1e952d2078df5f7097fb6db14df5dfa3d814'
+ 'd510ca55cd1b9c162b4c3bcd224a80b6a18421ef'
+ '963919986fc778972432db9460dbffca0368d739'
+ 'e7358a93f643403ef95b6072c9311d59a0c40a7d'
+ '233a5c63d81aa86d85e9aafc926a729d3216478b')
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
+ cd "${srcdir}/${pkgname}_${pkgver}"
+ patch -p1 < ../avidemux-2.5.0-gcc-4.4.patch || return 1
+ patch -p1 < ../avidemux-2.5-i18n.patch || return 1
+ patch -p1 < ../avidemux-2.5.0-format-strings.patch || return 1
+ patch -p1 < ../avidemux_2.5.0-underlinking.patch || return 1
+ patch -p1 < ../avidemux_2.5.0-wrong-include.patch || return 1
+ patch -p1 < ../avidemux-plugins-2.5.0-gcc-4.4.patch || return 1
mkdir build
cd build
cmake -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_BUILD_TYPE=Release -D NO_GTK=0 -D NO_QT4=0 .. || return 1
make || return 1
- make DESTDIR=${pkgdir} install || return 1
+ make DESTDIR="${pkgdir}" install || return 1
- install -D -m644 ../avidemux_icon.png ${pkgdir}/usr/share/pixmaps/avidemux.png || return 1
- install -D -m644 ${srcdir}/avidemux.desktop ${pkgdir}/usr/share/applications/avidemux.desktop || return 1
- install -D -m644 ../man/avidemux.1 ${pkgdir}/usr/share/man/man1/avidemux.1 || return 1
+# plugin build expects libraries to be already installed; we fake a prefix
+# in build/ by symlinking all libraries to build/lib/
+ mkdir -p lib
+ cd lib
+ find ../avidemux -name '*.so*' | xargs ln -sft . || return 1
+ cd ../../plugins
+ mkdir build
+ cd build
+ cmake -D CMAKE_INSTALL_PREFIX=/usr -D AVIDEMUX_SOURCE_DIR=${srcdir}/avidemux_${pkgver} \
+ -D AVIDEMUX_CORECONFIG_DIR=${srcdir}/avidemux_${pkgver}/build/config \
+ -D AVIDEMUX_INSTALL_PREFIX=${srcdir}/avidemux_${pkgver}/build -D CMAKE_BUILD_TYPE=Release .. || return 1
+ make || return 1
+ make DESTDIR="${pkgdir}" install || return 1
+
+ install -D -m644 ../../avidemux_icon.png "${pkgdir}/usr/share/pixmaps/avidemux.png" || return 1
+ install -D -m644 "${srcdir}/avidemux.desktop" "${pkgdir}/usr/share/applications/avidemux.desktop" || return 1
+ install -D -m644 ../../man/avidemux.1 "${pkgdir}/usr/share/man/man1/avidemux.1" || return 1
}
Deleted: avidemux-2.4-cmake264.patch
===================================================================
--- avidemux-2.4-cmake264.patch 2009-07-20 23:30:42 UTC (rev 46895)
+++ avidemux-2.4-cmake264.patch 2009-07-21 01:12:24 UTC (rev 46896)
@@ -1,36 +0,0 @@
-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})
-
Deleted: avidemux-2.4-i18n.patch
===================================================================
--- avidemux-2.4-i18n.patch 2009-07-20 23:30:42 UTC (rev 46895)
+++ avidemux-2.4-i18n.patch 2009-07-21 01:12:24 UTC (rev 46896)
@@ -1,33 +0,0 @@
-diff -ur avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
---- avidemux_2.4.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-10-16 21:23:21.000000000 +0300
-+++ avidemux_2.4/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2007-12-28 20:35:30.000000000 +0200
-@@ -53,7 +53,7 @@
- {
- printf("\n[Locale] Locale: %s\n", QLocale::system().name().toUtf8().constData());
-
-- QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
-+ QString appdir = "/usr/share/avidemux/i18n/";
-
- loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
- loadTranslation(&avidemuxTranslator, appdir + "avidemux_" + QLocale::system().name());
-diff -ur avidemux_2.4.orig/cmake/Ts.cmake avidemux_2.4/cmake/Ts.cmake
---- avidemux_2.4.orig/cmake/Ts.cmake 2007-10-14 14:58:28.000000000 +0300
-+++ avidemux_2.4/cmake/Ts.cmake 2007-12-28 20:36:05.000000000 +0200
-@@ -63,7 +63,7 @@
-
- SET(qm_files ${qm_files} ${_outXml} ${_out})
-
-- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")
-+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
- ENDFOREACH(ts_input ${ts_files})
-
- SET(${_sources} ${${_sources}} ${qm_files})
-@@ -94,7 +94,7 @@
-
- SET(qm_files ${qm_files} ${_out})
-
-- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/bin/i18n")
-+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
- ENDFOREACH(ts_input ${ts_files})
-
- SET(${_sources} ${${_sources}} ${qm_files})
Deleted: avidemux-2.4.4-gcc-4.4.patch
===================================================================
--- avidemux-2.4.4-gcc-4.4.patch 2009-07-20 23:30:42 UTC (rev 46895)
+++ avidemux-2.4.4-gcc-4.4.patch 2009-07-21 01:12:24 UTC (rev 46896)
@@ -1,135 +0,0 @@
---- 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" \
Added: avidemux-2.5-i18n.patch
===================================================================
--- avidemux-2.5-i18n.patch (rev 0)
+++ avidemux-2.5-i18n.patch 2009-07-21 01:12:24 UTC (rev 46896)
@@ -0,0 +1,40 @@
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp
+--- avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2009-07-11 21:12:49.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp 2009-07-11 21:14:03.000000000 -0400
+@@ -73,7 +73,7 @@
+ #ifdef __APPLE__
+ QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/";
+ #else
+- QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
++ QString appdir = "/usr/share/avidemux/i18n/";
+ #endif
+
+ loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
+@@ -164,4 +164,4 @@
+ }
+
+ return "Qt";
+-}
+\ No newline at end of file
++}
+diff -Naur avidemux_2.5.0.orig/cmake/Ts.cmake avidemux_2.5.0/cmake/Ts.cmake
+--- avidemux_2.5.0.orig/cmake/Ts.cmake 2009-07-11 21:12:51.000000000 -0400
++++ avidemux_2.5.0/cmake/Ts.cmake 2009-07-11 21:22:34.000000000 -0400
+@@ -64,7 +64,7 @@
+
+ SET(qm_files ${qm_files} ${_outXml} ${_out})
+
+- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
++ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
+ ENDFOREACH(ts_input ${ts_files})
+
+ SET(${_sources} ${${_sources}} ${qm_files})
+@@ -95,7 +95,7 @@
+
+ SET(qm_files ${qm_files} ${_out})
+
+- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
++ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
+ ENDFOREACH(ts_input ${ts_files})
+
+ SET(${_sources} ${${_sources}} ${qm_files})
Added: avidemux-2.5.0-format-strings.patch
===================================================================
--- avidemux-2.5.0-format-strings.patch (rev 0)
+++ avidemux-2.5.0-format-strings.patch 2009-07-21 01:12:24 UTC (rev 46896)
@@ -0,0 +1,44 @@
+diff -p -up avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_properties.cpp.format-strings avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_properties.cpp
+--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_properties.cpp.format-strings 2008-05-17 19:45:51.000000000 +0200
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_GTK/ADM_dialog/DIA_properties.cpp 2009-07-09 21:24:29.000000000 +0200
+@@ -84,10 +84,10 @@ void DIA_properties( void )
+ switch (wavinfo->channels)
+ {
+ case 1:
+- sprintf(text, QT_TR_NOOP("Mono"));
++ sprintf(text, "%s", QT_TR_NOOP("Mono"));
+ break;
+ case 2:
+- sprintf(text, QT_TR_NOOP("Stereo"));
++ sprintf(text, "%s", QT_TR_NOOP("Stereo"));
+ break;
+ default:
+ sprintf(text, "%d",wavinfo->channels);
+diff -p -up avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_props.cpp.format-strings avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_props.cpp
+--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_props.cpp.format-strings 2009-02-05 21:04:06.000000000 +0100
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_props.cpp 2009-07-09 21:24:29.000000000 +0200
+@@ -76,10 +76,10 @@ propWindow::propWindow(QWidget *parent)
+ switch (wavinfo->channels)
+ {
+ case 1:
+- sprintf(text, QT_TR_NOOP("Mono"));
++ sprintf(text, "%s", QT_TR_NOOP("Mono"));
+ break;
+ case 2:
+- sprintf(text, QT_TR_NOOP("Stereo"));
++ sprintf(text, "%s", QT_TR_NOOP("Stereo"));
+ break;
+ default:
+ sprintf(text, "%d",wavinfo->channels);
+diff -p -up avidemux_2.5.0/avidemux/gtk_gui.cpp.format-strings avidemux_2.5.0/avidemux/gtk_gui.cpp
+--- avidemux_2.5.0/avidemux/gtk_gui.cpp.format-strings 2009-04-20 17:58:54.000000000 +0200
++++ avidemux_2.5.0/avidemux/gtk_gui.cpp 2009-07-09 21:24:29.000000000 +0200
+@@ -1352,7 +1352,7 @@ A_loadAC3 (char *name)
+ if (ac3->open (path) == 0)
+ {
+ GUI_Error_HIG (QT_TR_NOOP("Failed to open the file"), QT_TR_NOOP("Not a WAV file?"));
+- printf (QT_TR_NOOP("WAV open file failed..."));
++ printf ("%s", QT_TR_NOOP("WAV open file failed..."));
+ delete ac3;
+ delete [] path;
+ return 0;
Added: avidemux-2.5.0-gcc-4.4.patch
===================================================================
--- avidemux-2.5.0-gcc-4.4.patch (rev 0)
+++ avidemux-2.5.0-gcc-4.4.patch 2009-07-21 01:12:24 UTC (rev 46896)
@@ -0,0 +1,170 @@
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_UIs/ADM_QT4/src/T_threadCount.h avidemux_2.5.0/avidemux/ADM_UIs/ADM_QT4/src/T_threadCount.h
+--- avidemux_2.5.0.orig/avidemux/ADM_UIs/ADM_QT4/src/T_threadCount.h 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_UIs/ADM_QT4/src/T_threadCount.h 2009-07-11 18:34:50.000000000 -0400
+@@ -1,6 +1,7 @@
+ #ifndef T_threadCount_h
+ #define T_threadCount_h
+
++#include <stdint.h>
+ #include <QtGui/QButtonGroup>
+ #include <QtGui/QGridLayout>
+ #include <QtGui/QLabel>
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_core/src/ADM_fileio.cpp avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp
+--- avidemux_2.5.0.orig/avidemux/ADM_core/src/ADM_fileio.cpp 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp 2009-07-11 18:34:50.000000000 -0400
+@@ -681,7 +681,7 @@
+ */
+ const char *ADM_GetFileName(const char *str)
+ {
+- char *filename;
++ const char *filename;
+ char *filename2;
+
+ #ifndef __WIN32
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_coreUI/include/DIA_coreToolkit.h avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h
+--- avidemux_2.5.0.orig/avidemux/ADM_coreUI/include/DIA_coreToolkit.h 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h 2009-07-11 18:34:50.000000000 -0400
+@@ -19,6 +19,8 @@
+ #ifndef ADM_COREUI_TOOLKIT__
+ #define ADM_COREUI_TOOLKIT__
+
++#include <stdint.h>
++
+ typedef enum
+ {
+ ADM_LOG_NONE=0,
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_coreUI/include/DIA_enter.h avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_enter.h
+--- avidemux_2.5.0.orig/avidemux/ADM_coreUI/include/DIA_enter.h 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_enter.h 2009-07-11 18:34:50.000000000 -0400
+@@ -16,6 +16,8 @@
+ #ifndef DIA_ENTER_H
+ #define DIA_ENTER_H
+
++#include <stdint.h>
++
+ // Get a float value
+ uint8_t DIA_GetFloatValue(float *value, float min, float max, const char *title, const char *legend);
+ // Get an integer value
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_coreUI/include/DIA_fileSel.h avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_fileSel.h
+--- avidemux_2.5.0.orig/avidemux/ADM_coreUI/include/DIA_fileSel.h 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_fileSel.h 2009-07-11 18:34:50.000000000 -0400
+@@ -15,6 +15,9 @@
+
+ #ifndef DIA_FILESEL_H
+ #define DIA_FILESEL_H
++
++#include <stdint.h>
++
+ typedef void SELFILE_CB(const char *);
+
+ // Associated functions type
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
+--- avidemux_2.5.0.orig/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp 2009-07-11 18:34:50.000000000 -0400
+@@ -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)
+
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc
+--- avidemux_2.5.0.orig/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc 2009-07-11 18:34:50.000000000 -0400
+@@ -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);
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp
+--- avidemux_2.5.0.orig/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp 2009-07-11 18:34:50.000000000 -0400
+@@ -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;
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp
+--- avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp 2009-07-11 18:34:50.000000000 -0400
+@@ -1,3 +1,4 @@
++#include <stdint.h>
+ #include <QtGui/QColorDialog>
+
+ #include "ADM_toolkitQt.h"
+@@ -17,4 +18,4 @@
+ }
+
+ return 0;
+-}
+\ No newline at end of file
++}
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.h avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.h
+--- avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.h 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.h 2009-07-11 18:34:50.000000000 -0400
+@@ -1,6 +1,8 @@
+ #ifndef Q_jobs_h
+ #define Q_jobs_h
+
++#include <cstdio>
++#include <stdint.h>
+ #include "ui_jobs.h"
+ #include "ADM_misc.h"
+
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.h avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.h
+--- avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.h 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.h 2009-07-11 18:34:50.000000000 -0400
+@@ -1,6 +1,7 @@
+ #ifndef Q_license_h
+ #define Q_license_h
+
++#include <stdint.h>
+ #include "ui_license.h"
+
+ class Ui_licenseWindow : public QDialog
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h
+--- avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h 2009-07-11 18:34:50.000000000 -0400
+@@ -1,6 +1,9 @@
+ #ifndef ADM_Q_SLIDER_H
+ #define ADM_Q_SLIDER_H
+
++#include <cstdio>
++#include <stdint.h>
++
+ class ADM_QSlider : public QSlider
+ {
+ protected:
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp
+--- avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp 2009-07-11 18:34:50.000000000 -0400
+@@ -8,6 +8,7 @@
+ //
+ //
+
++#include <stdint.h>
+ #include "config.h"
+
+ #include <QtGui/QApplication>
+diff -Naur avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_commonUI/ADM_tray.h avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_commonUI/ADM_tray.h
+--- avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_commonUI/ADM_tray.h 2009-07-11 18:11:26.000000000 -0400
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_commonUI/ADM_tray.h 2009-07-11 18:34:50.000000000 -0400
+@@ -18,6 +18,8 @@
+ #ifndef ADM_TRAY_H
+ #define ADM_TRAY_H
+
++#include <stdint.h>
++
+ class ADM_tray
+ {
+ protected:
Added: avidemux-plugins-2.5.0-gcc-4.4.patch
===================================================================
--- avidemux-plugins-2.5.0-gcc-4.4.patch (rev 0)
+++ avidemux-plugins-2.5.0-gcc-4.4.patch 2009-07-21 01:12:24 UTC (rev 46896)
@@ -0,0 +1,116 @@
+--- avidemux-plugins_2.5.0/plugins/ADM_videoFilters/AvisynthResize/qt4/Q_resize.h
++++ avidemux-plugins_2.5.0/plugins/ADM_videoFilters/AvisynthResize/qt4/Q_resize.h
+@@ -1,6 +1,8 @@
+ #ifndef Q_resizing_h
+ #define Q_resizing_h
+
++#include <stdint.h>
++
+ #include "ui_resizing.h"
+
+ typedef struct resParam
+--- avidemux-plugins_2.5.0/plugins/ADM_videoFilters/CNR2/ADM_vidCNR2_param.h
++++ avidemux-plugins_2.5.0/plugins/ADM_videoFilters/CNR2/ADM_vidCNR2_param.h
+@@ -15,6 +15,8 @@
+ #ifndef _CNR2_
+ #define _CNR2_
+
++#include <stdint.h>
++
+ typedef struct CNR2Param
+ {
+ double scdthr; // Scene change threshold in % default 10
+--- avidemux-plugins_2.5.0/plugins/ADM_videoFilters/colorYUV/ADM_vidColorYuv_param.h
++++ avidemux-plugins_2.5.0/plugins/ADM_videoFilters/colorYUV/ADM_vidColorYuv_param.h
+@@ -14,6 +14,9 @@
+
+ #ifndef ADM_VID_COLOR_YUV_PARAM_H
+ #define ADM_VID_COLOR_YUV_PARAM_H
++
++#include <stdint.h>
++
+ typedef struct COLOR_YUV_PARAM
+ {
+ double y_contrast, y_bright, y_gamma, y_gain;
+--- avidemux-plugins_2.5.0/plugins/ADM_videoFilters/MPDelogo/ADM_vidMPdelogo.h
++++ avidemux-plugins_2.5.0/plugins/ADM_videoFilters/MPDelogo/ADM_vidMPdelogo.h
+@@ -12,6 +12,9 @@
+ ***************************************************************************/
+ #ifndef ADM_DELOGO_H
+ #define ADM_DELOGO_H
++
++#include <stdint.h>
++
+ typedef struct MPDELOGO_PARAM
+ {
+ uint32_t xoff;
+--- avidemux-plugins_2.5.0/plugins/ADM_videoFilters/MPDelogo/DIA_flyMpDelogo.h
++++ avidemux-plugins_2.5.0/plugins/ADM_videoFilters/MPDelogo/DIA_flyMpDelogo.h
+@@ -1,5 +1,8 @@
+ #ifndef FLY_MPDELOGO_H
+ #define FLY_MPDELOGO_H
++
++#include <stdint.h>
++
+ class flyMpDelogo : public FLY_DIALOG_TYPE
+ {
+ public:
+--- avidemux-plugins_2.5.0/plugins/ADM_videoFilters/MplayerResize/qt4/Q_resize.h
++++ avidemux-plugins_2.5.0/plugins/ADM_videoFilters/MplayerResize/qt4/Q_resize.h
+@@ -1,6 +1,8 @@
+ #ifndef Q_resizing_h
+ #define Q_resizing_h
+
++#include <stdint.h>
++
+ #include "ui_resizing.h"
+
+ typedef struct resParam
+diff -Naur avidemux-plugins_2.5.0.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/guiHelper.cpp avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/guiHelper.cpp
+--- avidemux-plugins_2.5.0.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/guiHelper.cpp 2009-07-12 01:47:28.082355322 -0400
++++ avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/guiHelper.cpp 2009-07-12 01:49:40.403171050 -0400
+@@ -62,8 +62,8 @@
+
+ int x264_cqm_parse_jmlist(const char *buf, const char *name, uint8_t *cqm, uint8_t *defaultMatrix, int length)
+ {
+- char *p;
+- char *nextvar;
++ const char *p;
++ const char *nextvar;
+ int i;
+
+ p = strstr(buf, name);
+diff -Naur avidemux-plugins_2.5.0.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264CustomMatrixDialog.h avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264CustomMatrixDialog.h
+--- avidemux-plugins_2.5.0.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264CustomMatrixDialog.h 2009-07-12 01:47:28.079020819 -0400
++++ avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264CustomMatrixDialog.h 2009-07-12 01:50:19.009000160 -0400
+@@ -1,6 +1,7 @@
+ #ifndef x264CustomMatrixDialog_h
+ #define x264CustomMatrixDialog_h
+
++#include <stdint.h>
+ #include "ui_x264CustomMatrixDialog.h"
+
+ class x264CustomMatrixDialog : public QDialog
+diff -Naur avidemux-plugins_2.5.0.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/zoneOptions.h avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/zoneOptions.h
+--- avidemux-plugins_2.5.0.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/zoneOptions.h 2009-07-12 01:47:28.079020819 -0400
++++ avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/zoneOptions.h 2009-07-12 01:50:44.178997807 -0400
+@@ -17,6 +17,8 @@
+ #ifndef zoneOptions_h
+ #define zoneOptions_h
+
++#include <stdint.h>
++
+ extern "C"
+ {
+ #include "x264.h"
+diff -Naur avidemux-plugins_2.5.0.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/options.h avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/options.h
+--- avidemux-plugins_2.5.0.orig/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/options.h 2009-07-12 01:47:28.082355322 -0400
++++ avidemux-plugins_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_xvid/options.h 2009-07-12 01:51:12.152328208 -0400
+@@ -17,6 +17,7 @@
+ #ifndef options_h
+ #define options_h
+
++#include <stdint.h>
+ #include <libxml/tree.h>
+ #include "xvid.h"
+
Added: avidemux_2.5.0-typecast.patch
===================================================================
--- avidemux_2.5.0-typecast.patch (rev 0)
+++ avidemux_2.5.0-typecast.patch 2009-07-21 01:12:24 UTC (rev 46896)
@@ -0,0 +1,59 @@
+diff -p -up avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp~ avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp
+--- avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp~ 2009-03-09 21:10:03.000000000 +0100
++++ avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp 2009-07-09 21:34:15.000000000 +0200
+@@ -685,7 +685,7 @@ const char *ADM_GetFileName(const char *
+ char *filename2;
+
+ #ifndef __WIN32
+- filename = strrchr(str, '/');
++ filename = strrchr((char*) str, '/');
+ #else
+ filename = strrchr(str, '\\');
+ filename2 = strrchr(str, '/');
+diff -p -up avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp~ avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp
+--- avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp~ 2008-09-13 18:27:58.000000000 +0200
++++ avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp 2009-07-09 21:48:17.000000000 +0200
+@@ -87,7 +87,7 @@ uint8_t fileParser::open( const char *fi
+
+
+ // find the last dot
+- dot = strrchr( filename, '.' );
++ dot = strrchr( (char *) filename, '.' );
+
+ // count the decimals before the dot
+ decimals = 1;
+diff -p -up avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc~ avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc
+--- avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc~ 2004-01-30 20:32:00.000000000 +0100
++++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc 2009-07-09 21:49:28.000000000 +0200
+@@ -104,7 +104,7 @@ void y4m_ratio_reduce(y4m_ratio_t *r)
+
+ int y4m_parse_ratio(y4m_ratio_t *r, const char *s)
+ {
+- char *t = strchr(s, ':');
++ char *t = strchr((char *) s, ':');
+ if (t == NULL) return Y4M_ERR_RANGE;
+ r->n = atoi(s);
+ r->d = atoi(t+1);
+diff -p -up avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp~ avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp
+--- avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp~ 2007-08-03 02:04:40.000000000 +0200
++++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp 2009-07-09 21:50:06.000000000 +0200
+@@ -53,7 +53,7 @@ LPCMStream::LPCMStream(IBitStream &ibs,
+
+ bool LPCMStream::Probe(IBitStream &bs )
+ {
+- char *last_dot = strrchr( bs.StreamName(), '.' );
++ char *last_dot = strrchr( (char *) bs.StreamName(), '.' );
+ return
+ last_dot != NULL
+ && strcmp( last_dot+1, "lpcm") == 0;
+--- avidemux_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/guiHelper.cpp~ 2009-07-10 13:39:52.745385459 +0200
++++ avidemux_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/guiHelper.cpp 2009-07-10 14:00:03.432445620 +0200
+@@ -67,7 +67,7 @@
+ char *nextvar;
+ int i;
+
+- p = strstr(buf, name);
++ p = strstr((char *) buf, name);
+
+ if (!p)
+ {
Added: avidemux_2.5.0-underlinking.patch
===================================================================
--- avidemux_2.5.0-underlinking.patch (rev 0)
+++ avidemux_2.5.0-underlinking.patch 2009-07-21 01:12:24 UTC (rev 46896)
@@ -0,0 +1,103 @@
+Index: avidemux_2.5.0/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/CMakeLists.txt
+===================================================================
+--- avidemux_2.5.0/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/CMakeLists.txt
++++ avidemux_2.5.0/plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52/CMakeLists.txt 2009-07-10 20:24:52.000000000 +0300
+@@ -5,9 +5,7 @@
+
+ ADD_LIBRARY(${ADM_LIB} STATIC ${${ADM_LIB}_SRCS})
+
+-IF (WIN32 OR APPLE)
+- TARGET_LINK_LIBRARIES(${ADM_LIB} ADM_core)
+-ENDIF (WIN32 OR APPLE)
++TARGET_LINK_LIBRARIES(${ADM_LIB} ADM_core)
+
+ IF (UNIX)
+ ADD_TARGET_CFLAGS(${ADM_LIB} -fPIC)
+Index: avidemux_2.5.0/plugins/ADM_audioDevices/Alsa/CMakeLists.txt
+===================================================================
+--- avidemux_2.5.0/plugins/ADM_audioDevices/Alsa/CMakeLists.txt
++++ avidemux_2.5.0/plugins/ADM_audioDevices/Alsa/CMakeLists.txt 2009-07-10 20:46:43.000000000 +0300
+@@ -4,7 +4,7 @@
+ SET(ADM_av_alsa_SRCS ADM_deviceALSA.cpp)
+
+ ADD_LIBRARY(ADM_av_alsa SHARED ${ADM_av_alsa_SRCS})
+-TARGET_LINK_LIBRARIES(ADM_av_alsa ${ASOUND_LIBRARY})
++TARGET_LINK_LIBRARIES(ADM_av_alsa ADM_core ADM_coreAudio ${ASOUND_LIBRARY})
+
+ INIT_AUDIO_DEVICE(ADM_av_alsa)
+ INSTALL_AUDIODEVICE(ADM_av_alsa)
+Index: avidemux_2.5.0/plugins/ADM_audioDevices/Arts/CMakeLists.txt
+===================================================================
+--- avidemux_2.5.0/plugins/ADM_audioDevices/Arts/CMakeLists.txt
++++ avidemux_2.5.0/plugins/ADM_audioDevices/Arts/CMakeLists.txt 2009-07-10 21:23:13.000000000 +0300
+@@ -4,7 +4,7 @@
+ SET(ADM_av_arts_SRCS ADM_deviceArts.cpp)
+
+ ADD_LIBRARY(ADM_av_arts SHARED ${ADM_av_arts_SRCS})
+-TARGET_LINK_LIBRARIES(ADM_av_arts ${ARTS_LDFLAGS})
++TARGET_LINK_LIBRARIES(ADM_av_arts ADM_coreAudio ${ARTS_LDFLAGS})
+ ADD_DEFINITIONS(${ARTS_CFLAGS})
+ INIT_AUDIO_DEVICE(ADM_av_arts)
+ INSTALL_AUDIODEVICE(ADM_av_arts)
+Index: avidemux_2.5.0/plugins/ADM_audioDevices/Oss/CMakeLists.txt
+===================================================================
+--- avidemux_2.5.0/plugins/ADM_audioDevices/Oss/CMakeLists.txt
++++ avidemux_2.5.0/plugins/ADM_audioDevices/Oss/CMakeLists.txt 2009-07-10 21:14:29.000000000 +0300
+@@ -4,6 +4,7 @@
+ SET(ADM_av_oss_SRCS ADM_deviceoss.cpp)
+
+ ADD_LIBRARY(ADM_av_oss SHARED ${ADM_av_oss_SRCS})
++TARGET_LINK_LIBRARIES(ADM_av_oss ADM_coreAudio)
+ include_directories(${OSS_INCLUDE_DIR})
+ INIT_AUDIO_DEVICE(ADM_av_oss)
+ INSTALL_AUDIODEVICE(ADM_av_oss)
+Index: avidemux_2.5.0/avidemux/ADM_libraries/ADM_smjs/CMakeLists.txt
+===================================================================
+--- avidemux_2.5.0/avidemux/ADM_libraries/ADM_smjs/CMakeLists.txt
++++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_smjs/CMakeLists.txt 2009-07-10 19:15:45.000000000 +0300
+@@ -14,5 +14,6 @@
+ ENDIF (MINGW)
+
+ ADD_TARGET_CFLAGS(${ADM_LIB} "-DNDEBUG -DTRIMMED -DEXPORT_JS_API -DJS_USE_SAFE_ARENA -D_IEEE_LIBM")
++TARGET_LINK_LIBRARIES(${ADM_LIB} m)
+
+ INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+\ Ei rivinvaihtoa tiedoston lopussa
+Index: avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_render/CMakeLists.txt
+===================================================================
+--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_render/CMakeLists.txt
++++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_render/CMakeLists.txt 2009-07-10 19:50:46.000000000 +0300
+@@ -27,6 +27,10 @@
+ TARGET_LINK_LIBRARIES(${ADM_LIB}_gtk ${SDL_LIBRARY})
+ ENDIF (USE_SDL)
+
++ IF (USE_XV)
++ TARGET_LINK_LIBRARIES(${ADM_LIB}_gtk ${XVIDEO_LIBRARY_DIR} X11 Xext)
++ ENDIF (USE_XV)
++
+ INSTALL(TARGETS ${ADM_LIB}_gtk RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+ ENDIF (ADM_UI_GTK)
+
+@@ -35,6 +39,10 @@
+ TARGET_LINK_LIBRARIES(${ADM_LIB}_qt4 ${SDL_LIBRARY})
+ ENDIF (USE_SDL)
+
++ IF (USE_XV)
++ TARGET_LINK_LIBRARIES(${ADM_LIB}_qt4 ${XVIDEO_LIBRARY_DIR} X11 Xext)
++ ENDIF (USE_XV)
++
+ INSTALL(TARGETS ${ADM_LIB}_qt4 RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+ ENDIF (ADM_UI_QT4)
+
+Index: avidemux_2.5.0/avidemux/ADM_core/src/CMakeLists.txt
+===================================================================
+--- avidemux_2.5.0/avidemux/ADM_core/src/CMakeLists.txt
++++ avidemux_2.5.0/avidemux/ADM_core/src/CMakeLists.txt 2009-07-10 19:06:53.000000000 +0300
+@@ -5,6 +5,7 @@
+
+ ADD_LIBRARY(ADM_core SHARED ${ADM_core_SRCS})
+ ADD_TARGET_DEFINITIONS(ADM_core ADM_DEBUG FIND_LEAKS)
++TARGET_LINK_LIBRARIES(ADM_core dl)
+
+ IF (MINGW)
+ TARGET_LINK_LIBRARIES(ADM_core "${PTHREAD_LIBRARIES}" imagehlp ws2_32)
Added: avidemux_2.5.0-wrong-include.patch
===================================================================
--- avidemux_2.5.0-wrong-include.patch (rev 0)
+++ avidemux_2.5.0-wrong-include.patch 2009-07-21 01:12:24 UTC (rev 46896)
@@ -0,0 +1,12 @@
+Index: avidemux_2.5.0/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp
+===================================================================
+--- avidemux_2.5.0/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp
++++ avidemux_2.5.0/plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp 2009-07-10 18:53:47.000000000 +0300
+@@ -19,7 +19,6 @@
+ #include "ADM_default.h"
+ #include "DIA_factory.h"
+ #include "DIA_coreToolkit.h"
+-#include <lame/lame.h>
+ #include "audioencoder.h"
+ #include "audioencoderInternal.h"
+ //
More information about the arch-commits
mailing list