rpms/avidemux/F-11 avidemux-2.5-filelocations.patch, NONE, 1.1 avidemux-2.5-gcc-44.patch, NONE, 1.1 avidemux-2.5-i18n.patch, NONE, 1.1 avidemux-2.5-pulseaudio-default.patch, NONE, 1.1 avidemux-plugins-2.5-gcc44.patch, NONE, 1.1 avidemux-plugins-2.5-plugdir.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 avidemux.spec, 1.22, 1.23 sources, 1.4, 1.5 avidemux-2.4-cmake264.patch, 1.1, NONE avidemux-2.4-gcc44.patch, 1.1, NONE avidemux-2.4-i18n.patch, 1.3, NONE avidemux-2.4-libdca.patch, 1.4, NONE

Stewart Adam firewing at rpmfusion.org
Fri Jul 31 02:45:49 CEST 2009 

Author: firewing

Update of /cvs/free/rpms/avidemux/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16493

Modified Files:
	.cvsignore avidemux.spec sources 
Added Files:
	avidemux-2.5-filelocations.patch avidemux-2.5-gcc-44.patch 
	avidemux-2.5-i18n.patch avidemux-2.5-pulseaudio-default.patch 
	avidemux-plugins-2.5-gcc44.patch 
	avidemux-plugins-2.5-plugdir.patch 
Removed Files:
	avidemux-2.4-cmake264.patch avidemux-2.4-gcc44.patch 
	avidemux-2.4-i18n.patch avidemux-2.4-libdca.patch 
Log Message:
* Thu Jul 30 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-2
- Reintegrate plugins package as a subpackage

* Thu Jul 02 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-1
- Update to 2.5.0
- Require cli/gui packages of same release as well as version
- Split plugins into a separate package


avidemux-2.5-filelocations.patch:

--- NEW FILE avidemux-2.5-filelocations.patch ---
--- avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_render/CMakeLists.txt	2009-02-24 17:25:28.000000000 -0500
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_render/CMakeLists.txt	2009-07-02 17:07:43.299171804 -0400
@@ -27,7 +27,7 @@
 		TARGET_LINK_LIBRARIES(${ADM_LIB}_gtk ${SDL_LIBRARY})
 	ENDIF (USE_SDL)
 
-	INSTALL(TARGETS ${ADM_LIB}_gtk RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib  ARCHIVE DESTINATION lib)
+	INSTALL(TARGETS ${ADM_LIB}_gtk RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib${LIB_SUFFIX}  ARCHIVE DESTINATION lib${LIB_SUFFIX})
 ENDIF (ADM_UI_GTK)
 
 IF (ADM_UI_QT4)
@@ -35,11 +35,11 @@
 		TARGET_LINK_LIBRARIES(${ADM_LIB}_qt4 ${SDL_LIBRARY})
 	ENDIF (USE_SDL)
 
-	INSTALL(TARGETS ${ADM_LIB}_qt4 RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib  ARCHIVE DESTINATION lib)
+	INSTALL(TARGETS ${ADM_LIB}_qt4 RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib${LIB_SUFFIX}  ARCHIVE DESTINATION lib${LIB_SUFFIX})
 ENDIF (ADM_UI_QT4)
 
 IF (GETTEXT_FOUND)
 	TARGET_LINK_LIBRARIES(${ADM_LIB}_cli ${GETTEXT_LIBRARY_DIR})
 ENDIF (GETTEXT_FOUND)
 
-INSTALL(TARGETS ${ADM_LIB}_cli RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib  ARCHIVE DESTINATION lib)
\ No newline at end of file
+INSTALL(TARGETS ${ADM_LIB}_cli RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib${LIB_SUFFIX}  ARCHIVE DESTINATION lib${LIB_SUFFIX})
\ No newline at end of file
--- avidemux_2.5.0.orig/avidemux/ADM_coreUI/src/CMakeLists.txt	2008-06-10 20:33:07.000000000 -0400
+++ avidemux_2.5.0/avidemux/ADM_coreUI/src/CMakeLists.txt	2009-07-02 17:07:43.310171885 -0400
@@ -7,4 +7,4 @@
 ADD_LIBRARY(ADM_coreUI SHARED ${ADM_coreUI_SRCS})
 TARGET_LINK_LIBRARIES(ADM_coreUI ADM_core)
 
-INSTALL(TARGETS ADM_coreUI RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib  ARCHIVE DESTINATION lib)
+INSTALL(TARGETS ADM_coreUI RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib${LIB_SUFFIX}  ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- avidemux_2.5.0.orig/avidemux/ADM_core/src/CMakeLists.txt	2009-02-02 16:32:18.000000000 -0500
+++ avidemux_2.5.0/avidemux/ADM_core/src/CMakeLists.txt	2009-07-02 17:07:43.319172299 -0400
@@ -16,4 +16,4 @@
 REMOVE_DEFINITIONS(-DHAVE_CONFIG_H)
 include_directories("${FFMPEG_BINARY_DIR}")
 
-INSTALL(TARGETS ADM_core RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib  ARCHIVE DESTINATION lib)
+INSTALL(TARGETS ADM_core RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib${LIB_SUFFIX}  ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- avidemux_2.5.0.orig/avidemux/ADM_libraries/ADM_smjs/CMakeLists.txt	2009-04-25 19:09:35.000000000 -0400
+++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_smjs/CMakeLists.txt	2009-07-02 17:07:43.338171611 -0400
@@ -15,4 +15,4 @@
 
 ADD_TARGET_CFLAGS(${ADM_LIB} "-DNDEBUG -DTRIMMED -DEXPORT_JS_API -DJS_USE_SAFE_ARENA -D_IEEE_LIBM")
 
-INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib  ARCHIVE DESTINATION lib)
\ No newline at end of file
+INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib${LIB_SUFFIX}  ARCHIVE DESTINATION lib${LIB_SUFFIX})
\ No newline at end of file
--- avidemux_2.5.0.orig/avidemux/CMakeLists.txt	2009-04-25 19:09:35.000000000 -0400
+++ avidemux_2.5.0/avidemux/CMakeLists.txt	2009-07-02 17:07:43.372172827 -0400
@@ -493,11 +493,11 @@
 
 IF (APPLE)
 	IF (MAC_BUNDLE_DIR)
