diff options
| -rw-r--r-- | rules/fbterm.in | 17 | ||||
| -rw-r--r-- | rules/fbterm.make | 2 | ||||
| -rw-r--r-- | rules/gpm.in | 14 | ||||
| -rw-r--r-- | rules/gpm.make | 57 | ||||
| -rw-r--r-- | rules/links.in | 18 | ||||
| -rw-r--r-- | rules/links.make | 8 |
6 files changed, 6 insertions, 110 deletions
diff --git a/rules/fbterm.in b/rules/fbterm.in index 2dc478f9b..68013c01d 100644 --- a/rules/fbterm.in +++ b/rules/fbterm.in @@ -1,25 +1,12 @@ ## SECTION=multimedia_framebuffer -menuconfig FBTERM +config FBTERM tristate - prompt "fbterm " + prompt "fbterm" select FREETYPE select FONTCONFIG - select GPM if FBTERM_GPM help Framebuffer terminal. Supports unicode and uses fontconfig and Freetype for font rendering. Thus is has support for anti-aliased fonts. -if FBTERM - -config FBTERM_GPM - bool - depends on STAGING - prompt "Build fbterm with gpm support" - help - If enabled, fbterm is built with console mouse support. The required - 'gpm' package is automatically selected. - -endif - # vim: set ts=8 sw=8 noet ft=kconfig: diff --git a/rules/fbterm.make b/rules/fbterm.make index a743a56b4..781189c11 100644 --- a/rules/fbterm.make +++ b/rules/fbterm.make @@ -35,7 +35,7 @@ FBTERM_LICENSE := GPL-2.0-only FBTERM_CONF_TOOL := autoconf FBTERM_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ - --$(call ptx/endis, PTXCONF_FBTERM_GPM)-gpm \ + --disable-gpm \ --disable-vesa \ --enable-epoll \ --enable-signalfd diff --git a/rules/gpm.in b/rules/gpm.in deleted file mode 100644 index 82923744e..000000000 --- a/rules/gpm.in +++ /dev/null @@ -1,14 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=system_libraries - -config GPM - tristate - prompt "gpm" - select LIBC_M - select NCURSES - help - Console-based mouse driver - - STAGING: remove in ptxdist-2019.04.0 - Old, obsolete package that fails to build gcc 7.x diff --git a/rules/gpm.make b/rules/gpm.make deleted file mode 100644 index 4d7e6991b..000000000 --- a/rules/gpm.make +++ /dev/null @@ -1,57 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2009 by Markus Rathgeb <rathgeb.markus@googlemail.com> -# -# See CREDITS for details about who has contributed to this project. -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -PACKAGES-$(PTXCONF_GPM) += gpm - -# -# Paths and names -# -GPM_VERSION := 1.20.6 -GPM_MD5 := 6b534da16dc1b28ba828dea89e520f6f -GPM := gpm-$(GPM_VERSION) -GPM_SUFFIX := tar.bz2 -GPM_URL := http://www.nico.schottelius.org/software/gpm/archives/$(GPM).$(GPM_SUFFIX) -GPM_SOURCE := $(SRCDIR)/$(GPM).$(GPM_SUFFIX) -GPM_DIR := $(BUILDDIR)/$(GPM) -GPM_LICENSE := GPL-2.0-or-later - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -GPM_PATH := PATH=$(CROSS_PATH) -GPM_ENV := $(CROSS_ENV) - -# -# autoconf -# -GPM_AUTOCONF := $(CROSS_AUTOCONF_USR) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/gpm.targetinstall: - @$(call targetinfo) - - @$(call install_init, gpm) - @$(call install_fixup, gpm,PRIORITY,optional) - @$(call install_fixup, gpm,SECTION,base) - @$(call install_fixup, gpm,AUTHOR,"Markus Rathgeb <rathgeb.markus@googlemail.com>") - @$(call install_fixup, gpm,DESCRIPTION,missing) - - @$(call install_lib, gpm, 0, 0, 0644, libgpm) - @$(call install_copy, gpm, 0, 0, 0755, -, /usr/sbin/gpm) - - @$(call install_finish, gpm) - - @$(call touch) - -# vim: syntax=make diff --git a/rules/links.in b/rules/links.in index 9ae1e0355..da0ae9755 100644 --- a/rules/links.in +++ b/rules/links.in @@ -7,7 +7,6 @@ menuconfig LINKS select LIBC_M select LIBC_DL select OPENSSL if LINKS_SSL - select GPM if LINKS_GPM select LIBPNG if LINKS_PNG select LIBJPEG if LINKS_JPEG select XORG_LIB_XEXT if LINKS_X @@ -28,13 +27,6 @@ config LINKS_SSL help Include support for Secure Socket Layer (SSL) transfers -config LINKS_GPM - bool - depends on STAGING - prompt "support for GPM" - help - Activate support for General Purpose Mouse (GPM) service - config LINKS_PNG bool prompt "support for png" @@ -48,16 +40,6 @@ config LINKS_JPEG Activate support for Joint Photographic Experts Group (JPEG) image format -config LINKS_FBCON - bool - select LINKS_PNG - select LINKS_JPEG - select LINKS_GPM - depends on STAGING - prompt "support for fbcon" - help - Activate support for Framebuffer Console mode - config LINKS_TIFF bool depends on BROKEN # no libtiff in ptxdist yet diff --git a/rules/links.make b/rules/links.make index fa831c052..3b6503e87 100644 --- a/rules/links.make +++ b/rules/links.make @@ -35,10 +35,10 @@ LINKS_ENV := $(CROSS_ENV) LINKS_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ --$(call ptx/wwo, PTXCONF_LINKS_SSL)-ssl \ - --$(call ptx/wwo, PTXCONF_LINKS_GPM)-gpm \ + --without-gpm \ --$(call ptx/wwo, PTXCONF_LINKS_PNG)-png \ --$(call ptx/wwo, PTXCONF_LINKS_JPEG)-libjpeg \ - --$(call ptx/wwo, PTXCONF_LINKS_FBCON)-fb \ + --without-fb \ --$(call ptx/wwo, PTXCONF_LINKS_TIFF)-libtiff \ --$(call ptx/wwo, PTXCONF_LINKS_X)-x \ --without-directfb \ @@ -47,7 +47,7 @@ LINKS_AUTOCONF := \ --$(call ptx/wwo, PTXCONF_LINKS_BZIP2)-bzip2 \ --$(call ptx/wwo, PTXCONF_LINKS_LZMA)-lzma \ -ifneq ($(PTXCONF_LINKS_X)$(PTXCONF_LINKS_FBCON),) +ifneq ($(PTXCONF_LINKS_X),) LINKS_AUTOCONF += --enable-graphics else LINKS_AUTOCONF += --disable-graphics @@ -55,9 +55,7 @@ endif # Note: ./configure only support 'gpm' features auto-detection, so # we use the autoconf trick (see Gentoo ebuild) -ifndef PTXCONF_LINKS_GPM LINKS_ENV += ac_cv_lib_gpm_Gpm_Open=no -endif # ---------------------------------------------------------------------------- # Target-Install |