rpms/avidemux/devel avidemux-2.4-gcc44-movq.patch, 1.1, 1.2 avidemux-2.4-libdca.patch, 1.3, 1.4 avidemux.spec, 1.16, 1.17

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4900

Modified Files:
	avidemux-2.4-gcc44-movq.patch avidemux-2.4-libdca.patch 
	avidemux.spec 
Log Message:
* Wed Mar 25 2009 Dominik Mierzejewski <rpm at greysector.net> - 2.4.4-4
- Fix gcc 4.4 patch
- Improve dca patch


avidemux-2.4-gcc44-movq.patch:

Index: avidemux-2.4-gcc44-movq.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux-2.4-gcc44-movq.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avidemux-2.4-gcc44-movq.patch	22 Mar 2009 17:50:15 -0000	1.1
+++ avidemux-2.4-gcc44-movq.patch	25 Mar 2009 21:54:47 -0000	1.2
@@ -58,6 +58,16 @@
          char *filename2;
  #ifndef ADM_WIN32		
  	filename = strrchr(str, '/');
+diff -up avidemux_2.4.4/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp.compile avidemux_2.4.4/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp
+--- avidemux_2.4.4/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp.compile	2008-09-25 11:34:33.000000000 +0200
++++ avidemux_2.4.4/avidemux/ADM_userInterfaces/ADM_QT4/ADM_dialog/DIA_color.cpp	2009-03-23 22:59:21.000000000 +0100
+@@ -1,5 +1,5 @@
+ #include <QtGui>
+-
++#include <inttypes.h>
+ #include "../ADM_toolkit/qtToolkit.h"
+ 
+ int DIA_colorSel(uint8_t *r, uint8_t *g, uint8_t *b)
 diff -up avidemux_2.4.3/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp.compile avidemux_2.4.3/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp
 --- avidemux_2.4.3/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp.compile	2009-03-22 14:10:27.000000000 +0100
 +++ avidemux_2.4.3/avidemux/ADM_userInterfaces/ADM_QT4/ADM_gui/ADM_qslider.cpp	2009-03-22 14:15:51.000000000 +0100
@@ -93,6 +103,29 @@
  #include <QtGui/QApplication>
  #include <QtGui/QDesktopWidget>
  
