From 8b20b080037df92742c65ad6117f16b6a6dd2f59 Mon Sep 17 00:00:00 2001 From: landry Date: Sun, 8 Sep 2013 13:08:15 +0000 Subject: [PATCH] Fix build after mesa/gl update, pigment now tries to build an OpenGL ES plugin, and fails. Backport https://code.fluendo.com/pigment/trac/changeset/1472 and blindly update the PLIST. --- graphics/pigment/Makefile | 4 +-- .../patch-plugins_opengles_pgmglesviewport_c | 27 +++++++++++++++++++ graphics/pigment/pkg/PFRAG.shared | 3 ++- graphics/pigment/pkg/PLIST | 4 ++- 4 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 graphics/pigment/patches/patch-plugins_opengles_pgmglesviewport_c diff --git a/graphics/pigment/Makefile b/graphics/pigment/Makefile index 1bfe1354726..29374604c49 100644 --- a/graphics/pigment/Makefile +++ b/graphics/pigment/Makefile @@ -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 \ diff --git a/graphics/pigment/patches/patch-plugins_opengles_pgmglesviewport_c b/graphics/pigment/patches/patch-plugins_opengles_pgmglesviewport_c new file mode 100644 index 00000000000..ca86daa79e8 --- /dev/null +++ b/graphics/pigment/patches/patch-plugins_opengles_pgmglesviewport_c @@ -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 */ diff --git a/graphics/pigment/pkg/PFRAG.shared b/graphics/pigment/pkg/PFRAG.shared index 2706c0f5996..5cecdbdd858 100644 --- a/graphics/pigment/pkg/PFRAG.shared +++ b/graphics/pigment/pkg/PFRAG.shared @@ -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 diff --git a/graphics/pigment/pkg/PLIST b/graphics/pigment/pkg/PLIST index c4638f4cd18..bc674f92cdc 100644 --- a/graphics/pigment/pkg/PLIST +++ b/graphics/pigment/pkg/PLIST @@ -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