rpms/avidemux/F-11 avidemux-2.5-libmpeg2enc-altivec.patch, NONE, 1.1 avidemux.spec, 1.23, 1.24

[Stewart Adam]

Author: firewing

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

Modified Files:
	avidemux.spec 
Added Files:
	avidemux-2.5-libmpeg2enc-altivec.patch 
Log Message:
* Fri Jul 31 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-3
- Add patch to fix Altivec build errors on PPC


avidemux-2.5-libmpeg2enc-altivec.patch:

--- NEW FILE avidemux-2.5-libmpeg2enc-altivec.patch ---
--- avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/mjpeg_types.h.orig	2009-07-31 12:09:42.574079146 -0400
+++ avidemux_2.5.0/avidemux/ADM_libraries/ADM_libmpeg2enc/mjpeg_types.h	2009-07-31 12:10:13.522203051 -0400
@@ -22,63 +22,9 @@
 #define __MJPEG_TYPES_H__
 //#include <config.h>
 
-#if defined(HAVE_STDINT_H)
-# include <stdint.h>
-#elif defined(HAVE_INTTYPES_H)
-# include <inttypes.h>
-#elif defined(__CYGWIN__)
-# include <sys/types.h>
-typedef u_int8_t uint8_t;
-typedef u_int16_t uint16_t;
-typedef u_int32_t uint32_t;
-typedef u_int64_t uint64_t;
-# define INT8_C(c)     c
-# define INT16_C(c)    c
-# define INT32_C(c)    c
-# define INT64_C(c)    c ## LL
-# define UINT8_C(c)    c ## U
-# define UINT16_C(c)   c ## U
-# define UINT32_C(c)   c ## U
-# define UINT64_C(c)   c ## ULL
-#elif  defined(_WIN32)
-#include <win32defs.h>
-#else
-/* warning ISO/IEC 9899:1999 <stdint.h> was missing and even <inttypes.h> */
-/* fixme */
-/* (Ronald) we'll just give an error now...Better solutions might come later */
-#error You don't seem to have sys/types.h, inttypes.h or stdint.h! \
-This might mean two things: \
-Either you really don't have them, in which case you should \
-install the system headers and/or C-library headers. \
-You might also have forgotten to define whether you have them. \
-You can do this by either defining their presence before including \
-mjpegtools' header files (e.g. "#define HAVE_STDINT_H"), or you can check \
-for their presence in a configure script. mjpegtools' configure \
-script is a good example of how to do this. You need to check for \
-PRId64, stdbool.h, inttypes.h, stdint.h and sys/types.h
-#endif /* HAVE_STDINT_H */
-
-#if defined(__FreeBSD__)
-#include <sys/types.h> /* FreeBSD - ssize_t */
-#endif
-
-#if defined(HAVE_STDBOOL_H) && !defined(__cplusplus)
-#include <stdbool.h>
-#else
-/* ISO/IEC 9899:1999 <stdbool.h> missing -- enabling workaround */
-
-# ifndef __cplusplus
-typedef enum
-  {
-    false = 0,
-    true = 1
-  } locBool;
-
-#  define false   false
-#  define true    true
-#  define bool locBool
-# endif
-#endif
+#include <sys/types.h> /* FreeBSD, others - ssize_t */
+#include <stdint.h>
+#include <inttypes.h>
 
 #ifndef PRId64
 #define PRId64 PRID64_STRING_FORMAT


Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-11/avidemux.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- avidemux.spec	31 Jul 2009 00:45:49 -0000	1.23
+++ avidemux.spec	31 Jul 2009 16:25:47 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           avidemux
 Version:        2.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Graphical video editing and transcoding tool
 
 Group:          Applications/Multimedia
@@ -21,10 +21,13 @@
 # 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
+# Fixes altivec build errors on PPC
+Patch5:         avidemux-2.5-libmpeg2enc-altivec.patch
+### Patches for plugins
 # Install to correct libdir on 64bit and moves plugins into avidemux subdir
-Patch5:         avidemux-plugins-2.5-plugdir.patch
+Patch6:         avidemux-plugins-2.5-plugdir.patch
 # Fixes for gcc 4.4 (plugins)
-Patch6:         avidemux-plugins-2.5-gcc44.patch
+Patch7:         avidemux-plugins-2.5-gcc44.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -157,8 +160,9 @@
 sed -i.bak 's/startDir="lib";/startDir="lib64";/' avidemux/main.cpp
 %endif
 %patch4 -p1 -b .gcc44
-%patch5 -p1 -b .plugdir
-%patch6 -p1 -b .pluggcc44
+%patch5 -p1 -b .altivec
+%patch6 -p1 -b .plugdir
+%patch7 -p1 -b .pluggcc44
 
 %build
 # Out of source build
@@ -244,6 +248,9 @@
 %{_includedir}/ADM_coreConfig.h
 
 %changelog
+* Fri Jul 31 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-3
+- Add patch to fix Altivec build errors on PPC
+
 * Thu Jul 30 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.0-2
 - Reintegrate plugins package as a subpackage