Author: tpg
Date: Thu Feb 15 10:04:43 2007
New Revision: 121290
Added:
packages/cooker/libggi/current/SOURCES/libggi-2.0.1-no-lcd823-ppc.patch
packages/cooker/libggi/current/SOURCES/libggi-2.0.3-xpath.patch
packages/cooker/libggi/current/SOURCES/libggi-2.1.0-gcc4.patch
packages/cooker/libggi/current/SOURCES/libggi-2.1.0-lib64.patch
packages/cooker/libggi/current/SOURCES/libggi-2.1.0-libtool.patch
packages/cooker/libggi/current/SOURCES/libggi-2.1.1-glibc2.4-fix.patch
packages/cooker/libggi/current/SOURCES/libggi-2.2.2.src.tar.bz2 (contents,
props changed)
Removed:
packages/cooker/libggi/current/SOURCES/libggi-2.0.1-no-lcd823-ppc.patch.bz2
packages/cooker/libggi/current/SOURCES/libggi-2.0.3-xpath.patch.bz2
packages/cooker/libggi/current/SOURCES/libggi-2.1.0-gcc4.patch.bz2
packages/cooker/libggi/current/SOURCES/libggi-2.1.0-lib64.patch.bz2
packages/cooker/libggi/current/SOURCES/libggi-2.1.0-libtool.patch.bz2
packages/cooker/libggi/current/SOURCES/libggi-2.1.1-glibc2.4-fix.patch.bz2
packages/cooker/libggi/current/SOURCES/libggi-2.1.1.src.tar.bz2
Modified:
packages/cooker/libggi/current/SPECS/libggi.spec
Log:
- new version
- bunzip patches
- spec file clean
Added: packages/cooker/libggi/current/SOURCES/libggi-2.0.1-no-lcd823-ppc.patch
==============================================================================
--- (empty file)
+++ packages/cooker/libggi/current/SOURCES/libggi-2.0.1-no-lcd823-ppc.patch
Thu Feb 15 10:04:43 2007
@@ -0,0 +1,10 @@
+--- libggi-2.0.1/configure.in.ppc 2002-11-27 19:27:51.000000000 -0500
++++ libggi-2.0.1/configure.in 2002-11-27 19:28:04.000000000 -0500
+@@ -420,6 +420,7 @@
+
+ case "$host" in
+ powerpc-*-linux*)
++ build_lcd823_target="no"
+ ;;
+ *)
+ build_lcd823_target="no"
Added: packages/cooker/libggi/current/SOURCES/libggi-2.0.3-xpath.patch
==============================================================================
--- (empty file)
+++ packages/cooker/libggi/current/SOURCES/libggi-2.0.3-xpath.patch Thu Feb
15 10:04:43 2007
@@ -0,0 +1,13 @@
+--- libggi-2.0.3/configure.in.xpath 2003-09-17 20:15:29.000000000 +0200
++++ libggi-2.0.3/configure.in 2003-09-17 20:18:23.000000000 +0200
+@@ -616,6 +616,10 @@ if test "x$build_x_target" != "xno" \
+ -o "x$build_xlib_target" != "xno" \
+ -o "x$build_dga_target" != "xno"; then
+ AC_PATH_XTRA
++ dnl [gb] yes, ugly hackaround
++ if test "x$ac_x_includes" = "x" -a "x$x_includes" != "xNONE"; then
++ ac_x_includes=$x_includes
++ fi
+ if test "x$no_x" = "xyes"; then
+ build_x_target="no"
+ build_xlib_target="no"
Added: packages/cooker/libggi/current/SOURCES/libggi-2.1.0-gcc4.patch
==============================================================================
--- (empty file)
+++ packages/cooker/libggi/current/SOURCES/libggi-2.1.0-gcc4.patch Thu Feb
15 10:04:43 2007
@@ -0,0 +1,71 @@
+--- libggi-2.1.0/default/fbdev/ati/mach64/visual.c.gcc4 2004-09-13
12:19:19.000000000 -0400
++++ libggi-2.1.0/default/fbdev/ati/mach64/visual.c 2005-08-17
16:39:51.000000000 -0400
+@@ -281,7 +281,7 @@ static int do_cleanup(ggi_visual *vis)
+ }*/
+
+ free(priv);
+- ATI_MACH64_PRIV(vis) = NULL;
++ FBDEV_PRIV(vis)->accelpriv = NULL;
+
+ ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);
+
+@@ -313,7 +313,7 @@ static int GGIopen(ggi_visual *vis, stru
+ if (priv == NULL) {
+ return GGI_ENOMEM;
+ }
+- ATI_MACH64_PRIV(vis) = priv;
++ FBDEV_PRIV(vis)->accelpriv = priv;
+
+
+ fbdevpriv->mmioaddr = mmap(NULL, fbdevpriv->orig_fix.mmio_len,
+--- libggi-2.1.0/default/fbdev/mga/2164w/visual.c.gcc4 2004-09-13
12:19:59.000000000 -0400
++++ libggi-2.1.0/default/fbdev/mga/2164w/visual.c 2005-08-17
16:38:22.000000000 -0400
+@@ -111,7 +111,7 @@ static int do_cleanup(ggi_visual *vis)
+ }
+
+ free(priv);
+- M2164W_PRIV(vis) = NULL;
++ FBDEV_PRIV(vis)->accelpriv = NULL;
+
+ ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);
+
+@@ -253,7 +253,7 @@ static int GGIopen(ggi_visual *vis, stru
+ vis->opdraw->crossblit = GGI_m2164w_crossblit;
+ }
+
+- M2164W_PRIV(vis) = priv;
++ FBDEV_PRIV(vis)->accelpriv = priv;
+
+ /* Register cleanup handler */
+ ggRegisterCleanup((ggcleanup_func *)do_cleanup, vis);
+--- libggi-2.1.0/default/fbdev/mga/g400/visual.c.gcc4 2004-09-13
12:20:44.000000000 -0400
++++ libggi-2.1.0/default/fbdev/mga/g400/visual.c 2005-08-17
16:37:39.000000000 -0400
+@@ -117,7 +117,7 @@ static int do_cleanup(ggi_visual *vis)
+ }
+
+ free(priv);
+- MGA_G400_PRIV(vis) = NULL;
++ FBDEV_PRIV(vis)->accelpriv = NULL;
+
+ ggUnregisterCleanup((ggcleanup_func *)do_cleanup, vis);
+
+@@ -259,7 +259,7 @@ static int GGIopen(ggi_visual *vis, stru
+ /* vis->opdraw->crossblit = GGI_mga_g400_crossblit; */
+ }
+
+- MGA_G400_PRIV(vis) = priv;
++ FBDEV_PRIV(vis)->accelpriv = priv;
+
+ /* Register cleanup handler */
+ ggRegisterCleanup((ggcleanup_func *)do_cleanup, vis);
+--- libggi-2.1.0/display/vcsa/visual.c.gcc4 2004-11-13 19:55:49.000000000
-0500
++++ libggi-2.1.0/display/vcsa/visual.c 2005-08-17 16:28:50.000000000 -0400
+@@ -124,7 +124,7 @@ static int GGIopen(ggi_visual *vis, stru
+ }
+ }
+
+- priv = VCSA_PRIV(vis) = malloc(sizeof(ggi_vcsa_priv));
++ priv = LIBGGI_PRIVATE(vis) = malloc(sizeof(ggi_vcsa_priv));
+ if (priv == NULL) return GGI_ENOMEM;
+
+ LIBGGI_GC(vis) = malloc(sizeof(ggi_gc));
Added: packages/cooker/libggi/current/SOURCES/libggi-2.1.0-lib64.patch
==============================================================================
--- (empty file)
+++ packages/cooker/libggi/current/SOURCES/libggi-2.1.0-lib64.patch Thu Feb
15 10:04:43 2007
@@ -0,0 +1,11 @@
+--- libggi-2.1.0/m4/gii_paths.m4.lib64 2004-06-06 08:42:53.000000000 -0400
++++ libggi-2.1.0/m4/gii_paths.m4 2005-08-17 16:43:43.000000000 -0400
+@@ -10,7 +10,7 @@ CFLAGS="$CFLAGS -I$withval/include"
+ LDFLAGS="$LDFLAGS -L$withval/lib",
+ CFLAGS="$CFLAGS -I$prefix/include"
+ CPPFLAGS="$CPPFLAGS -I$prefix/include"
+- LDFLAGS="$LDFLAGS -L$prefix/lib")
++ LDFLAGS="$LDFLAGS -L$libdir")
+
+ ])
+
Added: packages/cooker/libggi/current/SOURCES/libggi-2.1.0-libtool.patch
==============================================================================
--- (empty file)
+++ packages/cooker/libggi/current/SOURCES/libggi-2.1.0-libtool.patch Thu Feb
15 10:04:43 2007
@@ -0,0 +1,66 @@
+--- libggi-2.1.0/m4/libtool.m4.libtool 2004-10-29 15:53:22.000000000 -0400
++++ libggi-2.1.0/m4/libtool.m4 2005-08-17 16:15:43.000000000 -0400
+@@ -101,6 +101,20 @@ case $host in
+ rm -rf conftest*
+ ;;
+
++*-*-linux*)
++ # Test if the compiler is 64bit
++ echo 'int i;' > conftest.$ac_ext
++ lt_cv_cc_64bit_output=no
++ if AC_TRY_EVAL(ac_compile); then
++ case `/usr/bin/file conftest.$ac_objext` in
++ *"ELF 64"*)
++ lt_cv_cc_64bit_output=yes
++ ;;
++ esac
++ fi
++ rm -rf conftest*
++ ;;
++
+ *-*-sco3.2v5*)
+ # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+ SAVE_CFLAGS="$CFLAGS"
+@@ -2222,6 +2236,13 @@ linux-gnu*)
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
++ case $host_cpu:$lt_cv_cc_64bit_output in
++ powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
++ sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64
/usr/X11R6/lib64"
++ ;;
++ esac
++
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+@@ -2521,7 +2542,7 @@ if test -f "$ltmain"; then
+ # careful not to overquote the AC_SUBSTed values. We take copies of the
+ # variables and quote the copies for generation of the libtool script.
+ for var in echo old_CC old_CFLAGS SED \
+- AR AR_FLAGS CC LD LN_S NM SHELL STRIP \
++ AR AR_FLAGS CC LD LN_S NM SHELL STRIP EGREP \
+ reload_flag reload_cmds wl \
+ pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
+ thread_safe_flag_spec whole_archive_flag_spec libname_spec \
+@@ -2628,6 +2649,9 @@ CC=$lt_CC
+ # Is the compiler the GNU C compiler?
+ with_gcc=$GCC
+
++# An ERE matcher.
++EGREP=$lt_EGREP
++
+ # The linker used to build libraries.
+ LD=$lt_LD
+
+@@ -3178,7 +3202,8 @@ pic_mode=ifelse($#,1,$1,default)])
+
+ # AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
+ AC_DEFUN([AC_PATH_TOOL_PREFIX],
+-[AC_MSG_CHECKING([for $1])
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_MSG_CHECKING([for $1])
+ AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+ [case $MAGIC_CMD in
+ /*)
Added: packages/cooker/libggi/current/SOURCES/libggi-2.1.1-glibc2.4-fix.patch
==============================================================================
--- (empty file)
+++ packages/cooker/libggi/current/SOURCES/libggi-2.1.1-glibc2.4-fix.patch
Thu Feb 15 10:04:43 2007
@@ -0,0 +1,44 @@
+--- libggi-2.1.1/programs/check/speed.c.orig 2004-09-08 21:26:22.000000000
+0200
++++ libggi-2.1.1/programs/check/speed.c 2006-06-06 19:19:03.000000000
+0200
+@@ -1,4 +1,4 @@
+-/* $Id: speed.c,v 1.5 2004/09/08 19:26:22 cegger Exp $
++/* $Id: speed.c,v 1.8.2.1 2006/03/16 19:07:36 cegger Exp $
+ ******************************************************************************
+
+ speed.c - LibGGI speed-test application.
+@@ -15,16 +15,25 @@
+ ******************************************************************************
+ */
+
++#include "config.h"
+ #include <ggi/ggi.h>
+
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
+ #include <sys/times.h>
++#ifdef HAVE_LIMITS_H
++#include <limits.h>
++#endif
+ #ifndef CLK_TCK
+ #include <time.h>
+ #endif
++#ifndef CLK_TCK
++# define CLK_TCK sysconf(_SC_CLK_TCK)
++#endif
+
+ static struct {
+ ggi_visual_t vis;
+@@ -424,7 +433,8 @@ static void CopyBox(void)
+ /* List of tests.
+ */
+ static struct test
+-{ char *name;
++{
++ const char *name;
+ void (*func)(void);
+ int active;
+ } tests[]=
Added: packages/cooker/libggi/current/SOURCES/libggi-2.2.2.src.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/libggi/current/SPECS/libggi.spec
==============================================================================
--- packages/cooker/libggi/current/SPECS/libggi.spec (original)
+++ packages/cooker/libggi/current/SPECS/libggi.spec Thu Feb 15 10:04:43 2007
@@ -1,25 +1,22 @@
-%define name libggi
-%define version 2.1.1
-%define release %mkrel 3
-%define lib_name_orig %{name}
-%define lib_major 2
-%define lib_name %mklibname ggi %{lib_major}
-
-Name: %{name}
-Version: %{version}
-Release: %{release}
+%define libname_orig %{name}
+%define major 2
+%define libname %mklibname ggi %{major}
+
Summary: A fast, simple, small and flexible user-space graphics library
+Name: libggi
+Version: 2.2.2
+Release: %mkrel 1
License: GPL
Group: System/Libraries
URL: http://www.ggi-project.org/
-Source: %{name}-%{version}.src.tar.bz2
-Patch0: libggi-2.0.1-no-lcd823-ppc.patch.bz2
-Patch1: libggi-2.1.0-gcc4.patch.bz2
-Patch2: libggi-2.1.0-libtool.patch.bz2
-Patch3: libggi-2.0.3-xpath.patch.bz2
-Patch4: libggi-2.1.0-lib64.patch.bz2
-Patch5: libggi-2.1.1-glibc2.4-fix.patch.bz2
-Buildrequires: libgii-devel >= 0.9.1
+Source:
http://www.ggi-project.org/ftp/ggi/v2.2/%{name}-%{version}.src.tar.bz2
+Patch0: libggi-2.0.1-no-lcd823-ppc.patch
+Patch1: libggi-2.1.0-gcc4.patch
+Patch2: libggi-2.1.0-libtool.patch
+Patch3: libggi-2.0.3-xpath.patch
+Patch4: libggi-2.1.0-lib64.patch
+Patch5: libggi-2.1.1-glibc2.4-fix.patch
+Buildrequires: libgii-devel >= 1.0.2-2mdv
BuildRequires: autoconf2.5 >= 2.58, automake1.9
Buildrequires: aalib-devel ncurses-devel DirectFB-devel libxext-devel
BuildConflicts: svgalib-devel
@@ -46,31 +43,31 @@
every platform that has remotely heard of POSIX (ports to other systems
such as Win32 are underway) and on many display subsystems.
-%package -n %{lib_name}
+%package -n %{libname}
Summary: Main library for %{name}
Group: System/Libraries
Requires: %{name}
-%description -n %{lib_name}
+%description -n %{libname}
This package contains the library needed to run programs dynamically
linked with %{name}.
-%package -n %{lib_name}-devel
+%package -n %{libname}-devel
Summary: Headers for developing programs that will use %{name}
Group: Development/Other
-Requires: %{lib_name} = %{version}-%{release} libgii-devel
-Provides: %{lib_name_orig}-devel = %{version}-%{release}
+Requires: %{libname} = %{version}-%{release} libgii-devel
+Provides: %{libname_orig}-devel = %{version}-%{release}
-%description -n %{lib_name}-devel
+%description -n %{libname}-devel
This package contains the headers that programmers will need to develop
applications which will use %{name}.
-%package -n %{lib_name}-static-devel
+%package -n %{libname}-static-devel
Summary: Static Library for developing programs that will use %{name}
Group: Development/Other
-Requires: %{lib_name}-devel = %{version}-%{release}
+Requires: %{libname}-devel = %{version}-%{release}
-%description -n %{lib_name}-static-devel
+%description -n %{libname}-static-devel
This package contains the static library that programmers will need to develop
applications which will use %{name}.
@@ -78,29 +75,30 @@
%prep
%setup -q
%patch0 -p1 -b .ppc
-%patch1 -p1 -b .gcc4
-%patch2 -p1 -b .libtool
+#%patch1 -p1 -b .gcc4
+#%patch2 -p1 -b .libtool
%patch3 -p1 -b .xpath
-%patch4 -p1 -b .lib64
-%patch5 -p1 -b .glibc2.4
+#%patch4 -p1 -b .lib64
+#%patch5 -p1 -b .glibc2.4
# regenerate configure script
./autogen.sh
%build
-%configure2_5x --enable-static \
- --disable-debug
-%make
+%configure2_5x --with-gii=%{_prefix} \
+ --disable-debug \
+%make
%install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+
+%makeinstall_std
%clean
-rm -rf $RPM_BUILD_ROOT
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
-%post -n %{lib_name} -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
-%postun -n %{lib_name} -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
%files
%defattr(-,root,root)
@@ -109,7 +107,6 @@
%dir %{_sysconfdir}/ggi/targets
%config(noreplace) %{_sysconfdir}/ggi/libggi.conf
%config(noreplace) %{_sysconfdir}/ggi/targets/fbdev.conf
-
%{_bindir}/*
%dir %{_libdir}/ggi/
%dir %{_libdir}/ggi/default/
@@ -126,17 +123,17 @@
%{_mandir}/man3/*
%{_mandir}/man7/*
-%files -n %{lib_name}
+%files -n %{libname}
%defattr(-,root,root)
-%{_libdir}/*.so.*
+%{_libdir}/*.so.%{major}*
-%files -n %{lib_name}-devel
+%files -n %{libname}-devel
%defattr(-,root,root)
%{_includedir}/ggi/*
%{_libdir}/*.so
%{_libdir}/*.la
-%files -n %{lib_name}-static-devel
+%files -n %{libname}-static-devel
%defattr(-,root,root)
%{_includedir}/ggi/*
%{_libdir}/*.a
