cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build after mesa/gl update, pigment now tries to build an OpenGL ES

Browse Source 
plugin, and fails. Backport https://code.fluendo.com/pigment/trac/changeset/1472
and blindly update the PLIST.
This commit is contained in:
landry 2013-09-08 13:08:15 +00:00
parent 3ee5353b60
commit 8b20b08003
4 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/pigment/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.10 2013/03/21 08:45:19 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.11 2013/09/08 13:08:15 landry Exp $
COMMENT = 3D scene graph library for rich UI
@ -7,7 +7,7 @@ CATEGORIES = graphics
DISTNAME = pigment-0.3.17
MASTER_SITES = http://elisa.fluendo.com/static/download/pigment/
REVISION = 4
REVISION = 5
SHARED_LIBS += pigment-0.3 0.0 \
pigment-gtk-0.3 0.0 \

27
graphics/pigment/patches/patch-plugins_opengles_pgmglesviewport_c Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-plugins_opengles_pgmglesviewport_c,v 1.1 2013/09/08 13:08:16 landry Exp $
https://code.fluendo.com/pigment/trac/changeset/1472
--- plugins/opengles/pgmglesviewport.c.orig Sun Sep 8 15:03:29 2013
+++ plugins/opengles/pgmglesviewport.c Sun Sep 8 15:03:59 2013
@@ -1418,22 +1418,6 @@ pgm_gles_viewport_flush_update_queue (PgmGlesViewport
void
pgm_gles_viewport_update_drawable_projection (PgmGlesViewport *glesviewport)
{
- g_mutex_lock (glesviewport->layer_lock);
-
- /* Adapt position and size of all the drawables */
- g_list_foreach (glesviewport->near_layer,
- (GFunc) pgm_gles_drawable_update_projection, NULL);
- g_list_foreach (glesviewport->middle_layer,
- (GFunc) pgm_gles_drawable_update_projection, NULL);
- g_list_foreach (glesviewport->far_layer,
- (GFunc) pgm_gles_drawable_update_projection, NULL);
-
- g_mutex_unlock (glesviewport->layer_lock);
-}
-
-void
-pgm_gles_viewport_update_drawable_projection (PgmGlesViewport *glesviewport)
-{
GList *near_layer, *middle_layer, *far_layer;
/* Get copies of the layers */

3
graphics/pigment/pkg/PFRAG.shared
View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2009/10/13 19:36:31 landry Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2013/09/08 13:08:16 landry Exp $
@lib lib/libpigment-0.3.so.${LIBpigment-0.3_VERSION}
@lib lib/libpigment-gtk-0.3.so.${LIBpigment-gtk-0.3_VERSION}
@lib lib/libpigment-imaging-0.3.so.${LIBpigment-imaging-0.3_VERSION}
lib/pigment-0.3/0.3.17/libpgmboilerplate.so
lib/pigment-0.3/0.3.17/libpgmopengl.so
lib/pigment-0.3/0.3.17/libpgmopengles.so

4
graphics/pigment/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/10/13 19:36:31 landry Exp $
@comment $OpenBSD: PLIST,v 1.2 2013/09/08 13:08:16 landry Exp $
%%SHARED%%
include/pigment-0.3/
include/pigment-0.3/pgm/
@ -35,6 +35,8 @@ lib/pigment-0.3/0.3.17/libpgmboilerplate.a
lib/pigment-0.3/0.3.17/libpgmboilerplate.la
lib/pigment-0.3/0.3.17/libpgmopengl.a
lib/pigment-0.3/0.3.17/libpgmopengl.la
lib/pigment-0.3/0.3.17/libpgmopengles.a
lib/pigment-0.3/0.3.17/libpgmopengles.la
lib/pkgconfig/
lib/pkgconfig/pigment-0.3.pc
lib/pkgconfig/pigment-gtk-0.3.pc