Revert back to 1.12.2.

Turns out that gnome-shell 3.6 and gdm 3.6 freeze up with cogl/clutter 1.14+


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18852 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 22 insertions, 45 deletions

diff --git a/graphics/clutter/Makefile b/graphics/clutter/Makefile
index f45860a4f..0dae60d26 100644
--- a/graphics/clutter/Makefile
+++ b/graphics/clutter/Makefile
@@ -3,7 +3,7 @@
 #  $MCom: ports/trunk/graphics/clutter/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	clutter
-PORTVERSION=	1.16.0
+PORTVERSION=	1.12.2
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
@@ -25,7 +25,7 @@ USE_GL=		gl
 USE_XORG=	glproto x11 xfixes xdamage xcomposite xi
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-x --enable-conformance=no \
-		--disable-gdk-backend --disable-wayland-backend
+		--disable-gdk-backend
 
 CPPFLAGS+=	-I${LOCALBASE}/include -fno-omit-frame-pointer
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/clutter/distinfo b/graphics/clutter/distinfo
index 6fc649d4e..f72e7363a 100644
--- a/graphics/clutter/distinfo
+++ b/graphics/clutter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clutter-1.16.0.tar.xz) = a213c7859051d6d19b5550c7e433757a35aa8e2b61a43d2eae83dd87912ea8ae
-SIZE (clutter-1.16.0.tar.xz) = 5199388
+SHA256 (clutter-1.12.2.tar.xz) = 27a8c4495099ea33de39c2d9a911a2c9e00ffa4dcc8f94fafedbcc752c0ddf13
+SIZE (clutter-1.12.2.tar.xz) = 4996752
diff --git a/graphics/clutter/pkg-plist b/graphics/clutter/pkg-plist
index ec0bb0100..402e82b3e 100644
--- a/graphics/clutter/pkg-plist
+++ b/graphics/clutter/pkg-plist
@@ -83,7 +83,6 @@ include/clutter-1.0/clutter/clutter-stage-manager.h
 include/clutter-1.0/clutter/clutter-stage.h
 include/clutter-1.0/clutter/clutter-swipe-action.h
 include/clutter-1.0/clutter/clutter-table-layout.h
-include/clutter-1.0/clutter/clutter-tap-action.h
 include/clutter-1.0/clutter/clutter-text-buffer.h
 include/clutter-1.0/clutter/clutter-text.h
 include/clutter-1.0/clutter/clutter-texture.h
@@ -173,13 +172,10 @@ share/doc/cally/ix01.html
 share/doc/cally/ix02.html
 share/doc/cally/ix03.html
 share/doc/cally/ix04.html
-share/doc/cally/left-insensitive.png
 share/doc/cally/left.png
 share/doc/cally/license.html
-share/doc/cally/right-insensitive.png
 share/doc/cally/right.png
 share/doc/cally/style.css
-share/doc/cally/up-insensitive.png
 share/doc/cally/up.png
 %%DOCSDIR%%/ClutterAction.html
 %%DOCSDIR%%/ClutterActor.html
@@ -251,7 +247,6 @@ share/doc/cally/up.png
 %%DOCSDIR%%/ClutterState.html
 %%DOCSDIR%%/ClutterSwipeAction.html
 %%DOCSDIR%%/ClutterTableLayout.html
-%%DOCSDIR%%/ClutterTapAction.html
 %%DOCSDIR%%/ClutterText.html
 %%DOCSDIR%%/ClutterTextBuffer.html
 %%DOCSDIR%%/ClutterTexture.html
@@ -299,7 +294,6 @@ share/doc/cally/up.png
 %%DOCSDIR%%/clutter-Value-intervals.html
 %%DOCSDIR%%/clutter-Versioning-Macros.html
 %%DOCSDIR%%/clutter-Wayland-compositor-specific-support.html
-%%DOCSDIR%%/clutter-Wayland-specific-support.html
 %%DOCSDIR%%/clutter-Win32-Specific-Support.html
 %%DOCSDIR%%/clutter-X11-Specific-Support.html
 %%DOCSDIR%%/clutter-overview.html
@@ -335,8 +329,6 @@ share/doc/cally/up.png
 %%DOCSDIR%%/ix11.html
 %%DOCSDIR%%/ix12.html
 %%DOCSDIR%%/ix13.html
-%%DOCSDIR%%/ix14.html
-%%DOCSDIR%%/left-insensitive.png
 %%DOCSDIR%%/left.png
 %%DOCSDIR%%/license.html
 %%DOCSDIR%%/migrating-ClutterAnimation.html
@@ -347,18 +339,15 @@ share/doc/cally/up.png
 %%DOCSDIR%%/offscreen-redirect.png
 %%DOCSDIR%%/path-alpha-func.png
 %%DOCSDIR%%/pt09.html
