[Gnash-commit] [SCM] Gnash branch, hwaccel, updated. release_0_8_9_final-764-g116d02e

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, hwaccel has been updated
       via  116d02e69545a912560a40b2a9a3e15b142648c4 (commit)
       via  db6cdea10cdf373cc74f8d8761845f29bc8c85c1 (commit)
       via  77da6838eed4e2d01e732887fb2c6a1bded05c1b (commit)
       via  12f40f3fc4819e1fedb530ab34dfa8ba6438702d (commit)
       via  3f6cca586316c7e66e7552555392a054c9a79495 (commit)
       via  2042ef675a2e7048236cd3c2a04cc239c7e70a7a (commit)
       via  a29228a9bfbe94f24afa46a5c956769d506ce4db (commit)
       via  b167ea26a78c8157c4341f323315ad768fa6f561 (commit)
       via  d6ce1c163ddf3dd8d45fe10eb538aa4e9db901c7 (commit)
       via  57d10cb35b0ee1e04c1eb5be9c7282e07c666fcb (commit)
       via  6f3d304f189bfb3ce5ea3b5ff1cbab235bc4612e (commit)
       via  856418a28e9b28b33163b0f6a79bda013a50a924 (commit)
       via  cb9aa89e7ac2cbc4b39d7b5f09b22a045e6050e8 (commit)
       via  3d5783bf91b86369a885a0f5303c34c3f39137c7 (commit)
       via  5f9b8e50df621afc46001425a2b89bee415b3615 (commit)
       via  205b13bdbc9fe50ce13b0d9c947efda5e2010380 (commit)
       via  815855bc09fc2ddadf70b60a79b0a877da043560 (commit)
       via  c7db7bacc77e0e70de89ab5a129300d1e8902eb5 (commit)
       via  2cde99868d849295b17c3e2ba100c556d4740dae (commit)
       via  0c15c95c68c27b1abbbe974ee5deeaf51e11a03f (commit)
       via  262348ccf7b10da92632b824067c58283ab040e7 (commit)
       via  3ef494fedbeae5c41edf7bc3ffddcd25f18f8cf9 (commit)
       via  eeca73a6e741567ef381033978fe9d97d1c4ccf8 (commit)
       via  748f8dfd6ac2cfa7d3a0296613f67090cf8c6b51 (commit)
       via  002fcf0d43a7d8844b8432f84d8546cde1aa0ef2 (commit)
       via  581b90f1d4452cdaade968071bff565817cc84e7 (commit)
       via  9b4a4673d98bed3fde6c6a290085ed771a0c556e (commit)
       via  1f13468479b35f240c4b7c843c570f64abbe851a (commit)
       via  ce42c221e28fef508a43f0f07a345ec55be001b8 (commit)
       via  fca7a99b29e2b723dc6e77f4291922b2dc90d0a8 (commit)
       via  f9779b4d6737b495162becef505f5fdaf92351fc (commit)
       via  1d5e8ed9f5c606f82fac0c7ff6505edb08d7e31f (commit)
       via  23185dee082e2206ab6ef5f47135891b97122227 (commit)
       via  14fd995d6a81e335c249693f44a2912b08fa192f (commit)
       via  d3e8f6854af250b31a1522f017f12fed5c3b00f5 (commit)
       via  de743f6360ef6731db36edb07d52ef3a772d0224 (commit)
       via  f9c278c45a719bd7f291f692a1a58c0c485f5ed6 (commit)
       via  09eb36cad0a3ec3ca6492ac136d782942c1f1829 (commit)
       via  c37db484ccea5cff8dec4c9bd34878462a31e0a9 (commit)
       via  8206b4714302874fdc9204b019c8df18d0e335e0 (commit)
      from  eeb6cd6cad76d184b48900449fa736a5ea8af378 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=116d02e69545a912560a40b2a9a3e15b142648c4


commit 116d02e69545a912560a40b2a9a3e15b142648c4
Merge: eeb6cd6 db6cdea
Author: Rob Savoye <address@hidden>
Date:   Sun May 1 08:26:05 2011 -0600

    merge from master

