- added glide patch; now glide supports builds at least

Changed files:
    libggi-glide.patch -> 1.1
    libggi.spec -> 1.94

diff --git a/libggi-glide.patch b/libggi-glide.patch
new file mode 100644 (file)
index 0000000..6b496e0
--- /dev/null
+++ b/libggi-glide.patch
@@ -0,0 +1,43 @@
+--- libggi-2.2.2/display/glide/mode.c.orig     2005-09-19 20:46:42.000000000 +0200
++++ libggi-2.2.2/display/glide/mode.c  2012-01-15 16:25:19.400372178 +0100
+@@ -33,6 +33,7 @@
+ 
+ #include "config.h"
+ #include <ggi/internal/ggi-dl.h>
++#include <ggi/internal/ggi_debug.h>
+ #include <ggi/display/glide.h>
+ #include "../../default/color/color.h"
+ 
+@@ -547,9 +548,9 @@ int GGI_glide_checkmode(ggi_visual *vis,
+       APP_ASSERT(vis != NULL, "glide: Visual NULL in GGIcheckmode");
+ 
+       /* handle AUTO */
+-      _GGIhandle_ggiauto(mode, 640, 480);
++      _GGIhandle_ggiauto(tm, 640, 480);
+ 
+-      mode->graphtype = _GGIhandle_gtauto(mode->graphtype);
++      tm->graphtype = _GGIhandle_gtauto(tm->graphtype);
+ 
+       if (tm->frames == GGI_AUTO) {
+               tm->frames = 1;
+--- libggi-2.2.2/display/glide/visual.c.orig   2005-09-19 20:46:42.000000000 +0200
++++ libggi-2.2.2/display/glide/visual.c        2012-01-15 16:28:15.690378084 +0100
+@@ -32,7 +32,9 @@
+ #include "config.h"
+ #include <ggi/display/glide.h>
+ #include <ggi/display/linvtsw.h>
++#include <ggi/display/monotext.h>
+ #include <ggi/internal/gg_replace.h>
++#include <ggi/internal/ggi_debug.h>
+ 
+ 
+ void _GGI_glide_freedbs(ggi_visual *vis)
+@@ -219,7 +221,7 @@ static int GGIopen(ggi_visual *vis, stru
+               = priv->hwconf.SSTs[currentcard].sstBoard.VoodooConfig.fbRam
+               * 1024 * 1024;
+       priv->setmodesuccess = 0;
+-      MONOTEXT_PRIV(vis) = priv;
++      LIBGGI_PRIVATE(vis) = priv;
+ 
+       /* Has mode management */
+       vis->opdisplay->flush = GGI_glide_flush;

diff --git a/libggi.spec b/libggi.spec
index 1104a375bb388814085c4027187697f4db009a95..c19ad24412faa6dfa2bffc5b651536592ae8539e 100644 (file)
--- a/libggi.spec
+++ b/libggi.spec
@@ -21,12 +21,13 @@ Patch0:             %{name}-ppc.patch
 Patch1:                ac.patch
 Patch2:                link.patch
 Patch3:                %{name}-directfb.patch
+Patch4:                %{name}-glide.patch
 URL:           http://www.ggi-project.org/
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 1.4.15}
+%{?with_glide:BuildRequires:   Glide2x-devel}
 %{?with_aalib:BuildRequires:   aalib-devel}
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
-%{?with_glide:BuildRequires:   glide-devel}
 BuildRequires: libgii-devel >= 1.0.2
 BuildRequires: libtool >= 2:2.0
 BuildRequires: ncurses-devel
@@ -177,6 +178,7 @@ Statyczna biblioteka libggi.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__rm} acinclude.m4 m4/{libtool,lt*}.m4
 
@@ -186,7 +188,7 @@ Statyczna biblioteka libggi.
 %{__autoheader}
 %{__autoconf}
 %{__automake}
-CPPFLAGS="%{rpmcppflags} %{?with_glibde:-I/usr/include/glide} %{?with_directfb:-I/usr/include/directfb -I/usr/include/directfb-internal}"
+CPPFLAGS="%{rpmcppflags} %{?with_glide:-I/usr/include/glide} %{?with_directfb:-I/usr/include/directfb -I/usr/include/directfb-internal}"
 %configure \
        %{!?with_aalib:--disable-aa} \
        %{!?debug:--disable-debug} \