GNOME.org
 

[clutter/wip/cogl-winsys-egl: 18/37] backend: remove untested fruity backend

commit 945bb48ec74f18c6ceedb47261484a666494106a
Author: Robert Bragg <robert linux intel com>
Date:   Thu Feb 24 12:05:15 2011 +0000

    backend: remove untested fruity backend
    
    This backend hasn't been used for years now and so because it is
    untested code and almost certainly doesn't work any more it would be a
    burdon to continue trying to maintain it. Considering that we are now
    looking at moving OpenGL window system integration code down from
    Clutter backends into Cogl that will be easier if we don't have to
    consider this backend.

 README.in                                     |    3 -
 clutter/Makefile.am                           |   23 --
 clutter/clutter-main.c                        |   12 -
 clutter/cogl/cogl/Makefile.am                 |    4 -
 clutter/cogl/cogl/winsys/cogl-winsys-fruity.c |   35 --
 clutter/cogl/configure.ac                     |    2 -
 clutter/fruity/clutter-backend-fruity.c       |  302 -----------------
 clutter/fruity/clutter-backend-fruity.h       |   93 -----
 clutter/fruity/clutter-fruity.c               |  443 -------------------------
 clutter/fruity/clutter-fruity.h               |   53 ---
 clutter/fruity/clutter-stage-fruity.c         |  259 ---------------
 clutter/fruity/clutter-stage-fruity.h         |   48 ---
 configure.ac                                  |   38 +--
 doc/reference/clutter/Makefile.am             |    1 -
 doc/reference/clutter/building-clutter.xml    |    2 +-
 15 files changed, 4 insertions(+), 1314 deletions(-)
---
diff --git a/README.in b/README.in
index fc79a07..c89055d 100644
--- a/README.in
+++ b/README.in
@@ -210,9 +210,6 @@ Clutter has additional command line options for the configure script:
         win32:
                 Microsoft Windows(tm) WGL backend.
 
-        fruity:
-                Apple iPod Touch(tm)/iPhone(tm) backend. (EXPERIMENTAL)
-
  --with-imagebackend=[gdk-pixbuf/quartz/internal]
         Select the image loading backend used by COGL
 
diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 5314d7e..480474d 100644
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -536,29 +536,6 @@ clutterosx_includedir = $(clutter_includedir)/osx
 clutterosx_include_HEADERS = $(osx_source_h)
 endif # SUPPORT_OSX
 
-# Fruity backend rules
-fruity_source_c = \
-	$(srcdir)/fruity/clutter-backend-fruity.c	\
-	$(srcdir)/fruity/clutter-stage-fruity.c		\
-	$(srcdir)/fruity/clutter-fruity.c		\
-	$(NULL)
-
-fruity_source_h = \
-	$(srcdir)/fruity/clutter-backend-fruity.h	\
-	$(srcdir)/fruity/clutter-stage-fruity.h		\
-	$(srcdir)/fruity/clutter-fruity.h		\
-	$(NULL)
-
-if SUPPORT_FRUITY
-AM_CFLAGS += -xobjective-c
-
-backend_source_c_priv += $(fruity_source_c)
-backend_source_h_priv += $(fruity_source_h)
-
-clutterfruity_includedir = $(clutter_includedir)/fruity
-clutterfruity_include_HEADERS = $(srcdir)/fruity/clutter-fruity.h
-endif # SUPPORT_FRUITY
-
 # Wayland backend rules
 if SUPPORT_WAYLAND
 backend_source_h += \
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 183f784..c7d2f30 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -665,19 +665,12 @@ clutter_main (void)
   loop = g_main_loop_new (NULL, TRUE);
   main_loops = g_slist_prepend (main_loops, loop);
 
-#ifdef HAVE_CLUTTER_FRUITY
-  /* clutter fruity creates an application that forwards events and manually
-   * spins the mainloop
-   */
-  clutter_fruity_main ();
-#else
   if (g_main_loop_is_running (main_loops->data))
     {
       clutter_threads_leave ();
       g_main_loop_run (loop);
       clutter_threads_enter ();
     }
-#endif
 
   main_loops = g_slist_remove (main_loops, loop);
 
