Mon Mar 12 11:22:15 2012 UTC ()
Fix build on SunOS.


(fhajny)
diff -r1.21 -r1.22 pkgsrc/multimedia/gpac/Makefile
diff -r1.3 -r1.4 pkgsrc/multimedia/gpac/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/gpac/patches/patch-extra_lib__include__ffmpeg__avio.h
cvs diff -r1.21 -r1.22 pkgsrc/multimedia/gpac/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/gpac/Makefile 2012/03/06 17:38:59 1.21
+++ pkgsrc/multimedia/gpac/Makefile 2012/03/12 11:22:15 1.22
@@ -1,37 +1,43 @@ @@ -1,37 +1,43 @@
1# $NetBSD: Makefile,v 1.21 2012/03/06 17:38:59 ryoon Exp $ 1# $NetBSD: Makefile,v 1.22 2012/03/12 11:22:15 fhajny Exp $
2# 2#
3 3
4DISTNAME= gpac-0.4.5 4DISTNAME= gpac-0.4.5
5PKGREVISION= 15 5PKGREVISION= 15
6CATEGORIES= multimedia 6CATEGORIES= multimedia
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpac/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gpac/}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://gpac.sourceforge.net/ 10HOMEPAGE= http://gpac.sourceforge.net/
11COMMENT= Open source multimedia framework 11COMMENT= Open source multimedia framework
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16MAKE_JOBS_SAFE= no 16MAKE_JOBS_SAFE= no
17 17
18WRKSRC= ${WRKDIR}/gpac 18WRKSRC= ${WRKDIR}/gpac
19USE_TOOLS+= gmake 19USE_TOOLS+= gmake
20USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
21# not really GNU configure, but close enough 21# not really GNU configure, but close enough
22GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
23 23
 24.include "../../mk/bsd.prefs.mk"
 25
24CONFIGURE_ARGS+= --disable-wx 26CONFIGURE_ARGS+= --disable-wx
 27CONFIGURE_ARGS+= --X11-path=${X11BASE}
 28.if ${OPSYS} == "SunOS"
 29CONFIGURE_ARGS+= --enable-pic
 30.endif
25 31
26.include "../../audio/faad2/buildlink3.mk" 32.include "../../audio/faad2/buildlink3.mk"
27.include "../../audio/liba52/buildlink3.mk" 33.include "../../audio/liba52/buildlink3.mk"
28.include "../../audio/libmad/buildlink3.mk" 34.include "../../audio/libmad/buildlink3.mk"
29.include "../../audio/pulseaudio/buildlink3.mk" 35.include "../../audio/pulseaudio/buildlink3.mk"
30.include "../../devel/zlib/buildlink3.mk" 36.include "../../devel/zlib/buildlink3.mk"
31.include "../../graphics/freetype2/buildlink3.mk" 37.include "../../graphics/freetype2/buildlink3.mk"
32.include "../../mk/jpeg.buildlink3.mk" 38.include "../../mk/jpeg.buildlink3.mk"
33.include "../../graphics/png/buildlink3.mk" 39.include "../../graphics/png/buildlink3.mk"
34# doesn't work yet 40# doesn't work yet
35#.include "../../lang/spidermonkey/buildlink3.mk" 41#.include "../../lang/spidermonkey/buildlink3.mk"
36.include "../../multimedia/ffmpeg/buildlink3.mk" 42.include "../../multimedia/ffmpeg/buildlink3.mk"
37.include "../../multimedia/libogg/buildlink3.mk" 43.include "../../multimedia/libogg/buildlink3.mk"
cvs diff -r1.3 -r1.4 pkgsrc/multimedia/gpac/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/gpac/distinfo 2011/02/06 15:50:04 1.3
+++ pkgsrc/multimedia/gpac/distinfo 2012/03/12 11:22:15 1.4
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.3 2011/02/06 15:50:04 wiz Exp $ 1$NetBSD: distinfo,v 1.4 2012/03/12 11:22:15 fhajny Exp $
2 2
3SHA1 (gpac-0.4.5.tar.gz) = 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8 3SHA1 (gpac-0.4.5.tar.gz) = 2ec03c1d7dc3f4d10c0f7b47696cc1e753a56fc8
4RMD160 (gpac-0.4.5.tar.gz) = 21249249a412efa5d1237907cb6b8cfe6282e86f 4RMD160 (gpac-0.4.5.tar.gz) = 21249249a412efa5d1237907cb6b8cfe6282e86f
5Size (gpac-0.4.5.tar.gz) = 4269054 bytes 5Size (gpac-0.4.5.tar.gz) = 4269054 bytes
6SHA1 (patch-aa) = bd4a1314fa80ced3cc4aaa632e4a522f877207a9 6SHA1 (patch-aa) = bd4a1314fa80ced3cc4aaa632e4a522f877207a9
7SHA1 (patch-ab) = 19bb0746ced98fbb438673a406a570cad7aaabb4 7SHA1 (patch-ab) = 19bb0746ced98fbb438673a406a570cad7aaabb4
8SHA1 (patch-ac) = 25f8b92a308b6a70fb160980fe86e7d3e3f3f0ac 8SHA1 (patch-ac) = 25f8b92a308b6a70fb160980fe86e7d3e3f3f0ac
9SHA1 (patch-ad) = 32eac449b1b108937f9a723d7c4ba622182cf9ed 9SHA1 (patch-ad) = 32eac449b1b108937f9a723d7c4ba622182cf9ed
 10SHA1 (patch-extra_lib__include__ffmpeg__avio.h) = dff4609d59ec5da3788e2b613b73075eda0e7af0
File Added: pkgsrc/multimedia/gpac/patches/Attic/patch-extra_lib__include__ffmpeg__avio.h
$NetBSD: patch-extra_lib__include__ffmpeg__avio.h,v 1.1 2012/03/12 11:22:15 fhajny Exp $

SunOS already has offset_t defined.
--- extra_lib/include/ffmpeg/avio.h.orig	2007-05-30 15:54:08.000000000 +0000
+++ extra_lib/include/ffmpeg/avio.h
@@ -23,7 +23,9 @@
 
 /* output byte stream handling */
 
+#if !defined(__sun)
 typedef int64_t offset_t;
+#endif
 
 /* unbuffered I/O */