Re: [Gnash-dev] Making error, post-script conflicts.

[Jun Ma]

On 3/25/08, Jun Ma <address@hidden> wrote:
> On 3/25/08, Markus Gothe <address@hidden> wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA256
> >
> > You never run ./autogen.sh did you?
> >
> > //Markus
> >
>
> Sorry, I forgot to do that on this working copy. :)
>

 48 make[3]: Entering directory `/root/disk/gnash-git/gui'
 49 if g++ -DHAVE_CONFIG_H -I. -I. -I..  -DGUI_SDL
-DGUI_CONFIG=\"SDL\" -I.. -I.. -I../server -I../server/parser
-I../server/vm -I..    /libltdl -I../libbase -I../backend
-I../libgeometry -I../libmedia -I../libmedia/ffmpeg -I../libmedia/gst
-DLOCALEDIR=\"/usr/loca    l/share/locale\"
-DPLUGINSDIR=\"/usr/local/lib/gnash/plugins\" -I/usr/include/libxml2
-I/usr/include -pthread      -DPKGDATADI
R=\"/usr/local/share/gnash\" -DRENDERER_CONFIG=\"agg\"
-DMEDIA_CONFIG=\"ffmpeg\" -DTARGET_CONFIG=\"\"
-DCONFIG_CONFIG="\"--enabl    e-gui=SDL --enable-renderer=AGG
--disable-plugins --enable-jpeg --enable-png --disable-glext
--enable-gstreamer=no --enable-medi    a=ffmpeg --with-x=no
--disable-xml\"" -DCXXFLAGS="\"-g -O2 -pthread -pthread     -W
-Wall     -Wcast-align     -Wcast-qual         -Wpointer-arith
-Wreturn-type      -fvisibility-inlines-hidden\"" -I/usr/include/SDL
-D_GNU_SOURCE=1 -D_REENTRANT  -I/usr    /include/agg2
-I/usr/include/freetype2      -g -O2 -pthread -pthread     -W
-Wall     -Wcast-align     -Wcast-qual     -Wpoi    nter-arith
-Wreturn-type      -fvisibility-inlines-hidden -MT sdl_gnash-sdl.o -MD
-MP -MF ".deps/sdl_gnash-sdl.Tpo" -c -o sd    l_gnash-sdl.o `test -f
'sdl.cpp' || echo './'`sdl.cpp; \
 50 >___then mv -f ".deps/sdl_gnash-sdl.Tpo" ".deps/sdl_gnash-sdl.Po";
else rm -f ".deps/sdl_gnash-sdl.Tpo"; exit 1; fi
 51 sdl.cpp: In static member function ‘static int
gnash::SDLGui::sdl_to_gnash_modifier(int)’:
 52 sdl.cpp:297: error: ‘MOD_NONE’ is not a member of ‘gnash::key’
53 sdl.cpp:300: error: ‘MOD_SHIFT’ is not a member of ‘gnash::key’
54 sdl.cpp:303: error: ‘MOD_CONTROL’ is not a member of ‘gnash::key’
 55 sdl.cpp:306: error: ‘MOD_ALT’ is not a member of ‘gnash::key’
 56 make[3]: *** [sdl_gnash-sdl.o] Error 1
 57 make[3]: Leaving directory `/root/disk/gnash-git/gui'
 58 make[2]: *** [all] Error 2
 59 make[2]: Leaving directory `/root/disk/gnash-git/gui'
 60 make[1]: *** [all-recursive] Error 1
 61 make[1]: Leaving directory `/root/disk/gnash-git'
 62 make: *** [all] Error 2

It complains no suchs members exist in gnash::SDLGui::sdl_to_gnash_modifier,

the grep result shows:
address@hidden gnash-git]# grep MOD_NONE * -r
gui/fb.cpp:        int modifier = gnash::key::MOD_NONE;
gui/fltk.cpp:    int modifier = gnash::key::GNASH_MOD_NONE;
gui/gtk.cpp:    int modifier = gnash::key::GNASH_MOD_NONE;
gui/kde.cpp:    int modifier = gnash::key::GNASH_MOD_NONE;
gui/sdl.cpp:  int modifier = gnash::key::MOD_NONE;
server/gnash.h:    GNASH_MOD_NONE = 0,
address@hidden gnash-git]#


CVS log show gnash.h modified several days ago,

   1
   2 RCS file: /sources/gnash/gnash/server/gnash.h,v
   3 Working file: server/gnash.h
   4 head: 1.119
   5 branch:
   6 locks: strict
   7 access list:
   8 symbolic names:
   9 >___release_0_8_2_final: 1.115
  10 >___release_0_8_2_rc1: 1.115.0.2
  11 >___release_0_8_1_final: 1.101
  12 >___release_0_8_1_rc4: 1.101
  13 >___release_0_8_1_rc3: 1.101
  14 >___release_0_8_1_rc2: 1.101
  15 >___release_0_8_1_rc1: 1.101
  16 >___release_0_8_1: 1.101.0.2
  17 >___release_0_8_0_final: 1.97
  18 >___release-0-8-0-final: 1.97
  19 >___release-0-8-0: 1.97.0.4
  20 >___release-0-8-8-0: 1.97.0.2
  21 >___release_0_7_2_final: 1.68.2.2
  22 >___release_0_7_2: 1.68.0.2
  23 >___release_0_7_1: 1.16
  24 keyword substitution: kv
  25 total revisions: 121;>__selected revisions: 121
  26 description:
  27 ----------------------------
  28 revision 1.119
  29 date: 2008-03-22 02:27:23 +0000;  author: dossy;  state: Exp;
lines: +8 -4;  commitid: PnTMYyCkhUyB54Ws;
  30 Fix some macro redefinition issues when compiling with GCC 3.x,
  31 which does not have strongly typed enums.
  32 ----------------------------

make done succ when update MOD_* to GNASH_MOD_* in sdl.cpp
BTW: this situation may still exist in gui/fb.cpp
(int modifier = gnash::key::MOD_NONE;)


-- 
FIXME if it is wrong.