cvs commit: ports/multimedia/libxine Makefile distinfo pkg-plist patch-src:libmad:Makefile.in

[Greg Lewis]

On Thu, Apr 28, 2005 at 02:20:28PM -0700, Kent Stewart wrote:
> On Thursday 28 April 2005 10:33 am, MANTANI Nobutaka wrote:
> > nobutaka    2005-04-28 17:33:54 UTC
> >
> >   FreeBSD ports repository
> >
> >   Log:
> >   Update to 1.0.1.
> >   This version contains the fixes for the MMS and Real RTSP buffer
> > overflow vulnerabilities.
> When you try to upgrade this port on 4-stable, you get the following
> 
>  cc -DHAVE_CONFIG_H -I. -I. -I../.. -I../.. -I../../include 
> -I../../include -I../../src -I../../src/xine-engine 
> -I../../src/xine-engine -I../../src/xine-utils -I../../src/input 
> -I../../src/input -I../../lib -I/usr/local/include -I/usr/X11R6/include 
> -D_THREAD_SAFE -I/usr/X11R6/include -I/usr/local/include/freetype2 
> -I/usr/local/include -pipe -fomit-frame-pointer -malign-functions=4 
> -malign-loops=4 -malign-jumps=4 -mwide-multiply 
> -mpreferred-stack-boundary=2 -fexpensive-optimizations 
> -fschedule-insns2 -fno-strict-aliasing -ffast-math -finline-functions 
> -Wall -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -DXINE_COMPILE 
> -Wnested-externs -Wcast-align -Wchar-subscripts -Wmissing-declarations 
> -Wmissing-prototypes -DENABLE_IPV6 -D_THREAD_SAFE -O -pipe 
> -fno-force-addr -I/usr/local/include -I/usr/local/include/dvdread 
> -I/usr/X11R6/include -c input_rip.c -Wp,-MD,.deps/input_rip.TPlo  -fPIC 
> -DPIC -o .libs/input_rip.o
> input_rip.c: In function `rip_plugin_read':
> input_rip.c:160: syntax error before `PRIdMAX'
> input_rip.c: In function `rip_plugin_read_block':
> input_rip.c:289: syntax error before `PRIdMAX'
> input_rip.c: In function `rip_plugin_seek':
> input_rip.c:395: syntax error before `PRIdMAX'
> input_rip.c: In function `_x_rip_plugin_get_instance':
> input_rip.c:641: syntax error before `PRIdMAX'
> gmake[3]: *** [input_rip.lo] Error 1
> gmake[3]: Leaving directory 
> `/usr/ports/multimedia/libxine/work/xine-lib-1.0.1/src/xine-engine'
> gmake[2]: *** [all-recursive] Error 1
> gmake[2]: Leaving directory 
> `/usr/ports/multimedia/libxine/work/xine-lib-1.0.1/src'
> gmake[1]: *** [all-recursive] Error 1
> gmake[1]: Leaving directory 
> `/usr/ports/multimedia/libxine/work/xine-lib-1.0.1'
> gmake: *** [all] Error 2
> *** Error code 2

Simply replace files/patch-src:xine-engine:xine_internal.h with the
version attached.  This works for me on 4.x (all it does is add appropriate
definitions for PRIdMAX and PRIxMAX).

Nobutaka-san, is this ok to commit?

-- 
Greg Lewis                          Email   : glewis at eyesbeyond.com
Eyes Beyond                         Web     : http://www.eyesbeyond.com
Information Technology              FreeBSD : glewis at FreeBSD.org
-------------- next part --------------
--- src/xine-engine/xine_internal.h.orig	Tue Apr 26 02:09:12 2005
+++ src/xine-engine/xine_internal.h	Fri Apr 29 13:31:27 2005
@@ -70,6 +70,50 @@
 #  include <xine/info_helper.h>
 #endif
 
+#ifndef INT8_MIN
+#define INT8_MIN	(-0x7f-1)
+#endif
+
+#ifndef INT8_MAX
+#define INT8_MAX	0x7f
+#endif
+
+#ifndef PRIiMAX
+#define PRIiMAX	"lld"
+typedef long long intmax_t;
+#endif
+
+#ifndef PRIdMAX
+#define PRIdMAX	"lld"
+#endif
+
+#ifndef	SCNdMAX
+#define SCNdMAX	"lld"
+#endif
+
+#ifndef PRIx32
+#define	PRIx32	"x"
+#endif
+
+#ifndef PRIx16
+#define	PRIx16	"x"
+#endif
+
+#ifndef PRIx8
+#define	PRIx8	"x"
+#endif
+
+#ifndef PRIXMAX
+#define	PRIXMAX	"llX"
+#endif
+
+#ifndef PRIxMAX
+#define	PRIxMAX	"llx"
+#endif
+
+#ifndef UINT64_C
+#define	UINT64_C(c)	(c ## ULL)
+#endif
 
 #define XINE_MAX_EVENT_LISTENERS         50
 #define XINE_MAX_EVENT_TYPES             100