-%%DOCSDIR%%/right-insensitive.png
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/running-clutter.html
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/table-layout.png
-%%DOCSDIR%%/up-insensitive.png
 %%DOCSDIR%%/up.png
 %%DOCSDIR%%/using-cairo.html
 share/gir-1.0/Cally-1.0.gir
 share/gir-1.0/Clutter-1.0.gir
 share/gir-1.0/ClutterX11-1.0.gir
-share/locale/an/LC_MESSAGES/clutter-1.0.mo
 share/locale/ar/LC_MESSAGES/clutter-1.0.mo
 share/locale/as/LC_MESSAGES/clutter-1.0.mo
 share/locale/ast/LC_MESSAGES/clutter-1.0.mo
@@ -399,7 +388,6 @@ share/locale/pt/LC_MESSAGES/clutter-1.0.mo
 share/locale/pt_BR/LC_MESSAGES/clutter-1.0.mo
 share/locale/ro/LC_MESSAGES/clutter-1.0.mo
 share/locale/ru/LC_MESSAGES/clutter-1.0.mo
-share/locale/sk/LC_MESSAGES/clutter-1.0.mo
 share/locale/sl/LC_MESSAGES/clutter-1.0.mo
 share/locale/sr/LC_MESSAGES/clutter-1.0.mo
 share/locale/sr@latin/LC_MESSAGES/clutter-1.0.mo
@@ -440,8 +428,6 @@ share/locale/zh_TW/LC_MESSAGES/clutter-1.0.mo
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrmtry share/locale/an/LC_MESSAGES
-@dirrmtry share/locale/an
 @dirrm %%DOCSDIR%%
 @dirrm share/doc/cally
 @dirrm include/clutter-1.0/clutter/x11
diff --git a/graphics/cogl/Makefile b/graphics/cogl/Makefile
index 3ee0b23d6..90a0b408c 100644
--- a/graphics/cogl/Makefile
+++ b/graphics/cogl/Makefile
@@ -3,7 +3,7 @@
 #  $MCom: ports/trunk/graphics/cogl/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	cogl
