[csw-devel] SF.net SVN: gar:[8764] csw/mgar/pkg/ffmpeg/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue Feb 23 15:27:48 CET 2010
Revision: 8764
http://gar.svn.sourceforge.net/gar/?rev=8764&view=rev
Author: dmichelsen
Date: 2010-02-23 14:27:48 +0000 (Tue, 23 Feb 2010)
Log Message:
-----------
ffmpeg: Small fix towards clean compile, no int64_t due to not have LP64 on gcc
Modified Paths:
--------------
csw/mgar/pkg/ffmpeg/trunk/Makefile
csw/mgar/pkg/ffmpeg/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch
Modified: csw/mgar/pkg/ffmpeg/trunk/Makefile
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/Makefile 2010-02-23 13:44:04 UTC (rev 8763)
+++ csw/mgar/pkg/ffmpeg/trunk/Makefile 2010-02-23 14:27:48 UTC (rev 8764)
@@ -16,6 +16,7 @@
DISTFILES = $(DISTNAME).tar.bz2
PATCHFILES = gnu-grep.patch
+PATCHFILES += 0001-Use-inttypes-instead-of-stdint.patch
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
Modified: csw/mgar/pkg/ffmpeg/trunk/checksums
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/checksums 2010-02-23 13:44:04 UTC (rev 8763)
+++ csw/mgar/pkg/ffmpeg/trunk/checksums 2010-02-23 14:27:48 UTC (rev 8764)
@@ -1,2 +1,3 @@
+bd1248747b96e9fc36c64c02a1f5f191 0001-Use-inttypes-instead-of-stdint.patch
be8503f15c3b81ba00eb8379ca8dcf33 ffmpeg-0.5.tar.bz2
aa4573b73656b4105abb209eab474680 gnu-grep.patch
Added: csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch
===================================================================
--- csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch (rev 0)
+++ csw/mgar/pkg/ffmpeg/trunk/files/0001-Use-inttypes-instead-of-stdint.patch 2010-02-23 14:27:48 UTC (rev 8764)
@@ -0,0 +1,292 @@
+From 75ce36962bc346787026dcfa754f704240abddec Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 23 Feb 2010 15:25:05 +0100
+Subject: [PATCH] Use inttypes instead of stdint
+
+---
+ libavutil/adler32.h | 2 +-
+ libavutil/aes.h | 2 +-
+ libavutil/base64.h | 2 +-
+ libavutil/bswap.h | 2 +-
+ libavutil/crc.h | 2 +-
+ libavutil/des.h | 2 +-
+ libavutil/fifo.h | 2 +-
+ libavutil/integer.h | 2 +-
+ libavutil/internal.h | 2 +-
+ libavutil/intfloat_readwrite.h | 2 +-
+ libavutil/intreadwrite.h | 2 +-
+ libavutil/lzo.h | 2 +-
+ libavutil/mathematics.h | 2 +-
+ libavutil/md5.h | 2 +-
+ libavutil/rational.h | 3 ++-
+ libavutil/rc4.h | 2 +-
+ libavutil/sha1.h | 2 +-
+ libavutil/softfloat.h | 2 +-
+ libavutil/timer.h | 2 +-
+ libavutil/x86_cpu.h | 2 +-
+ 20 files changed, 21 insertions(+), 20 deletions(-)
+
+diff --git a/libavutil/adler32.h b/libavutil/adler32.h
+index 34f2b53..76e50ad 100644
+--- a/libavutil/adler32.h
++++ b/libavutil/adler32.h
+@@ -21,7 +21,7 @@
+ #ifndef AVUTIL_ADLER32_H
+ #define AVUTIL_ADLER32_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+ #include "common.h"
+
+ unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
+diff --git a/libavutil/aes.h b/libavutil/aes.h
+index 1ca853d..cd7a523 100644
+--- a/libavutil/aes.h
++++ b/libavutil/aes.h
+@@ -21,7 +21,7 @@
+ #ifndef AVUTIL_AES_H
+ #define AVUTIL_AES_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+
+ extern const int av_aes_size;
+
+diff --git a/libavutil/base64.h b/libavutil/base64.h
+index e3152eb..5f3b261 100644
+--- a/libavutil/base64.h
++++ b/libavutil/base64.h
+@@ -21,7 +21,7 @@
+ #ifndef AVUTIL_BASE64_H
+ #define AVUTIL_BASE64_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+
+ /**
+ * Decodes the base64-encoded string in \p in and puts the decoded
+diff --git a/libavutil/bswap.h b/libavutil/bswap.h
+index cf68c43..881fdc2 100644
+--- a/libavutil/bswap.h
++++ b/libavutil/bswap.h
+@@ -26,7 +26,7 @@
+ #ifndef AVUTIL_BSWAP_H
+ #define AVUTIL_BSWAP_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+ #include "config.h"
+ #include "common.h"
+
+diff --git a/libavutil/crc.h b/libavutil/crc.h
+index fa34059..7d587ca 100644
+--- a/libavutil/crc.h
++++ b/libavutil/crc.h
+@@ -21,7 +21,7 @@
+ #ifndef AVUTIL_CRC_H
+ #define AVUTIL_CRC_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+ #include <stddef.h>
+ #include "common.h"
+
+diff --git a/libavutil/des.h b/libavutil/des.h
+index e80bdd3..874ccf1 100644
+--- a/libavutil/des.h
++++ b/libavutil/des.h
+@@ -22,7 +22,7 @@
+ #ifndef AVUTIL_DES_H
+ #define AVUTIL_DES_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+
+ struct AVDES {
+ uint64_t round_keys[3][16];
+diff --git a/libavutil/fifo.h b/libavutil/fifo.h
+index 1a549f2..c3471ba 100644
+--- a/libavutil/fifo.h
++++ b/libavutil/fifo.h
+@@ -24,7 +24,7 @@
+ #ifndef AVUTIL_FIFO_H
+ #define AVUTIL_FIFO_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+ #include "avutil.h"
+ #include "common.h"
+
+diff --git a/libavutil/integer.h b/libavutil/integer.h
+index d4d0201..28fc91d 100644
+--- a/libavutil/integer.h
++++ b/libavutil/integer.h
+@@ -28,7 +28,7 @@
+ #ifndef AVUTIL_INTEGER_H
+ #define AVUTIL_INTEGER_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+ #include "common.h"
+
+ #define AV_INTEGER_SIZE 8
+diff --git a/libavutil/internal.h b/libavutil/internal.h
+index f5f769e..370d7f0 100644
+--- a/libavutil/internal.h
++++ b/libavutil/internal.h
+@@ -31,7 +31,7 @@
+ #endif
+
+ #include <limits.h>
+-#include <stdint.h>
++#include <inttypes.h>
+ #include <stddef.h>
+ #include <assert.h>
+ #include "config.h"
+diff --git a/libavutil/intfloat_readwrite.h b/libavutil/intfloat_readwrite.h
+index e2d5d5b..2abbafd 100644
+--- a/libavutil/intfloat_readwrite.h
++++ b/libavutil/intfloat_readwrite.h
+@@ -21,7 +21,7 @@
+ #ifndef AVUTIL_INTFLOAT_READWRITE_H
+ #define AVUTIL_INTFLOAT_READWRITE_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+ #include "common.h"
+
+ /* IEEE 80 bits extended float */
+diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h
+index 7c5909e..d7c0c6f 100644
+--- a/libavutil/intreadwrite.h
++++ b/libavutil/intreadwrite.h
+@@ -19,7 +19,7 @@
+ #ifndef AVUTIL_INTREADWRITE_H
+ #define AVUTIL_INTREADWRITE_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+ #include "config.h"
+ #include "bswap.h"
+
+diff --git a/libavutil/lzo.h b/libavutil/lzo.h
+index 6788054..736d01a 100644
+--- a/libavutil/lzo.h
++++ b/libavutil/lzo.h
+@@ -22,7 +22,7 @@
+ #ifndef AVUTIL_LZO_H
+ #define AVUTIL_LZO_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+
+ /** \defgroup errflags Error flags returned by av_lzo1x_decode
+ * \{ */
+diff --git a/libavutil/mathematics.h b/libavutil/mathematics.h
+index 782efcc..b138421 100644
+--- a/libavutil/mathematics.h
++++ b/libavutil/mathematics.h
+@@ -21,7 +21,7 @@
+ #ifndef AVUTIL_MATHEMATICS_H
+ #define AVUTIL_MATHEMATICS_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+ #include <math.h>
+ #include "common.h"
+ #include "rational.h"
+diff --git a/libavutil/md5.h b/libavutil/md5.h
+index 969202a..8baaee6 100644
+--- a/libavutil/md5.h
++++ b/libavutil/md5.h
+@@ -21,7 +21,7 @@
+ #ifndef AVUTIL_MD5_H
+ #define AVUTIL_MD5_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+
+ extern const int av_md5_size;
+
+diff --git a/libavutil/rational.h b/libavutil/rational.h
+index 5ee70c9..b022e17 100644
+--- a/libavutil/rational.h
++++ b/libavutil/rational.h
+@@ -28,7 +28,8 @@
+ #ifndef AVUTIL_RATIONAL_H
+ #define AVUTIL_RATIONAL_H
+
+-#include <stdint.h>
++#include <inttypes.h>
++#include <sys/int_types.h>
+ #include "common.h"
+
+ /**
+diff --git a/libavutil/rc4.h b/libavutil/rc4.h
+index 07223a5..2568a8c 100644
+--- a/libavutil/rc4.h
++++ b/libavutil/rc4.h
+@@ -21,7 +21,7 @@
+ #ifndef AVUTIL_RC4_H
+ #define AVUTIL_RC4_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+
+ struct AVRC4 {
+ uint8_t state[256];
+diff --git a/libavutil/sha1.h b/libavutil/sha1.h
+index 0f14ca8..2cfeb4c 100644
+--- a/libavutil/sha1.h
++++ b/libavutil/sha1.h
+@@ -21,7 +21,7 @@
+ #ifndef AVUTIL_SHA1_H
+ #define AVUTIL_SHA1_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+
+ extern const int av_sha1_size;
+
+diff --git a/libavutil/softfloat.h b/libavutil/softfloat.h
+index 97e09ea..7a2e82c 100644
+--- a/libavutil/softfloat.h
++++ b/libavutil/softfloat.h
+@@ -21,7 +21,7 @@
+ #ifndef AVUTIL_SOFTFLOAT_H
+ #define AVUTIL_SOFTFLOAT_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+ #include "common.h"
+
+ #define MIN_EXP -126
+diff --git a/libavutil/timer.h b/libavutil/timer.h
+index 709e12f..9c5b468 100644
+--- a/libavutil/timer.h
++++ b/libavutil/timer.h
+@@ -25,7 +25,7 @@
+ #define AVUTIL_TIMER_H
+
+ #include <stdlib.h>
+-#include <stdint.h>
++#include <inttypes.h>
+ #include "config.h"
+
+ #if ARCH_X86 || ARCH_PPC || ARCH_BFIN
+diff --git a/libavutil/x86_cpu.h b/libavutil/x86_cpu.h
+index d29b7d8..2ff3cb8 100644
+--- a/libavutil/x86_cpu.h
++++ b/libavutil/x86_cpu.h
+@@ -21,7 +21,7 @@
+ #ifndef AVUTIL_X86_CPU_H
+ #define AVUTIL_X86_CPU_H
+
+-#include <stdint.h>
++#include <inttypes.h>
+ #include "config.h"
+
+ #if ARCH_X86_64
+--
+1.6.6
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list