Update of /cvsroot/fink/experimental/rangerrick/common/main/finkinfo/graphics
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27709
Added Files:
freetype2-hinting.info freetype2-hinting.patch freetype2.info
freetype2.patch
Log Message:
freetype2 with backwards compatibility... I think
--- NEW FILE: freetype2-hinting.info ---
Package: freetype2-hinting
Version: 2.1.9
Revision: 1
Depends: %N-shlibs (= %v-%r)
Conflicts: freetype2
Replaces: freetype2
Provides: freetype2
BuildDependsOnly: True
Source: mirror:sourceforge:freetype/freetype-%v.tar.bz2
Source-MD5: ec1b903e4be5f073caa72458ea58c29c
Patch: %n.patch
#PatchScript: mv install install.sh
CompileScript: <<
make setup CFG="--prefix=%p"
perl -pi.bak -e 's/^allow_undefined_flag.*/allow_undefined_flag=\"\"/'
builds/unix/libtool
make
<<
InstallScript: <<
#!/bin/sh -e
make install prefix=%i
install -d -m 755 %i/lib/freetype2/lib
mv %i/bin %i/lib/freetype2
mv %i/lib/libfreetype.a %i/lib/freetype2/lib
mv %i/lib/libfreetype.dylib %i/lib/freetype2/lib
ln -sf %p/lib/libfreetype.6.dylib %i/lib/freetype2/lib/libfreetype.dylib
perl -p -e 's,%p/lib,%p/lib/freetype2/lib,g' %i/lib/libfreetype.la >
%i/lib/freetype2/lib/libfreetype.la
rm -rf %i/lib/libfreetype.la
mv %i/include %i/lib/freetype2
rm -rf %i/share/aclocal
for file in %i/lib/libfreetype*.dylib; do
REALFILE=`echo "$file" | sed -e 's,^%d,,'`
ln -sf "$REALFILE" %i/lib/freetype2/lib/
done
install -d -m 755 %i/share/doc/%N
cp -pR %i/share/doc/%N/
<<
SplitOff: <<
Package: %N-shlibs
Replaces: freetype2-shlibs, freetype2 (<< 2.0.8-2)
Conflicts: freetype2-shlibs
Provides: freetype2-shlibs
Files: lib/libfreetype.6*dylib
Shlibs: %p/lib/libfreetype.6.dylib 10.0.0 %n (>= 2.0.9-1)
DocFiles: <<
README src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
Description: TrueType font rendering library, version 2, shared libs
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (=%v-%r)
Replaces: freetype2-dev
Conflicts: freetype2-dev
Provides: freetype2-dev
Files: lib/freetype2
DocFiles: <<
README src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
Description: TrueType font rendering library, version 2, headers
<<
DocFiles: <<
README src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
Description: TrueType font rendering library, version 2 (dummy)
DescDetail: <<
FreeType 2 is a library that provides access to and rendering of a
wide range of font file formats, including TrueType, PostScript Type 1,
and several bitmap font formats.
The freetype2 packages now exist only for compatibility with older Fink
packages. Developers should use the freetype that is part of XFree86
for new packages.
For packages that need freetype2 version 2.1.3 or newer, there is now
a freetype2-dev splitoff. For this to work, you need to make sure that
configure finds the freetype-config script in %p/lib/freetype2/bin
<<
DescPort: <<
Previous versions by Christoph Pfisterer
<<
License: Restrictive
Homepage: http://www.freetype.org/
Maintainer: Alexander Strange <[EMAIL PROTECTED]>
--- NEW FILE: freetype2.patch ---
diff -uNr freetype-2.1.9/builds/unix/detect.mk
freetype-2.1.9-new/builds/unix/detect.mk
--- freetype-2.1.9/builds/unix/detect.mk Tue Apr 13 04:35:05 2004
+++ freetype-2.1.9-new/builds/unix/detect.mk Thu Feb 24 17:02:56 2005
@@ -20,7 +20,8 @@
#
is_unix := $(strip $(wildcard /sbin/init) \
$(wildcard /usr/sbin/init) \
- $(wildcard /hurd/auth))
+ $(wildcard /hurd/auth) \
+ $(wildcard /sbin/launchd))
ifneq ($(is_unix),)
PLATFORM := unix
diff -uNr freetype-2.1.9/builds/unix/freetype-config.in
freetype-2.1.9-new/builds/unix/freetype-config.in
--- freetype-2.1.9/builds/unix/freetype-config.in Sat Apr 17 14:58:43 2004
+++ freetype-2.1.9-new/builds/unix/freetype-config.in Thu Feb 24 16:59:17 2005
@@ -1,6 +1,6 @@
#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/lib/freetype2
[EMAIL PROTECTED]@
exec_prefix_set=no
[EMAIL PROTECTED]@
diff -uNr freetype-2.1.9/src/base/ftapi.c freetype-2.1.9-new/src/base/ftapi.c
--- freetype-2.1.9/src/base/ftapi.c Sat Mar 30 08:16:33 2002
+++ freetype-2.1.9-new/src/base/ftapi.c Thu Feb 24 16:57:09 2005
@@ -118,4 +118,18 @@
}
+ FT_BASE_DEF( FT_Short )
+ FT_Get_Short( FT_Stream stream )
+ {
+ return FT_GET_SHORT();
+ }
+
+
+ FT_BASE_DEF( FT_Long )
+ FT_Get_Long( FT_Stream stream )
+ {
+ return FT_GET_LONG();
+ }
+
+
/* END */
diff -uNr freetype-2.1.9/src/base/ftbase.c freetype-2.1.9-new/src/base/ftbase.c
--- freetype-2.1.9/src/base/ftbase.c Wed Feb 25 07:58:54 2004
+++ freetype-2.1.9-new/src/base/ftbase.c Thu Feb 24 16:57:09 2005
@@ -29,6 +29,7 @@
#include "ftgloadr.c"
#include "ftobjs.c"
#include "ftnames.c"
+#include "ftapi.c"
#include "ftrfork.c"
#if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON )
diff -uNr freetype-2.1.9/src/base/ftobjs.c freetype-2.1.9-new/src/base/ftobjs.c
--- freetype-2.1.9/src/base/ftobjs.c Mon Jun 21 17:16:56 2004
+++ freetype-2.1.9-new/src/base/ftobjs.c Thu Feb 24 17:01:59 2005
@@ -947,7 +947,7 @@
/* there's a Mac-specific extended implementation of FT_New_Face() */
/* in src/base/ftmac.c */
-#ifndef FT_MACINTOSH
+/* #ifndef FT_MACINTOSH */
/* documentation is in freetype.h */
@@ -970,7 +970,7 @@
return FT_Open_Face( library, &args, face_index, aface );
}
-#endif /* !FT_MACINTOSH */
+/* #endif */ /* !FT_MACINTOSH */
/* documentation is in freetype.h */
diff -uNr freetype-2.1.9/src/truetype/ttinterp.c
freetype-2.1.9-new/src/truetype/ttinterp.c
--- freetype-2.1.9/src/truetype/ttinterp.c Fri Mar 5 04:26:22 2004
+++ freetype-2.1.9-new/src/truetype/ttinterp.c Thu Feb 24 16:57:19 2005
@@ -2474,7 +2474,7 @@
W = Vx * Vx + Vy * Vy;
/* Now, we want that Sqrt( W ) = 0x4000 */
- /* Or 0x1000000 <= W < 0x1004000 */
+ /* Or 0x10000000 <= W < 0x10004000 */
if ( Vx < 0 )
{
@@ -2492,7 +2492,7 @@
else
S2 = FALSE;
- while ( W < 0x1000000L )
+ while ( W < 0x10000000L )
{
/* We need to increase W by a minimal amount */
if ( Vx < Vy )
@@ -2503,7 +2503,7 @@
W = Vx * Vx + Vy * Vy;
}
- while ( W >= 0x1004000L )
+ while ( W >= 0x10004000L )
{
/* We need to decrease W by a minimal amount */
if ( Vx < Vy )
--- freetype-2.1.9/include/freetype/freetype.h Sat Jun 19 16:50:08 2004
+++ freetype-2.1.9-new/include/freetype/freetype.h Thu Feb 24 17:06:43 2005
@@ -17,11 +17,7 @@
#ifndef FT_FREETYPE_H
-#error "`ft2build.h' hasn't been included yet!"
-#error "Please always use macros to include FreeType header files."
-#error "Example:"
-#error " #include <ft2build.h>"
-#error " #include FT_FREETYPE_H"
+#include <ft2build.h>
#endif
--- NEW FILE: freetype2.info ---
Package: freetype2
Version: 2.1.9
Revision: 1
Depends: %N-shlibs (= %v-%r)
Conflicts: freetype2-hinting
Replaces: freetype2-hinting
BuildDependsOnly: True
Source: mirror:sourceforge:freetype/freetype-%v.tar.bz2
Source-MD5: ec1b903e4be5f073caa72458ea58c29c
Patch: %n.patch
#PatchScript: mv install install.sh
CompileScript: <<
make setup CFG="--prefix=%p"
perl -pi.bak -e 's/^allow_undefined_flag.*/allow_undefined_flag=\"\"/'
builds/unix/libtool
make
<<
InstallScript: <<
#!/bin/sh -e
make install prefix=%i
install -d -m 755 %i/lib/freetype2/lib
mv %i/bin %i/lib/freetype2
mv %i/lib/libfreetype.a %i/lib/freetype2/lib
mv %i/lib/libfreetype.dylib %i/lib/freetype2/lib
ln -sf %p/lib/libfreetype.6.dylib %i/lib/freetype2/lib/libfreetype.dylib
perl -p -e 's,%p/lib,%p/lib/freetype2/lib,g' %i/lib/libfreetype.la >
%i/lib/freetype2/lib/libfreetype.la
rm -rf %i/lib/libfreetype.la
mv %i/include %i/lib/freetype2
rm -rf %i/share/aclocal
for file in %i/lib/libfreetype*.dylib; do
REALFILE=`echo "$file" | sed -e 's,^%d,,'`
ln -sf "$REALFILE" %i/lib/freetype2/lib/
done
install -d -m 755 %i/share/doc/%N
cp -pR docs/* %i/share/doc/%N/
<<
SplitOff: <<
Package: %N-shlibs
Replaces: freetype2-hinting-shlibs, freetype2 (<< 2.0.8-2)
Conflicts: freetype2-hinting-shlibs
Files: lib/libfreetype.6*dylib
Shlibs: %p/lib/libfreetype.6.dylib 10.0.0 %n (>= 2.0.9-1)
DocFiles: <<
README src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
Description: TrueType font rendering library, version 2, shared libs
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (=%v-%r)
Replaces: freetype2-hinting-dev
Conflicts: freetype2-hinting-dev
Files: lib/freetype2
DocFiles: <<
README src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
Description: TrueType font rendering library, version 2, headers
<<
DocFiles: <<
README src/autohint/CatharonLicense.txt
src/pcf/readme:README.pcf
<<
Description: TrueType font rendering library, version 2 (dummy)
DescDetail: <<
FreeType 2 is a library that provides access to and rendering of a
wide range of font file formats, including TrueType, PostScript Type 1,
and several bitmap font formats.
The freetype2 package now exists only for compatibility with older Fink
packages. Developers should use the freetype that is part of XFree86
for new packages.
For packages that need freetype2 version 2.1.3 or newer, there is now
a freetype2-dev splitoff. For this to work, you need to make sure that
configure finds the freetype-config script in %p/lib/freetype2/bin
<<
DescPort: <<
Previous versions by Christoph Pfisterer
<<
License: OSI-Approved
Homepage: http://www.freetype.org/
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
--- NEW FILE: freetype2-hinting.patch ---
diff -uNr freetype-2.1.9/builds/unix/detect.mk
freetype-2.1.9-new/builds/unix/detect.mk
--- freetype-2.1.9/builds/unix/detect.mk Tue Apr 13 04:35:05 2004
+++ freetype-2.1.9-new/builds/unix/detect.mk Thu Feb 24 17:02:56 2005
@@ -20,7 +20,8 @@
#
is_unix := $(strip $(wildcard /sbin/init) \
$(wildcard /usr/sbin/init) \
- $(wildcard /hurd/auth))
+ $(wildcard /hurd/auth) \
+ $(wildcard /sbin/launchd))
ifneq ($(is_unix),)
PLATFORM := unix
diff -uNr freetype-2.1.9/builds/unix/freetype-config.in
freetype-2.1.9-new/builds/unix/freetype-config.in
--- freetype-2.1.9/builds/unix/freetype-config.in Sat Apr 17 14:58:43 2004
+++ freetype-2.1.9-new/builds/unix/freetype-config.in Thu Feb 24 16:59:17 2005
@@ -1,6 +1,6 @@
#! /bin/sh
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@/lib/freetype2
[EMAIL PROTECTED]@
exec_prefix_set=no
[EMAIL PROTECTED]@
diff -uNr freetype-2.1.9/include/freetype/config/ftoption.h
freetype-2.1.9-new/include/freetype/config/ftoption.h
--- freetype-2.1.9/include/freetype/config/ftoption.h Sun Apr 25 16:15:09 2004
+++ freetype-2.1.9-new/include/freetype/config/ftoption.h Thu Feb 24
16:56:45 2005
@@ -436,7 +436,7 @@
/* Do not #undef this macro here, since the build system might */
/* define it for certain configurations only. */
/* */
-/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
+#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER
/*************************************************************************/
diff -uNr freetype-2.1.9/src/base/ftapi.c freetype-2.1.9-new/src/base/ftapi.c
--- freetype-2.1.9/src/base/ftapi.c Sat Mar 30 08:16:33 2002
+++ freetype-2.1.9-new/src/base/ftapi.c Thu Feb 24 16:57:09 2005
@@ -118,4 +118,18 @@
}
+ FT_BASE_DEF( FT_Short )
+ FT_Get_Short( FT_Stream stream )
+ {
+ return FT_GET_SHORT();
+ }
+
+
+ FT_BASE_DEF( FT_Long )
+ FT_Get_Long( FT_Stream stream )
+ {
+ return FT_GET_LONG();
+ }
+
+
/* END */
diff -uNr freetype-2.1.9/src/base/ftbase.c freetype-2.1.9-new/src/base/ftbase.c
--- freetype-2.1.9/src/base/ftbase.c Wed Feb 25 07:58:54 2004
+++ freetype-2.1.9-new/src/base/ftbase.c Thu Feb 24 16:57:09 2005
@@ -29,6 +29,7 @@
#include "ftgloadr.c"
#include "ftobjs.c"
#include "ftnames.c"
+#include "ftapi.c"
#include "ftrfork.c"
#if defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON )
diff -uNr freetype-2.1.9/src/base/ftobjs.c freetype-2.1.9-new/src/base/ftobjs.c
--- freetype-2.1.9/src/base/ftobjs.c Mon Jun 21 17:16:56 2004
+++ freetype-2.1.9-new/src/base/ftobjs.c Thu Feb 24 17:01:59 2005
@@ -947,7 +947,7 @@
/* there's a Mac-specific extended implementation of FT_New_Face() */
/* in src/base/ftmac.c */
-#ifndef FT_MACINTOSH
+/* #ifndef FT_MACINTOSH */
/* documentation is in freetype.h */
@@ -970,7 +970,7 @@
return FT_Open_Face( library, &args, face_index, aface );
}
-#endif /* !FT_MACINTOSH */
+/* #endif */ /* !FT_MACINTOSH */
/* documentation is in freetype.h */
diff -uNr freetype-2.1.9/src/truetype/ttinterp.c
freetype-2.1.9-new/src/truetype/ttinterp.c
--- freetype-2.1.9/src/truetype/ttinterp.c Fri Mar 5 04:26:22 2004
+++ freetype-2.1.9-new/src/truetype/ttinterp.c Thu Feb 24 16:57:19 2005
@@ -2474,7 +2474,7 @@
W = Vx * Vx + Vy * Vy;
/* Now, we want that Sqrt( W ) = 0x4000 */
- /* Or 0x1000000 <= W < 0x1004000 */
+ /* Or 0x10000000 <= W < 0x10004000 */
if ( Vx < 0 )
{
@@ -2492,7 +2492,7 @@
else
S2 = FALSE;
- while ( W < 0x1000000L )
+ while ( W < 0x10000000L )
{
/* We need to increase W by a minimal amount */
if ( Vx < Vy )
@@ -2503,7 +2503,7 @@
W = Vx * Vx + Vy * Vy;
}
- while ( W >= 0x1004000L )
+ while ( W >= 0x10004000L )
{
/* We need to decrease W by a minimal amount */
if ( Vx < Vy )
--- freetype-2.1.9/include/freetype/freetype.h Sat Jun 19 16:50:08 2004
+++ freetype-2.1.9-new/include/freetype/freetype.h Thu Feb 24 17:06:43 2005
@@ -17,11 +17,7 @@
#ifndef FT_FREETYPE_H
-#error "`ft2build.h' hasn't been included yet!"
-#error "Please always use macros to include FreeType header files."
-#error "Example:"
-#error " #include <ft2build.h>"
-#error " #include FT_FREETYPE_H"
+#include <ft2build.h>
#endif
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
