]> git.sesse.net Git - vlc/commitdiff
GPE is integrated in familiar files.
authorJean-Paul Saman <jpsaman@videolan.org>
Tue, 29 Oct 2002 20:52:54 +0000 (20:52 +0000)
committerJean-Paul Saman <jpsaman@videolan.org>
Tue, 29 Oct 2002 20:52:54 +0000 (20:52 +0000)
ipkg/gpe-configure.in.patch [deleted file]
ipkg/gpe.patch [deleted file]

diff --git a/ipkg/gpe-configure.in.patch b/ipkg/gpe-configure.in.patch
deleted file mode 100644 (file)
index 5604bb3..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.in       Fri Oct  4 13:45:02 2002
-+++ configure.gpe.in   Sun Oct  6 22:24:16 2002
-@@ -1508,5 +1508,23 @@
-       PLUGINS="${PLUGINS} familiar"
-     fi
-+    GPE_PATH=""
-+    AC_ARG_WITH(gpe,
-+    [    --with-gpe=PATH gpe path (default search in \$PATH)],
-+    [ if test "x${with_gpe}" != "xno"
-+      then
-+        GPE_PATH="${with_gpe}:${PATH}"
-+      fi ])
-+    ac_cv_gpe_headers=yes
-+    AC_CHECK_HEADERS(gpe/init.h, , [
-+      ac_cv_gpe_headers=no
-+      echo "Cannot find gpe development headers."
-+    ])
-+    if test "x${ac_cv_gtk_headers}" = "xyes"
-+    then
-+      familiar_CFLAGS="${familiar_CFLAGS} -I${GPE_PATH}/libgpewidget"
-+      familiar_LDFLAGS="${familiar_LDFLAGS} -L${GPE_PATH}/libgpewidget -lgpewidget"
-+    fi
-     CPPFLAGS="${save_CPPFLAGS}"
-   fi
- fi
diff --git a/ipkg/gpe.patch b/ipkg/gpe.patch
deleted file mode 100644 (file)
index da36273..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
---- familiar.c Wed Oct  2 23:41:50 2002
-+++ familiar-gpe.c     Sun Oct  6 22:01:23 2002
-@@ -32,6 +32,7 @@
- #include <videolan/vlc.h>
- #include <gtk/gtk.h>
-+#include <gpe/init.h>
- #include "stream_control.h"
- #include "input_ext-intf.h"
-@@ -178,12 +179,9 @@
-     int    i_args   = 1;
-     int    i_dummy  = 0;
--    /* Initialize Gtk+ */
--    gtk_set_locale ();
--
--    /* gtk_init will register stuff with g_atexit, so we need to take
--     * the global lock if we want to be able to intercept the calls */
--    gtk_init( &i_args, &pp_args );
-+   /* Initialize GPE interface */
-+   if (gpe_application_init (&argc, &argv) == FALSE)
-+        exit (1);     
-     /* Create some useful widgets that will certainly be used */
- // FIXME: magic path