Date: Fri, 20 Aug 2004 14:06:49 +0200 From: "Thomas E. Zander" <riggs@rrr.de> To: Matt <matt@xtaz.net> Cc: current@freebsd.org Subject: Re: broken make Message-ID: <20040820120649.GA17512@marvin.riggiland.au> In-Reply-To: <4125E570.70801@xtaz.net> References: <20040820113839.GA93606@stud.fit.vutbr.cz> <4125E570.70801@xtaz.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--aM3YZ0Iwxop3KEKx Content-Type: multipart/mixed; boundary="FL5UXtIhxfXey3p5" Content-Disposition: inline --FL5UXtIhxfXey3p5 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi, On Fri, 20. Aug 2004, at 12:50 +0100, Matt wrote according to [Re: broken make]: > The mplayer port has been broken on -current since the last commit to=20 > the Makefile to enable GTK2. I get this: > [snip] > Stop in /usr/ports/multimedia/mplayer. >=20 > This was mentioned by the port maintainer in this thread: > http://docs.freebsd.org/cgi/mid.cgi?20040817185121.GA16366 >=20 > However I haven't seen anything else about it since. Patch for this is already on the way and will probably committed soon. Until it's done, you could replace ${PORTSDIR}/multimedia/mplayer/files/extra-patch-gcc34 by the attached file. Riggs --=20 - "[...] I talked to the computer at great length and -- explained my view of the Universe to it" said Marvin. --- And what happened?" pressed Ford. ---- "It committed suicide." said Marvin. --FL5UXtIhxfXey3p5 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: attachment; filename=extra-patch-gcc34 Content-Transfer-Encoding: quoted-printable --- libaf/af_format.c.orig Sat Aug 7 20:30:05 2004 +++ libaf/af_format.c Sat Aug 7 20:32:03 2004 @@ -15,8 +15,13 @@ =20 // Integer to float conversion through lrintf() #ifdef HAVE_LRINTF +#ifdef __FreeBSD__ +#include <math.h> +#define lrintf(x) rintf(x) +#else #define __USE_ISOC99 1 #include <math.h> +#endif #else #define lrintf(x) ((int)(x)) #endif --- libavcodec/faandct.c.orig Sat Aug 7 20:45:54 2004 +++ libavcodec/faandct.c Sat Aug 7 20:46:18 2004 @@ -29,6 +29,21 @@ #include "dsputil.h" #include "faandct.h" =20 +#include "config.h" + +// Integer to float conversion through lrintf() +#ifdef HAVE_LRINTF +#ifdef __FreeBSD__ +#include <math.h> +#define lrintf(x) rintf(x) +#else +#define __USE_ISOC99 1 +#include <math.h> +#endif +#else +#define lrintf(x) ((int)(x)) +#endif + #define FLOAT float #ifdef FAAN_POSTSCALE # define SCALE(x) postscale[x] --- libavcodec/mpegaudiodec.c.orig Sat Aug 7 20:43:50 2004 +++ libavcodec/mpegaudiodec.c Sat Aug 7 20:44:23 2004 @@ -27,6 +27,21 @@ #include "mpegaudio.h" #include "dsputil.h" =20 +#include "config.h" + +// Integer to float conversion through lrintf() +#ifdef HAVE_LRINTF +#ifdef __FreeBSD__ +#include <math.h> +#define lrintf(x) rintf(x) +#else +#define __USE_ISOC99 1 +#include <math.h> +#endif +#else +#define lrintf(x) ((int)(x)) +#endif + /* * TODO: * - in low precision mode, use more 16 bit multiplies in synth filter --- libavcodec/mpegvideo.c.orig Sat Aug 7 20:41:35 2004 +++ libavcodec/mpegvideo.c Sat Aug 7 20:42:36 2004 @@ -38,6 +38,21 @@ //#undef NDEBUG //#include <assert.h> =20 +#include "config.h" + +// Integer to float conversion through lrintf() +#ifdef HAVE_LRINTF +#ifdef __FreeBSD__ +#include <math.h> +#define lrintf(x) rintf(x) +#else +#define __USE_ISOC99 1 +#include <math.h> +#endif +#else +#define lrintf(x) ((int)(x)) +#endif + #ifdef CONFIG_ENCODERS static void encode_picture(MpegEncContext *s, int picture_number); #endif //CONFIG_ENCODERS --- libavcodec/wmadec.c.orig Sat Aug 7 20:47:09 2004 +++ libavcodec/wmadec.c Sat Aug 7 20:47:30 2004 @@ -34,6 +34,21 @@ #include "avcodec.h" #include "dsputil.h" =20 +#include "config.h" + +// Integer to float conversion through lrintf() +#ifdef HAVE_LRINTF +#ifdef __FreeBSD__ +#include <math.h> +#define lrintf(x) rintf(x) +#else +#define __USE_ISOC99 1 +#include <math.h> +#endif +#else +#define lrintf(x) ((int)(x)) +#endif + /* size of blocks */ #define BLOCK_MIN_BITS 7 #define BLOCK_MAX_BITS 11 --- libmpcodecs/vf_qp.c.orig Sat Aug 7 20:26:22 2004 +++ libmpcodecs/vf_qp.c Sat Aug 7 20:33:45 2004 @@ -19,10 +19,22 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <math.h> #include <inttypes.h> =20 #include "../config.h" + +// Integer to float conversion through lrintf() +#ifdef HAVE_LRINTF +#ifdef __FreeBSD__ +#include <math.h> +#define lrintf(x) rintf(x) +#else +#define __USE_ISOC99 1 +#include <math.h> +#endif +#else +#define lrintf(x) ((int)(x)) +#endif =20 #ifdef USE_LIBAVCODEC =20 --- libavcodec/dsputil.h.orig Thu Jul 15 02:18:47 2004 +++ libavcodec/dsputil.h Thu Aug 19 23:11:22 2004 @@ -554,7 +554,7 @@ return score;\ } =20 -#ifndef HAVE_LRINTF +#if !defined(HAVE_LRINTF) && !defined(__FreeBSD__) /* XXX: add ISOC specific test to avoid specific BSD testing. */ /* better than nothing implementation. */ /* btw, rintf() is existing on fbsd too -- alex */ --FL5UXtIhxfXey3p5-- --aM3YZ0Iwxop3KEKx Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- iD8DBQFBJelZjdSJKchZls0RAh+7AJ9WQhHHGehBUIVFUYRL1p1XKJES1gCeLxZG 6GhSMj3Ic8DAFwppLrfpn8k= =Ba4E -----END PGP SIGNATURE----- --aM3YZ0Iwxop3KEKx--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040820120649.GA17512>