-		INSTALL(TARGETS ${ADM_EXES} RUNTIME DESTINATION ${BIN_DIR} BUNDLE DESTINATION ${MAC_BUNDLE_DIR} LIBRARY DESTINATION lib)
+		INSTALL(TARGETS ${ADM_EXES} RUNTIME DESTINATION ${BIN_DIR} BUNDLE DESTINATION ${MAC_BUNDLE_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX})
 	ELSE (MAC_BUNDLE_DIR)
-		INSTALL(TARGETS ${ADM_EXES} RUNTIME DESTINATION ${BIN_DIR} BUNDLE DESTINATION "/Applications" LIBRARY DESTINATION lib)
+		INSTALL(TARGETS ${ADM_EXES} RUNTIME DESTINATION ${BIN_DIR} BUNDLE DESTINATION "/Applications" LIBRARY DESTINATION lib${LIB_SUFFIX})
 		SET (MAC_BUNDLE_DIR "/Applications")
 	ENDIF (MAC_BUNDLE_DIR)
 ELSE (APPLE)
-	INSTALL(TARGETS ${ADM_EXES} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib)
+	INSTALL(TARGETS ${ADM_EXES} RUNTIME DESTINATION ${BIN_DIR} LIBRARY DESTINATION lib${LIB_SUFFIX})
 ENDIF (APPLE)
--- avidemux_2.5.0.orig/avidemux/ADM_UIs/ADM_GTK/src/CMakeLists.txt	2008-06-10 20:33:07.000000000 -0400
+++ avidemux_2.5.0/avidemux/ADM_UIs/ADM_GTK/src/CMakeLists.txt	2009-07-02 17:07:43.407172890 -0400
@@ -29,4 +29,4 @@
 TARGET_LINK_LIBRARIES(${ADM_LIB} ${GTK_LDFLAGS} ADM_core ADM_coreUI ADM_render_gtk)
 ADD_TARGET_CFLAGS(${ADM_LIB} ${GTK_CFLAGS})
 ADD_SOURCE_CFLAGS(DIA_flyDialogGtk.cpp " -DADM_UI_TYPE_BUILD=2")
-INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib  ARCHIVE DESTINATION lib)
\ No newline at end of file
+INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib${LIB_SUFFIX}  ARCHIVE DESTINATION lib${LIB_SUFFIX})
\ No newline at end of file
--- avidemux_2.5.0.orig/avidemux/ADM_UIs/ADM_QT4/src/CMakeLists.txt	2008-10-01 11:09:22.000000000 -0400
+++ avidemux_2.5.0/avidemux/ADM_UIs/ADM_QT4/src/CMakeLists.txt	2009-07-02 17:07:43.411171579 -0400
@@ -21,4 +21,4 @@
 ADD_SOURCE_CFLAGS(T_flyDialogQt4.cpp " -DADM_UI_TYPE_BUILD=4")
 ADD_SOURCE_CFLAGS(T_QCanvas.cpp " -DADM_UI_TYPE_BUILD=4")
 TARGET_LINK_LIBRARIES(${ADM_LIB} ADM_core ADM_coreUI ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ADM_render_qt4)
-INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib  ARCHIVE DESTINATION lib)
+INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib${LIB_SUFFIX}  ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- avidemux_2.5.0.orig/avidemux/ADM_UIs/ADM_CLI/src/CMakeLists.txt	2008-06-10 20:33:07.000000000 -0400
+++ avidemux_2.5.0/avidemux/ADM_UIs/ADM_CLI/src/CMakeLists.txt	2009-07-02 17:07:43.416172246 -0400
@@ -9,4 +9,4 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include)
 ADD_LIBRARY(${ADM_LIB}  SHARED ${${ADM_LIB}_SRCS})
 ADD_SOURCE_CFLAGS(DIA_flyDialogCli.cpp " -DADM_UI_TYPE_BUILD=1")
-INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib  ARCHIVE DESTINATION lib)
+INSTALL(TARGETS ${ADM_LIB} RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib${LIB_SUFFIX}  ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- avidemux_2.5.0.orig/avidemux/ADM_coreImage/src/CMakeLists.txt	2008-06-10 20:33:07.000000000 -0400
+++ avidemux_2.5.0/avidemux/ADM_coreImage/src/CMakeLists.txt	2009-07-02 17:07:43.420172349 -0400
@@ -26,4 +26,4 @@
 ENDIF (APPLE)
 
 TARGET_LINK_LIBRARIES(ADM_coreImage ADM_core ADM_coreUI ADM_libswscale ADM_libpostproc)
-INSTALL(TARGETS ADM_coreImage RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib  ARCHIVE DESTINATION lib)
+INSTALL(TARGETS ADM_coreImage RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib${LIB_SUFFIX}  ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- avidemux_2.5.0.orig/avidemux/ADM_coreAudio/src/CMakeLists.txt	2009-04-21 12:15:51.000000000 -0400
+++ avidemux_2.5.0/avidemux/ADM_coreAudio/src/CMakeLists.txt	2009-07-02 17:07:43.428172034 -0400
@@ -17,4 +17,4 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/avidemux/ADM_coreAudio/include)
 TARGET_LINK_LIBRARIES(ADM_coreAudio ADM_core)
 
-INSTALL(TARGETS ADM_coreAudio RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib  ARCHIVE DESTINATION lib)
+INSTALL(TARGETS ADM_coreAudio RUNTIME DESTINATION ${BIN_DIR}  LIBRARY DESTINATION lib${LIB_SUFFIX}  ARCHIVE DESTINATION lib${LIB_SUFFIX})
--- avidemux_2.5.0.orig/cmake/admFFmpegBuild.cmake	2009-05-25 12:59:24.000000000 -0400
+++ avidemux_2.5.0/cmake/admFFmpegBuild.cmake	2009-07-03 15:16:03.799477658 -0400
@@ -132,7 +132,7 @@
 if (WIN32)
 	set(FFMPEG_INSTALL_DIR ${BIN_DIR})
 else (WIN32)
-	set(FFMPEG_INSTALL_DIR lib)
+	set(FFMPEG_INSTALL_DIR lib${LIB_SUFFIX})
 endif (WIN32)
 
 add_library(ADM_libswscale UNKNOWN IMPORTED)
--- avidemux_2.5.0.orig/scripts/CMakeLists.txt	2009-03-11 15:48:03.000000000 -0400
+++ avidemux_2.5.0/scripts/CMakeLists.txt	2009-07-03 15:45:56.875997035 -0400
@@ -1,7 +1,8 @@
+
 if (WIN32)
 	SET(scriptInstallDir ${CMAKE_INSTALL_PREFIX}/scripts)
 else (WIN32)
-	SET(scriptInstallDir ${CMAKE_INSTALL_PREFIX}/share/ADM_scripts)
+	SET(scriptInstallDir ${CMAKE_INSTALL_PREFIX}/share/avidemux/ADM_scripts)
 endif (WIN32)
 
-install(DIRECTORY . DESTINATION "${scriptInstallDir}" FILES_MATCHING PATTERN "*.js" PATTERN ".svn" EXCLUDE)
\ No newline at end of file
+install(DIRECTORY . DESTINATION "${scriptInstallDir}" FILES_MATCHING PATTERN "*.js" PATTERN ".svn" EXCLUDE)
--- avidemux_2.5.0.orig/avidemux/ADM_core/src/ADM_fileio.cpp	2009-03-09 16:10:03.000000000 -0400
+++ avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp	2009-07-03 15:58:36.757096530 -0400
@@ -361,7 +361,7 @@
 	const char *scriptPath = "scripts";
 #else
 	const char *startDir = "share";
-	const char *scriptPath = "ADM_scripts";
+	const char *scriptPath = "avidemux/ADM_scripts";
 #endif
 
 	return ADM_getInstallRelativePath(startDir, scriptPath, NULL);


avidemux-2.5-gcc-44.patch:

--- NEW FILE avidemux-2.5-gcc-44.patch ---
--- avidemux_2.5.0/avidemux/ADM_core/include/ADM_misc.h.ark	2009-06-21 16:50:12.412942889 +0200
+++ avidemux_2.5.0/avidemux/ADM_core/include/ADM_misc.h	2009-06-21 16:50:18.760943176 +0200
@@ -10,7 +10,7 @@
 #define ADM_MISC_H
 
 #include "ADM_coreConfig.h"
-
+#include <stdint.h>
 
 typedef struct 
 {
--- avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp.ark	2009-06-21 16:35:38.140135807 +0200
+++ avidemux_2.5.0/avidemux/ADM_core/src/ADM_fileio.cpp	2009-06-21 16:35:51.867969517 +0200
@@ -681,7 +681,7 @@ void ADM_PathStripName(char *str)
 */
 const char *ADM_GetFileName(const char *str)
 {
-	char *filename;
+	const char *filename;
 	char *filename2;
 
 #ifndef __WIN32
--- avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h.ark	2009-06-21 16:57:14.895092062 +0200
+++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_coreToolkit.h	2009-06-21 16:57:23.752111783 +0200
@@ -19,6 +19,8 @@
 #ifndef ADM_COREUI_TOOLKIT__
 #define ADM_COREUI_TOOLKIT__
 
+#include <stdint.h>
+
 typedef enum 
 {
         ADM_LOG_NONE=0,
--- avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_enter.h.ark	2009-06-21 16:55:46.188973629 +0200
+++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_enter.h	2009-06-21 16:55:53.465409726 +0200
@@ -15,6 +15,7 @@
  ***************************************************************************/
 #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);
--- avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_fileSel.h.ark	2009-06-21 16:55:31.471073751 +0200
+++ avidemux_2.5.0/avidemux/ADM_coreUI/include/DIA_fileSel.h	2009-06-21 16:55:39.379067926 +0200
@@ -15,6 +15,7 @@
 
 #ifndef DIA_FILESEL_H
 #define DIA_FILESEL_H
+#include <stdint.h>
 typedef void SELFILE_CB(const char *);
 
 // Associated functions type
--- avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp.ark	2009-06-21 16:40:22.066196323 +0200
+++ avidemux_2.5.0/avidemux/ADM_inputs/ADM_mpegdemuxer/dmx_io.cpp	2009-06-21 16:40:29.289001011 +0200
@@ -71,7 +71,7 @@ fileParser::~fileParser()
 */
 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_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc.ark	2009-06-21 16:42:15.574312778 +0200
+++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/yuv4mpeg_ratio.cc	2009-06-21 16:42:18.926951396 +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, ':');
+  const char *t = strchr(s, ':');
   if (t == NULL) return Y4M_ERR_RANGE;
   r->n = atoi(s);
   r->d = atoi(t+1);
--- avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp.ark	2009-06-21 16:43:15.988362511 +0200
+++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_mplex/lpcmstrm_in.cpp	2009-06-21 16:43:19.560943520 +0200
@@ -53,7 +53,7 @@ LPCMStream::LPCMStream(IBitStream &ibs, 
 
 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_2.5.0/avidemux/ADM_UIs/ADM_QT4/src/T_threadCount.h.ark	2009-06-21 16:48:26.935280369 +0200
+++ avidemux_2.5.0/avidemux/ADM_UIs/ADM_QT4/src/T_threadCount.h	2009-06-21 16:48:38.041943420 +0200
@@ -7,6 +7,7 @@
 #include <QtGui/QRadioButton>
 #include <QtGui/QSpinBox>
 #include <QtGui/QWidget>
+#include <stdint.h>
 
 namespace ADM_qt4Factory
 {
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_commonUI/ADM_tray.h.ark	2009-06-21 17:06:07.032249029 +0200
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_commonUI/ADM_tray.h	2009-06-21 17:06:13.612069717 +0200
@@ -17,6 +17,7 @@
 
 #ifndef ADM_TRAY_H
 #define ADM_TRAY_H
+#include <stdint.h>
 
 class ADM_tray
 {
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp.ark	2009-06-21 17:00:29.869950030 +0200
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp	2009-06-21 17:00:36.084898982 +0200
@@ -1,4 +1,5 @@
 #include <QtGui/QColorDialog>
+#include <stdint.h>
 
 #include "ADM_toolkitQt.h"
 
@@ -17,4 +18,4 @@ int DIA_colorSel(uint8_t *r, uint8_t *g,
 	}
 
 	return 0;
-}
\ No newline at end of file
+}
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.cpp.ark	2009-06-21 16:54:38.555192979 +0200
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_jobs.cpp	2009-06-21 16:54:44.176068089 +0200
@@ -6,6 +6,7 @@
 #include "Q_jobs.h"
 #include "DIA_coreToolkit.h"
 #include "ADM_toolkitQt.h"
+#include <cstdio>
 
 static void updateStatus(void);
 extern bool parseECMAScript(const char *name);
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.cpp.ark	2009-06-21 16:53:15.590997514 +0200
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/Q_license.cpp	2009-06-21 16:53:23.719993769 +0200
@@ -17,6 +17,7 @@
 
 #include "Q_license.h"
 #include "ADM_toolkitQt.h"
+#include <stdint.h>
 
 Ui_licenseWindow::Ui_licenseWindow(QWidget *parent) : QDialog(parent)
 {
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp.ark	2009-06-21 17:04:44.617943090 +0200
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp	2009-06-21 17:04:50.589943463 +0200
@@ -14,6 +14,7 @@ Custom slider
 
 #include <QtGui/QPainter>
 #include <QtGui/QSlider>
+#include <cstdio>
 
 #include "ADM_qslider.h"
 
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h.ark	2009-06-21 17:01:19.298477728 +0200
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.h	2009-06-21 17:01:25.233500616 +0200
@@ -1,5 +1,6 @@
 #ifndef ADM_Q_SLIDER_H
 #define ADM_Q_SLIDER_H
+#include <stdint.h>
 
 class ADM_QSlider : public QSlider
 {
--- avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp.ark	2009-06-21 17:04:07.237197461 +0200
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/gui_none.cpp	2009-06-21 17:04:14.105432535 +0200
@@ -9,6 +9,7 @@
 //
 
 #include "config.h"
+#include <stdint.h>
 
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopWidget>

avidemux-2.5-i18n.patch:

--- NEW FILE avidemux-2.5-i18n.patch ---
--- avidemux_2.5.0.orig/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2008-10-01 09:49:39.000000000 -0400
+++ avidemux_2.5.0/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp	2009-07-02 16:16:34.474297592 -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
+}
--- avidemux_2.5.0.orig/cmake/Ts.cmake	2009-07-02 16:29:10.899297616 -0400
+++ avidemux_2.5.0/cmake/Ts.cmake	2009-07-02 16:32:52.218297313 -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})

avidemux-2.5-pulseaudio-default.patch:

--- NEW FILE avidemux-2.5-pulseaudio-default.patch ---
--- avidemux_2.5.0.orig/avidemux/prefs.in	2009-02-22 08:36:02.000000000 -0500
+++ avidemux_2.5.0/avidemux/prefs.in	2009-07-10 15:07:05.100178665 -0400
@@ -53,9 +53,9 @@
 #ifdef __WIN32
 device.audiodevice,			STRING,	WIN32
 #else
-device.audiodevice,			STRING,	ALSA
+device.audiodevice,			STRING,	PulseAudioS
 #endif
-device.audio.alsa_device,               STRING, "dmix"
+device.audio.alsa_device,               STRING, "pulse"
 device.videodevice,			UINT,	0,	0,	10
 # Posproc
 default.postproc_type,			UINT,	3,	0,	7
--- avidemux_2.5.0.orig/avidemux/ADM_libraries/ADM_utilities/prefs.cpp	2009-02-22 08:36:02.000000000 -0500
+++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_utilities/prefs.cpp	2009-07-10 15:07:21.436178612 -0400
@@ -97,9 +97,9 @@
 #ifdef __WIN32
 	{"device.audiodevice",		STRING,"WIN32",NULL, NULL, NULL },
 #else
-	{"device.audiodevice",		STRING,"ALSA",	NULL, NULL, NULL },
+	{"device.audiodevice",		STRING,"PulseAudioS",	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-plugins-2.5-gcc44.patch:

--- NEW FILE avidemux-plugins-2.5-gcc44.patch ---
--- avidemux_2.5.0.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/guiHelper.cpp	2008-06-04 13:00:03.000000000 -0400
+++ avidemux_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/guiHelper.cpp	2009-07-03 20:54:54.422096888 -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);
--- avidemux_2.5.0.orig/plugins/ADM_videoFilters/AvisynthResize/qt4/Q_resize.h	2008-09-30 20:03:46.000000000 -0400
+++ avidemux_2.5.0/plugins/ADM_videoFilters/AvisynthResize/qt4/Q_resize.h	2009-07-03 21:03:23.949971298 -0400
@@ -1,6 +1,7 @@
 #ifndef Q_resizing_h
 #define Q_resizing_h
 
+#include <stdint.h>
 #include "ui_resizing.h"
 
 typedef struct resParam
--- avidemux_2.5.0.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h	2009-02-21 11:02:13.000000000 -0500
+++ avidemux_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.h	2009-07-03 21:15:58.542993276 -0400
@@ -1,6 +1,7 @@
 #ifndef x264ConfigDialog_h
 #define x264ConfigDialog_h
 
+#include <stdint.h>
 #include "ui_x264ConfigDialog.h"
 #include "../options.h"
 #include "x264ZoneTableModel.h"
--- avidemux_2.5.0.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264CustomMatrixDialog.h	2009-01-11 08:00:18.000000000 -0500
+++ avidemux_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264CustomMatrixDialog.h	2009-07-03 21:16:17.023216696 -0400
@@ -1,6 +1,7 @@
 #ifndef x264CustomMatrixDialog_h
 #define x264CustomMatrixDialog_h
 
+#include <stdint.h>
 #include "ui_x264CustomMatrixDialog.h"
 
 class x264CustomMatrixDialog : public QDialog
--- avidemux_2.5.0.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ZoneTableModel.h	2008-06-04 13:00:03.000000000 -0400
+++ avidemux_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ZoneTableModel.h	2009-07-03 21:19:27.163971100 -0400
@@ -1,6 +1,7 @@
 #ifndef x264ZoneTableModel_h
 #define x264ZoneTableModel_h
 
+#include <stdint.h>
 #include <QtCore/QAbstractTableModel>
 #include <QtCore/QPair>
 #include <QtCore/QList>
--- avidemux_2.5.0.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2009-04-22 16:52:19.000000000 -0400
+++ avidemux_2.5.0/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp	2009-07-03 21:22:02.812970995 -0400
@@ -17,6 +17,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <stdint.h>
 #include <math.h>
 #include <QtGui/QFileDialog>
 
--- avidemux_2.5.0.orig/plugins/ADM_videoFilters/MplayerResize/qt4/Q_resize.cpp	2008-10-01 11:09:22.000000000 -0400
+++ avidemux_2.5.0/plugins/ADM_videoFilters/MplayerResize/qt4/Q_resize.cpp	2009-07-03 21:47:39.378097028 -0400
@@ -13,6 +13,7 @@
  ***************************************************************************/
 
 #include <math.h>
+#include <stdint.h>
 
 #include "Q_resize.h"
 #include "DIA_coreToolkit.h"
--- avidemux_2.5.0.orig/plugins/ADM_videoFilters/MplayerResize/qt4/Q_resize.h	2009-07-03 21:49:19.116971495 -0400
+++ avidemux_2.5.0/plugins/ADM_videoFilters/MplayerResize/qt4/Q_resize.h	2009-07-03 21:49:26.191970527 -0400
@@ -1,6 +1,7 @@
 #ifndef Q_resizing_h
 #define Q_resizing_h
 
+#include <stdint.h>
 #include "ui_resizing.h"
 
 typedef struct resParam
--- avidemux_2.5.0.orig/plugins/ADM_videoFilters/CNR2/ADM_vidCNR2_param.h	2008-06-04 13:00:03.000000000 -0400
+++ avidemux_2.5.0/plugins/ADM_videoFilters/CNR2/ADM_vidCNR2_param.h	2009-07-03 21:51:25.800096682 -0400
@@ -15,6 +15,8 @@
 #ifndef _CNR2_
 #define _CNR2_
 
+#include <stdint.h>
+
 typedef struct CNR2Param
 {
         double scdthr;          // Scene change threshold in % default 10
--- avidemux_2.5.0.orig/plugins/ADM_videoFilters/colorYUV/ADM_vidColorYuv_param.h	2008-06-04 13:00:03.000000000 -0400
+++ avidemux_2.5.0/plugins/ADM_videoFilters/colorYUV/ADM_vidColorYuv_param.h	2009-07-03 21:52:07.184096982 -0400
@@ -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_2.5.0.orig/plugins/ADM_videoFilters/MPDelogo/ADM_vidMPdelogo.h	2008-06-04 13:00:03.000000000 -0400
+++ avidemux_2.5.0/plugins/ADM_videoFilters/MPDelogo/ADM_vidMPdelogo.h	2009-07-03 21:52:59.329096895 -0400
@@ -12,6 +12,9 @@
  ***************************************************************************/
 #ifndef ADM_DELOGO_H
 #define ADM_DELOGO_H
+
+#include <stdint.h>
+
 typedef struct MPDELOGO_PARAM
 {
         uint32_t xoff;
--- avidemux_2.5.0.orig/avidemux/ADM_plugin/ADM_vidEnc_plugin.h	2009-03-04 17:49:41.000000000 -0500
+++ avidemux_2.5.0/avidemux/ADM_plugin/ADM_vidEnc_plugin.h	2009-07-03 22:18:01.394215102 -0400
@@ -42,6 +42,7 @@
 
 #define ADM_VIDENC_REQ_NULL_FLUSH 1
 
+#include <stdint.h>
 #include "DIA_uiTypes.h"
 
 #define ADM_VIDENC_FLAG_GLOBAL_HEADER 1

avidemux-plugins-2.5-plugdir.patch:

--- NEW FILE avidemux-plugins-2.5-plugdir.patch ---
--- avidemux_2.5.0.orig/cmake/ad_plugin.cmake	2009-02-13 18:29:49.000000000 -0500
+++ avidemux_2.5.0/cmake/ad_plugin.cmake	2009-07-03 16:05:49.680096748 -0400
@@ -1,7 +1,7 @@
 IF (WIN32)
 	SET(AUDDEC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/plugins/audioDecoder/")
 ELSE (WIN32)
-	SET(AUDDEC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/ADM_plugins/audioDecoder/")
+	SET(AUDDEC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/ADM_plugins/audioDecoder/")
 ENDIF (WIN32)
 
 MACRO(INIT_AUDIO_PLUGIN _lib)
--- avidemux_2.5.0.orig/cmake/ae_plugin.cmake	2009-02-13 18:29:49.000000000 -0500
+++ avidemux_2.5.0/cmake/ae_plugin.cmake	2009-07-03 16:05:53.112971418 -0400
@@ -1,7 +1,7 @@
 IF (WIN32)
 	SET(AUDENC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/plugins/audioEncoders/")
 ELSE (WIN32)
-	SET(AUDENC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/ADM_plugins/audioEncoders/")
+	SET(AUDENC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/ADM_plugins/audioEncoders/")
 ENDIF (WIN32)
 
 MACRO(INIT_AUDIO_ENCODER _lib)
--- avidemux_2.5.0.orig/cmake/av_plugin.cmake	2009-02-13 18:29:49.000000000 -0500
+++ avidemux_2.5.0/cmake/av_plugin.cmake	2009-07-03 16:05:59.148971424 -0400
@@ -1,7 +1,7 @@
 IF (WIN32)
 	SET(AUDDEV_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/plugins/audioDevices/")
 ELSE (WIN32)
-	SET(AUDDEV_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/ADM_plugins/audioDevices/")
+	SET(AUDDEV_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/ADM_plugins/audioDevices/")
 ENDIF (WIN32)
 
 MACRO(INIT_AUDIO_DEVICE _lib)
--- avidemux_2.5.0.orig/plugins/CMakeLists.txt	2009-02-21 12:26:30.000000000 -0500
+++ avidemux_2.5.0/plugins/CMakeLists.txt	2009-07-03 21:30:28.105096766 -0400
@@ -43,7 +43,7 @@
 	SET(AVIDEMUX_INSTALL_PREFIX "${AVIDEMUX_INSTALL_PREFIX}" CACHE STRING "")
 ENDIF (NOT AVIDEMUX_INSTALL_PREFIX)
 
-LINK_DIRECTORIES(${AVIDEMUX_INSTALL_PREFIX}/lib)
+LINK_DIRECTORIES(${AVIDEMUX_INSTALL_PREFIX}/lib${LIB_SUFFIX})
 
 ########################################
 # Where is coreConfig ?
@@ -98,7 +98,7 @@
 	ENDIF (CMAKE_BUILD_TYPE STREQUAL "Release")
 ELSE (WIN32)
 	SET(BIN_DIR bin)
-	set(FFMPEG_LIB_DIR ${AVIDEMUX_INSTALL_PREFIX}/lib)
+	set(FFMPEG_LIB_DIR ${AVIDEMUX_INSTALL_PREFIX}/lib${LIB_SUFFIX})
 ENDIF (WIN32)
 
 ########################################
--- avidemux_2.5.0.orig/cmake/admPluginVideoEncoder.cmake	2009-02-13 18:29:49.000000000 -0500
+++ avidemux_2.5.0/cmake/admPluginVideoEncoder.cmake	2009-07-03 21:38:18.910097181 -0400
@@ -1,7 +1,7 @@
 IF (WIN32)
 	SET(VIDENC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/plugins/videoEncoder/")
 ELSE (WIN32)
-	SET(VIDENC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/ADM_plugins/videoEncoder/")
+	SET(VIDENC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/ADM_plugins/videoEncoder/")
 ENDIF (WIN32)
 
 MACRO(INIT_VIDEO_ENCODER_PLUGIN _lib)

--- avidemux_2.5.0.orig/cmake/vf_plugin.cmake	2009-02-13 18:29:49.000000000 -0500
+++ avidemux_2.5.0/cmake/vf_plugin.cmake	2009-07-03 22:13:26.025096615 -0400
@@ -1,7 +1,7 @@
 IF (WIN32)
 	SET(VIDFLT_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/plugins/videoFilter/")
 ELSE (WIN32)
-	SET(VIDFLT_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/ADM_plugins/videoFilter/")
+	SET(VIDFLT_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/ADM_plugins/videoFilter/")
 ENDIF (WIN32)
 
 MACRO(INIT_VIDEOFILTER_PLUGIN _lib)


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	20 Feb 2009 04:41:56 -0000	1.4
+++ .cvsignore	31 Jul 2009 00:45:49 -0000	1.5
@@ -1 +1 @@
-avidemux_2.4.4.tar.gz
+avidemux_2.5.0.tar.gz


Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-11/avidemux.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- avidemux.spec	19 Jun 2009 20:04:34 -0000	1.22
+++ avidemux.spec	31 Jul 2009 00:45:49 -0000	1.23
@@ -1,8 +1,6 @@
-#define svndate 20080521
-
 Name:           avidemux
-Version:        2.4.4
-Release:        9%{?dist}
+Version:        2.5.0
+Release:        2%{?dist}
 Summary:        Graphical video editing and transcoding tool
 
 Group:          Applications/Multimedia
@@ -12,28 +10,30 @@
 Source1:        %{name}-gtk.desktop
 Source2:        %{name}-qt.desktop
 # Make PulseAudio the default audio out device
-Patch0:         avidemux-2.4-pulseaudio-default.patch
+Patch0:         avidemux-2.5-pulseaudio-default.patch
 # Search for lrelease-qt4 instead of lrelease
 Patch1:         avidemux-2.4-qt4.patch
-# Why are i18n files stored in bindir? Move to datadir...
-Patch2:         avidemux-2.4-i18n.patch
-# http://ftp.ncnu.edu.tw/Linux/Gentoo/gentoo-portage/media-video/avidemux/files/avidemux-2.4-libdca.patch
-Patch3:         avidemux-2.4-libdca.patch
-# Our report: https://bugzilla.rpmfusion.org/attachment.cgi?id=131
-# Upstream report: http://bugs.avidemux.org/index.php?do=details&task_id=592
-# Patch from: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/avidemux/files/avidemux-2.4.4-gcc-4.4.patch?view=markup
-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/files/avidemux-2.4-cmake264.patch?rev=1.1&view=markup
-Patch5:         avidemux-2.4-cmake264.patch
+# Move translations out of bindir
+Patch2:         avidemux-2.5-i18n.patch
+# Fix libdir location on 64bit
+# Move scripts & plugins avidemux subdir instead of in libdir or datadir
+Patch3:         avidemux-2.5-filelocations.patch
+# Fixes for gcc 4.4
+# Patch from http://arklinux.ch/~bero/avidemux-2.5.0-gcc-4.4.patch
+Patch4:         avidemux-2.5-gcc-44.patch
+# Install to correct libdir on 64bit and moves plugins into avidemux subdir
+Patch5:         avidemux-plugins-2.5-plugdir.patch
+# Fixes for gcc 4.4 (plugins)
+Patch6:         avidemux-plugins-2.5-gcc44.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:       %{name}-cli  = %{version}
-Requires:       %{name}-gui = %{version}
+Requires:       %{name}-cli  = %{version}-%{release}
+Requires:       %{name}-gui = %{version}-%{release}
+Requires:       %{name}-plugins = %{version}
 
 # Compiling
-BuildRequires:	cmake
+BuildRequires:  cmake
 BuildRequires:  gettext-devel
 
 # Libraries
@@ -46,12 +46,13 @@
 BuildRequires:  libXmu-devel
 # Required by gtk: libXi-devel, libXext-devel, libX11-devel
 # Required by qt: libXt-devel, libXext-devel, libX11-devel
-BuildRequires:	libsamplerate-devel
-BuildRequires:	jack-audio-connection-kit-devel
+BuildRequires:  libsamplerate-devel
+BuildRequires:  jack-audio-connection-kit-devel
 
 # Sound out
 BuildRequires:  alsa-lib-devel >= 1.0.3
 BuildRequires:  esound-devel >= 0.2.0
+BuildRequires:  pulseaudio-libs-devel
 
 # Video out 
 BuildRequires:  SDL-devel >= 1.2.7
@@ -65,9 +66,6 @@
 BuildRequires:  libogg-devel >= 1.1
 BuildRequires:  libvorbis-devel >= 1.0.1
 
-# needs libdts/dts_internal.h; but that's not shipped by  libdca-devel because
-# it's an internal lib. Someone needs to report that upstream to get fixed
-# ** this is fixed by patch3
 BuildRequires:  libdca-devel
 
 
@@ -87,58 +85,117 @@
 MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
 using projects, job queue and powerful scripting capabilities.
 
+For compatability reasons, avidemux is a meta-package which installs the
+graphical, command line and plugin packages. If you want a smaller setup,
+you may selectively install one or more of the avidemux-* subpackages.
+
 %package cli
 Summary:        CLI for %{name}
 Group:          Applications/Multimedia
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 
 %description cli
-This package provides command-line interface for %{name}.
+This package provides a command-line interface to editing videos with %{name}.
+
+%package libs
+Summary:        Libraries for %{name}
+Group:          System Environment/Libraries
+
+%description libs
+This package contains the runtime libraries for %{name}.
 
 %package gtk
-Summary:        GTK GUI for %{name}
+Summary:        GTK interface for %{name}
 Group:          Applications/Multimedia
 BuildRequires:  gtk2-devel >= 2.8.0
 BuildRequires:  cairo-devel
 # Slightly higher so it is default, but it can be avoided by installing
 # avidemux-qt directly or it can be removed later once avidemux-qt is installed
 Provides:       %{name}-gui = %{version}-%{release}.1
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 
 %description gtk
-This package provides the GTK interface for %{name}.
+This package provides the GTK graphical interface for %{name}.
 
 %package qt
-Summary:        QT GUI for %{name}
+Summary:        Qt interface for %{name}
 Group:          Applications/Multimedia
 # 4.5.0-9 fixes a failure when there are duplicate translated strings
 # https://bugzilla.redhat.com/show_bug.cgi?id=491514
 BuildRequires:  qt4-devel >= 4.5.0-9
 Provides:       %{name}-gui = %{version}-%{release}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 
 %description qt
-This package provides the Qt interface for %{name}.
+This package contains the Qt graphical interface for %{name}.
+
+%package devel
+Summary:        Development files for %{name}
+Group:          Development/Libraries
+Requires:       %{name}-libs = %{version}-%{release}
+
+%description devel
+This package contains files required to develop with or extend %{name}.
+
+%package plugins
+Summary:        Plugins for the avidemux video editing and transcoding tool
+Group:          Applications/Multimedia
+Requires:       %{name}-libs = %{version}-%{release}
+
+%description plugins
+This package contains various plugins for avidemux.
 
 %prep
 %setup -q -n avidemux_%{version}
-%patch0 -b .pulse
+%patch0 -p1 -b .pulse
 %patch1 -p1 -b .qt4
 %patch2 -p1 -b .i18n
-%patch3 -p1 -b .libdca
-%patch4 -b .gcc44
-%patch5 -p1 -b .cmake
+%patch3 -p1 -b .lib64
+# change hardcoded libdir paths
+%ifarch x86_64
+sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/ADM_core/src/ADM_fileio.cpp
+sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/main.cpp
+%endif
+%patch4 -p1 -b .gcc44
+%patch5 -p1 -b .plugdir
+%patch6 -p1 -b .pluggcc44
 
 %build
-%cmake
+# Out of source build
+mkdir build build_plugins && cd build
+%cmake ../
 # po/ not smp safe - http://bugs.avidemux.org/index.php?do=details&task_id=605
 make -C po
 make %{?_smp_mflags}
+# Do a local install to build plugins
+make install DESTDIR=%{_builddir}/avidemux_%{version}/localinstall
+
+mkdir avidemux_%{version}/build_plugins avidemux_%{version}/build && cd avidemux_%{version}/build
+%cmake ../
+cd ../build_plugins
+%cmake -DAVIDEMUX_SOURCE_DIR=%{_builddir}/avidemux_%{version} \
+       -DAVIDEMUX_CORECONFIG_DIR=%{_builddir}/avidemux_%{version}/build/config \
+       -DAVIDEMUX_INSTALL_PREFIX=%{_builddir}/avidemux_%{version}/localinstall/%{_prefix} \
+       ../plugins
+make %{?_smp_mflags}
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
+# Install main to $RPM_BUILD_ROOT
+cd build
+make install DESTDIR=$RPM_BUILD_ROOT
+install -d -m755 $RPM_BUILD_ROOT%{_includedir}
+install -m644 config/ADM_coreConfig.h $RPM_BUILD_ROOT%{_includedir}/ADM_coreConfig.h
+%find_lang %{name}
+# Install plugins to $RPM_BUILD_ROOT
+cd ../build_plugins
 make install DESTDIR=$RPM_BUILD_ROOT
 
+# Find and remove all la files
+find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
+# Install .desktop shortcuts
 desktop-file-install --vendor rpmfusion \
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     %{SOURCE1}
@@ -147,16 +204,21 @@
     --dir $RPM_BUILD_ROOT%{_datadir}/applications \
     %{SOURCE2}
 
-find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-%find_lang %{name}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}.lang
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog History README TODO
+# metapackage, no files
+
+%files libs -f build/%{name}.lang
+%doc AUTHORS COPYING README TODO
 %dir %{_datadir}/%{name}
+%{_datadir}/%{name}/ADM_scripts/
+%{_libdir}/libADM*
 
 %files cli
 %defattr(-,root,root,-)
@@ -169,12 +231,27 @@
 
 %files qt
 %defattr(-,root,root,-)
-%dir %{_datadir}/%{name}/i18n/
-%{_datadir}/%{name}/i18n/*.qm
+%{_datadir}/%{name}/i18n/
 %{_bindir}/avidemux2_qt4
 %{_datadir}/applications/*qt*.desktop
 
+%files plugins
+%defattr(-,root,root,-)
+%{_libdir}/ADM_plugins/
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/ADM_coreConfig.h
+
 %changelog
+* Thu Jul 30 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-2
+- Reintegrate plugins package as a subpackage
+
+* Thu Jul 02 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-1
+- Update to 2.5.0
+- Require cli/gui packages of same release as well as version
+- Split plugins into a separate package
+
 * 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


Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	20 Feb 2009 04:41:56 -0000	1.4
+++ sources	31 Jul 2009 00:45:49 -0000	1.5
@@ -1 +1 @@
-503dfd25842ef81be7c769811e7bc54e  avidemux_2.4.4.tar.gz
+69624352ac4e4cbb507e02b2bace5f56  avidemux_2.5.0.tar.gz


--- avidemux-2.4-cmake264.patch DELETED ---


--- avidemux-2.4-gcc44.patch DELETED ---


--- avidemux-2.4-i18n.patch DELETED ---


--- avidemux-2.4-libdca.patch DELETED ---

More information about the rpmfusion-commits mailing list