From 5763596c25e748da6f48ec77aba9b51fc149f97b Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Wed, 25 Sep 2019 11:14:34 +0200 Subject: xorg-lib-Xfont2: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Newer versions of the XServer need libXfont2. Signed-off-by: Björn Esser Signed-off-by: Michael Olbrich --- rules/graphics_and_multimedia.in | 2 +- rules/xorg-font-ttf.in | 3 +- rules/xorg-lib-Xfont2.in | 70 +++++++++++++++++++++++++++++++++++++ rules/xorg-lib-Xfont2.make | 75 ++++++++++++++++++++++++++++++++++++++++ rules/xorg-server.in | 4 +-- 5 files changed, 149 insertions(+), 5 deletions(-) create mode 100644 rules/xorg-lib-Xfont2.in create mode 100644 rules/xorg-lib-Xfont2.make diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in index a885b90d2..c4e555902 100644 --- a/rules/graphics_and_multimedia.in +++ b/rules/graphics_and_multimedia.in @@ -3,7 +3,7 @@ menuconfig MENU_XORG_FONTS bool prompt "fonts " - select XORG_LIB_XFONT_PCF_FONTS if XORG_SERVER + select XORG_LIB_XFONT2_PCF_FONTS if XORG_SERVER default y if XORG_SERVER help These fonts can be used with an x-server, standalone directfb or diff --git a/rules/xorg-font-ttf.in b/rules/xorg-font-ttf.in index abab0c7a8..c1a454358 100644 --- a/rules/xorg-font-ttf.in +++ b/rules/xorg-font-ttf.in @@ -2,9 +2,8 @@ menuconfig XORG_FONT_TTF depends on MENU_XORG_FONTS - select XORG_LIB_XFONT_FREETYPE if XORG_LIB_XFONT + select XORG_LIB_XFONT2_FREETYPE if XORG_LIB_XFONT2 bool prompt "xorg true/open type fonts " source "generated/multimedia_xorg_font_ttf.in" - diff --git a/rules/xorg-lib-Xfont2.in b/rules/xorg-lib-Xfont2.in new file mode 100644 index 000000000..19e40fe8a --- /dev/null +++ b/rules/xorg-lib-Xfont2.in @@ -0,0 +1,70 @@ +## SECTION=multimedia_xorg_lib + +# These are always required: +# Requires: xproto fontsproto +# Requires.private: fontenc +# Libs.private: -lz -lm + +config XORG_LIB_XFONT2 + tristate + select LIBC_M + select XORGPROTO + select XORG_LIB_FONTENC + select XORG_LIB_XTRANS + select ZLIB if XORG_LIB_XFONT2_BUILTIN_FONTS + select FREETYPE if XORG_LIB_XFONT2_FREETYPE + # disabling builtins is currently broken + select XORG_LIB_XFONT2_BUILTIN_FONTS + prompt "xorg-lib-xfont2 " + help + X font Library. At least one file based font support must be enabled + to make the xorg server (part dix) happy. + +config XORG_LIB_XFONT2_FREETYPE + depends on XORG_LIB_XFONT2 + select FREETYPE + bool + prompt "Use freetype as rendering library" + help + This will enable freetype 2.x library. + +config XORG_LIB_XFONT2_FONTSERVER + depends on XORG_LIB_XFONT2 + bool + prompt "Support font server connections" + help + This will support connections to font server. + FIXME: xorg server fails when font server connections are disabled. + +config XORG_LIB_XFONT2_PCF_FONTS + depends on XORG_LIB_XFONT2 + bool + prompt "Support pcf format fonts" + help + Enable pcf format fonts in this X server. + +config XORG_LIB_XFONT2_BDF_FONTS + depends on XORG_LIB_XFONT2 + bool + default y + prompt "Support bdf format fonts" + help + Enable bdf format fonts in this X server. + +config XORG_LIB_XFONT2_SNF_FONTS + depends on XORG_LIB_XFONT2 + bool + prompt "Support snf format fonts" + help + Enable snf format fonts in this X server. + +config XORG_LIB_XFONT2_BUILTIN_FONTS + depends on XORG_LIB_XFONT2 + bool + prompt "Support builtin fonts" + default y + help + Builtins (gzipped pcf format in .text segment). Enable this font type + if you don't have any fonts on you target nor a font server in your + network. + FIXME: xorg server fails to build when this entry is disabled. diff --git a/rules/xorg-lib-Xfont2.make b/rules/xorg-lib-Xfont2.make new file mode 100644 index 000000000..5163c3aa7 --- /dev/null +++ b/rules/xorg-lib-Xfont2.make @@ -0,0 +1,75 @@ +# -*-makefile-*- +# +# Copyright (C) 2019 by Bjoern Esser +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_XORG_LIB_XFONT2) += xorg-lib-xfont2 + +# +# Paths and names +# +XORG_LIB_XFONT2_VERSION := 2.0.4 +XORG_LIB_XFONT2_MD5 := 00516bed7ec1453d56974560379fff2f +XORG_LIB_XFONT2 := libXfont2-$(XORG_LIB_XFONT2_VERSION) +XORG_LIB_XFONT2_SUFFIX := tar.bz2 +XORG_LIB_XFONT2_URL := $(call ptx/mirror, XORG, individual/lib/$(XORG_LIB_XFONT2).$(XORG_LIB_XFONT2_SUFFIX)) +XORG_LIB_XFONT2_SOURCE := $(SRCDIR)/$(XORG_LIB_XFONT2).$(XORG_LIB_XFONT2_SUFFIX) +XORG_LIB_XFONT2_DIR := $(BUILDDIR)/$(XORG_LIB_XFONT2) +XORG_LIB_XFONT2_LICENSE := unknown + +# ---------------------------------------------------------------------------- +# Prepare +# ---------------------------------------------------------------------------- + +XORG_LIB_XFONT2_CONF_ENV := \ + $(CROSS_ENV)\ + ac_cv_func_reallocarray=no \ + ac_cv_func_strlcat=no \ + ac_cv_func_strlcpy=no \ + ac_cv_search_strlcat=no + +# +# autoconf +# +XORG_LIB_XFONT2_CONF_TOOL := autoconf +XORG_LIB_XFONT2_CONF_OPT := \ + $(CROSS_AUTOCONF_USR) \ + --disable-devel-docs \ + --disable-strict-compilation \ + --$(call ptx/endis, PTXCONF_XORG_LIB_XFONT2_FREETYPE)-freetype \ + --$(call ptx/endis, PTXCONF_XORG_LIB_XFONT2_BUILTIN_FONTS)-builtins \ + --$(call ptx/endis, PTXCONF_XORG_LIB_XFONT2_PCF_FONTS)-pcfformat \ + --$(call ptx/endis, PTXCONF_XORG_LIB_XFONT2_BDF_FONTS)-bdfformat \ + --$(call ptx/endis, PTXCONF_XORG_LIB_XFONT2_SNF_FONTS)-snfformat \ + --$(call ptx/endis, PTXCONF_XORG_LIB_XFONT2_FONTSERVER)-fc \ + $(XORG_OPTIONS_TRANS) \ + --without-xmlto \ + --without-fop \ + --without-bzip2 + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/xorg-lib-xfont2.targetinstall: + @$(call targetinfo) + + @$(call install_init, xorg-lib-xfont2) + @$(call install_fixup, xorg-lib-xfont2,PRIORITY,optional) + @$(call install_fixup, xorg-lib-xfont2,SECTION,base) + @$(call install_fixup, xorg-lib-xfont2,AUTHOR,"Bjoern Esser ") + @$(call install_fixup, xorg-lib-xfont2,DESCRIPTION,missing) + + @$(call install_lib, xorg-lib-xfont2, 0, 0, 0644, libXfont2) + + @$(call install_finish, xorg-lib-xfont2) + + @$(call touch) + +# vim: syntax=make diff --git a/rules/xorg-server.in b/rules/xorg-server.in index d83c3938f..19e661941 100644 --- a/rules/xorg-server.in +++ b/rules/xorg-server.in @@ -23,7 +23,7 @@ menuconfig XORG_SERVER select XORG_LIB_XTRANS # libs - select XORG_LIB_XFONT + select XORG_LIB_XFONT2 select XORG_LIB_XAU select XORG_LIB_FONTENC select XORG_LIB_XEXT @@ -109,7 +109,7 @@ menuconfig XORG_SERVER # FIXME: xorg fails in dix subdirectory if no connection to font servers # are enabled. - select XORG_LIB_XFONT_FONTSERVER + select XORG_LIB_XFONT2_FONTSERVER if XORG_SERVER -- cgit v1.2.3