packages: libggi/libggi.spec, libggi/libggi-glide.patch (NEW) - added glide...

[qboosh]

Author: qboosh                       Date: Sun Jan 15 15:37:23 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added glide patch; now glide supports builds at least

---- Files affected:
packages/libggi:
   libggi.spec (1.93 -> 1.94) , libggi-glide.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libggi/libggi.spec
diff -u packages/libggi/libggi.spec:1.93 packages/libggi/libggi.spec:1.94
--- packages/libggi/libggi.spec:1.93	Sat Jan  7 09:57:24 2012
+++ packages/libggi/libggi.spec	Sun Jan 15 16:37:18 2012
@@ -22,12 +22,13 @@
 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
@@ -178,6 +179,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__rm} acinclude.m4 m4/{libtool,lt*}.m4
 
@@ -187,7 +189,7 @@
 %{__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} \
@@ -370,6 +372,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.94  2012/01/15 15:37:18  qboosh
+- added glide patch; now glide supports builds at least
+
 Revision 1.93  2012/01/07 08:57:24  qboosh
 - moved target-related man pages to appropriate packages
 - disable static library by default (building it causes all modules to be built into main

================================================================
Index: packages/libggi/libggi-glide.patch
diff -u /dev/null packages/libggi/libggi-glide.patch:1.1
--- /dev/null	Sun Jan 15 16:37:23 2012
+++ packages/libggi/libggi-glide.patch	Sun Jan 15 16:37:18 2012
@@ -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;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libggi/libggi.spec?r1=1.93&r2=1.94&f=u