ports/70613: mplayer port in 5.2-CURRENT is broken
Thomas E. Zander
riggs at rrr.de
Thu Aug 19 21:50:24 UTC 2004
The following reply was made to PR ports/70613; it has been noted by GNATS.
From: "Thomas E. Zander" <riggs at rrr.de>
To: Oliver Eikemeier <eikemeier at fillmore-labs.com>
Cc: FreeBSD-gnats-submit at FreeBSD.org,
"Eygene A. Ryabinkin" <rea at rea.mbslab.kiae.ru>
Subject: Re: ports/70613: mplayer port in 5.2-CURRENT is broken
Date: Thu, 19 Aug 2004 23:41:34 +0200
--3siQDZowHQqNOShm
Content-Type: multipart/mixed; boundary="/NkBOFFp2J2Af1nK"
Content-Disposition: inline
--/NkBOFFp2J2Af1nK
Content-Type: text/plain; charset=iso-8859-15
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Gentlemen,
Am Wed, dem 18. Aug 2004, um 14:04 +0200 Uhr schrubte Oliver Eikemeier
zum Thema [Re: ports/70613: mplayer port in 5.2-CURRENT is broken]:
> could you please have a look into PR 70613:
> <http://www.freebsd.org/cgi/query-pr.cgi?pr=3D70613>
Could you please verify and (if successful) commit the attached updated
version of extra-patch-gcc34 to the port?
It just encapsulates Eygene's workaround from pr 70613 into the gcc-metapat=
ch,
no big deal.
If it works for you as it does for me, imho pr 70613 can be closed.
Regards,
Riggs
--=20
- Die Welt schl=E4ft tief schon lange Zeit | Sent with RiggiSmooth [tm] -
-- Mich nur flieht die Dunkelheit | ------------------------- --
--- Denn per Infrarot seh ich | just to fit your ---
---- Die Nacht ist wirklich widerlich. | primitive screen. ----
--/NkBOFFp2J2Af1nK
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 */
--/NkBOFFp2J2Af1nK--
--3siQDZowHQqNOShm
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
iD8DBQFBJR6OjdSJKchZls0RAg6MAJwIepjpqnqbXI7Pzld/EDxuqg3PGACdH8Mf
qkJGUyox7VIPQ4cMiITYhXM=
=0udF
-----END PGP SIGNATURE-----
--3siQDZowHQqNOShm--
More information about the freebsd-ports-bugs
mailing list