From owner-cvs-all@FreeBSD.ORG Fri Apr 29 19:40:34 2005 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A9AC116A4CE; Fri, 29 Apr 2005 19:40:34 +0000 (GMT) Received: from misty.eyesbeyond.com (glewis.dsl.xmission.com [166.70.56.15]) by mx1.FreeBSD.org (Postfix) with ESMTP id E3DB943D2D; Fri, 29 Apr 2005 19:40:33 +0000 (GMT) (envelope-from glewis@eyesbeyond.com) Received: from misty.eyesbeyond.com (localhost.eyesbeyond.com [127.0.0.1]) by misty.eyesbeyond.com (8.13.3/8.13.3) with ESMTP id j3TJeWxi045284; Fri, 29 Apr 2005 13:40:32 -0600 (MDT) (envelope-from glewis@eyesbeyond.com) Received: (from glewis@localhost) by misty.eyesbeyond.com (8.13.3/8.13.3/Submit) id j3TJeV1L045281; Fri, 29 Apr 2005 13:40:31 -0600 (MDT) (envelope-from glewis@eyesbeyond.com) X-Authentication-Warning: misty.eyesbeyond.com: glewis set sender to glewis@eyesbeyond.com using -f Date: Fri, 29 Apr 2005 13:40:31 -0600 From: Greg Lewis To: Kent Stewart Message-ID: <20050429194031.GA45237@misty.eyesbeyond.com> References: <200504281733.j3SHXsKm065013@repoman.freebsd.org> <200504281420.29102.kstewart@owt.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="bp/iNruPH9dso1Pn" Content-Disposition: inline In-Reply-To: <200504281420.29102.kstewart@owt.com> User-Agent: Mutt/1.4.2.1i cc: cvs-ports@FreeBSD.org cc: MANTANI Nobutaka cc: cvs-all@FreeBSD.org cc: ports-committers@FreeBSD.org Subject: Re: cvs commit: ports/multimedia/libxine Makefile distinfo pkg-plist patch-src:libmad:Makefile.in X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2005 19:40:34 -0000 --bp/iNruPH9dso1Pn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline 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@eyesbeyond.com Eyes Beyond Web : http://www.eyesbeyond.com Information Technology FreeBSD : glewis@FreeBSD.org --bp/iNruPH9dso1Pn Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch-src:xine-engine:xine_internal.h" --- 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 #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 --bp/iNruPH9dso1Pn--