@@ -1406,14 +1399,9 @@ pre_parse_hook (GOptionContext  *context,
   if (env_string)
     clutter_disable_mipmap_text = TRUE;
 
-#ifdef HAVE_CLUTTER_FRUITY
-  /* we always enable fuzzy picking in the "fruity" backend */
-  clutter_use_fuzzy_picking = TRUE;
-#else
   env_string = g_getenv ("CLUTTER_FUZZY_PICK");
   if (env_string)
     clutter_use_fuzzy_picking = TRUE;
-#endif /* HAVE_CLUTTER_FRUITY */
 
   return _clutter_backend_pre_parse (backend, error);
 }
diff --git a/clutter/cogl/cogl/Makefile.am b/clutter/cogl/cogl/Makefile.am
index 0d97216..ce3ff0d 100644
--- a/clutter/cogl/cogl/Makefile.am
+++ b/clutter/cogl/cogl/Makefile.am
@@ -344,10 +344,6 @@ cogl_sources_c += \
        $(srcdir)/winsys/cogl-winsys-egl.c \
        $(srcdir)/winsys/cogl-winsys-stub.c
 endif
-if SUPPORT_EGL_PLATFORM_FRUITY
-cogl_sources_c += \
-       $(srcdir)/winsys/cogl-winsys-fruity.c
-endif
 if SUPPORT_EGL_PLATFORM_DRM_SURFACELESS
 cogl_sources_c += \
        $(srcdir)/winsys/cogl-winsys-egl.c \
diff --git a/clutter/cogl/configure.ac b/clutter/cogl/configure.ac
index 1ef4e40..45bfe8c 100644
--- a/clutter/cogl/configure.ac
+++ b/clutter/cogl/configure.ac
@@ -273,9 +273,7 @@ AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_X11, [false])
 AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_NULL, [false])
 AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_GDL, [false])
 AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_DRM_SURFACELESS, [false])
-AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_FRUITY, [false])
 AM_CONDITIONAL(SUPPORT_OSX, [false])
-AM_CONDITIONAL(SUPPORT_FRUITY, [false])
 AM_CONDITIONAL(SUPPORT_WIN32, [false])
 AM_CONDITIONAL(SUPPORT_CEX100, [false])
 AM_CONDITIONAL(SUPPORT_WAYLAND, [false])
diff --git a/configure.ac b/configure.ac
index 1cb3317..b6b5ade 100644
--- a/configure.ac
+++ b/configure.ac
@@ -195,7 +195,7 @@ experimental_backend=no
 experimental_image=no
 
 AC_ARG_WITH([flavour],
-            [AC_HELP_STRING([--with-flavour=@<:@glx/opengl-egl-xlib/wayland/eglx/eglnative/osx/win32/fruity/cex100@:>@],
+            [AC_HELP_STRING([--with-flavour=@<:@glx/opengl-egl-xlib/wayland/eglx/eglnative/osx/win32/cex100@:>@],
                             [Select the Clutter window system backend])],
             [CLUTTER_FLAVOUR=$with_flavour])
 
@@ -400,25 +400,6 @@ AS_CASE([$CLUTTER_FLAVOUR],
           FLAVOUR_LIBS="$FLAVOUR_LIBS -lgdl $EVDEV_LIBS"
         ],
 
-        [fruity],
-        [
-          experimental_backend="yes"
-          # the GL header is defined in the COGL checks above
-          CLUTTER_STAGE_TYPE="CLUTTER_TYPE_STAGE_FRUITY"
-          AC_DEFINE([HAVE_CLUTTER_FRUITY], [1], [Have the Fruity backend])
-          AC_DEFINE([COGL_HAS_EGL_PLATFORM_FRUITY_SUPPORT], [1],
-                     [Cogl supports OpenGLES using the EGL API with Fruity platform typedefs])
-
-          COGL_DRIVER="gles"
-          # the fruity backend requires a different handling for GLES
-          glesversion=fruity
-
-          FLAVOUR_LIBS="$FLAVOUR_LIBS -ObjC -framework Foundation  -framework CoreFoundation  -framework CoreGraphics  -framework CoreSurface  -framework GraphicsServices  -framework OpenGLES  -framework LayerKit  -framework UIKit"
-
-          CLUTTER_WINSYS=fruity
-          CLUTTER_SONAME_INFIX=fruity
-        ],
-
         [osx],
         [
           experimental_backend="yes"
@@ -460,7 +441,8 @@ AS_CASE([$CLUTTER_FLAVOUR],
           CLUTTER_SONAME_INFIX=win32
         ],
 
-        [AC_MSG_ERROR([Invalid backend for Clutter: use glx, osx, win32, eglx, eglnative or fruity])]
+        [AC_MSG_ERROR([Invalid backend for Clutter: use glx, osx,
+                      win32, eglx or eglnative])]
 )
 
 AS_IF([test "x$SUPPORT_X11" = "x1"],
@@ -534,11 +516,8 @@ AM_CONDITIONAL(SUPPORT_EGL, [test "x$SUPPORT_EGL" = "x1"])
 AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_X11, [test "x$SUPPORT_EGL_PLATFORM_POWERVR_X11" = "x1"])
 AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_NULL, [test "x$SUPPORT_EGL_PLATFORM_POWERVR_NULL" = "x1"])
 AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_POWERVR_GDL, [test "x$SUPPORT_EGL_PLATFORM_POWERVR_GDL" = "x1"])
-AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_FRUITY, [test "x$CLUTTER_WINSYS" = "xfruity"])
 AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_DRM_SURFACELESS, [test "x$SUPPORT_EGL_PLATFORM_DRM_SURFACELESS" = "x1"])
-AM_CONDITIONAL(SUPPORT_EGL_PLATFORM_FRUITY, [test "x$CLUTTER_WINSYS" = "xfruity"])
 AM_CONDITIONAL(SUPPORT_OSX, [test "x$CLUTTER_WINSYS" = "xosx"])
-AM_CONDITIONAL(SUPPORT_FRUITY, [test "x$CLUTTER_WINSYS" = "xfruity"])
 AM_CONDITIONAL(SUPPORT_WIN32, [test "x$CLUTTER_WINSYS" = "xwin32"])
 AM_CONDITIONAL(SUPPORT_CEX100, [test "x$SUPPORT_EGL_PLATFORM_POWERVR_GDL" = "x1"])
 AM_CONDITIONAL(SUPPORT_WAYLAND, [test "x$CLUTTER_WINSYS" = "xwayland"])
@@ -647,17 +626,6 @@ AS_IF([test "x$COGL_DRIVER" = "xgles"],
 	    NEED_SEPARATE_EGL=yes
           ],
 
-          [fruity],
-          [
-            cogl_gl_headers="GLES/gl.h GLES/glext.h"
-            AC_DEFINE([HAVE_COGL_GLES], 1, [Have GL/ES for rendering])
-            cogl_gles_version_define="COGL_HAS_GLES1"
-
-            AC_CHECK_HEADERS([GLES/egl.h],
-                             [],
-                             [AC_MSG_ERROR([Unable to locate required GLES headers])])
-          ],
-
           [AC_MSG_ERROR([Unknown argument for --with-gles])]
         )
       ]
diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am
index adc4785..82b8a83 100644
--- a/doc/reference/clutter/Makefile.am
+++ b/doc/reference/clutter/Makefile.am
@@ -95,7 +95,6 @@ IGNORE_HFILES=\
 	cogl 				\
 	egl 				\
 	evdev				\
-	fruity				\
 	glx 				\
 	osx 				\
 	x11 				\
diff --git a/doc/reference/clutter/building-clutter.xml b/doc/reference/clutter/building-clutter.xml
index 53a8e1b..c922a12 100644
--- a/doc/reference/clutter/building-clutter.xml
+++ b/doc/reference/clutter/building-clutter.xml
@@ -141,7 +141,7 @@
               </varlistentry>
 
               <varlistentry>
-                <term>--with-flavour=[glx/eglx/eglnative/win32/osx/fruity/cex100]</term>
+                <term>--with-flavour=[glx/eglx/eglnative/win32/osx/cex100]</term>
                 <listitem>
                   <para>Select the Clutter backend; default=glx.
                   </para>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]