2 files changed, 178 insertions, 11 deletions

diff --git a/graphics/gnash/files/patch-backend-render_handler_ogl.h b/graphics/gnash/files/patch-backend-render_handler_ogl.h
new file mode 100644
index 000000000000..b4f4382b3e44
--- /dev/null
+++ b/graphics/gnash/files/patch-backend-render_handler_ogl.h
@@ -0,0 +1,178 @@
+diff -ruN backend/render_handler_ogl.h.orig backend/render_handler_ogl.h
+--- backend/render_handler_ogl.h.orig	1970-01-01 03:00:00.000000000 +0300
++++ backend/render_handler_ogl.h	2008-05-15 06:18:41.725653935 +0400
+@@ -0,0 +1,174 @@
++// 
++//   Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++// 
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 3 of the License, or
++// (at your option) any later version.
++// 
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++// GNU General Public License for more details.
++// 
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
++
++#ifndef __RENDER_HANDLER_OGL_H__
++#define __RENDER_HANDLER_OGL_H__
++
++
++#if defined(NOT_SGI_GL) || defined(__APPLE_CC__)
++#include <AGL/agl.h>
++#include <OpenGL/gl.h>
++#include <OpenGL/glu.h>
++#include <OpenGL/glext.h>
++#define GLUCALLBACKTYPE GLvoid (*)(...)
++#else
++# define GLUCALLBACKTYPE void (*)()
++# include <GL/gl.h>
++# ifdef WIN32
++#  define GL_CLAMP_TO_EDGE 0x812F
++# else
++# include <GL/glx.h>
++# ifdef OSMESA_TESTING
++#  include <GL/osmesa.h>
++# endif // OSMESA_TESTING
++# endif
++# include <GL/glu.h>
++# ifndef APIENTRY
++#  define APIENTRY
++# endif
++#endif
++
++
++
++
++namespace gnash {
++
++
++
++
++typedef std::vector<const path*> PathRefs;
++
++
++
++struct oglVertex {
++  oglVertex(double x, double y, double z = 0.0)
++    : _x(x), _y(y), _z(z)
++  {
++  }
++  
++  oglVertex(const point& p)
++    : _x(p.x), _y(p.y), _z(0.0)
++  {
++  }
++
++  GLdouble _x;
++  GLdouble _y;
++  GLdouble _z;
++};
++
++typedef std::map< const path*, std::vector<oglVertex> > PathPointMap;
++
++class Tesselator
++{
++public:
++  Tesselator();  
++  ~Tesselator();
++  
++  void beginPolygon();
++  
++  void feed(std::vector<oglVertex>& vertices);
++  
++  void tesselate();
++  
++  void beginContour();
++  void endContour();
++  
++  void rememberVertex(GLdouble* v);
++  
++  static void
++  error(GLenum error);
++
++  static void combine(GLdouble coords [3], void *vertex_data[4],
++                      GLfloat weight[4], void **outData, void* userdata);
++  
++
++  
++private:
++  std::vector<GLdouble*> _vertices;
++  GLUtesselator* _tessobj;
++};
++
++class WholeShape
++{
++public:
++  void newPath(const path& new_path)
++  {
++    PathRefs refs;
++    refs.push_back(&new_path);
++    
++    shape.push_back(refs);
++  }
++  
++  void addPath(const path& add_path)
++  {
++    PathRefs& refs = shape.back();
++    refs.push_back(&add_path);
++  }
++  
++  void addPathRefs(const PathRefs& pathrefs)
++  {
++  
++    PathRefs new_refs(pathrefs.begin(), pathrefs.end());
++    
++    shape.push_back(new_refs);
++  }
++  
++  
++  const std::vector<PathRefs>& get() const
++  {
++    return shape;
++  }
++  
++private:
++  std::vector<PathRefs> shape;
++
++};
++
++
++class bitmap_info_ogl : public bitmap_info
++{
++  public:
++    bitmap_info_ogl(image::image_base* image, GLenum pixelformat,
++                    bool ogl_accessible);
++    ~bitmap_info_ogl();
++
++    void apply(const gnash::matrix& bitmap_matrix,
++               render_handler::bitmap_wrap_mode wrap_mode);
++  private:
++    inline bool ogl_accessible() const;
++    void setup();    
++    void upload(boost::uint8_t* data, size_t width, size_t height);
++    
++    std::auto_ptr<image::image_base> _img;
++    GLenum _pixel_format;
++    GLenum _ogl_img_type;
++    bool _ogl_accessible;  
++    GLuint _texture_id;
++    size_t _orig_width;
++    size_t _orig_height;
++};
++
++
++
++
++
++
++} // namespace gnash
++
++
++#endif // __RENDER_HANDLER_OGL_H__
++
diff --git a/graphics/gnash/files/patch-utilities-Makefile.in b/graphics/gnash/files/patch-utilities-Makefile.in
deleted file mode 100644
index c12a8846d50d..000000000000
--- a/graphics/gnash/files/patch-utilities-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- utilities/Makefile.in.orig	2007-08-29 15:03:59.000000000 +0000
-+++ utilities/Makefile.in	2007-11-07 20:37:02.000000000 +0000
-@@ -365,7 +365,7 @@
- 	$(top_builddir)/libbase/libgnashbase.la \
- 	$(top_builddir)/backend/libgnashbackend.la \
- 	$(top_builddir)/libamf/libgnashamf.la $(am__append_2) \
--	$(am__append_4) $(GLIB_LIBS) $(GSTREAMER_LIBS)
-+	$(am__append_4) $(GLIB_LIBS) $(GSTREAMER_LIBS) $(INTLLIBS)
- AM_LDFLAGS = \
- 	$(LIBADD_DL) \
- 	$(LIBLTDL) \