Message ID | 20161127110616.3451-12-bernd.kuhls@t-online.de |
---|---|
State | Changes Requested |
Headers | show |
Hello, On Sun, 27 Nov 2016 12:06:15 +0100, Bernd Kuhls wrote: > diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk > new file mode 100644 > index 0000000..233ec40 > --- /dev/null > +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk > @@ -0,0 +1,35 @@ > +################################################################################ > +# > +# xlib_libXfont2 > +# > +################################################################################ > + > +XLIB_LIBXFONT2_VERSION = 2.0.1 > +XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2 > +XLIB_LIBXFONT2_SITE = http://xorg.freedesktop.org/releases/individual/lib > +XLIB_LIBXFONT2_AUTORECONF = YES Why is autoreconf needed? The tarball has the configure script generated, and there are no patches for this package. If there's a good reason, it should be specified by a comment above this line. > +XLIB_LIBXFONT2_LICENSE = MIT > +XLIB_LIBXFONT2_LICENSE_FILES = COPYING > +XLIB_LIBXFONT2_INSTALL_STAGING = YES > + > +XLIB_LIBXFONT2_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontsproto xproto_xproto xfont_encodings Breaking this line that is a bit too long would be good. > +HOST_XLIB_LIBXFONT2_DEPENDENCIES = \ > + host-freetype host-xlib_libfontenc host-xlib_xtrans \ > + host-xproto_fontsproto host-xproto_xproto host-xfont_encodings > + > +XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs > +HOST_XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs > + > +ifeq ($(BR2_microblaze),y) > +# The microblaze toolchains don't define the __ELF__ preprocessor > +# symbol even though they do use the elf format. LibXfont checks for > +# this symbol to know if weak symbols are supported, and otherwise > +# falls back to emulation code using dlopen - Causing linker issues > +# for stuff using libXfont. > +# Work around it by defining the symbol here as well. > +XLIB_LIBXFONT2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D__ELF__" > +endif Are you sure this is needed? The src/stubs/stubs.h code in libXfont doesn't exist in libXfont2. Thanks, Thomas
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in index 40aa80c..c40a643 100644 --- a/package/x11r7/Config.in +++ b/package/x11r7/Config.in @@ -35,6 +35,7 @@ if BR2_PACKAGE_XORG7 source package/x11r7/xlib_libXext/Config.in source package/x11r7/xlib_libXfixes/Config.in source package/x11r7/xlib_libXfont/Config.in + source package/x11r7/xlib_libXfont2/Config.in source package/x11r7/xlib_libXft/Config.in source package/x11r7/xlib_libXi/Config.in source package/x11r7/xlib_libXinerama/Config.in diff --git a/package/x11r7/xlib_libXfont2/Config.in b/package/x11r7/xlib_libXfont2/Config.in new file mode 100644 index 0000000..6cba465 --- /dev/null +++ b/package/x11r7/xlib_libXfont2/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_XLIB_LIBXFONT2 + bool "libXfont2" + select BR2_PACKAGE_FREETYPE + select BR2_PACKAGE_XLIB_LIBFONTENC + select BR2_PACKAGE_XLIB_XTRANS + select BR2_PACKAGE_XPROTO_FONTSPROTO + select BR2_PACKAGE_XPROTO_XPROTO + select BR2_PACKAGE_XFONT_ENCODINGS + help + X.Org Xfont library diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash new file mode 100644 index 0000000..81a3c9f --- /dev/null +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.hash @@ -0,0 +1,2 @@ +# From https://lists.x.org/archives/xorg-announce/2015-December/002663.html +sha256 e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e libXfont2-2.0.1.tar.bz2 diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk new file mode 100644 index 0000000..233ec40 --- /dev/null +++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# xlib_libXfont2 +# +################################################################################ + +XLIB_LIBXFONT2_VERSION = 2.0.1 +XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2 +XLIB_LIBXFONT2_SITE = http://xorg.freedesktop.org/releases/individual/lib +XLIB_LIBXFONT2_AUTORECONF = YES +XLIB_LIBXFONT2_LICENSE = MIT +XLIB_LIBXFONT2_LICENSE_FILES = COPYING +XLIB_LIBXFONT2_INSTALL_STAGING = YES + +XLIB_LIBXFONT2_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontsproto xproto_xproto xfont_encodings + +HOST_XLIB_LIBXFONT2_DEPENDENCIES = \ + host-freetype host-xlib_libfontenc host-xlib_xtrans \ + host-xproto_fontsproto host-xproto_xproto host-xfont_encodings + +XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs +HOST_XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs + +ifeq ($(BR2_microblaze),y) +# The microblaze toolchains don't define the __ELF__ preprocessor +# symbol even though they do use the elf format. LibXfont checks for +# this symbol to know if weak symbols are supported, and otherwise +# falls back to emulation code using dlopen - Causing linker issues +# for stuff using libXfont. +# Work around it by defining the symbol here as well. +XLIB_LIBXFONT2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D__ELF__" +endif + +$(eval $(autotools-package)) +$(eval $(host-autotools-package))
Needed for xserver_xorg-server 1.19+ https://cgit.freedesktop.org/xorg/xserver/commit/?id=05a793f5b3c40747d5a92a076def7f4fb673c7e7 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- package/x11r7/Config.in | 1 + package/x11r7/xlib_libXfont2/Config.in | 10 +++++++ package/x11r7/xlib_libXfont2/xlib_libXfont2.hash | 2 ++ package/x11r7/xlib_libXfont2/xlib_libXfont2.mk | 35 ++++++++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 package/x11r7/xlib_libXfont2/Config.in create mode 100644 package/x11r7/xlib_libXfont2/xlib_libXfont2.hash create mode 100644 package/x11r7/xlib_libXfont2/xlib_libXfont2.mk