diff --cc gui/fb/fb.cpp
index d4bdd7a,75f31ff..4902812
--- a/gui/fb/fb.cpp
+++ b/gui/fb/fb.cpp
@@@ -233,52 -234,57 +233,47 @@@ FBGui::init(int argc, char *** argv
      // Initialize all the input devices
  
      // Look for Mice that use the PS/2 mouse protocol
 -    _inputs = InputDevice::scanForDevices(this);
 -    if (_inputs.empty()) {
 +    std::vector<boost::shared_ptr<InputDevice> > possibles
 +        = InputDevice::scanForDevices();
 +    if (possibles.empty()) {
          log_error("Found no accessible input event devices");
 +    } else {
 +        log_debug("Found %d input event devices.", possibles.size());
      }
      
 -    // Open the framebuffer device
 -#ifdef ENABLE_FAKE_FRAMEBUFFER
 -    fd = open(FAKEFB, O_RDWR);
 -#else
 -    fd = open("/dev/fb0", O_RDWR);
 -#endif
 -    if (fd < 0) {
 -        fatal_error("Could not open framebuffer device: %s", strerror(errno));
 -        return false;
 -    }
 -  
 -    // Load framebuffer properties
 -#ifdef ENABLE_FAKE_FRAMEBUFFER
 -    fakefb_ioctl(fd, FBIOGET_VSCREENINFO, &var_screeninfo);
 -    fakefb_ioctl(fd, FBIOGET_FSCREENINFO, &fix_screeninfo);
 +    std::vector<boost::shared_ptr<InputDevice> >::iterator it;
 +    for (it=possibles.begin(); it!=possibles.end(); ++it) {
 +        //(*it)->dump();
 +        if ((*it)->getType() == InputDevice::MOUSE) {
 +            log_debug("WARNING: Mouse support disabled as it conflicts with 
the input event support.");
 +            // For now we only want keyboard input events, as the mouse
 +            // interface default of /dev/input/mice supports hotpluging 
devices,
 +            // unlike the regular events.
 +            // _inputs.push_back(*it);
 +        }
 +        if ((*it)->getType() == InputDevice::KEYBOARD) {
 +            _inputs.push_back(*it);
 +        }
 +        // TSLib also supports linux input events, so we
 +        // use that instead of handling the events directly. The
 +        // Babbage is configured as a tablet when using input events.
 +        if ((*it)->getType() == InputDevice::TOUCHSCREEN) {
 +            log_debug("Enabling Touchscreen support.");
 +            _inputs.push_back(*it);
 +        }
 +        if ((*it)->getType() == InputDevice::TABLET) {
 +#if 1
 +            log_debug("WARNING: Babbage Tablet support disabled as it 
conflicts with TSlib");
  #else
 -    ioctl(fd, FBIOGET_VSCREENINFO, &var_screeninfo);
 -    ioctl(fd, FBIOGET_FSCREENINFO, &fix_screeninfo);
 +            log_debug("Enabling Babbage Touchscreen support");
 +            _inputs.push_back(*it);
  #endif
 -    log_debug(_("Framebuffer device uses %d bytes of memory."),
 -              fix_screeninfo.smem_len);
 -    log_debug(_("Video mode: %dx%d with %d bits per pixel."),
 -              var_screeninfo.xres, var_screeninfo.yres, 
var_screeninfo.bits_per_pixel);
 -
 -    // map framebuffer into memory
 -    fbmem = (unsigned char *)
 -        mmap(0, fix_screeninfo.smem_len, PROT_READ|PROT_WRITE, MAP_SHARED, 
fd, 0);
 -
 -#ifdef ENABLE_DOUBLE_BUFFERING
 -    // allocate offscreen buffer
 -    buffer = (unsigned char*)malloc(fix_screeninfo.smem_len);
 -    memset(buffer, 0, fix_screeninfo.smem_len);
 -#endif  
 -
 -#ifdef PIXELFORMAT_LUT8
 -    // Set grayscale for 8 bit modes
 -    if (var_screeninfo.bits_per_pixel==8) {
 -        if (!set_grayscale_lut8())
 -            return false;
 +        }
 +        if ((*it)->getType() == InputDevice::POWERBUTTON) {
 +            _inputs.push_back(*it);
 +        }
      }
 -#endif
 -
 -    // Set "window" size
 -    _width    = var_screeninfo.xres;
 -    _height   = var_screeninfo.yres;
 -
 +    
- #if 0
-     // FIXME: this allows to draw in a subsection of the screen. OpenVG
-     // should be able to support this, but right now it hust gets in
-     // the way of debugging.
-     
      // Let -j -k override "window" size
      optind = 0; opterr = 0; char c;
      while ((c = getopt (argc, *argv, "j:k:X:Y:")) != -1) {
@@@ -297,28 -303,78 +292,33 @@@
                  break;
          }
      }
 +    
++#if 0
++    // FIXME: this allows to draw in a subsection of the screen. OpenVG
++    // should be able to support this, but right now it just gets in
++    // the way of debugging.
++    
 +    if ( _xpos < 0 ) _xpos += _var_screeninfo.xres - _width;
 +    _xpos = clamp<int>(_xpos, 0, _var_screeninfo.xres-_width);
  
 -    if ( _xpos < 0 ) _xpos += var_screeninfo.xres - _width;
 -    _xpos = clamp<int>(_xpos, 0, var_screeninfo.xres-_width);
 -
 -    if ( _ypos < 0 ) _ypos += var_screeninfo.yres - _height;
 -    _ypos = clamp<int>(_ypos, 0, var_screeninfo.yres-_height);
 +    if ( _ypos < 0 ) _ypos += _var_screeninfo.yres - _height;
 +    _ypos = clamp<int>(_ypos, 0, _var_screeninfo.yres-_height);
  
 -    log_debug("Width:%d, Height:%d", _width, _height);
      log_debug("X:%d, Y:%d", _xpos, _ypos);
 -
 -    _validbounds.setTo(0, 0, _width - 1, _height - 1);    
 -
 -    return true;
 -}
 -
 -bool
 -FBGui::initialize_renderer()
 -{
 -    // GNASH_REPORT_FUNCTION;
 -
 -    const int bpp = var_screeninfo.bits_per_pixel;
 -    const int size = fix_screeninfo.smem_len; 
 -
 -    // TODO: should recalculate!  
 -    unsigned char* mem;
 -    Renderer_agg_base* agg_handler;
 -  
 -#ifdef ENABLE_DOUBLE_BUFFERING
 -    log_debug(_("Double buffering enabled"));
 -    mem = buffer;
 -#else
 -    log_debug(_("Double buffering disabled"));
 -    mem = fbmem;
  #endif
 -  
 -    agg_handler = NULL;
 -  
 -    // choose apropriate pixel format
 -  
 -    log_debug(_("red channel: %d / %d"), var_screeninfo.red.offset, 
 -              var_screeninfo.red.length);
 -    log_debug(_("green channel: %d / %d"), var_screeninfo.green.offset, 
 -              var_screeninfo.green.length);
 -    log_debug(_("blue channel: %d / %d"), var_screeninfo.blue.offset, 
 -              var_screeninfo.blue.length);
 -    log_debug(_("Total bits per pixel: %d"), var_screeninfo.bits_per_pixel);
 -  
 -    const char* pixelformat = agg_detect_pixel_format(
 -        var_screeninfo.red.offset, var_screeninfo.red.length,
 -        var_screeninfo.green.offset, var_screeninfo.green.length,
 -        var_screeninfo.blue.offset, var_screeninfo.blue.length,
 -        bpp
 -        );
 -
 -    if (pixelformat) {    
 -        agg_handler = create_Renderer_agg(pixelformat);      
 -    } else {
 -        fatal_error("The pixel format of your framebuffer could not be 
detected.");
 -        return false;
 -    }
  
 -    assert(agg_handler);
 +    _validbounds.setTo(0, 0, _width - 1, _height - 1);
  
 -    _renderer.reset(agg_handler);
 -
 -    _runResources.setRenderer(_renderer);
 -  
 -    m_rowsize = var_screeninfo.xres_virtual*((bpp+7)/8);
 -  
 -    agg_handler->init_buffer(mem, size, _width, _height, m_rowsize);
 -  
 -    disable_terminal();
 +    if (renderer == "openvg") {
 +        _renderer.reset(renderer::openvg::create_handler(0));     
 +        renderer::openvg::Renderer_ovg *rend = reinterpret_cast
 +            <renderer::openvg::Renderer_ovg *>(_renderer.get());
 +        rend->init(_width, _height);
 +    }
 +    
 +    if (renderer == "agg") {
 +        _renderer.reset(create_Renderer_agg(0));
 +    }
  
      return true;
  }
diff --cc gui/gtk/gtk.am
index 4f967f0,1c83cc5..645a736
--- a/gui/gtk/gtk.am
+++ b/gui/gtk/gtk.am
@@@ -45,20 -48,22 +48,23 @@@ endif      # BUILD_OGL_RENDERE
  if BUILD_AGG_RENDERER
  gtk_gnash_CPPFLAGS += $(AGG_CFLAGS)
  gtk_gnash_SOURCES += gtk/gtk_glue_agg.cpp gtk/gtk_glue_agg.h 
- gtk_gnash_LDADD += $(AGG_LIBS)
 -gtk_gnash_LDADD += $(GNASH_LIBS) \
++gtk_gnash_LDADD += \
+       $(AGG_LIBS) \
+       $(NULL)
 +
  if HAVE_VAAPI
  noinst_HEADERS                += gtk/gtk_glue_agg_vaapi.h
  gtk_gnash_SOURCES     += gtk/gtk_glue_agg_vaapi.cpp
  gtk_gnash_CPPFLAGS    += \
        $(X11_CFLAGS) \
        $(LIBVA_X11_CFLAGS) \
 -      -I$(top_srcdir)/libvaapi \
 +      -I$(top_srcdir)/libdevice/vaapi \
        $(NULL)
  gtk_gnash_LDADD += \
 -      $(top_builddir)/libvaapi/libgnashvaapi.la \
        $(X11_LIBS) \
+       $(LIBVA_LIBS) \
        $(LIBVA_X11_LIBS) \
 +      $(top_builddir)/libdevice/libgnashvaapi.la \
        $(NULL)
  endif   # USE_VAAPI
  endif # BUILD_AGG_RENDERER
@@@ -74,8 -71,9 +80,10 @@@ endif        # BUILD_OVG_RENDERE
  if BUILD_CAIRO_RENDERER
  gtk_gnash_CPPFLAGS += $(CAIRO_CFLAGS)
  gtk_gnash_SOURCES += gtk/gtk_glue_cairo.cpp gtk/gtk_glue_cairo.h 
- gtk_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
-               $(CAIRO_LIBS)
+ gtk_gnash_LDADD += \
+       $(CAIRO_LIBS) \
+       $(NULL)
++
  endif # BUILD_CAIRO_RENDERER
  
  endif # BUILD_GTK_GUI
diff --cc libdevice/vaapi/vaapi.am
index 35a2e50,7d5283e..fb5e840
--- a/libdevice/vaapi/vaapi.am
+++ b/libdevice/vaapi/vaapi.am
@@@ -45,7 -34,30 +45,8 @@@ libgnashvaapi_la_LIBADD = 
        $(LIBVA_X11_LIBS) \
        $(NULL)
  
 -libgnashvaapi_la_SOURCES = \
 -      vaapi_common.h \
 -      vaapi_utils.cpp \
 -      vaapi_utils.h \
 -      VaapiContext.cpp \
 -      VaapiContext.h \
 -      VaapiDisplay.cpp \
 -      VaapiDisplay.h \
 -      VaapiDisplayX11.h \
 -      VaapiException.h \
 -      VaapiGlobalContext.cpp \
 -      VaapiGlobalContext.h \
 -      VaapiImage.cpp \
 -      VaapiImage.h \
 -      VaapiImageFormat.cpp \
 -      VaapiImageFormat.h \
 -      VaapiSubpicture.cpp \
 -      VaapiSubpicture.h \
 -      VaapiSurface.cpp \
 -      VaapiSurface.h \
 -      VaapiSurfaceProxy.cpp \
 -      VaapiSurfaceProxy.h \
 -      $(NULL)
 +libgnashvaapi_la_SOURCES = $(SRCS)
+ 
  if HAVE_VAAPI_GLX
  libgnashvaapi_la_CPPFLAGS += \
        $(LIBVA_GLX_CFLAGS) \

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                                 |   25 ++-
 gui/dump/dump.cpp                            |    2 +-
 gui/fb/fb.cpp                                |   10 +-
 gui/gtk/gtk.am                               |   24 ++-
 libbase/Makefile.am                          |  269 +++++++++++++++-----------
 libcore/asobj/flash/net/FileReference_as.cpp |  112 ++++++------
 libcore/fontlib.cpp                          |   85 +++-----
 libcore/fontlib.h                            |    9 +-
 libdevice/vaapi/vaapi.am                     |    5 +-
 libmedia/Makefile.am                         |  250 ++++++++++++------------
 libsound/Makefile.am                         |   85 +++++----
 packaging/debian/control                     |    2 +-
 testsuite/MovieTester.cpp                    |    6 +
 testsuite/MovieTester.h                      |    3 +
 utilities/Makefile.am                        |    1 +
 15 files changed, 463 insertions(+), 425 deletions(-)


hooks/post-receive
-- 
Gnash