[gegl] revert premature integration of image viewer



commit 64ea85ad169b9ee7dee52f6e7fd0adc67fc20528
Author: Oyvind Kolas <pippin gimp org>
Date:   Tue Jul 28 17:38:52 2015 +0200

    revert premature integration of image viewer

 bin/Makefile.am |   11 +-
 bin/gegl.c      |    8 -
 bin/mrg-ui.c    | 1410 -------------------------------------------------------
 configure.ac    |   42 --
 4 files changed, 3 insertions(+), 1468 deletions(-)
---
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 91fc956..24e77b4 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -22,13 +22,12 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/gegl/property-types
 
 AM_CFLAGS = \
-       $(DEP_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS) \
-        $(MRG_CFLAGS) $(GEXIV2_CFLAGS)
+       $(DEP_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS)
+
 
 AM_LDFLAGS =  \
        $(no_undefined) ../gegl/libgegl-$(GEGL_API_VERSION).la \
-       $(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO) $(MATH_LIB) \
-        $(MRG_LIBS) $(GEXIV2_LIBS)
+       $(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO) $(MATH_LIB)
 
 bin_PROGRAMS = gegl gegl-tester
 
@@ -42,10 +41,6 @@ gegl_SOURCES =                       \
 gegl_tester_SOURCES = \
        gegl-tester.c
 
-if HAVE_MRG
-gegl_SOURCES += mrg-ui.c
-endif
-
 if HAVE_SPIRO
 gegl_SOURCES += gegl-path-spiro.h gegl-path-spiro.c
 endif
diff --git a/bin/gegl.c b/bin/gegl.c
index b2fe155..e6455a6 100644
--- a/bin/gegl.c
+++ b/bin/gegl.c
@@ -76,8 +76,6 @@ static gboolean file_is_gegl_xml (const gchar *path)
   return FALSE;
 }
 
-int mrg_ui_main (int argc, char **argv);
-
 gint
 main (gint    argc,
       gchar **argv)
@@ -173,12 +171,6 @@ main (gint    argc,
           script = g_strdup (DEFAULT_COMPOSITION);
         }
     }
-  
-  if (o->mode == GEGL_RUN_MODE_DISPLAY)
-    {
-      mrg_ui_main (argc, argv);
-      return 0;
-    }
 
   gegl = gegl_node_new_from_xml (script, path_root);
 
diff --git a/configure.ac b/configure.ac
index 949ecab..ae31682 100644
--- a/configure.ac
+++ b/configure.ac
@@ -646,46 +646,6 @@ AM_CONDITIONAL(HAVE_DOT, test "x$have_dot" = "xyes")
 AM_PATH_PYTHON([2.5.0],, [:])
 AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 
-###############
-# Check for mrg
-###############
-
-AC_ARG_WITH(mrg, [  --without-mrg           build without mrg support])
-
-have_mrg="no"
-if test "x$with_mrg" != "xno"; then
-  PKG_CHECK_MODULES(MRG, mrg,
-    AC_DEFINE(HAVE_MRG, 1,
-                [Define to 1 if the mrg library is available])
-    have_mrg="yes",
-    have_mrg="no  (mrg not found)")
-fi
-
-AM_CONDITIONAL(HAVE_MRG, test "$have_mrg" = "yes")
-
-AC_SUBST(MRG_CFLAGS) 
-AC_SUBST(MRG_LIBS) 
-
-##################
-# Check for gexiv2
-##################
-
-AC_ARG_WITH(gexiv2, [  --without-gexiv2         build without gexiv2 support])
-
-have_gexiv2="no"
-if test "x$with_gexiv2" != "xno"; then
-  PKG_CHECK_MODULES(GEXIV2, gexiv2,
-    AC_DEFINE(HAVE_GEXIV2, 1,
-                [Define to 1 if the gexiv2 library is available])
-    have_gexiv2="yes",
-    have_gexiv2="no  (gexiv2 not found)")
-fi
-
-AM_CONDITIONAL(HAVE_GEXIV2, test "$have_gexiv2" = "yes")
-
-AC_SUBST(GEXIV2_CFLAGS) 
-AC_SUBST(GEXIV2_LIBS) 
-
 #################
 # Check for Cairo
 #################
@@ -1324,7 +1284,6 @@ Optional features:
 Optional dependencies:
   asciidoc:        $have_asciidoc
   enscript:        $have_enscript
-  mrg:             $have_mrg
   Ruby:            $have_ruby
   Lua:             $have_lua
   Cairo:           $have_cairo
@@ -1344,7 +1303,6 @@ Optional dependencies:
   V4L2:            $have_libv4l2
   spiro:           $spiro_ok
   EXIV:            $have_exiv2
-  gexiv2:          $have_gexiv2
   umfpack:         $have_umfpack
   webp:            $have_webp
   poly2tri-c:      $have_p2tc


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]