Attachment #87861 for bug #124557

View | Details | Raw Unified | Return to bug 124557
Collapse All | Expand All




#

PORTNAME=	gnash
PORTVERSION=	0.8.3
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	http://getgnash.org/packages/releases/ \
		${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}

MAINTAINER=	amdmi3@amdmi3.ru

GNU_CONFIGURE=	yes
WANT_SDL=	yes
WANT_GNOME=	yes
USE_GCC=	4.2+	# triggers compiler error on gcc 3.4
WANT_GSTREAMER=	yes
USE_GNOME=	pkgconfig libxml2
USE_XORG=	x11 xau xdmcp xext xi xinerama ice sm

		--with-npapi-plugindir="${PREFIX}/lib/browser_plugins" \
		--with-kde-pluginprefix="${PREFIX}"

GNASHVER=	${DISTVERSION}

WRKSRC=		${WRKDIR}/${PORTNAME}-${GNASHVER}
PLIST_SUB+=	GNASHVER="${GNASHVER}"

USE_LDCONFIG=	${PREFIX}/lib/gnash

MAN1=		cygnal.1 gnash.1 gprocessor.1 soldumper.1 dumpshm.1

.endif

post-patch:
	@${REINPLACE_CMD} -e 's|^LIBS = |&$${INTLLIBS} |' \
		${WRKSRC}/utilities/Makefile.in ${WRKSRC}/cygnal/Makefile.in
	@${REINPLACE_CMD} -e '/^PTHREAD_[LC][IF]*=/ d' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
		s|/lib64|/lib|g; \

Lines 1-3 Link Here

(-)gnash/distinfo (-3 / +3 lines)
1	MD5 (gnash-0.8.2.tar.bz2) = 05cac831181be3fb40cbf3c00ab25c0f	1	MD5 (gnash-0.8.3.tar.bz2) = 5033ef2602ea1234a9ccb73000a0dedb
2	SHA256 (gnash-0.8.2.tar.bz2) = 4c81e71e6619b79da9641a90ed2c73c362603103bcdcc7b9cc5cc53739d06baa	2	SHA256 (gnash-0.8.3.tar.bz2) = af1fd8454472e0ac588c015b09c67449392f32aa6297d4a625b8344dce11c39a
3	SIZE (gnash-0.8.2.tar.bz2) = 2637636	3	SIZE (gnash-0.8.3.tar.bz2) = 2902610




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__
+

Lines 12-33 Link Here

(-)gnash/pkg-plist (-4 / +15 lines)
12	%%KONQPLUGIN%%lib/kde3/libklashpart.a	12	%%KONQPLUGIN%%lib/kde3/libklashpart.a
13	%%KONQPLUGIN%%lib/kde3/libklashpart.so	13	%%KONQPLUGIN%%lib/kde3/libklashpart.so
14	%%KONQPLUGIN%%lib/kde3/libklashpart.la	14	%%KONQPLUGIN%%lib/kde3/libklashpart.la
15	lib/gnash/libgnashamf-0.8.2.so	15	etc/gnashpluginrc
		16	etc/gnashrc
		17	lib/gnash/libgnashamf-%%GNASHVER%%.so
16	lib/gnash/libgnashamf.a	18	lib/gnash/libgnashamf.a
17	lib/gnash/libgnashamf.la	19	lib/gnash/libgnashamf.la
18	lib/gnash/libgnashamf.so	20	lib/gnash/libgnashamf.so
19	lib/gnash/libgnashbase-0.8.2.so	21	lib/gnash/libgnashbase-%%GNASHVER%%.so
20	lib/gnash/libgnashbase.a	22	lib/gnash/libgnashbase.a
21	lib/gnash/libgnashbase.la	23	lib/gnash/libgnashbase.la
22	lib/gnash/libgnashbase.so	24	lib/gnash/libgnashbase.so
23	lib/gnash/libgnashmedia-0.8.2.so	25	lib/gnash/libgnashmedia-%%GNASHVER%%.so
24	lib/gnash/libgnashmedia.a	26	lib/gnash/libgnashmedia.a
25	lib/gnash/libgnashmedia.la	27	lib/gnash/libgnashmedia.la
26	lib/gnash/libgnashmedia.so	28	lib/gnash/libgnashmedia.so
27	lib/gnash/libgnashserver-0.8.2.so	29	lib/gnash/libgnashnet.a
		30	lib/gnash/libgnashnet.la
		31	lib/gnash/libgnashnet.so
		32	lib/gnash/libgnashnet.so.0
		33	lib/gnash/libgnashserver-%%GNASHVER%%.so
28	lib/gnash/libgnashserver.a	34	lib/gnash/libgnashserver.a
29	lib/gnash/libgnashserver.la	35	lib/gnash/libgnashserver.la
30	lib/gnash/libgnashserver.so	36	lib/gnash/libgnashserver.so
		37	%%FFPLUGIN%%lib/gnash/libmozsdk.a
		38	%%FFPLUGIN%%lib/gnash/libmozsdk.la
		39	%%FFPLUGIN%%lib/gnash/libmozsdk.so
		40	%%FFPLUGIN%%lib/gnash/libmozsdk.so.0
