mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: "Björn Esser" <b.esser@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: "Björn Esser" <b.esser@pengutronix.de>
Subject: [ptxdist] [PATCH 71/73] xorg-lib-Xfont2: new package
Date: Tue, 24 Sep 2019 12:44:02 +0200	[thread overview]
Message-ID: <20190924104404.32692-71-b.esser@pengutronix.de> (raw)
In-Reply-To: <20190924104404.32692-1-b.esser@pengutronix.de>

Newer versions of the XServer need libXfont2.

Signed-off-by: Björn Esser <b.esser@pengutronix.de>
---
 rules/xorg-font-ttf.in     |  3 +-
 rules/xorg-lib-Xfont2.in   | 70 +++++++++++++++++++++++++++++++++++
 rules/xorg-lib-Xfont2.make | 75 ++++++++++++++++++++++++++++++++++++++
 rules/xorg-server.in       |  4 +-
 4 files changed, 148 insertions(+), 4 deletions(-)
 create mode 100644 rules/xorg-lib-Xfont2.in
 create mode 100644 rules/xorg-lib-Xfont2.make

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 <bes@pengutronix.de>
+#
+# 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 <bes@pengutronix.de>")
+	@$(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 e91d982ba..64fea61a1 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
-- 
2.23.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

  parent reply	other threads:[~2019-09-24 10:44 UTC|newest]

Thread overview: 77+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-24 10:42 [ptxdist] [PATCH 01/73] xorgproto: version bump 2018.4 -> 2019.1 Björn Esser
2019-09-24 10:42 ` [ptxdist] [PATCH 02/73] xorgproto: Build with --enable-legacy Björn Esser
2019-09-24 10:42 ` [ptxdist] [PATCH 03/73] host-xorg-util-macros: version bump 1.17 -> 1.19.2 Björn Esser
2019-09-24 10:42 ` [ptxdist] [PATCH 04/73] host-xorg-app-bdftopcf: version bump 1.0.3 -> 1.0.5 Björn Esser
2019-09-24 10:42 ` [ptxdist] [PATCH 05/73] xorg-lib-x11: version bump 1.6.7 -> 1.6.8 Björn Esser
2019-09-24 10:42 ` [ptxdist] [PATCH 06/73] host-xorg-lib-x11: enable xthreads Björn Esser
2019-09-25  7:36   ` Michael Tretter
2019-09-24 10:42 ` [ptxdist] [PATCH 07/73] xorg-app-iceauth: version bump 1.0.5 -> 1.0.8 Björn Esser
2019-09-24 10:42 ` [ptxdist] [PATCH 08/73] xorg-app-mkfontscale: version bump 1.1.0 -> 1.2.1 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 09/73] xorg-app-rgb: version bump 1.0.4 -> 1.0.6 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 10/73] xorg-app-setxkbmap: version bump 1.3.0 -> 1.3.2 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 11/73] xorg-app-setxkbmap: version bump 1.0.7 -> 1.1 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 12/73] xorg-app-xdm: version bump 1.1.11 -> 1.1.12 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 13/73] xorg-app-xev: version bump 1.2.0 -> 1.2.3 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 14/73] xorg-app-xeyes: version bump 1.1.1 -> 1.1.2 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 15/73] xorg-app-xhost: version bump 1.0.5 -> 1.0.8 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 16/73] xorg-app-xinit: version bump 1.3.2 -> 1.4.1 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 17/73] xorg-app-xinput: version bump 1.6.0 -> 1.6.3 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 18/73] xorg-app-xkbcomp: version bump 1.2.4 -> 1.4.2 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 19/73] xorg-app-xprop: version bump 1.2.1 -> 1.2.4 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 20/73] xorg-app-xrandr: version bump 1.3.5 -> 1.5.1 Björn Esser
2019-09-25  7:42   ` Michael Tretter
2019-09-25  8:07     ` Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 21/73] xorg-app-xrandr: version bump 1.0.9 -> 1.2.0 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 22/73] xorg-app-xset: version bump 1.2.2 -> 1.2.4 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 23/73] xorg-app-xsetroot: version bump 1.1.0 -> 1.1.2 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 24/73] xorg-app-xvinfo: version bump 1.1.1 -> 1.1.4 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 25/73] xorg-data-xbitmaps: version bump 1.1.0 -> 1.1.2 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 26/73] xorg-driver-input-evdev: version bump 2.9.0 -> 2.10.6 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 27/73] xorg-driver-input-keyboard: version bump 1.8.0 -> 1.9.0 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 28/73] xorg-driver-input-mouse: version bump 1.9.0 -> 1.9.3 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 29/73] xorg-driver-input-void: version bump 1.4.0 -> 1.4.1 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 30/73] xorg-driver-video-apm: version bump 1.2.5 -> 1.3.0 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 31/73] xorg-driver-video-ati: version bump 7.4.0 -> 19.0.1 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 32/73] xorg-driver-video-dummy: version bump 0.3.7 -> 0.3.8 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 33/73] xorg-driver-video-fbdev: version bump 0.4.4 -> 0.5.0 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 34/73] xorg-driver-video-intel: version bump 2.21.15 -> 2.99.917 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 35/73] xorg-driver-video-vesa: version bump 2.3.3 -> 2.4.0 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 36/73] xorg-font-encodings: version bump 1.0.4 -> 1.0.5 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 37/73] xorg-font-util: version bump 1.3.0 -> 1.3.2 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 38/73] xorg-lib-dmx: version bump 1.1.3 -> 1.1.4 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 39/73] xorg-lib-fontenc: version bump 1.1.2 " Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 40/73] xorg-lib-FS: version bump 1.0.6 -> 1.0.8 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 41/73] xorg-lib-ICE: version bump 1.0.9 -> 1.0.10 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 42/73] xorg-lib-SM: version bump 1.2.2 -> 1.2.3 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 43/73] xorg-lib-Xau: version bump 1.0.8 -> 1.0.9 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 44/73] xorg-lib-Xaw: version bump 1.0.12 -> 1.0.13 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 45/73] xorg-lib-Xcomposite: version bump 0.4.4 -> 0.4.5 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 46/73] xorg-lib-Xcursor: version bump 1.1.14 -> 1.2.0 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 47/73] xorg-lib-Xdamage: version bump 1.1.4 -> 1.1.5 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 48/73] xorg-lib-Xdmcp: version bump 1.1.1 -> 1.1.3 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 49/73] xorg-lib-Xext: version bump 1.3.3 -> 1.3.4 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 50/73] xorg-lib-Xfixes: version bump 5.0.1 -> 5.0.3 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 51/73] xorg-lib-Xft: version bump 2.3.2 -> 2.3.3 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 52/73] xorg-lib-Xi: version bump 1.7.4 -> 1.7.10 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 53/73] xorg-lib-Xinerama: version bump 1.1.3 -> 1.1.4 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 54/73] xorg-lib-Xmu: version bump 1.1.2 -> 1.1.3 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 55/73] xorg-lib-Xpm: version bump 3.5.11 -> 3.5.12 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 56/73] xorg-lib-Xrandr: version bump 1.4.2 -> 1.5.2 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 57/73] xorg-lib-Xrender: version bump 0.9.8 -> 0.9.10 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 58/73] xorg-lib-Xres: version bump 1.0.7 -> 1.2.0 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 59/73] xorg-lib-XScrnSaver: version bump 1.2.2 -> 1.2.3 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 60/73] xorg-lib-Xt: version bump 1.1.4 -> 1.2.0 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 61/73] xorg-lib-Xtst: version bump 1.2.2 -> 1.2.3 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 62/73] xorg-lib-Xv: version bump 1.0.10 -> 1.0.11 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 63/73] xorg-lib-XvMC: version bump 1.0.8 " Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 64/73] xorg-lib-Xxf86dga: version bump 1.1.4 -> 1.1.5 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 65/73] xorg-lib-Xxf86misc: version bump 1.0.3 -> 1.0.4 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 66/73] xorg-lib-Xxf86vm: version bump 1.1.3 -> 1.1.4 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 67/73] xorg-lib-xkbfile: version bump 1.0.8 -> 1.1.0 Björn Esser
2019-09-24 10:43 ` [ptxdist] [PATCH 68/73] xorg-lib-xshmfence: version bump 1.1 -> 1.3 Björn Esser
2019-09-24 10:44 ` [ptxdist] [PATCH 69/73] xorg-lib-xtrans: version bump 1.3.5 -> 1.4.0 Björn Esser
2019-09-24 10:44 ` [ptxdist] [PATCH 70/73] xorg-server: version bump 1.17.2 -> 1.20.5 Björn Esser
2019-09-25  7:35   ` Michael Tretter
2019-09-24 10:44 ` Björn Esser [this message]
2019-09-24 10:44 ` [ptxdist] [PATCH 72/73] xorg-lib-Xfont: drop package for target Björn Esser
2019-09-24 10:44 ` [ptxdist] [PATCH 73/73] libx11-locale: Add needed build dependencies Björn Esser

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190924104404.32692-71-b.esser@pengutronix.de \
    --to=b.esser@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox