Wed Jan 11 15:43:44 2012 UTC ()
SunOS doesn't have u_int8_t etc., so define them in the header where
they are used. Fixes build of several packages using libmp4v2.


(hans)
diff -r1.6 -r1.7 pkgsrc/multimedia/libmp4v2/distinfo
diff -r1.4 -r1.5 pkgsrc/multimedia/libmp4v2/patches/patch-al
cvs diff -r1.6 -r1.7 pkgsrc/multimedia/libmp4v2/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/libmp4v2/Attic/distinfo 2011/01/29 21:00:45 1.6
+++ pkgsrc/multimedia/libmp4v2/Attic/distinfo 2012/01/11 15:43:44 1.7
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: distinfo,v 1.6 2011/01/29 21:00:45 markd Exp $ 1$NetBSD: distinfo,v 1.7 2012/01/11 15:43:44 hans Exp $
2 2
3SHA1 (mpeg4ip-1.6.1.tar.gz) = 2af97fc0da6a5c0bcb7b433c6715967487b80e38 3SHA1 (mpeg4ip-1.6.1.tar.gz) = 2af97fc0da6a5c0bcb7b433c6715967487b80e38
4RMD160 (mpeg4ip-1.6.1.tar.gz) = ee8375d9581cccbbf685f730bb36f3866eaf12f7 4RMD160 (mpeg4ip-1.6.1.tar.gz) = ee8375d9581cccbbf685f730bb36f3866eaf12f7
5Size (mpeg4ip-1.6.1.tar.gz) = 6324289 bytes 5Size (mpeg4ip-1.6.1.tar.gz) = 6324289 bytes
6SHA1 (patch-aa) = d2bcba203cd373f02f9e7c6e45daf4c29c0b2c3a 6SHA1 (patch-aa) = d2bcba203cd373f02f9e7c6e45daf4c29c0b2c3a
7SHA1 (patch-ab) = ddf8650416757f161f156b0928062d39eae7fe3e 7SHA1 (patch-ab) = ddf8650416757f161f156b0928062d39eae7fe3e
8SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9 8SHA1 (patch-ac) = 9e4683fdbbfa3b85941243547773814ea50125a9
9SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56 9SHA1 (patch-ad) = e5dd062d7f17230bf27ffde0fc2db72d8357fd56
10SHA1 (patch-ae) = 9b01cadd24e03cfc1e65968d8d536e474bfec992 10SHA1 (patch-ae) = 9b01cadd24e03cfc1e65968d8d536e474bfec992
11SHA1 (patch-af) = a69e136fbe8db5ae844c90ae5e2f06e86bf2ed85 11SHA1 (patch-af) = a69e136fbe8db5ae844c90ae5e2f06e86bf2ed85
12SHA1 (patch-ag) = 76ec743b051ef39e4edb211a15a2accbf491d0b1 12SHA1 (patch-ag) = 76ec743b051ef39e4edb211a15a2accbf491d0b1
13SHA1 (patch-ah) = b5db1d879cf790c2b9c7e9132b14e1fc59e9cb4d 13SHA1 (patch-ah) = b5db1d879cf790c2b9c7e9132b14e1fc59e9cb4d
14SHA1 (patch-ai) = 8815f81cc09bb36944bf33691aaf9060b545c76e 14SHA1 (patch-ai) = 8815f81cc09bb36944bf33691aaf9060b545c76e
15SHA1 (patch-aj) = f0aeab4c17bb8a737a9ae3d4385c9f2989540ea7 15SHA1 (patch-aj) = f0aeab4c17bb8a737a9ae3d4385c9f2989540ea7
16SHA1 (patch-ak) = 36da5d4d2824cc8b3ac62e10924058dd651cb2a7 16SHA1 (patch-ak) = 36da5d4d2824cc8b3ac62e10924058dd651cb2a7
17SHA1 (patch-al) = f8fe797faf58d3819166c8e06c92d7f2ecf66d07 17SHA1 (patch-al) = 9ddfdeb35655c739c230d66f20e205b899af0b48
cvs diff -r1.4 -r1.5 pkgsrc/multimedia/libmp4v2/patches/Attic/patch-al (expand / switch to unified diff)

--- pkgsrc/multimedia/libmp4v2/patches/Attic/patch-al 2007/11/19 09:48:43 1.4
+++ pkgsrc/multimedia/libmp4v2/patches/Attic/patch-al 2012/01/11 15:43:44 1.5
@@ -1,27 +1,34 @@ @@ -1,27 +1,34 @@
1$NetBSD: patch-al,v 1.4 2007/11/19 09:48:43 dillo Exp $ 1$NetBSD: patch-al,v 1.5 2012/01/11 15:43:44 hans Exp $
2 2
3--- lib/mp4v2/mp4.h.orig 2007-09-28 22:45:11.000000000 +0200 3--- lib/mp4v2/mp4.h.orig 2007-09-28 22:45:11.000000000 +0200
4+++ lib/mp4v2/mp4.h 4+++ lib/mp4v2/mp4.h
5@@ -31,8 +31,22 @@ 5@@ -31,8 +31,29 @@
6 #ifndef __MP4_INCLUDED__ 6 #ifndef __MP4_INCLUDED__
7 #define __MP4_INCLUDED__ 7 #define __MP4_INCLUDED__
8  8
9+#ifdef MPEG4IP 9+#ifdef MPEG4IP
10 /* include system and project specific headers */ 10 /* include system and project specific headers */
11 #include "mpeg4ip.h" 11 #include "mpeg4ip.h"
12+#else 12+#else
13+#include <sys/types.h> 13+#include <sys/types.h>
14+#include <strings.h> 14+#include <strings.h>
15+#include <stdio.h> 15+#include <stdio.h>
16+#include <stdbool.h> 16+#include <stdbool.h>
17+#include <stdint.h> 17+#include <stdint.h>
18+ 18+
19+typedef void (*lib_message_func_t)(int loglevel, 19+typedef void (*lib_message_func_t)(int loglevel,
20+ const char *lib, 20+ const char *lib,
21+ const char *fmt, 21+ const char *fmt,
22+ ...); 22+ ...);
 23+
 24+#ifdef __sun
 25+#define u_int8_t uint8_t
 26+#define u_int16_t uint16_t
 27+#define u_int32_t uint32_t
 28+#define u_int64_t uint64_t
 29+#endif
23+#endif 30+#endif
24+ 31+
25 #include <math.h> /* to define float HUGE_VAL and/or NAN */ 32 #include <math.h> /* to define float HUGE_VAL and/or NAN */
26 #ifndef NAN 33 #ifndef NAN
27 #define NAN HUGE_VAL 34 #define NAN HUGE_VAL