+diff -up avidemux_2.4.4/avidemux/ADM_video/ADM_vidCNR2_param.h.compile avidemux_2.4.4/avidemux/ADM_video/ADM_vidCNR2_param.h
+--- avidemux_2.4.4/avidemux/ADM_video/ADM_vidCNR2_param.h.compile	2005-07-05 19:23:17.000000000 +0200
++++ avidemux_2.4.4/avidemux/ADM_video/ADM_vidCNR2_param.h	2009-03-23 23:25:00.000000000 +0100
+@@ -14,6 +14,7 @@
+ 
+ #ifndef _CNR2_
+ #define _CNR2_
++#include <inttypes.h>
+ 
+ typedef struct CNR2Param
+ {
+diff -up avidemux_2.4.4/avidemux/ADM_video/ADM_vidColorYuv_param.h.compile avidemux_2.4.4/avidemux/ADM_video/ADM_vidColorYuv_param.h
+--- avidemux_2.4.4/avidemux/ADM_video/ADM_vidColorYuv_param.h.compile	2006-04-17 12:11:17.000000000 +0200
++++ avidemux_2.4.4/avidemux/ADM_video/ADM_vidColorYuv_param.h	2009-03-23 23:26:23.000000000 +0100
+@@ -14,6 +14,8 @@
+ 
+ #ifndef ADM_VID_COLOR_YUV_PARAM_H
+ #define ADM_VID_COLOR_YUV_PARAM_H
++#include <inttypes.h>
++
+ typedef struct COLOR_YUV_PARAM
+ {
+     double y_contrast, y_bright, y_gamma, y_gain;
 diff -up avidemux_2.4.3/avidemux/ADM_video/mmx_macros.h.compile avidemux_2.4.3/avidemux/ADM_video/mmx_macros.h
 --- avidemux_2.4.3/avidemux/ADM_video/mmx_macros.h.compile	2006-10-31 16:35:20.000000000 +0100
 +++ avidemux_2.4.3/avidemux/ADM_video/mmx_macros.h	2009-03-22 13:47:06.000000000 +0100

avidemux-2.4-libdca.patch:

Index: avidemux-2.4-libdca.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux-2.4-libdca.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- avidemux-2.4-libdca.patch	20 Feb 2009 04:41:56 -0000	1.3
+++ avidemux-2.4-libdca.patch	25 Mar 2009 21:54:47 -0000	1.4
@@ -1,33 +1,15 @@
---- avidemux_2.4.4.orig/configure.in.in	2009-02-06 14:07:37.000000000 -0500
-+++ avidemux_2.4.4/configure.in.in	2009-02-18 23:48:22.000000000 -0500
-@@ -874,18 +874,14 @@
- if test "x$with_libdca" != "xno"; then
-     have_libdca=yes
-     AC_CHECK_HEADERS([dts.h], , have_libdca=no)
--    
--    if test "x$have_libdca" = "xyes"; then
--    	AC_CHECK_HEADERS([dts_internal.h], , have_libdca=no)
-     	
-     	if test "x$have_libdca" = "xyes"; then
-     		if test "x$use_late_binding" = "xno"; then
--				AC_CHECK_LIB(dts, dts_init, , have_libdca=no)
-+				AC_CHECK_LIB(dca, dca_init, , have_libdca=no)
- 			fi
- 		else
-     		AC_MSG_WARN(dts.h is there but I also need dts_internal.h to compile libdca/libdts. Please copy dts_internal.h where dts.h is)
-     	fi
--    fi
-     
-     if test "x$have_libdca" = "xyes"; then
- 		AC_DEFINE(USE_LIBDCA, 1, "[libdca detected]")
---- avidemux_2.4.4.orig/avidemux/CMakeLists.txt	2008-10-03 07:05:09.000000000 -0400
-+++ avidemux_2.4.4/avidemux/CMakeLists.txt	2009-02-18 23:45:12.000000000 -0500
-@@ -315,7 +315,7 @@
+diff -up avidemux_2.4.4/avidemux/CMakeLists.txt.libdca avidemux_2.4.4/avidemux/CMakeLists.txt
+--- avidemux_2.4.4/avidemux/CMakeLists.txt.libdca	2009-03-23 23:08:35.000000000 +0100
++++ avidemux_2.4.4/avidemux/CMakeLists.txt	2009-03-23 23:10:17.000000000 +0100
+@@ -315,7 +315,11 @@ endif(USE_AMR_NB AND NOT USE_LATE_BINDIN
  
  #libdts
  if(USE_LIBDCA AND NOT USE_LATE_BINDING)
--	add_libs_all_targets(dts)
-+	add_libs_all_targets(dca)
++	if(USE_DCA_INSTEAD_OF_DTS)
++		add_libs_all_targets(dca)
++	else(USE_DCA_INSTEAD_OF_DTS)
+ 	add_libs_all_targets(dts)
++	endif(USE_DCA_INSTEAD_OF_DTS)
  endif(USE_LIBDCA AND NOT USE_LATE_BINDING)
  
  # Lame


Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- avidemux.spec	24 Mar 2009 20:24:58 -0000	1.16
+++ avidemux.spec	25 Mar 2009 21:54:47 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           avidemux
 Version:        2.4.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Graphical video editing and transcoding tool
 
 Group:          Applications/Multimedia
@@ -107,7 +107,9 @@
 %package qt
 Summary:        QT GUI for %{name}
 Group:          Applications/Multimedia
-BuildRequires:  qt4-devel
+# 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}
 
@@ -166,6 +168,10 @@
 %{_datadir}/applications/*qt*.desktop
 
 %changelog
+* Wed Mar 25 2009 Dominik Mierzejewski <rpm at greysector.net> - 2.4.4-4
+- Fix gcc 4.4 patch
+- Improve dca patch
+
 * Sun Mar 22 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-3
 - Apply the patch