31	%%DOCSDIR%%/gnashuser.html	41	%%DOCSDIR%%/gnashuser.html
32	%%DOCSDIR%%/images/car_crash.png	42	%%DOCSDIR%%/images/car_crash.png
33	%%DOCSDIR%%/images/rtmp.png	43	%%DOCSDIR%%/images/rtmp.png
Lines 40-45 Link Here
40	share/locale/fi/LC_MESSAGES/gnash.mo	50	share/locale/fi/LC_MESSAGES/gnash.mo
41	share/locale/fr/LC_MESSAGES/gnash.mo	51	share/locale/fr/LC_MESSAGES/gnash.mo
42	share/locale/it/LC_MESSAGES/gnash.mo	52	share/locale/it/LC_MESSAGES/gnash.mo
		53	share/locale/ja/LC_MESSAGES/gnash.mo
43	share/locale/sv/LC_MESSAGES/gnash.mo	54	share/locale/sv/LC_MESSAGES/gnash.mo
44	@dirrm %%DATADIR%%	55	@dirrm %%DATADIR%%
45	@dirrm %%DOCSDIR%%/images	56	@dirrm %%DOCSDIR%%/images

Return to bug 124557

Lines 6-15 Link Here

(-)gnash/Makefile (-5 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= gnash	8	PORTNAME= gnash
9	PORTVERSION= 0.8.2	9	PORTVERSION= 0.8.3
10	PORTREVISION= 1
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= ${MASTER_SITE_GNU}	11	MASTER_SITES= http://getgnash.org/packages/releases/ \
		12	${MASTER_SITE_GNU}
13	MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}	13	MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION}
14		14
15	MAINTAINER= amdmi3@amdmi3.ru	15	MAINTAINER= amdmi3@amdmi3.ru
Lines 26-31 Link Here
26	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
27	WANT_SDL= yes	27	WANT_SDL= yes
28	WANT_GNOME= yes	28	WANT_GNOME= yes
		29	USE_GCC= 4.2+ # triggers compiler error on gcc 3.4
29	WANT_GSTREAMER= yes	30	WANT_GSTREAMER= yes
30	USE_GNOME= pkgconfig libxml2	31	USE_GNOME= pkgconfig libxml2
31	USE_XORG= x11 xau xdmcp xext xi xinerama ice sm	32	USE_XORG= x11 xau xdmcp xext xi xinerama ice sm
Lines 41-46 Link Here
41	--with-npapi-plugindir="${PREFIX}/lib/browser_plugins" \	42	--with-npapi-plugindir="${PREFIX}/lib/browser_plugins" \
42	--with-kde-pluginprefix="${PREFIX}"	43	--with-kde-pluginprefix="${PREFIX}"
43		44
		45	GNASHVER= ${DISTVERSION}
		46
		47	WRKSRC= ${WRKDIR}/${PORTNAME}-${GNASHVER}
		48	PLIST_SUB+= GNASHVER="${GNASHVER}"
		49
44	USE_LDCONFIG= ${PREFIX}/lib/gnash	50	USE_LDCONFIG= ${PREFIX}/lib/gnash
45		51
46	MAN1= cygnal.1 gnash.1 gprocessor.1 soldumper.1 dumpshm.1	52	MAN1= cygnal.1 gnash.1 gprocessor.1 soldumper.1 dumpshm.1
Lines 167-174 Link Here
167	.endif	173	.endif
168		174
169	post-patch:	175	post-patch:
170	@${REINPLACE_CMD} -e 's\|^LIBS = \|&$${INTLLIBS} \|' \
171	${WRKSRC}/utilities/Makefile.in ${WRKSRC}/cygnal/Makefile.in
172	@${REINPLACE_CMD} -e '/^PTHREAD_[LC][IF]*=/ d' ${WRKSRC}/configure	176	@${REINPLACE_CMD} -e '/^PTHREAD_[LC][IF]*=/ d' ${WRKSRC}/configure
173	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g; \	177	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g; \
174	s\|/lib64\|/lib\|g; \	178	s\|/lib64\|/lib\|g; \

Lines 1-178 Link Here

