diff options
Diffstat (limited to 'openembedded/packages/xfont')
-rw-r--r-- | openembedded/packages/xfont/files/autofoo.patch | 18 | ||||
-rw-r--r-- | openembedded/packages/xfont/files/scalable.patch | 27 | ||||
-rw-r--r-- | openembedded/packages/xfont/xfont_1.4.2.bb | 22 | ||||
-rw-r--r-- | openembedded/packages/xfont/xfont_cvs.bb | 21 |
4 files changed, 88 insertions, 0 deletions
diff --git a/openembedded/packages/xfont/files/autofoo.patch b/openembedded/packages/xfont/files/autofoo.patch new file mode 100644 index 0000000000..4998625c24 --- /dev/null +++ b/openembedded/packages/xfont/files/autofoo.patch @@ -0,0 +1,18 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- libXfont-1.4.2/configure.ac~autofoo 2004-05-06 20:19:03.000000000 -0400 ++++ libXfont-1.4.2/configure.ac 2005-01-16 12:14:14.042598720 -0500 +@@ -35,9 +35,9 @@ + dnl Yes, it is a pain to synchronize version numbers. Unfortunately, it's + dnl not possible to extract the version number here from Xfont.h + dnl ++AC_CONFIG_AUX_DIR(.) + AM_INIT_AUTOMAKE([dist-bzip2]) + AM_CONFIG_HEADER(config.h) +-AC_CONFIG_AUX_DIR(.) + AC_CONFIG_HEADERS([include/X11/fonts/fontconf.h]) + + # Check for progs diff --git a/openembedded/packages/xfont/files/scalable.patch b/openembedded/packages/xfont/files/scalable.patch new file mode 100644 index 0000000000..7f97b9a8f6 --- /dev/null +++ b/openembedded/packages/xfont/files/scalable.patch @@ -0,0 +1,27 @@ +Index: fontfile/fontdir.c +=================================================================== +RCS file: /cvs/xlibs/Xfont/fontfile/fontdir.c,v +retrieving revision 3.22 +diff -u -r3.22 fontdir.c +--- xfont/fontfile/fontdir.c 7 Jul 2003 16:40:11 -0000 3.22 ++++ xfont/fontfile/fontdir.c 30 Dec 2004 20:37:12 -0000 +@@ -699,6 +699,11 @@ + */ + if (isscale) + { ++ /* If the fontname says it is scalable, make sure that the ++ * renderer supports OpenScalable and GetInfoScalable. ++ */ ++ if (renderer->OpenScalable && renderer->GetInfoScalable) ++ { + if (vals.values_supplied & SIZE_SPECIFY_MASK) + { + bzero((char *)&zeroVals, sizeof(zeroVals)); +@@ -798,6 +803,7 @@ + bitmap->name.name); + } + } ++ } + } + return TRUE; + } diff --git a/openembedded/packages/xfont/xfont_1.4.2.bb b/openembedded/packages/xfont/xfont_1.4.2.bb new file mode 100644 index 0000000000..9f8720749a --- /dev/null +++ b/openembedded/packages/xfont/xfont_1.4.2.bb @@ -0,0 +1,22 @@ +SECTION = "x11/libs" +LICENSE = "BSD-X" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert <greg@treke.net>" +DEPENDS = "xproto xtrans zlib" +DESCRIPTION = "X font library (used by the X server)." +PR = "r2" + +SRC_URI = "${XLIBS_MIRROR}/libXfont-${PV}.tar.bz2 \ + file://scalable.patch;patch=1 \ + file://autofoo.patch;patch=1" +S = "${WORKDIR}/libXfont-${PV}" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} diff --git a/openembedded/packages/xfont/xfont_cvs.bb b/openembedded/packages/xfont/xfont_cvs.bb new file mode 100644 index 0000000000..dac69e2e2c --- /dev/null +++ b/openembedded/packages/xfont/xfont_cvs.bb @@ -0,0 +1,21 @@ +PV = "0.0cvs${CVSDATE}" +LICENSE = "BSD-X" +SECTION = "x11/libs" +PRIORITY = "optional" +MAINTAINER = "Greg Gilbert <greg@treke.net>" +DEPENDS = "xproto xtrans zlib" +DESCRIPTION = "X font library (used by the X server)." + +SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=Xfont \ + file://scalable.patch;patch=1" +S = "${WORKDIR}/Xfont" + +inherit autotools pkgconfig + +do_stage() { + oe_runmake install prefix=${STAGING_DIR} \ + bindir=${STAGING_BINDIR} \ + includedir=${STAGING_INCDIR} \ + libdir=${STAGING_LIBDIR} \ + datadir=${STAGING_DATADIR} +} |