t1lib: add 5.1.2

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi 2011-11-21 12:00:54 +01:00
parent fdbc6ae58b
commit b006355af5
3 changed files with 275 additions and 0 deletions

View File

@ -0,0 +1,128 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- t1lib-5.0.2/configure.in~configure.patch
+++ t1lib-5.0.2/configure.in
@@ -75,9 +75,9 @@
T1LIB_VERSIONSTRING=\"MACRO_T1LIB_IDENTIFIER\"
-dnl We use this file by Andreas Zeller to check for libXaw
-builtin(include, ac-tools/ice_find_athena.m4)
-builtin(include, ac-tools/aclocal.m4)
+#dnl We use this file by Andreas Zeller to check for libXaw
+#builtin(include, ac-tools/ice_find_athena.m4)
+#builtin(include, ac-tools/aclocal.m4)
dnl We want these before the checks, so the checks can modify their values.
test -z "$LDLIBS" && LDLIBS=-lm AC_SUBST(LDLIBS)
@@ -161,6 +161,7 @@
dnl **** Check for underscore on external symbols ****
+AH_TEMPLATE([NEED_UNDERSCORE_PREFIX], [Define if external symbols need an underscore prefix])
AC_CACHE_CHECK("whether external symbols need an underscore prefix",
ac_cv_c_extern_prefix,
[saved_libs=$LIBS
@@ -178,68 +179,48 @@
AC_DEFINE(NEED_UNDERSCORE_PREFIX)
fi
-dnl **** Check which ANSI integer type is 16 bit
+dnl **** Check which ANSI integer type is 16 bit
+T1_AA_TYPE16=""
+for type in short int; do
+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x2"; then
+ T1_AA_TYPE16="-DT1_AA_TYPE16=$type"
+ T1_INT16="$type"
+ break
+ fi
+done
-AC_CACHE_CHECK( "which ANSI integer type is 16 bit", ac_16bit_type,
- AC_TRY_RUN([
-int main(void) {
- if (sizeof(short)==2)
- return(0);
- else if (sizeof(int)==2)
- return(1);
- else
- return(2);
-}], ac_16bit_type="short", ac_16bit_type="int", ac_16bit_type=))
-if test "$ac_16bit_type" = "short"
-then
- T1_AA_TYPE16="-DT1_AA_TYPE16=short"
- T1_INT16="short"
-else
- T1_AA_TYPE16="-DT1_AA_TYPE16=int"
- T1_INT16="int"
+if test x"$T1_AA_TYPE16" = "x"; then
+ AC_MSG_ERROR("Unable to determine which integer type is 16 bit.")
fi
-
dnl **** Check which ANSI integer type is 32 bit
+T1_AA_TYPE32=""
+for type in int long; do
+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x4"; then
+ T1_AA_TYPE32="-DT1_AA_TYPE32=$type"
+ T1_INT32="$type"
+ break
+ fi
+done
-AC_CACHE_CHECK( "which ANSI integer type is 32 bit", ac_32bit_type,
- AC_TRY_RUN([
-int main(void) {
- if (sizeof(int)==4)
- return(0);
- else if (sizeof(long)==4)
- return(1);
- else
- return(2);
-}], ac_32bit_type="int", ac_32bit_type="long", ac_32bit_type=))
-if test "$ac_32bit_type" = "int"
-then
- T1_AA_TYPE32="-DT1_AA_TYPE32=int"
- T1_INT32="int"
-else
- T1_AA_TYPE32="-DT1_AA_TYPE32=long"
- T1_INT32="long"
+if test x"$T1_AA_TYPE32" = "x"; then
+ AC_MSG_ERROR("Unable to determine which integer type is 32 bit.")
fi
-
dnl **** Check which ANSI integer type is 64 bit
+T1_AA_TYPE64=""
+for type in long long_long; do
+ if test x"`eval echo \\$ac_cv_sizeof_$type`" = "x8"; then
+ AC_MSG_WARN("$type is 64 bit")
+ T1_AA_TYPE64="-DT1_AA_TYPE64=\"`echo $type|tr '_' ' '`\""
+ break
+ fi
+done
-AC_CACHE_CHECK( "which ANSI integer type is 64 bit", ac_64bit_type,
- AC_TRY_RUN([
-int main(void) {
- if (sizeof(long)==8)
- return(0);
- else
- return(1);
-}], ac_64bit_type="long", ac_64bit_type="<none>"))
-if test "$ac_64bit_type" = "long"
-then
- T1_AA_TYPE64="-DT1_AA_TYPE64=long"
-else
- T1_AA_TYPE64=
+if test x"$T1_AA_TYPE64" = "x"; then
+ AC_MSG_ERROR("Unable to determine which integer type is 64 bit.")
fi
-
CFLAGS="${CFLAGS} -DT1LIB_IDENT=\"\\\"${T1LIB_IDENTIFIER}\\\"\" -DGLOBAL_CONFIG_DIR=\"\\\"${T1LIB_DATA_DIR}\\\"\""
dnl **** Check for functions and header files ****

View File

@ -0,0 +1,116 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- t1lib-5.0.2/Makefile.in~libtool
+++ t1lib-5.0.2/Makefile.in
@@ -18,7 +18,8 @@
# Last modified: 2001-04-01
#
-SHELL = /bin/sh
+SHELL = @SHELL@
+LIBTOOL = @LIBTOOL@
CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@
@@ -150,7 +151,7 @@
$(RM) examples/Makefile
$(RM) xglyph/Makefile
$(RM) doc/Makefile
- $(RM) libtool
+ $(RM) $(LIBTOOL)
# The following two targets are for building and cleaning the python-
--- t1lib-5.0.2/examples/Makefile.in~libtool
+++ t1lib-5.0.2/examples/Makefile.in
@@ -14,9 +14,10 @@
# Last modified: 2001-04-01
#
+top_builddir = @top_builddir@
-LIBTOOL = ../libtool
-SHELL = /bin/sh
+LIBTOOL = @LIBTOOL@
+SHELL = @SHELL@
CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@
--- t1lib-5.0.2/lib/Makefile.in~libtool
+++ t1lib-5.0.2/lib/Makefile.in
@@ -15,8 +15,10 @@
#
# Contributions by H.Kakugawa to use libtool!
-LIBTOOL = ../libtool
-SHELL = /bin/sh
+top_builddir = @top_builddir@
+
+LIBTOOL = @LIBTOOL@
+SHELL = @SHELL@
CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@
--- t1lib-5.0.2/lib/t1lib/Makefile.in~libtool
+++ t1lib-5.0.2/lib/t1lib/Makefile.in
@@ -14,8 +14,10 @@
#
# Modified by H.Kakugawa to use libtool
-LIBTOOL = ../../libtool
-SHELL = /bin/sh
+top_builddir = @top_builddir@
+
+LIBTOOL = @LIBTOOL@
+SHELL = @SHELL@
CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@
--- t1lib-5.0.2/lib/type1/Makefile.in~libtool
+++ t1lib-5.0.2/lib/type1/Makefile.in
@@ -14,8 +14,10 @@
#
# Modified by H.Kakugawa to use libtool
-LIBTOOL = ../../libtool
-SHELL = /bin/sh
+top_builddir = @top_builddir@
+
+LIBTOOL = @LIBTOOL@
+SHELL = @SHELL@
CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@
--- t1lib-5.0.2/type1afm/Makefile.in~libtool
+++ t1lib-5.0.2/type1afm/Makefile.in
@@ -15,8 +15,10 @@
#
# Modified by H.Kakugawa to use libtool
-LIBTOOL = ../libtool
-SHELL = /bin/sh
+top_builddir = @top_builddir@
+
+LIBTOOL = @LIBTOOL@
+SHELL = @SHELL@
CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@
--- t1lib-5.0.2/xglyph/Makefile.in~libtool
+++ t1lib-5.0.2/xglyph/Makefile.in
@@ -15,8 +15,10 @@
#
# Modified by H.Kakugawa to use libtool
-LIBTOOL = ../libtool
-SHELL = /bin/sh
+top_builddir = @top_builddir@
+
+LIBTOOL = @LIBTOOL@
+SHELL = @SHELL@
CC = @CC@
CPP = @CPP@
CFLAGS = @CFLAGS@

View File

@ -0,0 +1,31 @@
DESCRIPTION = "A Type1 Font Rastering Library"
SECTION = "libs"
DEPENDS = "virtual/libx11 libxaw"
LICENSE = "LGPLv2 GPLv2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=8ca43cbc842c2336e835926c2166c28b \
file://LGPL;md5=6e29c688d912da12b66b73e32b03d812 \
"
SRC_URI = "${DEBIAN_MIRROR}/main/t/t1lib/t1lib_${PV}.orig.tar.gz \
file://configure.patch \
file://libtool.patch"
SRC_URI[md5sum] = "a5629b56b93134377718009df1435f3c"
SRC_URI[sha256sum] = "821328b5054f7890a0d0cd2f52825270705df3641dbd476d58d17e56ed957b59"
inherit autotools
# Fix GNU_HASH problem
TARGET_CC_ARCH += "${LDFLAGS}"
EXTRA_OECONF = "--with-x --without-athena"
EXTRA_OEMAKE = "without_doc"
do_configure() {
rm -f ${S}/ac-tools/aclocal.m4
autotools_do_configure
}
FILES_${PN} += " ${datadir}/t1lib/t1lib.config"
FILES_${PN}-doc = "${datadir}/t1lib/doc/t1lib_doc.pdf"