cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix build for gcc4

Browse Source
This commit is contained in:
espie 2010-05-23 16:20:47 +00:00
parent deebdc0033
commit bc9116d4ff
8 changed files with 84 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
graphics/flash/patches/patch-Lib_flash_cc Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-Lib_flash_cc,v 1.1 2010/05/23 16:20:47 espie Exp $
--- Lib/flash.cc.orig Sun May 23 18:18:13 2010
+++ Lib/flash.cc Sun May 23 18:19:33 2010
@@ -263,7 +263,6 @@ FlashSettings(FlashHandle flashHandle, long settings)
fh->main->program->modifySettings( settings );
}
-int shape_size,shape_nb,shaperecord_size,shaperecord_nb,style_size,style_nb;
void flash_dump(void)
{
@@ -273,3 +272,5 @@ void flash_dump(void)
}
}; /* end of extern C */
+
+int shape_size,shape_nb,shaperecord_size,shaperecord_nb,style_size,style_nb;

12
graphics/flash/patches/patch-Lib_graphic16_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Lib_graphic16_h,v 1.1 2010/05/23 16:20:47 espie Exp $
--- Lib/graphic16.h.orig Sun May 23 18:16:58 2010
+++ Lib/graphic16.h Sun May 23 18:17:04 2010
@@ -24,7 +24,7 @@
class GraphicDevice16: public GraphicDevice {
private:
- long GraphicDevice16::allocColor(Color color);
+ long allocColor(Color color);
public:
GraphicDevice16(FlashDisplay *fd);

12
graphics/flash/patches/patch-Lib_graphic24_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Lib_graphic24_h,v 1.1 2010/05/23 16:20:47 espie Exp $
--- Lib/graphic24.h.orig Sun May 23 18:17:10 2010
+++ Lib/graphic24.h Sun May 23 18:17:17 2010
@@ -24,7 +24,7 @@
class GraphicDevice24: public GraphicDevice {
private:
- long GraphicDevice24::allocColor(Color color);
+ long allocColor(Color color);
public:
GraphicDevice24(FlashDisplay *fd);

12
graphics/flash/patches/patch-Lib_graphic32_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Lib_graphic32_h,v 1.1 2010/05/23 16:20:47 espie Exp $
--- Lib/graphic32.h.orig Sun May 23 18:17:20 2010
+++ Lib/graphic32.h Sun May 23 18:17:25 2010
@@ -24,7 +24,7 @@
class GraphicDevice32: public GraphicDevice {
private:
- long GraphicDevice32::allocColor(Color color);
+ long allocColor(Color color);
public:
GraphicDevice32(FlashDisplay *fd);

19
graphics/flash/patches/patch-Lib_matrix_h Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-Lib_matrix_h,v 1.1 2010/05/23 16:20:47 espie Exp $
--- Lib/matrix.h.orig Sun May 23 18:16:21 2010
+++ Lib/matrix.h Sun May 23 18:16:29 2010
@@ -33,13 +33,13 @@ struct Matrix { (public)
#endif
inline
- long Matrix::getX(long x, long y)
+ long getX(long x, long y)
{
return (long) (x*a+y*b+tx);
};
inline
- long Matrix::getY(long x, long y)
+ long getY(long x, long y)
{
return (long) (x*c+y*d+ty);
};

8
graphics/flash/patches/patch-Lib_shape_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Lib_shape_cc,v 1.1 2002/09/28 22:19:40 naddy Exp $ $OpenBSD: patch-Lib_shape_cc,v 1.2 2010/05/23 16:20:47 espie Exp $
--- Lib/shape.cc.orig Sun Sep 29 00:12:12 2002 --- Lib/shape.cc.orig Wed Jun 7 20:11:08 2000
+++ Lib/shape.cc Sun Sep 29 00:12:24 2002 +++ Lib/shape.cc Sat May 22 16:02:37 2010
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
// //
@ -8,4 +8,4 @@ $OpenBSD: patch-Lib_shape_cc,v 1.1 2002/09/28 22:19:40 naddy Exp $
+#include <math.h> +#include <math.h>
#ifdef RCSID #ifdef RCSID
static char *rcsid = "$Id: patch-Lib_shape_cc,v 1.1 2002/09/28 22:19:40 naddy Exp $"; static char *rcsid = "$Id: patch-Lib_shape_cc,v 1.2 2010/05/23 16:20:47 espie Exp $";

8
graphics/flash/patches/patch-Lib_sound_cc
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Lib_sound_cc,v 1.1.1.1 2001/01/02 12:04:18 reinhard Exp $ $OpenBSD: patch-Lib_sound_cc,v 1.2 2010/05/23 16:20:47 espie Exp $
--- Lib/sound.cc.orig Wed Sep 1 15:10:03 1999 --- Lib/sound.cc.orig Wed Sep 1 17:10:03 1999
+++ Lib/sound.cc Mon Jan 1 18:44:57 2001 +++ Lib/sound.cc Sat May 22 16:02:37 2010
@@ -26,8 +26,12 @@ @@ -26,8 +26,12 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
@ -13,7 +13,7 @@ $OpenBSD: patch-Lib_sound_cc,v 1.1.1.1 2001/01/02 12:04:18 reinhard Exp $
+#endif +#endif
#ifdef RCSID #ifdef RCSID
static char *rcsid = "$Id: patch-Lib_sound_cc,v 1.1.1.1 2001/01/02 12:04:18 reinhard Exp $"; static char *rcsid = "$Id: patch-Lib_sound_cc,v 1.2 2010/05/23 16:20:47 espie Exp $";
@@ -162,7 +166,7 @@ SoundMixer::SoundMixer(char *device) @@ -162,7 +166,7 @@ SoundMixer::SoundMixer(char *device)
} }

8
graphics/flash/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.3 2002/09/28 22:19:40 naddy Exp $ $OpenBSD: patch-Makefile,v 1.4 2010/05/23 16:20:47 espie Exp $
--- Makefile.orig Mon Jun 12 10:19:14 2000 --- Makefile.orig Mon Jun 12 10:19:14 2000
+++ Makefile Sun Sep 29 00:20:10 2002 +++ Makefile Sat May 22 16:02:37 2010
@@ -1,7 +1,36 @@ @@ -1,7 +1,36 @@
-SUBDIRS= Jpeg Zlib Lib Player Plugin Kflash -SUBDIRS= Jpeg Zlib Lib Player Plugin Kflash
+CFLAGS+=-fno-rtti -DXP_UNIX +CFLAGS+=-fno-rtti -DXP_UNIX
@ -17,7 +17,7 @@ $OpenBSD: patch-Makefile,v 1.3 2002/09/28 22:19:40 naddy Exp $
+ graphic24.o graphic32.o matrix.o movie.o \ + graphic24.o graphic32.o matrix.o movie.o \
+ program.o script.o shape.o sound.o \ + program.o script.o shape.o sound.o \
+ sprite.o sqrt.o text.o + sprite.o sqrt.o text.o
+
+OBJS+= jcomapi.o jdapimin.o jdapistd.o jdatasrc.o jdcoefct.o \ +OBJS+= jcomapi.o jdapimin.o jdapistd.o jdatasrc.o jdcoefct.o \
+ jdcolor.o jddctmgr.o jdhuff.o jdinput.o jdmainct.o \ + jdcolor.o jddctmgr.o jdhuff.o jdinput.o jdmainct.o \
+ jdmarker.o jdmaster.o jdmerge.o jdphuff.o jdpostct.o \ + jdmarker.o jdmaster.o jdmerge.o jdphuff.o jdpostct.o \
@ -38,7 +38,7 @@ $OpenBSD: patch-Makefile,v 1.3 2002/09/28 22:19:40 naddy Exp $
+ +
+swfplayer: $(PLAYEROBJS) $(OBJS) +swfplayer: $(PLAYEROBJS) $(OBJS)
+ $(CXX) -o $@ main.o $(OBJS) -L/usr/X11R6/lib -lossaudio -lXext -lX11 -lm + $(CXX) -o $@ main.o $(OBJS) -L/usr/X11R6/lib -lossaudio -lXext -lX11 -lm
+
clean: clean:
- for subdir in $(SUBDIRS); do (cd $$subdir; $(MAKE) clean); done - for subdir in $(SUBDIRS); do (cd $$subdir; $(MAKE) clean); done
+ rm -f $(PLAYEROBJS) $(PLUGINOBJS) $(OBJS) swfplayer + rm -f $(PLAYEROBJS) $(PLUGINOBJS) $(OBJS) swfplayer