SOURCES: pike-Image-configure.patch, pike-freetype-includes.patch ...

[qboosh]

Author: qboosh                       Date: Sat Dec 23 14:56:45 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 7.8.86 issues

---- Files affected:
SOURCES:
   pike-Image-configure.patch (1.2 -> 1.3) , pike-freetype-includes.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/pike-Image-configure.patch
diff -u SOURCES/pike-Image-configure.patch:1.2 SOURCES/pike-Image-configure.patch:1.3
--- SOURCES/pike-Image-configure.patch:1.2	Tue Oct 15 13:48:55 2002
+++ SOURCES/pike-Image-configure.patch	Sat Dec 23 15:56:40 2006
@@ -1,21 +1,35 @@
-diff -uNr Pike-v7.2.239.orig/src/modules/Image/configure Pike-v7.2.239/src/modules/Image/configure
---- Pike-v7.2.239.orig/src/modules/Image/configure	Mon Nov 26 14:31:45 2001
-+++ Pike-v7.2.239/src/modules/Image/configure	Tue Oct 15 11:59:30 2002
-@@ -1387,6 +1387,9 @@
-   if test "`uname -m`" = "ia64"; then
-     echo "$ac_t""yes, but we are on an IA64 machine" 1>&6
+--- Pike-v7.6.86/src/modules/Image/configure.in.orig	2006-04-10 22:48:34.000000000 +0200
++++ Pike-v7.6.86/src/modules/Image/configure.in	2006-12-23 15:16:10.503925299 +0100
+@@ -27,22 +27,17 @@
+       # Darwin x86 can output ELF even though we can't use it
+       # FIXME: Investigate using nasm -f macho for Mach-O output
+       AC_MSG_RESULT([no, Mach-O not yet supported])
+-    elif test "`uname -m`" = "ia64"; then
+-      # nasm/ia64 can compile ia32 code...
+-      AC_MSG_RESULT([yes, but we are on an IA64 machine])
+-    elif test "`uname -m`" = "x86_64"; then
+-      # nasm/x86_64 can also compile ia32 code.
+-      # It can even link with it, but it's not a good idea...
+-      AC_MSG_RESULT([yes, but we are on an x86_64 machine])
+-    elif test "`uname -s`" = "OpenBSD"; then
+-      #nasm on OpenBSD is braindamaged
+-      AC_MSG_RESULT(no)
+-    elif test x"${with_valgrind:-no}" != xno; then
+-      AC_MSG_RESULT([no - valgrind is used])
+     else
+-      ASSEMBLY_OBJECTS=assembly.o
+-      AC_DEFINE(ASSEMBLY_OK)
+-      AC_MSG_RESULT(yes)
++      case "$build_alias" in
++	i?86-*|athlon-*)
++	  ASSEMBLY_OBJECTS=assembly.o
++	  AC_DEFINE(ASSEMBLY_OK)
++	  AC_MSG_RESULT(yes)
++	  ;;
++	*)
++	  AC_MSG_RESULT([yes, but we are doing non-x86 build])
++	  ;;
++      esac
+     fi
    else
-+   if $(uname -m | grep -v -q '^i.86$'); then
-+   echo "$ac_t""yes, but we are not on x86 machine" 1>&6
-+   else
-     ASSEMBLY_OBJECTS=assembly.o
-     cat >> confdefs.h <<\EOF
- #define ASSEMBLY_OK 1
-@@ -1394,6 +1397,7 @@
- 
-     echo "$ac_t""yes" 1>&6
-   fi
-+ fi
- else
-   echo "$ac_t""no" 1>&6
- fi
+     AC_MSG_RESULT(no)

================================================================
Index: SOURCES/pike-freetype-includes.patch
diff -u SOURCES/pike-freetype-includes.patch:1.1 SOURCES/pike-freetype-includes.patch:1.2
--- SOURCES/pike-freetype-includes.patch:1.1	Sun Apr  4 22:42:43 2004
+++ SOURCES/pike-freetype-includes.patch	Sat Dec 23 15:56:40 2006
@@ -1,42 +1,24 @@
---- Pike-v7.4.44/src/modules/_Image_FreeType/configure.in.orig	2003-01-15 20:31:40.000000000 +0100
-+++ Pike-v7.4.44/src/modules/_Image_FreeType/configure.in	2004-04-04 19:45:33.658341496 +0200
-@@ -1,5 +1,7 @@
- AC_INIT(freetype.c)
- AC_CONFIG_HEADER(config.h)
-+CONFIG_HEADERS="config.h"
-+AC_SUBST(CONFIG_HEADERS)
- AC_ARG_WITH(freetype,     [  --with(out)-freetype       Support Freetype via Freetype 2 (Image.FreeType)],[],[with_freetype=yes])
+--- Pike-v7.6.86/src/modules/_Image_FreeType/configure.in.orig	2004-01-15 02:19:14.000000000 +0100
++++ Pike-v7.6.86/src/modules/_Image_FreeType/configure.in	2006-12-23 15:25:19.215194572 +0100
+@@ -10,7 +10,7 @@
  
- AC_MODULE_INIT()
-@@ -21,7 +23,8 @@
-     LIBS="`$FT_CONFIG --libs` $LIBS"
-     AC_MSG_CHECKING(if freetype actually works)
-     AC_TRY_LINK([
--#include <freetype/freetype.h> 
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- ], 
- [
-   FT_Library library;
-@@ -36,7 +39,8 @@
+   PIKE_FEATURE_NODEP(Image.FreeType)
+ 
+-  MY_AC_PATH_PROG(FT_CONFIG, ${ac_tool_prefix}freetype-config, no)
++  MY_AC_PATH_PROG(FT_CONFIG, freetype-config, no)
+ 
+   if test "$FT_CONFIG" = "no" ; then
+      :
+@@ -56,7 +56,12 @@
        AC_MSG_CHECKING(for ft_encoding_latin_1 declaration)
        AC_CACHE_VAL(pike_cv_decl_ft_encoding_latin_1, [
          AC_TRY_COMPILE([
--#include <freetype/freetype.h>
++#ifdef HAVE_FT_FT2BUILD
 +#include <ft2build.h>
 +#include FT_FREETYPE_H
++#else
+ #include <freetype/freetype.h>
++#endif
  int q = ft_encoding_latin_1;
          ], [], [pike_cv_decl_ft_encoding_latin_1=yes
          ],[pike_cv_decl_ft_encoding_latin_1=no ])
---- Pike-v7.4.44/src/modules/_Image_FreeType/freetype.c.orig	2003-01-15 17:57:16.000000000 +0100
-+++ Pike-v7.4.44/src/modules/_Image_FreeType/freetype.c	2004-04-04 19:48:40.461943032 +0200
-@@ -12,7 +12,8 @@
- #include "pike_error.h"
- 
- #ifdef HAVE_LIBFT2
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include "pike_macros.h"
- #include "object.h"
- #include "constants.h"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/pike-Image-configure.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/pike-freetype-includes.patch?r1=1.1&r2=1.2&f=u