-PORTVERSION=	1.16.0
+PORTVERSION=	1.12.2
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 
diff --git a/graphics/cogl/distinfo b/graphics/cogl/distinfo
index a5e6b840d..3e548008c 100644
--- a/graphics/cogl/distinfo
+++ b/graphics/cogl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cogl-1.16.0.tar.xz) = 75c2c4636a050fda7ee8722ce3d9c618b08799ed92bbb72b4fdff3e73b096094
-SIZE (cogl-1.16.0.tar.xz) = 1653292
+SHA256 (cogl-1.12.2.tar.xz) = 31971d4c6543c589f6fc49ab1724dfbdc7062c58a7da842cb1935e32ca6e1d7e
+SIZE (cogl-1.12.2.tar.xz) = 1301108
diff --git a/graphics/cogl/files/patch-cogl_Makefile.in b/graphics/cogl/files/patch-cogl_Makefile.in
new file mode 100644
index 000000000..b81265c82
--- /dev/null
+++ b/graphics/cogl/files/patch-cogl_Makefile.in
@@ -0,0 +1,11 @@
+--- cogl/Makefile.in.orig	2013-04-23 19:50:18.000000000 +0000
++++ cogl/Makefile.in	2013-04-23 19:50:27.000000000 +0000
+@@ -192,7 +192,7 @@
+ @SUPPORT_SDL2_TRUE@       $(srcdir)/winsys/cogl-winsys-sdl2.c \
+ @SUPPORT_SDL2_TRUE@       $(srcdir)/cogl-sdl.c
+ 
+-@SUPPORT_GLX_TRUE@am__append_28 = -ldl
++@SUPPORT_GLX_TRUE@am__append_28 =
+ @HAVE_INTROSPECTION_TRUE@am__append_29 = Cogl-1.0.gir
+ @HAVE_INTROSPECTION_TRUE@am__append_30 = $(gir_DATA) $(typelib_DATA)
+ subdir = cogl
diff --git a/graphics/cogl/files/patch-cogl_cogl-attribute-buffer.c b/graphics/cogl/files/patch-cogl_cogl-attribute-buffer.c
deleted file mode 100644
index 3243e49cf..000000000
--- a/graphics/cogl/files/patch-cogl_cogl-attribute-buffer.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- cogl/cogl-attribute-buffer.c.orig	2013-10-31 12:42:44.000000000 +0100
-+++ cogl/cogl-attribute-buffer.c	2013-10-31 12:47:49.000000000 +0100
-@@ -37,7 +37,6 @@
- static void _cogl_attribute_buffer_free (CoglAttributeBuffer *array);
- 
- COGL_BUFFER_DEFINE (AttributeBuffer, attribute_buffer);
--COGL_GTYPE_DEFINE_CLASS (AttributeBuffer, attribute_buffer);
- 
- CoglAttributeBuffer *
- cogl_attribute_buffer_new_with_size (CoglContext *context,
diff --git a/graphics/cogl/pkg-plist b/graphics/cogl/pkg-plist
index 5fc46733f..fa97aeb7a 100644
--- a/graphics/cogl/pkg-plist
+++ b/graphics/cogl/pkg-plist
@@ -1,10 +1,4 @@
 include/cogl/cogl-pango/cogl-pango.h
-include/cogl/cogl-path/cogl-path-enum-types.h
-include/cogl/cogl-path/cogl-path-types.h
-include/cogl/cogl-path/cogl-path.h
-include/cogl/cogl-path/cogl1-path-functions.h
-include/cogl/cogl-path/cogl2-path-functions.h
-include/cogl/cogl/cogl-atlas-texture.h
 include/cogl/cogl/cogl-attribute-buffer.h
 include/cogl/cogl/cogl-attribute.h
 include/cogl/cogl/cogl-bitmap.h
@@ -19,28 +13,24 @@ include/cogl/cogl/cogl-deprecated.h
 include/cogl/cogl/cogl-depth-state.h
 include/cogl/cogl/cogl-display.h
 include/cogl/cogl/cogl-enum-types.h
-include/cogl/cogl/cogl-error.h
 include/cogl/cogl/cogl-euler.h
-include/cogl/cogl/cogl-fence.h
 include/cogl/cogl/cogl-fixed.h
-include/cogl/cogl/cogl-frame-info.h
 include/cogl/cogl/cogl-framebuffer.h
 include/cogl/cogl/cogl-gles2-types.h
 include/cogl/cogl/cogl-gles2.h
 include/cogl/cogl/cogl-glib-source.h
 include/cogl/cogl/cogl-index-buffer.h
 include/cogl/cogl/cogl-indices.h
-include/cogl/cogl/cogl-macros.h
 include/cogl/cogl/cogl-material-compat.h
-include/cogl/cogl/cogl-matrix-stack.h
 include/cogl/cogl/cogl-matrix.h
 include/cogl/cogl/cogl-meta-texture.h
 include/cogl/cogl/cogl-object.h
 include/cogl/cogl/cogl-offscreen.h
 include/cogl/cogl/cogl-onscreen-template.h
 include/cogl/cogl/cogl-onscreen.h
-include/cogl/cogl/cogl-output.h
 include/cogl/cogl/cogl-pango.h
+include/cogl/cogl/cogl-path-functions.h
+include/cogl/cogl/cogl-path.h
 include/cogl/cogl/cogl-pipeline-layer-state.h
 include/cogl/cogl/cogl-pipeline-state.h
 include/cogl/cogl/cogl-pipeline.h
@@ -55,7 +45,6 @@ include/cogl/cogl/cogl-shader.h
 include/cogl/cogl/cogl-snippet.h
 include/cogl/cogl/cogl-sub-texture.h
 include/cogl/cogl/cogl-swap-chain.h
-include/cogl/cogl/cogl-texture-2d-gl.h
 include/cogl/cogl/cogl-texture-2d-sliced.h
 include/cogl/cogl/cogl-texture-2d.h
 include/cogl/cogl/cogl-texture-3d.h
@@ -70,7 +59,9 @@ include/cogl/cogl/cogl-xlib-renderer.h
 include/cogl/cogl/cogl-xlib.h
 include/cogl/cogl/cogl.h
 include/cogl/cogl/cogl1-context.h
+include/cogl/cogl/cogl2-compatibility.h
 include/cogl/cogl/cogl2-experimental.h
+include/cogl/cogl/cogl2-path.h
 include/cogl/cogl/gl-prototypes/cogl-core-functions.h
 include/cogl/cogl/gl-prototypes/cogl-gles2-functions.h
 include/cogl/cogl/gl-prototypes/cogl-glsl-functions.h
@@ -134,7 +125,6 @@ share/locale/pl/LC_MESSAGES/cogl.mo
 share/locale/pt/LC_MESSAGES/cogl.mo
 share/locale/pt_BR/LC_MESSAGES/cogl.mo
 share/locale/ru/LC_MESSAGES/cogl.mo
-share/locale/sk/LC_MESSAGES/cogl.mo
 share/locale/sl/LC_MESSAGES/cogl.mo
 share/locale/sr/LC_MESSAGES/cogl.mo
 share/locale/sr@latin/LC_MESSAGES/cogl.mo