ports/75066: mbone/vic is broken on FreeBSD 5.3 and 6-CURRENT.
KONDOU, Kazuhiro
kazuhiro at alib.jp
Tue Dec 14 19:40:34 UTC 2004
>Number: 75066
>Category: ports
>Synopsis: mbone/vic is broken on FreeBSD 5.3 and 6-CURRENT.
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Dec 14 19:40:27 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: KONDOU, Kazuhiro
>Release: FreeBSD 6.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD feena.alib.jp 6.0-CURRENT FreeBSD 6.0-CURRENT #3: Wed Dec 15 00:19:38 JST 2004 root at feena.alib.jp:/usr/obj/usr/src/sys/FEENA i386
>Description:
vic cannot build on FreeBSD 5.3 and 6-CURRENT. (GCC 3.4)
>How-To-Repeat:
fails in `make build'.
>Fix:
patch-encoder-jpeg.cpp changes following patch.
--- codec/encoder-jpeg.cpp.old Fri Nov 5 20:36:07 1999
+++ codec/encoder-jpeg.cpp Wed Dec 15 02:08:17 2004
@@ -132,6 +132,10 @@
u_short val;
u_short nb;
};
+ static huffentry ldht[];
+ static huffentry cdht[];
+ static huffentry laht[];
+ static huffentry caht[];
int command(int argc, const char*const* argv);
@@ -194,15 +198,15 @@
99, 99, 99, 99, 99, 99, 99, 99,
99, 99, 99, 99, 99, 99, 99, 99 };
-static struct JpegEncoder::huffentry ldht[] = {
+JpegEncoder::huffentry JpegEncoder::ldht[] = {
{0x0, 2}, {0x2, 3}, {0x3, 3}, {0x4, 3}, {0x5, 3}, {0x6, 3},
{0xe, 4}, {0x1e, 5}, {0x3e, 6}, {0x7e, 7}, {0xfe, 8}, {0x1fe, 9}};
-static struct JpegEncoder::huffentry cdht[] = {
+JpegEncoder::huffentry JpegEncoder::cdht[] = {
{0x0, 2}, {0x1, 2}, {0x2, 2}, {0x6, 3}, {0xe, 4}, {0x1e, 5}, {0x3e, 6},
{0x7e, 7}, {0xfe, 8}, {0x1fe, 9}, {0x3fe, 10}, {0x7fe, 11}};
-static struct JpegEncoder::huffentry laht[] = {
+JpegEncoder::huffentry JpegEncoder::laht[] = {
{0x0a, 4}, {0x00, 2}, {0x01, 2}, {0x04, 3},
{0x0b, 4}, {0x1a, 5}, {0x78, 7}, {0xf8, 8},
{0x3f6, 10}, {0xff82, 16}, {0xff83, 16}, {0x00, 0},
@@ -268,7 +272,7 @@
{0xfffc, 16}, {0xfffd, 16}, {0xfffe, 16}, {0x00, 0},
{0x00, 0}, {0x00, 0}, {0x00, 0}, {0x00, 0} };
-static struct JpegEncoder::huffentry caht[] = {
+JpegEncoder::huffentry JpegEncoder::caht[] = {
{0x00, 2}, {0x01, 2}, {0x04, 3}, {0x0a, 4},
{0x18, 5}, {0x19, 5}, {0x38, 6}, {0x78, 7},
{0x1f4, 9}, {0x3f6, 10}, {0xff4, 12}, {0x00, 0},
apply following some patches.
--- codec/tmndec/global.h.old Fri Dec 3 00:52:26 2004
+++ codec/tmndec/global.h Thu Dec 2 02:14:14 2004
@@ -62,6 +62,7 @@
* defined) GLOBAL is defined in exactly one file (tmndec.c) */
#include <stdio.h>
+#include "tmndec.h"
#ifndef GLOBAL
#define EXTERN extern
--- render/color-true.cpp.old Thu Sep 9 21:38:14 1999
+++ render/color-true.cpp Thu Dec 2 02:22:07 2004
@@ -216,7 +216,7 @@
}
protected:
virtual void update();
- virtual void disable() { method_ = True24Method(&WindowRenderer::dither_null); }
+ virtual void disable() { method_ = True24Method(&TrueWindowRenderer24::dither_null); }
True24Method method_;
void map_422(const u_char* frm, u_int off, u_int x,
@@ -264,7 +264,7 @@
}
protected:
virtual void update();
- virtual void disable() { method_ = True32Method(&WindowRenderer::dither_null); }
+ virtual void disable() { method_ = True32Method(&TrueWindowRenderer32::dither_null); }
True32Method method_;
void map_422(const u_char* frm, u_int off, u_int x,
--- render/color-dither.cpp.old Thu Sep 9 21:38:10 1999
+++ render/color-dither.cpp Thu Dec 2 02:22:42 2004
@@ -177,7 +177,7 @@
protected:
DitherColorModel& cm_;
virtual void update();
- virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; }
+ virtual void disable() { method_ = &DitherWindowRenderer::dither_null; }
DitherMethod method_;
void dither_422(const u_char* frm, u_int off, u_int x,
u_int width, u_int height) const;
--- render/color-ed.cpp.old Thu Sep 9 21:38:11 1999
+++ render/color-ed.cpp Thu Dec 2 02:23:19 2004
@@ -180,7 +180,7 @@
protected:
EDColorModel& cm_;
virtual void update();
- virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; }
+ virtual void disable() { method_ = &EDWindowRenderer::dither_null; }
EDMethod method_;
void dither_422(const u_char* frm, u_int off, u_int x,
u_int width, u_int height) const;
--- render/color-gray.cpp.old Thu Sep 9 21:38:11 1999
+++ render/color-gray.cpp Thu Dec 2 02:25:43 2004
@@ -82,7 +82,7 @@
}
protected:
virtual void update();
- virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; }
+ virtual void disable() { method_ = &GrayWindowRenderer::dither_null; }
GrayMethod method_;
};
--- render/color-hi.cpp.old Thu Sep 9 21:38:11 1999
+++ render/color-hi.cpp Thu Dec 2 02:25:28 2004
@@ -196,7 +196,7 @@
protected:
HiColorModel& cm_;
virtual void update();
- virtual void disable() { method_ = HiMethod(&WindowRenderer::dither_null); }
+ virtual void disable() { method_ = HiMethod(&HiWindowRenderer::dither_null); }
HiMethod method_;
void map_422(const u_char* frm, u_int off, u_int x,
u_int width, u_int height) const;
--- render/color-mono.cpp.old Thu Sep 9 21:38:12 1999
+++ render/color-mono.cpp Thu Dec 2 02:25:57 2004
@@ -250,7 +250,7 @@
protected:
MonoColorModel& cm_;
virtual void update();
- virtual void disable() { method_ = &WindowDitherer::dither_null; }
+ virtual void disable() { method_ = &MonoWindowRenderer::dither_null; }
MonoMethod method_;
void dither(const u_char* frm, u_int off, u_int x,
u_int width, u_int height) const;
--- render/color-quant.cpp.old Thu Sep 9 21:38:13 1999
+++ render/color-quant.cpp Thu Dec 2 02:24:39 2004
@@ -92,7 +92,7 @@
protected:
QuantColorModel& cm_;
virtual void update();
- virtual void disable() { method_ = &PseudoWindowRenderer::dither_null; }
+ virtual void disable() { method_ = &QuantWindowRenderer::dither_null; }
QuantMethod method_;
void map_422(const u_char* frm, u_int off, u_int x,
u_int width, u_int height) const;
--- render/rgb-converter.h.old Fri Dec 3 00:52:26 2004
+++ render/rgb-converter.h Thu Dec 2 16:25:31 2004
@@ -37,7 +37,7 @@
#ifndef rgb_converter_h
#define rgb_converter_h
-#include "config.h"
+#include "../config.h"
class Converter {
public:
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list