(-)gnash/files/patch-backend-render_handler_ogl.h (-178 lines)
1	diff -ruN backend/render_handler_ogl.h.orig backend/render_handler_ogl.h
2	--- backend/render_handler_ogl.h.orig 1970-01-01 03:00:00.000000000 +0300
3	+++ backend/render_handler_ogl.h 2008-05-15 06:18:41.725653935 +0400
4	@@ -0,0 +1,174 @@
5	+//
6	+// Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
7	+//
8	+// This program is free software; you can redistribute it and/or modify
9	+// it under the terms of the GNU General Public License as published by
10	+// the Free Software Foundation; either version 3 of the License, or
11	+// (at your option) any later version.
12	+//
13	+// This program is distributed in the hope that it will be useful,
14	+// but WITHOUT ANY WARRANTY; without even the implied warranty of
15	+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	+// GNU General Public License for more details.
17	+//
18	+// You should have received a copy of the GNU General Public License
19	+// along with this program; if not, write to the Free Software
20	+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21	+
22	+#ifndef __RENDER_HANDLER_OGL_H__
23	+#define __RENDER_HANDLER_OGL_H__
24	+
25	+
26	+#if defined(NOT_SGI_GL) \|\| defined(__APPLE_CC__)
27	+#include <AGL/agl.h>
28	+#include <OpenGL/gl.h>
29	+#include <OpenGL/glu.h>
30	+#include <OpenGL/glext.h>
31	+#define GLUCALLBACKTYPE GLvoid (*)(...)
32	+#else
33	+# define GLUCALLBACKTYPE void (*)()
34	+# include <GL/gl.h>
35	+# ifdef WIN32
36	+# define GL_CLAMP_TO_EDGE 0x812F
37	+# else
38	+# include <GL/glx.h>
39	+# ifdef OSMESA_TESTING
40	+# include <GL/osmesa.h>
41	+# endif // OSMESA_TESTING
42	+# endif
43	+# include <GL/glu.h>
44	+# ifndef APIENTRY
45	+# define APIENTRY
46	+# endif
47	+#endif
48	+
49	+
50	+
51	+
52	+namespace gnash {
53	+
54	+
55	+
56	+
57	+typedef std::vector<const path*> PathRefs;
58	+
59	+
60	+
61	+struct oglVertex {
62	+ oglVertex(double x, double y, double z = 0.0)
63	+ : _x(x), _y(y), _z(z)
64	+ {
65	+ }
66	+
67	+ oglVertex(const point& p)
68	+ : _x(p.x), _y(p.y), _z(0.0)
69	+ {
70	+ }
71	+
72	+ GLdouble _x;
73	+ GLdouble _y;
74	+ GLdouble _z;
75	+};
76	+
77	+typedef std::map< const path*, std::vector<oglVertex> > PathPointMap;
78	+
79	+class Tesselator
80	+{
81	+public:
82	+ Tesselator();
83	+ ~Tesselator();
84	+
85	+ void beginPolygon();
86	+
87	+ void feed(std::vector<oglVertex>& vertices);
88	+
89	+ void tesselate();
90	+
91	+ void beginContour();
92	+ void endContour();
93	+
94	+ void rememberVertex(GLdouble* v);
95	+
96	+ static void
97	+ error(GLenum error);
98	+
99	+ static void combine(GLdouble coords [3], void *vertex_data[4],
100	+ GLfloat weight[4], void *outData, void userdata);
101	+
102	+
103	+
104	+private:
105	+ std::vector<GLdouble*> _vertices;
106	+ GLUtesselator* _tessobj;
107	+};
108	+
109	+class WholeShape
110	+{
111	+public:
112	+ void newPath(const path& new_path)
113	+ {
114	+ PathRefs refs;
115	+ refs.push_back(&new_path);
116	+
117	+ shape.push_back(refs);
118	+ }
119	+
120	+ void addPath(const path& add_path)
121	+ {
122	+ PathRefs& refs = shape.back();
123	+ refs.push_back(&add_path);
124	+ }
125	+
126	+ void addPathRefs(const PathRefs& pathrefs)
127	+ {
128	+
129	+ PathRefs new_refs(pathrefs.begin(), pathrefs.end());
130	+
131	+ shape.push_back(new_refs);
132	+ }
133	+
134	+
135	+ const std::vector<PathRefs>& get() const
136	+ {
137	+ return shape;
138	+ }
139	+
140	+private:
141	+ std::vector<PathRefs> shape;
142	+
143	+};
144	+
145	+
146	+class bitmap_info_ogl : public bitmap_info
147	+{
148	+ public:
149	+ bitmap_info_ogl(image::image_base* image, GLenum pixelformat,
150	+ bool ogl_accessible);
151	+ ~bitmap_info_ogl();
152	+
153	+ void apply(const gnash::matrix& bitmap_matrix,
154	+ render_handler::bitmap_wrap_mode wrap_mode);
155	+ private:
156	+ inline bool ogl_accessible() const;
157	+ void setup();
158	+ void upload(boost::uint8_t* data, size_t width, size_t height);
159	+
160	+ std::auto_ptr<image::image_base> _img;
161	+ GLenum _pixel_format;
162	+ GLenum _ogl_img_type;
163	+ bool _ogl_accessible;
164	+ GLuint _texture_id;
165	+ size_t _orig_width;
166	+ size_t _orig_height;
167	+};
168	+
169	+
170	+
171	+
172	+
173	+
174	+} // namespace gnash
175	+
176	+
177	+#endif // __RENDER_HANDLER_OGL_H__
178	+