[Gnash-commit] /srv/bzr/gnash/trunk r12210: Merge various minor changes.

[Benjamin Wolsey]

------------------------------------------------------------
revno: 12210 [merge]
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2010-06-03 17:07:12 +0200
message:
  Merge various minor changes.
  
  Change expected result for System.hasIME because, although it's documented,
  shows no signs of existence on any player.
  
  Drop hasIME member for Gnash.
  
  Commit fix from Bernhard Rosenkraenzer for bug #29937
modified:
  libcore/asobj/flash/system/System_as.cpp
  libvaapi/VaapiContext.h
  libvaapi/VaapiSurfaceProxy.h
  testsuite/actionscript.all/System.as

=== modified file 'libcore/asobj/flash/system/System_as.cpp'
--- a/libcore/asobj/flash/system/System_as.cpp  2010-06-02 20:44:00 +0000
+++ b/libcore/asobj/flash/system/System_as.cpp  2010-06-03 15:07:12 +0000
@@ -175,7 +175,6 @@
     // self-explanatory.
     const bool hasAudioEncoder = true;
     const bool hasEmbeddedVideo = true;
-    const bool hasIME = true;
     const bool hasMP3 = true;
     const bool hasScreenBroadcast = true;
     const bool hasScreenPlayback = true;
@@ -261,7 +260,6 @@
     o.init_member("avHardwareDisable", avHardwareDisable, flags);
     o.init_member("hasAudioEncoder", hasAudioEncoder, flags);
     o.init_member("hasEmbeddedVideo", hasEmbeddedVideo, flags);
-    o.init_member("hasIME", hasIME, flags);
     o.init_member("hasMP3", hasMP3, flags);
     o.init_member("hasPrinting", hasPrinting, flags);
     o.init_member("hasScreenBroadcast", hasScreenBroadcast, flags);

=== modified file 'libvaapi/VaapiContext.h'
--- a/libvaapi/VaapiContext.h   2010-05-04 14:21:15 +0000
+++ b/libvaapi/VaapiContext.h   2010-05-25 11:23:21 +0000
@@ -48,7 +48,7 @@
 };
 
 /// VA context abstraction
-class VaapiContext {
+class DSOEXPORT VaapiContext {
     typedef boost::shared_ptr<VaapiSurface> VaapiSurfaceSP;
     
     VADisplay                           _display;

=== modified file 'libvaapi/VaapiSurfaceProxy.h'
--- a/libvaapi/VaapiSurfaceProxy.h      2010-05-04 14:21:15 +0000
+++ b/libvaapi/VaapiSurfaceProxy.h      2010-05-25 11:23:21 +0000
@@ -30,7 +30,7 @@
 class VaapiImage;
 
 /// VA surface proxy used to release surface to context
-class VaapiSurfaceProxy {
+class DSOEXPORT VaapiSurfaceProxy {
     boost::shared_ptr<VaapiContext> _context;
     boost::shared_ptr<VaapiSurface> _surface;
 

=== modified file 'testsuite/actionscript.all/System.as'
--- a/testsuite/actionscript.all/System.as      2010-06-02 20:44:00 +0000
+++ b/testsuite/actionscript.all/System.as      2010-06-03 15:07:12 +0000
@@ -122,8 +122,8 @@
 check_equals(typeof(System.capabilities.avHardwareDisable), 'boolean');
 check_equals(typeof(System.capabilities.windowlessDisable), 'boolean');
 
-// Not present on Linux player version 9,0,115,0, but is (?) on windows.
-check_equals(typeof(System.capabilities.hasIME), 'boolean');
+// Not present on any known Linux player versions.
+check_equals(typeof(System.capabilities.hasIME), 'undefined');
 note("    System.capabilities.hasIME certainly fails on the pp on\n\
     some platforms. There's no verification that it exists at all so far.");