diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-03 11:01:19 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-10-03 11:05:14 +0200 |
| commit | 79b1852977b32fd4f5831713d77b3f7e8c13185c (patch) | |
| tree | e2cb54fddcefeedcb464b40de971df8d22446a5c | |
| parent | a30f8cf3e2ff300d39832091281f78036b83ba00 (diff) | |
| download | ptxdist-79b1852977b32fd4f5831713d77b3f7e8c13185c.tar.gz ptxdist-79b1852977b32fd4f5831713d77b3f7e8c13185c.tar.xz | |
directfb: remove after on year in staging
This is a really old version of DirectFB. It was in staging for more than
one year and nobody cared.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
29 files changed, 8 insertions, 930 deletions
diff --git a/patches/DirectFB-1.4.3/0001-fix-X11-detection.patch b/patches/DirectFB-1.4.3/0001-fix-X11-detection.patch deleted file mode 100644 index 9570ad2c8..000000000 --- a/patches/DirectFB-1.4.3/0001-fix-X11-detection.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ab900fcc9de2c1e2146cbf56abe95caebeba1caa Mon Sep 17 00:00:00 2001 -From: Erwin Rol <erwin@erwinrol.com> -Date: Wed, 20 Jan 2010 00:15:56 +0100 -Subject: [PATCH 1/2] fix X11 detection - -Use pkgconfig for X11 detection. This diff is simply cherrypicked from -upstream and should not be needed anymore for the next release -of directfb. - -Signed-off-by: Erwin Rol <erwin@erwinrol.com> ---- - configure.in | 14 ++------------ - 1 files changed, 2 insertions(+), 12 deletions(-) - -diff --git a/configure.in b/configure.in -index 1ca4d6d..6b7e0ba 100644 ---- a/configure.in -+++ b/configure.in -@@ -134,18 +134,8 @@ AC_ARG_ENABLE(x11, - enable_x11=yes) - - if test "$enable_x11" = "yes"; then -- CFLAGS_saved="$CFLAGS" -- CFLAGS="$CFLAGS -I/usr/X11R6/include" -- AC_CHECK_HEADER(X11/X.h, x11_found=yes, x11_found=no) -- CFLAGS="$CFLAGS_saved" -- if test "$x11_found" = no; then -- enable_x11=no -- AC_MSG_WARN([ --*** no X11/X.h found -- building without X11 support.]) -- else -- X11_LIBS="-L/usr/X11R6/lib -lX11 -lXext" -- X11_CFLAGS="-I/usr/X11R6/include" -- fi -+ PKG_CHECK_MODULES([X11], [xproto x11 xext], [enable_x11="yes"], [enable_x11="no", -+ AC_MSG_WARN([*** no X11 found -- building without X11 support])]) - fi - - AM_CONDITIONAL(X11_CORE, test "$enable_x11" = "yes") --- -1.6.6 - diff --git a/patches/DirectFB-1.4.3/0002-disable-ppc-memcpy-that-needs-kernel-kernel-config-f.patch b/patches/DirectFB-1.4.3/0002-disable-ppc-memcpy-that-needs-kernel-kernel-config-f.patch deleted file mode 100644 index fa00110f2..000000000 --- a/patches/DirectFB-1.4.3/0002-disable-ppc-memcpy-that-needs-kernel-kernel-config-f.patch +++ /dev/null @@ -1,33 +0,0 @@ -From be2ee14c009408145dcb2fe26a4667b3e7ed554b Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Wed, 20 Jan 2010 00:16:34 +0100 -Subject: [PATCH 2/2] disable ppc memcpy that needs kernel kernel config file - -ppcasm_memcpy_cachable.S needs the kernel config to compile. -This patch simply disables the file. - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - lib/direct/Makefile.am | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -diff --git a/lib/direct/Makefile.am b/lib/direct/Makefile.am -index ff89144..33ed187 100644 ---- a/lib/direct/Makefile.am -+++ b/lib/direct/Makefile.am -@@ -22,12 +22,7 @@ EXTRA_DIST = \ - ppc_asm.h - - if BUILDPPCASM --if HAVE_LINUX --ppcasm_sources = ppcasm_memcpy.S ppcasm_memcpy_cachable.S --else - ppcasm_sources = ppcasm_memcpy.S --endif -- - ppcasm_headers = ppcasm_memcpy.h ppc_asm.h - endif - --- -1.6.6 - diff --git a/patches/DirectFB-1.4.3/autogen.sh b/patches/DirectFB-1.4.3/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/DirectFB-1.4.3/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh
\ No newline at end of file diff --git a/patches/DirectFB-1.4.3/series b/patches/DirectFB-1.4.3/series deleted file mode 100644 index d8faf44c2..000000000 --- a/patches/DirectFB-1.4.3/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-fix-X11-detection.patch -0002-disable-ppc-memcpy-that-needs-kernel-kernel-config-f.patch diff --git a/patches/DirectFB-examples-1.2.0/ptx_logo_640_480.png b/patches/DirectFB-examples-1.2.0/ptx_logo_640_480.png Binary files differdeleted file mode 100644 index c70d4ea58..000000000 --- a/patches/DirectFB-examples-1.2.0/ptx_logo_640_480.png +++ /dev/null diff --git a/patches/DirectFB-examples-1.2.0/selectable_default_penguin_population.diff b/patches/DirectFB-examples-1.2.0/selectable_default_penguin_population.diff deleted file mode 100644 index 87b3bc7dd..000000000 --- a/patches/DirectFB-examples-1.2.0/selectable_default_penguin_population.diff +++ /dev/null @@ -1,45 +0,0 @@ -Subject: selectable default penguin population -From: Luotao Fu <l.fu@pengutronix.de> - - This one makes the default penguin population selectable though environment - variable "PENGUIN". This way we can start the control this on boards without - a keyboard. - -Signed-off-by: Luotao Fu <l.fu@pengutronix.de> - ---- - src/df_andi.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -Index: src/df_andi.c -=================================================================== ---- src/df_andi.c.orig -+++ src/df_andi.c -@@ -566,6 +566,7 @@ int main( int argc, char *argv[] ) - FPSData fps; - int quit = 0; - int clipping = 0; -+ unsigned long int default_population = 200; - - init_resources( argc, argv ); - -@@ -573,7 +574,18 @@ int main( int argc, char *argv[] ) - - initialize_animation(); - -- spawn_penguins( 200 ); -+ if (getenv("PENGUINS")) -+ default_population = strtoul(getenv("PENGUINS"), NULL, 10); -+ -+ if (default_population > 2000) { -+ fprintf(stderr, "ERR: %ld are more penguins than we can afford,", -+ default_population); -+ default_population = 200; -+ fprintf(stderr, " setting default population back to %ld\n", -+ default_population); -+ } -+ -+ spawn_penguins( default_population ); - - primary->SetDrawingFlags( primary, DSDRAW_BLEND ); - diff --git a/patches/DirectFB-examples-1.2.0/series b/patches/DirectFB-examples-1.2.0/series deleted file mode 100644 index 55ccc47fd..000000000 --- a/patches/DirectFB-examples-1.2.0/series +++ /dev/null @@ -1,2 +0,0 @@ -use_ptx_logo.diff -p0 -selectable_default_penguin_population.diff -p0 diff --git a/patches/DirectFB-examples-1.2.0/use_ptx_logo.diff b/patches/DirectFB-examples-1.2.0/use_ptx_logo.diff deleted file mode 100644 index a0082b185..000000000 --- a/patches/DirectFB-examples-1.2.0/use_ptx_logo.diff +++ /dev/null @@ -1,22 +0,0 @@ -From: Wolfram Sang <w.sang@pengutronix.de> -Subject: Add Pengutronix logo - -Signed-off-by: (not for upstream) - ---- - src/df_andi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: src/df_andi.c -=================================================================== ---- src/df_andi.c.orig -+++ src/df_andi.c -@@ -513,7 +513,7 @@ static void init_resources( int argc, ch - tuximage->SetSrcColorKey( tuximage, 0x00, 0xFF, 0x00 ); - - /* load the background image */ -- DFBCHECK(dfb->CreateImageProvider( dfb, DATADIR"/wood_andi.jpg", -+ DFBCHECK(dfb->CreateImageProvider( dfb, DATADIR"/ptx_logo_640_480.png", - &provider )); - - DFBCHECK (provider->GetSurfaceDescription (provider, &dsc)); diff --git a/rules/cairo.in b/rules/cairo.in index ca17903dc..7089dec7b 100644 --- a/rules/cairo.in +++ b/rules/cairo.in @@ -7,7 +7,6 @@ menuconfig CAIRO select XORG_LIB_XRENDER if CAIRO_XLIB select ZLIB if CAIRO_PS || CAIRO_PDF select GLIB if CAIRO_GOBJECT - select DIRECTFB if CAIRO_DIRECTFB select FREETYPE if CAIRO_FREETYPE select FONTCONFIG if CAIRO_FREETYPE select LIBPNG if CAIRO_PNG @@ -50,12 +49,6 @@ config CAIRO_GLES2 bool prompt "OpenGLESv2" -config CAIRO_DIRECTFB - bool - prompt "directfb" - depends on STAGING - select CAIRO_FREETYPE - config CAIRO_PS bool prompt "PostScript" diff --git a/rules/cairo.make b/rules/cairo.make index 74a55a64d..8141453c1 100644 --- a/rules/cairo.make +++ b/rules/cairo.make @@ -64,7 +64,7 @@ CAIRO_CONF_OPT := \ --$(call ptx/endis, PTXCONF_CAIRO_GL)-gl \ --$(call ptx/endis, PTXCONF_CAIRO_GLES2)-glesv2 \ --disable-cogl \ - --$(call ptx/endis, PTXCONF_CAIRO_DIRECTFB)-directfb \ + --disable-directfb \ --disable-vg \ --$(call ptx/endis, PTXCONF_CAIRO_EGL)-egl \ --$(call ptx/endis, PTXCONF_CAIRO_GLX)-glx \ diff --git a/rules/directfb-examples.in b/rules/directfb-examples.in deleted file mode 100644 index d41a23541..000000000 --- a/rules/directfb-examples.in +++ /dev/null @@ -1,16 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=multimedia_directfb - -config DIRECTFB_EXAMPLES - tristate - prompt "directfb examples" - select DIRECTFB_IMAGE_GIF - select DIRECTFB_IMAGE_PNG - select DIRECTFB_IMAGE_JPEG - select DIRECTFB_FONT_FREETYPE - select DIRECTFB - select LIBC_PTHREAD - help - STAGING: remove in ptxdist-2018.07.0 - DirectFB moved to staging. diff --git a/rules/directfb-examples.make b/rules/directfb-examples.make deleted file mode 100644 index bd62eaf6e..000000000 --- a/rules/directfb-examples.make +++ /dev/null @@ -1,89 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2007-2008, 2010 by Marc Kleine-Budde <mkl@pengutronix.de> -# -# 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. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_DIRECTFB_EXAMPLES) += directfb-examples - -# -# Paths and names -# -DIRECTFB_EXAMPLES_VERSION := 1.2.0 -DIRECTFB_EXAMPLES_MD5 := ce018f681b469a1d72ffc32650304b98 -DIRECTFB_EXAMPLES := DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION) -DIRECTFB_EXAMPLES_SUFFIX := tar.gz -DIRECTFB_EXAMPLES_SOURCE := $(SRCDIR)/$(DIRECTFB_EXAMPLES).$(DIRECTFB_EXAMPLES_SUFFIX) -DIRECTFB_EXAMPLES_DIR := $(BUILDDIR)/$(DIRECTFB_EXAMPLES) - -DIRECTFB_EXAMPLES_URL := \ - http://www.directfb.org/downloads/Extras/$(DIRECTFB_EXAMPLES).$(DIRECTFB_EXAMPLES_SUFFIX) \ - http://www.directfb.org/downloads/Old/$(DIRECTFB_EXAMPLES).$(DIRECTFB_EXAMPLES_SUFFIX) - -# ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/directfb-examples.extract: - @$(call targetinfo) - @$(call clean, $(DIRECTFB_EXAMPLES_DIR)) - @$(call extract, DIRECTFB_EXAMPLES) - @$(call patchin, DIRECTFB_EXAMPLES) - @cp $(DIRECTFB_EXAMPLES_DIR)/patches/ptx_logo_640_480.png $(DIRECTFB_EXAMPLES_DIR)/data - @$(call touch) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -DIRECTFB_EXAMPLES_PATH := PATH=$(CROSS_PATH) -DIRECTFB_EXAMPLES_ENV := $(CROSS_ENV) - -# -# autoconf -# -DIRECTFB_EXAMPLES_AUTOCONF := $(CROSS_AUTOCONF_USR) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/directfb-examples.targetinstall: - @$(call targetinfo) - - @$(call install_init, directfb-examples) - @$(call install_fixup, directfb-examples,PRIORITY,optional) - @$(call install_fixup, directfb-examples,SECTION,base) - @$(call install_fixup, directfb-examples,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") - @$(call install_fixup, directfb-examples,DESCRIPTION,missing) - -# installs the binaries - @cd $(DIRECTFB_EXAMPLES_PKGDIR)/usr/bin && \ - find . -perm /u+x -type f | \ - while read file; do \ - $(call install_copy, directfb-examples, 0, 0, 0755, -, \ - /usr/bin/$${file##*/} \ - ) \ - done - -# install the datafiles - @cd $(DIRECTFB_EXAMPLES_PKGDIR)/usr/share/directfb-examples && \ - find . -type f | \ - while read file; do \ - $(call install_copy, directfb-examples, 0, 0, 0644, -, \ - /usr/share/directfb-examples/$${file##./}, n \ - ) \ - done - - @$(call install_finish,directfb-examples) - - @$(call touch) - -# vim: syntax=make diff --git a/rules/directfb.in b/rules/directfb.in deleted file mode 100644 index 6523ef934..000000000 --- a/rules/directfb.in +++ /dev/null @@ -1,162 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=multimedia_directfb - -menuconfig DIRECTFB - tristate - prompt "directfb " - - select HOST_DIRECTFB - select MENU_XORG_FONTS - select LIBPNG if DIRECTFB_IMAGE_PNG - select LIBJPEG if DIRECTFB_IMAGE_JPEG - select FREETYPE if DIRECTFB_FONT_FREETYPE - select TSLIB if DIRECTFB_INPUT_TSLIB - select XORG_LIB_X11 if DIRECTFB_X11 - select MESALIB if DIRECTFB_GFX_GL - help - DirectFB is a thin library that provides hardware - graphics acceleration, input device handling and - abstraction, integrated windowing system with support - for translucent windows and multiple display layers, - not only on top of the Linux Framebuffer Device. - It is a complete hardware abstraction layer with - software fallbacks for every graphics operation that - is not supported by the underlying hardware. DirectFB - adds graphical power to embedded systems and sets a - new standard for graphics under Linux. - - STAGING: remove in ptxdist-2018.07.0 - Really old version that needs updating and fails to build. - -if DIRECTFB - -config DIRECTFB_DEBUG - bool "build with debug support" - -config DIRECTFB_TRACE - bool "build with trace support" - - -config DIRECTFB_X11 - bool "X11 support" - -config DIRECTFB_FBDEV - bool "Framebuffer Device support" - -config DIRECTFB_V4L - bool "Video for Linux support" - -config DIRECTFB_V4L2 - bool "Video for Linux v2 support" - -config DIRECTFB_FONT_FREETYPE - bool "build freetype2 font provider" - -config DIRECTFB_WM_UNIQUE - bool "enable unique (wm module)" - select DIRECTFB_IMAGE_PNG - -menu "config files " - -config DIRECTFB_CONFIG_DIRECTFBRC - bool "/etc/directfbrc" - -endmenu - -menu "image providers " - -config DIRECTFB_IMAGE_GIF - bool "gif" - -config DIRECTFB_IMAGE_PNG - bool "png" - -config DIRECTFB_IMAGE_JPEG - bool "jpeg" - -endmenu - -menu "graphics driver " - -config DIRECTFB_GFX_ATI128 - bool "ati128" - -config DIRECTFB_GFX_CLE266 - bool "cle266" - -config DIRECTFB_GFX_CYBER5K - bool "cyber5k" - -config DIRECTFB_GFX_DAVINCI - bool "davinci" - depends on BROKEN - -config DIRECTFB_GFX_EP9X - bool "ep9x" - -config DIRECTFB_GFX_GL - bool "OpenGL" - -config DIRECTFB_GFX_I810 - bool "i810" - -config DIRECTFB_GFX_I830 - bool "i830" - -config DIRECTFB_GFX_MACH64 - bool "mach64" - -config DIRECTFB_GFX_MATROX - bool "matrox" - -config DIRECTFB_GFX_NEOMAGIC - bool "neomagic" - -config DIRECTFB_GFX_NSC - bool "nsc" - -config DIRECTFB_GFX_NVIDIA - bool "nvidia" - -config DIRECTFB_GFX_OMAP - bool "omap" - -config DIRECTFB_GFX_RADEON - bool "radeon" - -config DIRECTFB_GFX_SAVAGE - bool "savage" - -config DIRECTFB_GFX_SIS315 - bool "sis315" - -config DIRECTFB_GFX_TDFX - bool "tdfx" - -config DIRECTFB_GFX_UNICHROME - bool "unichrome" - -config DIRECTFB_GFX_VMWARE - bool "vmware" - -endmenu - -menu "input driver " - -config DIRECTFB_INPUT_KEYBOARD - bool "keyboard" - -config DIRECTFB_INPUT_LINUXINPUT - default y - bool "linuxinput" - -config DIRECTFB_INPUT_PS2MOUSE - bool "ps2mouse" - -config DIRECTFB_INPUT_TSLIB - bool "tslib" - -endmenu - -endif diff --git a/rules/directfb.make b/rules/directfb.make deleted file mode 100644 index 53dca32f8..000000000 --- a/rules/directfb.make +++ /dev/null @@ -1,214 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2006, 2009, 2010 by Marc Kleine-Budde <mkl@pengutronix.de> -# 2010 by Erwin Rol <erwin@erwinrol.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. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_DIRECTFB) += directfb - -# -# Paths and names -# -DIRECTFB_VERSION := 1.4.3 -DIRECTFB_MD5 := 223e036da906ceb4bd44708026839ff1 -DIRECTFB := DirectFB-$(DIRECTFB_VERSION) -DIRECTFB_SUFFIX := tar.gz -DIRECTFB_SOURCE := $(SRCDIR)/$(DIRECTFB).$(DIRECTFB_SUFFIX) -DIRECTFB_DIR := $(BUILDDIR)/$(DIRECTFB) - -DIRECTFB_URL := \ - http://www.directfb.org/downloads/Core/DirectFB-1.4/$(DIRECTFB).$(DIRECTFB_SUFFIX) \ - http://www.directfb.org/downloads/Old/$(DIRECTFB).$(DIRECTFB_SUFFIX) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -DIRECTFB_PATH := PATH=$(CROSS_PATH) -DIRECTFB_ENV := \ - $(CROSS_ENV) \ - DIRECTFB_CSOURCE=$(PTXCONF_SYSROOT_HOST)/bin/directfb-csource - -DIRECTFB_INPUT-$(PTXCONF_DIRECTFB_INPUT_KEYBOARD) += keyboard -DIRECTFB_INPUT-$(PTXCONF_DIRECTFB_INPUT_LINUXINPUT) += linuxinput -DIRECTFB_INPUT-$(PTXCONF_DIRECTFB_INPUT_PS2MOUSE) += ps2mouse -DIRECTFB_INPUT-$(PTXCONF_DIRECTFB_INPUT_TSLIB) += tslib - - -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_ATI128) += ati128 -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_CLE266) += cle266 -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_CYBER5K) += cyber5k -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_DAVINCI) += davinci -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_EP9X) += ep9x -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_GL) += gl -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_I810) += i810 -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_I830) += i830 -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_MACH64) += mach64 -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_MATROX) += matrox -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_NEOMAGIC) += neomagic -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_NSC) += nsc -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_NVIDIA) += nvidia -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_OMAP) += omap -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_RADEON) += radeon -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_SAVAGE) += savage -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_SIS315) += sis315 -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_TDFX) += tdfx -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_UNICHROME) += unichrome -DIRECTFB_GFX-$(PTXCONF_DIRECTFB_GFX_VMWARE) += vmware - -# -# autoconf -# -DIRECTFB_AUTOCONF := \ - $(CROSS_AUTOCONF_USR) \ - --without-tests \ - --with-tools \ - --disable-osx \ - --disable-network \ - --disable-multi \ - --disable-voodoo \ - --disable-sdl \ - --disable-vnc \ - --disable-sysfs \ - --disable-zlib \ - --with-gfxdrivers=$(subst $(space),$(comma),$(DIRECTFB_GFX-y)) \ - --with-inputdrivers=$(subst $(space),$(comma),$(DIRECTFB_INPUT-y)) - -ifdef PTXCONF_DIRECTFB_X11 -DIRECTFB_AUTOCONF += --enable-x11 -else -DIRECTFB_AUTOCONF += --disable-x11 -endif - -ifdef PTXCONF_DIRECTFB_FBDEV -DIRECTFB_AUTOCONF += --enable-fbdev -else -DIRECTFB_AUTOCONF += --disable-fbdev -endif - -ifdef PTXCONF_DIRECTFB_V4L -DIRECTFB_AUTOCONF += --enable-video4linux -else -DIRECTFB_AUTOCONF += --disable-video4linux -endif - -ifdef PTXCONF_DIRECTFB_V4L2 -DIRECTFB_AUTOCONF += --enable-video4linux2 -else -DIRECTFB_AUTOCONF += --disable-video4linux2 -endif - -ifdef PTXCONF_DIRECTFB_DEBUG -DIRECTFB_AUTOCONF += --enable-debug -DIRECTFB_MODULE_DIRECTORY := /usr/lib/directfb-1.4-0 -else -DIRECTFB_AUTOCONF += --disable-debug-support -DIRECTFB_MODULE_DIRECTORY := /usr/lib/directfb-1.4-0-pure -endif - -ifdef PTXCONF_DIRECTFB_TRACE -DIRECTFB_AUTOCONF += --enable-trace -else -DIRECTFB_AUTOCONF += --disable-trace -endif - -ifdef PTXCONF_DIRECTFB_WM_UNIQUE -DIRECTFB_AUTOCONF += --enable-unique -else -DIRECTFB_AUTOCONF += --disable-unique -endif - -ifdef PTXCONF_DIRECTFB_IMAGE_GIF -DIRECTFB_AUTOCONF += --enable-gif -else -DIRECTFB_AUTOCONF += --disable-gif -endif - -ifdef PTXCONF_DIRECTFB_IMAGE_PNG -DIRECTFB_AUTOCONF += --enable-png -else -DIRECTFB_AUTOCONF += --disable-png -endif - -ifdef PTXCONF_DIRECTFB_IMAGE_JPEG -DIRECTFB_AUTOCONF += --enable-jpeg -else -DIRECTFB_AUTOCONF += --disable-jpeg -endif - -ifdef PTXCONF_DIRECTFB_FONT_FREETYPE -DIRECTFB_AUTOCONF += --enable-freetype -else -DIRECTFB_AUTOCONF += --disable-freetype -endif - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -# /usr/bin/dfblayer -# /usr/bin/dfbfx -# /usr/bin/dfbg -# /usr/bin/dfbinspector -# /usr/bin/dfbinput -# /usr/bin/mkdgiff -# /usr/bin/dfbscreen -# /usr/bin/dfbpenmount -# /usr/bin/directfb-config -# /usr/bin/mkdfiff -# /usr/bin/directfb-csource -# /usr/bin/dfbmaster -# /usr/bin/dfbdump -# /usr/share/directfb-1.3.5/cursor.dat -# /usr/lib/directfb-1.3-0-pure/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so -# /usr/lib/directfb-1.3-0-pure/interfaces/IDirectFBFont/libidirectfbfont_default.so -# /usr/lib/directfb-1.3-0-pure/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so -# /usr/lib/directfb-1.3-0-pure/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so -# /usr/lib/directfb-1.3-0-pure/systems/libdirectfb_devmem.so - -$(STATEDIR)/directfb.targetinstall: - @$(call targetinfo) - - @$(call install_init, directfb) - @$(call install_fixup, directfb,PRIORITY,optional) - @$(call install_fixup, directfb,SECTION,base) - @$(call install_fixup, directfb,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>") - @$(call install_fixup, directfb,DESCRIPTION,missing) - -ifdef PTXCONF_DIRECTFB_CONFIG_DIRECTFBRC - @$(call install_alternative, directfb, 0, 0, 0644, /etc/directfbrc) -endif - -ifdef PTXCONF_PRELINK - @$(call install_alternative, directfb, 0, 0, 0644, \ - /etc/prelink.conf.d/directfb) -endif - - @$(call install_copy, directfb, 0, 0, 0755, -, /usr/bin/dfbinfo) - - @$(call install_lib, directfb, 0, 0, 0644, libdirectfb-1.4) - @$(call install_lib, directfb, 0, 0, 0644, libfusion-1.4) - @$(call install_lib, directfb, 0, 0, 0644, libdirect-1.4) - -ifdef PTXCONF_DIRECTFB_WM_UNIQUE - @$(call install_lib, directfb, 0, 0, 0644, libuniquewm-1.4) -endif - - @cd $(DIRECTFB_PKGDIR) && for plugin in `find ./$(DIRECTFB_MODULE_DIRECTORY) -name "*.so"`; do \ - $(call install_copy, directfb, 0, 0, 0644, -, /$$plugin); \ - done - - @$(call install_finish, directfb) - - @$(call touch) - -# vim: syntax=make - diff --git a/rules/gst-plugins-bad.in b/rules/gst-plugins-bad.in index e7f605340..32dfaa8dc 100644 --- a/rules/gst-plugins-bad.in +++ b/rules/gst-plugins-bad.in @@ -6,7 +6,6 @@ menuconfig GST_PLUGINS_BAD select LIBOIL select GSTREAMER select GST_PLUGINS_BASE - select DIRECTFB if GST_PLUGINS_BAD_DIRECTFB select SDL if GST_PLUGINS_BAD_SDL select BZIP2 if GST_PLUGINS_BAD_BZ2 select BZIP2_LIBBZ2 if GST_PLUGINS_BAD_BZ2 @@ -301,8 +300,8 @@ config GST_PLUGINS_BAD_DC1394 config GST_PLUGINS_BAD_DIRECTFB bool - depends on STAGING prompt "directfb" + depends on BROKEN config GST_PLUGINS_BAD_DIRAC bool diff --git a/rules/gst-plugins-bad1.in b/rules/gst-plugins-bad1.in index 9d3ad6f7d..d71f27fde 100644 --- a/rules/gst-plugins-bad1.in +++ b/rules/gst-plugins-bad1.in @@ -14,7 +14,6 @@ menuconfig GST_PLUGINS_BAD1 select LIBCURL if GST_PLUGINS_BAD1_CURL select LIBXML2 if GST_PLUGINS_BAD1_DASH || GST_PLUGINS_BAD1_SMOOTHSTREAMING || GST_PLUGINS_BAD1_TTML select LIBXML2_DOM if GST_PLUGINS_BAD1_DASH || GST_PLUGINS_BAD1_SMOOTHSTREAMING - select DIRECTFB if GST_PLUGINS_BAD1_DIRECTFB select OPENSSL if GST_PLUGINS_BAD1_DTLS select OPENSSL if GST_PLUGINS_BAD1_HLS select LIBMMS if GST_PLUGINS_BAD1_LIBMMS @@ -408,7 +407,8 @@ config GST_PLUGINS_BAD1_DECKLINK config GST_PLUGINS_BAD1_DIRECTFB bool - depends on STAGING + # needs directfb + depends on BROKEN prompt "directfb" config GST_PLUGINS_BAD1_WAYLAND diff --git a/rules/gtk2.in b/rules/gtk2.in index e2b5ef2a3..92096c6c4 100644 --- a/rules/gtk2.in +++ b/rules/gtk2.in @@ -32,17 +32,11 @@ choice select CAIRO_XLIB select CAIRO_PS - config GTK2_TARGET_DIRECTFB - bool "directfb" - select CAIRO_DIRECTFB - select CAIRO_PS - endchoice config GTK2_TARGET string default "x11" if GTK2_TARGET_X11 - default "directfb" if GTK2_TARGET_DIRECTFB config GTK2_TARGET_X11_XINERAMA bool diff --git a/rules/host-directfb.in b/rules/host-directfb.in deleted file mode 100644 index 834f2e98e..000000000 --- a/rules/host-directfb.in +++ /dev/null @@ -1,8 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=hosttools_noprompt - -config HOST_DIRECTFB - tristate - select HOST_LIBPNG - default ALLYES diff --git a/rules/host-directfb.make b/rules/host-directfb.make deleted file mode 100644 index 9a9422a6c..000000000 --- a/rules/host-directfb.make +++ /dev/null @@ -1,65 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2007 by Marc Kleine-Budde <mkl@pengutronix.de> -# -# 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. -# - -# -# We provide this package -# -HOST_PACKAGES-$(PTXCONF_HOST_DIRECTFB) += host-directfb - -# -# Paths and names -# -HOST_DIRECTFB_DIR = $(HOST_BUILDDIR)/$(DIRECTFB) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -# -# autoconf -# -HOST_DIRECTFB_CONF_TOOL := autoconf -HOST_DIRECTFB_CONF_OPT := \ - $(HOST_AUTOCONF) \ - --disable-osx \ - --disable-x11 \ - --disable-network \ - --disable-multi \ - --disable-voodoo \ - --disable-unique \ - --disable-fbdev \ - --disable-sdl \ - --disable-vnc \ - --disable-sysfs \ - --disable-jpeg \ - --disable-zlib \ - --disable-gif \ - --disable-freetype \ - --disable-video4linux \ - --disable-video4linux2 \ - \ - --with-gfxdrivers=none \ - --with-inputdrivers=none \ - \ - --enable-png - -HOST_DIRECTFB_MAKE_OPT := \ - -C tools directfb-csource - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/host-directfb.install: - @$(call targetinfo) - install -D -m 755 $(HOST_DIRECTFB_DIR)/tools/directfb-csource $(HOST_DIRECTFB_PKGDIR)/bin/directfb-csource - @$(call touch) - -# vim: syntax=make diff --git a/rules/links.in b/rules/links.in index d27814aa0..c24240f15 100644 --- a/rules/links.in +++ b/rules/links.in @@ -11,7 +11,6 @@ menuconfig LINKS select LIBPNG if LINKS_PNG select LIBJPEG if LINKS_JPEG select XORG_LIB_XEXT if LINKS_X - select DIRECTFB if LINKS_DIRECTFB select SDL if LINKS_SDL select ZLIB if LINKS_ZLIB select BZIP2 if LINKS_BZIP2 @@ -67,12 +66,6 @@ config LINKS_X select LINKS_PNG prompt "support for X" -config LINKS_DIRECTFB - bool - depends on STAGING - select LINKS_PNG - prompt "support for DirectFB" - config LINKS_SDL bool prompt "support for SDL" diff --git a/rules/links.make b/rules/links.make index 5e811891d..fa831c052 100644 --- a/rules/links.make +++ b/rules/links.make @@ -41,13 +41,13 @@ LINKS_AUTOCONF := \ --$(call ptx/wwo, PTXCONF_LINKS_FBCON)-fb \ --$(call ptx/wwo, PTXCONF_LINKS_TIFF)-libtiff \ --$(call ptx/wwo, PTXCONF_LINKS_X)-x \ - --$(call ptx/wwo, PTXCONF_LINKS_DIRECTFB)-directfb \ + --without-directfb \ --$(call ptx/wwo, PTXCONF_LINKS_SDL)-sdl \ --$(call ptx/wwo, PTXCONF_LINKS_ZLIB)-zlib \ --$(call ptx/wwo, PTXCONF_LINKS_BZIP2)-bzip2 \ --$(call ptx/wwo, PTXCONF_LINKS_LZMA)-lzma \ -ifneq ($(PTXCONF_LINKS_X)$(PTXCONF_LINKS_FBCON)$(PTXCONF_LINKS_DIRECTFB),) +ifneq ($(PTXCONF_LINKS_X)$(PTXCONF_LINKS_FBCON),) LINKS_AUTOCONF += --enable-graphics else LINKS_AUTOCONF += --disable-graphics diff --git a/rules/lite.in b/rules/lite.in deleted file mode 100644 index 90b755ebb..000000000 --- a/rules/lite.in +++ /dev/null @@ -1,15 +0,0 @@ -## SECTION=staging -## old section: -### SECTION=multimedia_directfb - -config LITE - tristate - prompt "lite" - select LIBC_PTHREAD - select GCCLIBS_GCC_S - select DIRECTFB - help - LiTE is a Toolkit Engine for DirectFB - - STAGING: remove in ptxdist-2018.07.0 - DirectFB moved to staging. diff --git a/rules/lite.make b/rules/lite.make deleted file mode 100644 index eb8d18317..000000000 --- a/rules/lite.make +++ /dev/null @@ -1,131 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2007 by Denis Oliver Kropp -# 2010 by Marc Kleine-Budde <mkl@penugtronix.de> -# -# 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. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_LITE) += lite - -# -# Paths and names -# -LITE_VERSION := 0.8.10 -LITE_MD5 := b9a28007d38c2b1c51ba1c3841df29ad -LITE := LiTE-$(LITE_VERSION) -LITE_SUFFIX := tar.gz -LITE_URL := http://www.directfb.org/downloads/Libs/$(LITE).$(LITE_SUFFIX) -LITE_SOURCE := $(SRCDIR)/$(LITE).$(LITE_SUFFIX) -LITE_DIR := $(BUILDDIR)/$(LITE) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -LITE_CONF_TOOL := autoconf - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/lite.targetinstall: - @$(call targetinfo) - - @$(call install_init, lite) - @$(call install_fixup, lite,PRIORITY,optional) - @$(call install_fixup, lite,SECTION,base) - @$(call install_fixup, lite,AUTHOR,"Denis Oliver Kropp <dok@directfb.org>") - @$(call install_fixup, lite,DESCRIPTION,missing) - - @$(call install_lib, lite, 0, 0, 0644, liblite) - @$(call install_lib, lite, 0, 0, 0644, libleck) - - @for i in \ - cursor \ - links \ - obenlinks \ - oben \ - obenrechts \ - rechts \ - untenlinks \ - unten \ - untenrechts; \ - do \ - $(call install_copy, lite, 0, 0, 0644, -, \ - /usr/share/LiTE/$$i.png) \ - done - - @for i in \ - lite_bench \ - lite_checktest \ - lite_dfbspy \ - lite_listtest \ - lite_msgbox \ - lite_progressbar \ - lite_run \ - lite_scrollbartest \ - lite_simple \ - lite_slider \ - lite_textbuttontest \ - lite_textlinetest \ - lite_textlisttest; \ - do \ - $(call install_copy, lite, 0, 0, 0755, -, \ - /usr/bin/$$i) \ - done - - - @for i in \ - checkbox_images.png \ - D.png \ - stop.png \ - stop_disabled.png \ - stop_highlighted.png \ - stop_pressed.png \ - textbuttonbgnd.png \ - toggle.png \ - toggle_disabled.png \ - toggle_highlighted.png \ - toggle_pressed.png \ - toggle_highlighted_on.png \ - toggle_disabled_on.png \ - progress.png \ - progress_bg.png \ - scrollbar.png; \ - do \ - \ - $(call install_copy, lite, 0, 0, 0644, -, \ - /usr/share/LiTE/examples/$$i, n) \ - done - - - @$(call install_copy, lite, 0, 0, 0644, -, \ - /usr/share/fonts/truetype/vera.ttf, n) - - @$(call install_copy, lite, 0, 0, 0644, -, \ - /usr/share/fonts/truetype/verabd.ttf, n) - - @$(call install_copy, lite, 0, 0, 0644, -, \ - /usr/share/fonts/truetype/verabi.ttf, n) - - @$(call install_copy, lite, 0, 0, 0644, -, \ - /usr/share/fonts/truetype/verai.ttf, n) - - @$(call install_copy, lite, 0, 0, 0644, -, \ - /usr/share/fonts/truetype/decker.ttf, n) - - @$(call install_copy, lite, 0, 0, 0644, -, \ - /usr/share/fonts/truetype/whiterabbit.ttf, n) - - @$(call install_finish, lite) - - @$(call touch) - -# vim: syntax=make diff --git a/rules/qt4.in b/rules/qt4.in index 8371f0d55..c504f842c 100644 --- a/rules/qt4.in +++ b/rules/qt4.in @@ -18,7 +18,6 @@ menuconfig QT4 select LIBPNG if QT4_PNG_SYSTEM select LIBJPEG if QT4_JPG_SYSTEM select SQLITE if QT4_SQLITE_SYSTEM - select DIRECTFB if QT4_GFX_DIRECTFB_PLUGIN select GSTREAMER if QT4_BUILD_PHONON select GST_PLUGINS_BASE if QT4_BUILD_PHONON select OPENSSL if QT4_OPENSSL @@ -102,28 +101,6 @@ choice endchoice choice - prompt "DirectFB " - default QT4_GFX_DIRECTFB_NONE - help - Accelerated driver using DirectFB - - config QT4_GFX_DIRECTFB_NONE - bool - prompt "none " - help - Don't build the driver - -# only as plugin - - config QT4_GFX_DIRECTFB_PLUGIN - bool - depends on STAGING - prompt "plugin " - help - Load the driver at runtime -endchoice - -choice prompt "eglnullws " default QT4_GFX_EGLNULLWS_NULL help diff --git a/rules/qt4.make b/rules/qt4.make index c0ad325b7..14d9a0556 100644 --- a/rules/qt4.make +++ b/rules/qt4.make @@ -152,7 +152,6 @@ QT4_AUTOCONF += \ # graphics drivers QT4_AUTOCONF-$(call ptx/qt-plugin, GFX_AHI) += gfx-ahi -QT4_AUTOCONF-$(call ptx/qt-plugin, GFX_DIRECTFB) += gfx-directfb QT4_AUTOCONF-$(call ptx/qt-plugin, GFX_EGLNULLWS) += gfx-eglnullws QT4_AUTOCONF-$(call ptx/qt-plugin, GFX_LINUXFB) += gfx-linuxfb QT4_AUTOCONF-$(call ptx/qt-plugin, GFX_POWERVR) += gfx-powervr @@ -380,7 +379,6 @@ ifdef PTXCONF_QT4_BUILD_SVG QT4_IMAGEFORMATS- += svg endif -QT4_GFXDRIVERS-$(call ptx/qt-plugin, GFX_DIRECTFB) += directfbscreen QT4_GFXDRIVERS-$(call ptx/qt-plugin, GFX_EGLNULLWS) += eglnullws QT4_GFXDRIVERS-$(call ptx/qt-plugin, GFX_LINUXFB) += screenlinuxfb QT4_GFXDRIVERS-$(call ptx/qt-plugin, GFX_POWERVR) += gfxpvregl diff --git a/rules/qt5.in b/rules/qt5.in index 2d35f0826..de3ccf12f 100644 --- a/rules/qt5.in +++ b/rules/qt5.in @@ -33,7 +33,6 @@ menuconfig QT5 select UDEV if QT5_GUI || QT5_INPUT_LIBINPUT select UDEV_LIBUDEV if QT5_GUI select TSLIB if QT5_INPUT_TSLIB - select DIRECTFB if QT5_PLATFORM_DIRECTFB select LIBINPUT if QT5_INPUT_LIBINPUT select LIBXCB if QT5_PLATFORM_XCB select LIBXKBCOMMON if QT5_PLATFORM_XCB || QT5_INPUT_LIBINPUT @@ -182,7 +181,6 @@ config QT5_PLATFORM_DEFAULT string default "xcb" if QT5_PLATFORM_DEFAULT_XCB default "eglfs" if QT5_PLATFORM_DEFAULT_EGLFS - default "directfb" if QT5_PLATFORM_DEFAULT_DIRECTFB default "linuxfb" if QT5_PLATFORM_DEFAULT_LINUXFB default "wayland" if QT5_PLATFORM_DEFAULT_WAYLAND @@ -203,13 +201,6 @@ config QT5_PLATFORM_EGLFS_KMS endif -config QT5_PLATFORM_DIRECTFB - bool - # fails to build for Qt 5.6.0 - depends on BROKEN - depends on STAGING - prompt "DirectFB" - config QT5_PLATFORM_LINUXFB bool prompt "LinuxFB" @@ -227,7 +218,6 @@ config QT5_PLATFORM_DEFAULT_MISSING prompt "--nothing--" depends on !QT5_PLATFORM_XCB depends on !QT5_PLATFORM_EGLFS - depends on !QT5_PLATFORM_DIRECTFB depends on !QT5_PLATFORM_LINUXFB depends on !QT5_MODULE_QTWAYLAND @@ -241,11 +231,6 @@ config QT5_PLATFORM_DEFAULT_EGLFS depends on QT5_PLATFORM_EGLFS prompt "eglfs" -config QT5_PLATFORM_DEFAULT_DIRECTFB - bool - depends on QT5_PLATFORM_DIRECTFB - prompt "DirectFB" - config QT5_PLATFORM_DEFAULT_LINUXFB bool depends on QT5_PLATFORM_LINUXFB diff --git a/rules/qt5.make b/rules/qt5.make index 71740684f..99d4fca64 100644 --- a/rules/qt5.make +++ b/rules/qt5.make @@ -195,7 +195,7 @@ QT5_CONF_OPT := \ --$(call ptx/endis, PTXCONF_QT5_PLATFORM_EGLFS)-eglfs \ --$(call ptx/endis, PTXCONF_QT5_PLATFORM_EGLFS_KMS)-kms \ --$(call ptx/endis, PTXCONF_QT5_PLATFORM_EGLFS_KMS)-gbm \ - --$(call ptx/endis, PTXCONF_QT5_PLATFORM_DIRECTFB)-directfb \ + --disable-directfb \ --$(call ptx/endis, PTXCONF_QT5_PLATFORM_LINUXFB)-linuxfb \ --disable-mirclient \ $(call ptx/ifdef, PTXCONF_QT5_GUI,-qpa $(PTXCONF_QT5_PLATFORM_DEFAULT)) \ @@ -332,7 +332,6 @@ ifdef PTXCONF_QT5_OPENGL_DESKTOP QT5_PLUGINS-$(PTXCONF_QT5_PLATFORM_XCB) += xcbglintegrations/libqxcb-glx-integration endif -QT5_PLUGINS-$(PTXCONF_QT5_PLATFORM_DIRECTFB) += platforms/libqdirectfb QT5_PLUGINS-$(PTXCONF_QT5_PLATFORM_EGLFS) += platforms/libqeglfs QT5_PLUGINS-$(PTXCONF_QT5_PLATFORM_LINUXFB) += platforms/libqlinuxfb QT5_PLUGINS-$(PTXCONF_QT5_MODULE_QTBASE_GUI) += platforms/libqminimal diff --git a/rules/sdl.in b/rules/sdl.in index f9c5e78e5..5122c0d91 100644 --- a/rules/sdl.in +++ b/rules/sdl.in @@ -13,7 +13,6 @@ menuconfig SDL select XORG_LIB_XT if SDL_XORG select XORG_LIB_XV if SDL_XORG && SDL_VIDEO select XORG_LIB_XVMC if SDL_XORG && SDL_VIDEO - select DIRECTFB if SDL_DIRECTFB select TSLIB if SDL_TSLIB help Simple DirectMedia Layer is a cross-platform multimedia @@ -96,18 +95,6 @@ config SDL_FBCON help Framebuffer console -config SDL_DIRECTFB - bool - depends on STAGING - prompt "DirectFB Support" - default y - help - DirectFB is a thin library that provides hardware - graphics acceleration, input device handling and - abstraction, integrated windowing system with support - for translucent windows and multiple display layers, - not only on top of the Linux Framebuffer Device. - config SDL_OPENGL bool prompt "OpenGL Support" diff --git a/rules/sdl.make b/rules/sdl.make index 5aebcff77..38e528972 100644 --- a/rules/sdl.make +++ b/rules/sdl.make @@ -87,7 +87,7 @@ SDL_CONF_OPT := \ --disable-video-carbon \ --disable-video-cocoa \ --$(call ptx/endis,PTXCONF_SDL_FBCON)-video-fbcon \ - --$(call ptx/endis,PTXCONF_SDL_DIRECTFB)-video-directfb \ + --disable-video-directfb \ --disable-video-ps2gs \ --disable-video-ps3 \ --disable-video-ggi \ |
