diff --git a/.checkpackageignore b/.checkpackageignore index 37cd4c946082..4ae853c91fe8 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -399,13 +399,6 @@ package/dht/0001-cmake.patch lib_patch.Upstream package/dillo/0001-usr-local-include.patch lib_patch.Upstream package/dillo/0002-Fix-openssl-detection.patch lib_patch.Upstream package/dillo/0004-fix-build-with-gcc-10.patch lib_patch.Upstream -package/directfb-examples/0001-remove-bzero.patch lib_patch.Sob lib_patch.Upstream -package/directfb/0001-fix-missing-davinci-voodoo-header.patch lib_patch.Upstream -package/directfb/0002-imlib2-config.patch lib_patch.Upstream -package/directfb/0003-setregion-lock.patch lib_patch.Upstream -package/directfb/0004-use-gcc-link.patch lib_patch.Upstream -package/directfb/0005-add-missing-idivine-header.patch lib_patch.Upstream -package/directfb/0006-fix-client-gfx_state-initialisation.patch lib_patch.Upstream package/dmalloc/0001-configure-fix-build-on-mips.patch lib_patch.Upstream package/dmalloc/0003-configure-allow-overriding-some-tests.patch lib_patch.Upstream package/dmalloc/0004-Makefile-use-the-configure-detected-or-user-supplied.patch lib_patch.Upstream @@ -761,10 +754,6 @@ package/lighttpd/S50lighttpd Shellcheck lib_sysv.EmptyLastLine lib_sysv.Indent l package/linknx/0001-configure-ac-tweak-CPPUNIT-conditional.patch lib_patch.Upstream package/linknx/0002-src-Makefile.am-fix-linking-with-log4cpp.patch lib_patch.Upstream package/linphone/0001-src-core-paths-paths.cpp-fix-powerpc-build.patch lib_patch.Upstream -package/linux-fusion/0001-fix-for-linux-4-and-above.patch lib_patch.Upstream -package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch lib_patch.Upstream -package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch lib_patch.Upstream -package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch lib_patch.Upstream package/linux-zigbee/0001-test-serial-Remove-test-serial.patch lib_patch.Upstream package/linux-zigbee/0002-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch lib_patch.Upstream package/linuxptp/S65ptp4l Shellcheck lib_sysv.Indent @@ -772,9 +761,6 @@ package/linuxptp/S66phc2sys Shellcheck lib_sysv.Indent package/lirc-tools/0001-plugins-devinput.c-fix-build-with-musl-1.2.0.patch lib_patch.Upstream package/lirc-tools/0002-configure-add-disable-doc-option.patch lib_patch.Upstream package/lirc-tools/S25lircd lib_sysv.Indent lib_sysv.Variables -package/lite/0001-dfbspy-stat.patch lib_patch.Sob lib_patch.Upstream -package/lite/0002-no-tests.patch lib_patch.Sob lib_patch.Upstream -package/lite/0003-pkg-config.patch lib_patch.Sob lib_patch.Upstream package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch lib_patch.Upstream package/lldpd/S60lldpd Shellcheck lib_sysv.Indent lib_sysv.Variables package/llvm-project/clang/0001-lib-Driver-ToolChains-Gnu-Use-GCC_INSTALL_PREFIX-in-.patch lib_patch.Upstream @@ -855,7 +841,6 @@ package/mono/0001-Fix-linkage-with-a-system-libatomic_ops-shared-library.patch l package/mono/0002-Ongoing-work-on-the-cmake-build.patch lib_patch.Upstream package/mosquitto/S50mosquitto Shellcheck lib_sysv.Indent lib_sysv.Variables package/motion/S99motion Shellcheck lib_sysv.Indent lib_sysv.Variables -package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch lib_patch.Upstream package/mpir/0001-mpn-arm-udiv.asm-workaround-binutils-bug-14887.patch lib_patch.Upstream package/mpv/0001-fix-powerpc64-altivec.patch lib_patch.Upstream package/mraa/0001-include-Declare-gVERSION-global-as-extern.patch lib_patch.Upstream @@ -1120,9 +1105,8 @@ package/screen/0002-Change-binary-permission-flags-even-if-chown-fails.patch lib package/screen/0003-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch lib_patch.Upstream package/screen/0004-Renamed-sched.h-to-eventqueue.h.patch lib_patch.Upstream package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch lib_patch.Upstream -package/sdl/0001-use-correct-directfb-config.patch lib_patch.Upstream -package/sdl/0002-fix-compilation-with-libx11.patch lib_patch.Upstream -package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch lib_patch.Upstream +package/sdl/0001-fix-compilation-with-libx11.patch lib_patch.Upstream +package/sdl/0002-SDL_x11yuv.c-fix-possible-use-after-free.patch lib_patch.Upstream package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch lib_patch.Upstream package/sdl_mixer/0002-configure__set_macro_directory.patch lib_patch.Upstream package/sdl_mixer/0003-configure.ac-fix-static-linking-with-tremor.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index ed74bf15c2c9..fd12f8d49f5b 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,62 @@ endif comment "Legacy options removed in 2025.02" +config BR2_PACKAGE_DIRECTFB + bool "directfb has been removed" + select BR2_LEGACY + help + This package was no longer maintained upstream, so it was + dropped from Buildroot. + +config BR2_PACKAGE_SDL2_DIRECTFB + bool "sdl2 directfb support removed" + select BR2_LEGACY + help + The directfb support from SDL2 is no longer available, as + directfb is no longer packaged in Buildroot. + +config BR2_PACKAGE_SDL_DIRECTFB + bool "sdl directfb support removed" + select BR2_LEGACY + help + The directfb support from SDL is no longer available, as + directfb is no longer packaged in Buildroot. + +config BR2_PACKAGE_QT5BASE_DIRECTFB + bool "qt5base directfb support removed" + select BR2_LEGACY + help + The directfb support from qt5base is no longer available, as + directfb is no longer packaged in Buildroot. + +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB + bool "gstreamer directfb plugin removed" + select BR2_LEGACY + help + The directfb plugin from GStreamer is no longer supported, + as directfb is no longer packaged in Buildroot. + +config BR2_PACKAGE_LITE + bool "lite has been removed" + select BR2_LEGACY + help + This package was no longer maintained upstream, so it was + dropped from Buildroot. + +config BR2_PACKAGE_LINUX_FUSION + bool "linux-fusion has been removed" + select BR2_LEGACY + help + This package was no longer maintained upstream, so it was + dropped from Buildroot. + +config BR2_PACKAGE_DIRECTFB_EXAMPLES + bool "directfb-examples has been removed" + select BR2_LEGACY + help + This package was no longer maintained upstream, so it was + dropped from Buildroot. + config BR2_PACKAGE_HIAWATHA bool "hiwatha has been removed" select BR2_LEGACY @@ -5773,7 +5829,6 @@ config BR2_PACKAGE_KOBS_NG config BR2_PACKAGE_SAWMAN bool "sawman package removed" select BR2_LEGACY - select BR2_PACKAGE_DIRECTFB_SAWMAN help This option has been removed because the sawman package no longer exists: it was merged inside DirectFB itself. This @@ -5783,7 +5838,6 @@ config BR2_PACKAGE_SAWMAN config BR2_PACKAGE_DIVINE bool "divine package removed" select BR2_LEGACY - select BR2_PACKAGE_DIRECTFB_DIVINE help This option has been removed because the divine package no longer exists: it was merged inside DirectFB itself. This diff --git a/DEVELOPERS b/DEVELOPERS index 820a216735e2..4fb5ae023d90 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1864,6 +1864,7 @@ F: support/testing/tests/package/test_dmidecode.py F: support/testing/tests/package/test_dos2unix.py F: support/testing/tests/package/test_dosfstools.py F: support/testing/tests/package/test_dosfstools/ +F: support/testing/tests/package/test_dpdk.py F: support/testing/tests/package/test_ed.py F: support/testing/tests/package/test_ethtool.py F: support/testing/tests/package/test_ethtool/ @@ -2002,6 +2003,7 @@ F: support/testing/tests/package/test_which.py F: support/testing/tests/package/test_wine.py F: support/testing/tests/package/test_xfsprogs.py F: support/testing/tests/package/test_xfsprogs/ +F: support/testing/tests/package/test_xvisor.py F: support/testing/tests/package/test_xz.py F: support/testing/tests/package/test_z3.py F: support/testing/tests/package/test_z3/ diff --git a/arch/Config.in.arm b/arch/Config.in.arm index 219215d122a7..a11d581c433a 100644 --- a/arch/Config.in.arm +++ b/arch/Config.in.arm @@ -466,6 +466,14 @@ config BR2_cortex_a76_a55 select BR2_ARM_CPU_HAS_FP_ARMV8 select BR2_ARM_CPU_ARMV8A select BR2_ARCH_NEEDS_GCC_AT_LEAST_9 +config BR2_cortex_a78 + bool "cortex-A78" + select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_NEON if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_THUMB2 if !BR2_ARCH_IS_64 + select BR2_ARM_CPU_HAS_FP_ARMV8 + select BR2_ARM_CPU_ARMV8A + select BR2_ARCH_NEEDS_GCC_AT_LEAST_11 config BR2_neoverse_n1 bool "neoverse-N1 (aka ares)" select BR2_ARM_CPU_HAS_ARM if !BR2_ARCH_IS_64 @@ -876,6 +884,7 @@ config BR2_GCC_TARGET_CPU default "cortex-a75.cortex-a55" if BR2_cortex_a75_a55 default "cortex-a76" if BR2_cortex_a76 default "cortex-a76.cortex-a55" if BR2_cortex_a76_a55 + default "cortex-a78" if BR2_cortex_a78 default "neoverse-n1" if BR2_neoverse_n1 default "tsv110" if BR2_tsv110 # armv8.4a diff --git a/package/Config.in b/package/Config.in index 814101458d4a..17f458eee8f9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -344,8 +344,6 @@ comment "Graphic applications" comment "Graphic libraries" source "package/cegui/Config.in" - source "package/directfb/Config.in" - source "package/directfb-examples/Config.in" source "package/efl/Config.in" source "package/fb-test-app/Config.in" source "package/fbdump/Config.in" @@ -357,8 +355,6 @@ comment "Graphic libraries" source "package/graphicsmagick/Config.in" source "package/imagemagick/Config.in" source "package/libglvnd/Config.in" - source "package/linux-fusion/Config.in" - source "package/lite/Config.in" source "package/mesa3d/Config.in" source "package/mesa3d-headers/Config.in" source "package/ocrad/Config.in" diff --git a/package/bluez5_utils-headers/bluez5_utils-headers.mk b/package/bluez5_utils-headers/bluez5_utils-headers.mk index 1fd4e0fff340..7acf62b22671 100644 --- a/package/bluez5_utils-headers/bluez5_utils-headers.mk +++ b/package/bluez5_utils-headers/bluez5_utils-headers.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils -BLUEZ5_UTILS_HEADERS_VERSION = 5.78 +BLUEZ5_UTILS_HEADERS_VERSION = 5.79 BLUEZ5_UTILS_HEADERS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_HEADERS_DL_SUBDIR = bluez5_utils diff --git a/package/bluez5_utils/0001-gdbus-define-MAX_INPUT-for-musl.patch b/package/bluez5_utils/0001-gdbus-define-MAX_INPUT-for-musl.patch new file mode 100644 index 000000000000..dc823e927767 --- /dev/null +++ b/package/bluez5_utils/0001-gdbus-define-MAX_INPUT-for-musl.patch @@ -0,0 +1,33 @@ +From 9d69dba21f1e46b34cdd8ae27fec11d0803907ee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= +Date: Sat, 2 Nov 2024 16:10:18 +0000 +Subject: [PATCH] gdbus: define MAX_INPUT for musl + +This is the same solution as was done in src/shared/util.c + +Upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=9d69dba21f1e46b34cdd8ae27fec11d0803907ee +Signed-off-by: Fiona Klute +--- + gdbus/object.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/gdbus/object.c b/gdbus/object.c +index 84f116bf1..7b0476f1a 100644 +--- a/gdbus/object.c ++++ b/gdbus/object.c +@@ -20,6 +20,12 @@ + #include + + #include "gdbus.h" ++ ++/* define MAX_INPUT for musl */ ++#ifndef MAX_INPUT ++#define MAX_INPUT _POSIX_MAX_INPUT ++#endif ++ + #include "src/shared/util.h" + + #define info(fmt...) +-- +2.45.2 + diff --git a/package/bluez5_utils/0002-Leave-config-files-writable-for-owner.patch b/package/bluez5_utils/0002-Leave-config-files-writable-for-owner.patch new file mode 100644 index 000000000000..09ebe5edf101 --- /dev/null +++ b/package/bluez5_utils/0002-Leave-config-files-writable-for-owner.patch @@ -0,0 +1,35 @@ +From b1fd409960001a77cda2a09ecc00147ebd9c3667 Mon Sep 17 00:00:00 2001 +From: Fiona Klute +Date: Mon, 9 Dec 2024 16:40:43 +0100 +Subject: [PATCH BlueZ] build: Leave config files writable for owner + +This is needed for builds running as non-root users, so the build +process and any distribution tools can create/move/delete files in the +config directory without adjusting permissions separately. Limiting +writes from the running service needs to be done in the systemd unit +(already the case) or init script. + +See also: https://lore.kernel.org/linux-bluetooth/4d1206df-598b-4a68-8655-74981b62ecca@gmx.de/T/ +Reviewed-by: Bastien Nocera +Upstream: https://git.kernel.org/pub/scm/bluetooth/bluez.git/commit/?id=b1fd409960001a77cda2a09ecc00147ebd9c3667 +Signed-off-by: Fiona Klute (WIWA) +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 297d0774c..29018a91c 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -32,7 +32,7 @@ confdir = $(sysconfdir)/bluetooth + statedir = $(localstatedir)/lib/bluetooth + + bluetoothd-fix-permissions: +- install -dm555 $(DESTDIR)$(confdir) ++ install -dm755 $(DESTDIR)$(confdir) + install -dm700 $(DESTDIR)$(statedir) + + if DATAFILES +-- +2.45.2 + diff --git a/package/bluez5_utils/S40bluetoothd b/package/bluez5_utils/S40bluetoothd index ee4abe8b63c5..04f3f5ee9497 100644 --- a/package/bluez5_utils/S40bluetoothd +++ b/package/bluez5_utils/S40bluetoothd @@ -11,7 +11,8 @@ BLUETOOTHD_ARGS="-n" start() { printf 'Starting %s: ' "$DAEMON" # shellcheck disable=SC2086 # we need the word splitting - start-stop-daemon -S -q -m -b -p "$PIDFILE" -x "/usr/libexec/bluetooth/$DAEMON" \ + start-stop-daemon --start --background --make-pidfile \ + --pidfile "$PIDFILE" --exec "/usr/libexec/bluetooth/$DAEMON" \ -- $BLUETOOTHD_ARGS status=$? if [ "$status" -eq 0 ]; then @@ -24,25 +25,32 @@ start() { stop() { printf 'Stopping %s: ' "$DAEMON" - start-stop-daemon -K -q -p "$PIDFILE" + start-stop-daemon --stop --pidfile "$PIDFILE" \ + --exec "/usr/libexec/bluetooth/$DAEMON" status=$? if [ "$status" -eq 0 ]; then echo "OK" else echo "FAIL" + return "$status" fi + while start-stop-daemon --stop --test --quiet --pidfile "$PIDFILE" \ + --exec "/usr/libexec/bluetooth/$DAEMON"; do + sleep 0.1 + done + rm -f "$PIDFILE" return "$status" } restart() { stop - sleep 1 start } reload() { printf 'Reloading %s: ' "$DAEMON" - start-stop-daemon -K -s HUP -q -p "$PIDFILE" + start-stop-daemon --stop --signal HUP -q --pidfile "$PIDFILE" \ + --exec "/usr/libexec/bluetooth/$DAEMON" status=$? if [ "$status" -eq 0 ]; then echo "OK" diff --git a/package/bluez5_utils/bluez5_utils.hash b/package/bluez5_utils/bluez5_utils.hash index 41e39e0b5c30..9b39b19c0897 100644 --- a/package/bluez5_utils/bluez5_utils.hash +++ b/package/bluez5_utils/bluez5_utils.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 830fed1915c5d375b8de0f5e6f45fcdea0dcc5ff5ffb3d31db6ed0f00d73c5e3 bluez-5.78.tar.xz +sha256 4164a5303a9f71c70f48c03ff60be34231b568d93a9ad5e79928d34e6aa0ea8a bluez-5.79.tar.xz # Locally computed sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING.LIB diff --git a/package/bluez5_utils/bluez5_utils.mk b/package/bluez5_utils/bluez5_utils.mk index 717c10e870db..e3b47e1e809c 100644 --- a/package/bluez5_utils/bluez5_utils.mk +++ b/package/bluez5_utils/bluez5_utils.mk @@ -5,7 +5,7 @@ ################################################################################ # Keep the version and patches in sync with bluez5_utils-headers -BLUEZ5_UTILS_VERSION = 5.78 +BLUEZ5_UTILS_VERSION = 5.79 BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth BLUEZ5_UTILS_INSTALL_STAGING = YES @@ -13,6 +13,9 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+ BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB BLUEZ5_UTILS_CPE_ID_VENDOR = bluez BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez +# required because 0002-Leave-config-files-writable-for-owner.patch +# modifies Makefile.am +BLUEZ5_UTILS_AUTORECONF = YES BLUEZ5_UTILS_DEPENDENCIES = \ $(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \ @@ -22,13 +25,12 @@ BLUEZ5_UTILS_DEPENDENCIES = \ BLUEZ5_UTILS_CONF_OPTS = \ --enable-library \ --disable-cups \ - --disable-datafiles \ --disable-manpages \ --disable-asan \ --disable-lsan \ --disable-ubsan \ --disable-pie \ - --with-dbusconfdir=/etc + --with-dbusconfdir=/usr/share ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y) BLUEZ5_UTILS_CONF_OPTS += --enable-obex diff --git a/package/directfb-examples/0001-remove-bzero.patch b/package/directfb-examples/0001-remove-bzero.patch deleted file mode 100644 index 41616b5c312e..000000000000 --- a/package/directfb-examples/0001-remove-bzero.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - src/df_knuckles/matrix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: directfb-examples-1.2.0/src/df_knuckles/matrix.c -=================================================================== ---- directfb-examples-1.2.0.orig/src/df_knuckles/matrix.c -+++ directfb-examples-1.2.0/src/df_knuckles/matrix.c -@@ -19,7 +19,7 @@ - static float Cosine[3600]; - static float Sine[3600]; - --#define M_CLEAR(m) bzero(m, MATRIX_SIZE) -+#define M_CLEAR(m) memset(m, 0, MATRIX_SIZE) - #define M_IDENTITY(m) memcpy(m, IdentityMatrix, MATRIX_SIZE) - - static void MultiplyMatrix(float *A, float *B) diff --git a/package/directfb-examples/Config.in b/package/directfb-examples/Config.in deleted file mode 100644 index 4d5de030688d..000000000000 --- a/package/directfb-examples/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_DIRECTFB_EXAMPLES - bool "directfb examples" - depends on BR2_PACKAGE_DIRECTFB - help - The DirectFB-examples package contains a set of simple - DirectFB applications that can be used to test and demonstrate - various DirectFB features. As of 4 October 2015, DirectFB's - website http://www.directfb.org/ is down. See alternative site - listed below. - - http://elinux.org/DirectFB diff --git a/package/directfb-examples/directfb-examples.hash b/package/directfb-examples/directfb-examples.hash deleted file mode 100644 index 9c7f7c25a74d..000000000000 --- a/package/directfb-examples/directfb-examples.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a DirectFB-examples-1.7.0.tar.gz -sha256 f91483684678e8aa8ccc4ee0ede3140b0494f8305e162695c7e6e3f83e54f236 COPYING diff --git a/package/directfb-examples/directfb-examples.mk b/package/directfb-examples/directfb-examples.mk deleted file mode 100644 index c8d09b3e3367..000000000000 --- a/package/directfb-examples/directfb-examples.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# directfb-examples -# -################################################################################ - -DIRECTFB_EXAMPLES_VERSION = 1.7.0 -DIRECTFB_EXAMPLES_SITE = http://sources.buildroot.net/directfb-examples -DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz -DIRECTFB_EXAMPLES_LICENSE = MIT -DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING -DIRECTFB_EXAMPLES_DEPENDENCIES = directfb - -ifeq ($(BR2_STATIC_LIBS),y) -DIRECTFB_EXAMPLES_CONF_OPTS += LIBS=-lstdc++ -endif - -$(eval $(autotools-package)) diff --git a/package/directfb/0001-fix-missing-davinci-voodoo-header.patch b/package/directfb/0001-fix-missing-davinci-voodoo-header.patch deleted file mode 100644 index 6ad4958f847b..000000000000 --- a/package/directfb/0001-fix-missing-davinci-voodoo-header.patch +++ /dev/null @@ -1,1726 +0,0 @@ -The archive of directfb-1.6.3 is still missing some header files against -the tagged git tree of directfb. The following files are missing. - -gfxdrivers/davinci/davinci_c64x.h -gfxdrivers/davinci/davincifb.h -gfxdrivers/davinci/davinci_gfxdriver.h -tests/voodoo/voodoo_test.h - -The headers of course are needed to be able to build every module of -directfb. The headers are taken from the git tree of directfb -http://git.directfb.org/?p=core/DirectFB.git;a=commit;h=38b784549bc59bb07c58bb29667cb658695d39a7, -tag DIRECTFB_1_6_3, SHA1ID 38b784549bc59bb07c58bb29667cb658695d39a7. - -Signed-off-by: Carsten Schoenert - -diff -puNr -Naur directfb-1.6.3-orig/gfxdrivers/davinci/davinci_c64x.h directfb-1.6.3/gfxdrivers/davinci/davinci_c64x.h ---- directfb-1.6.3-orig/gfxdrivers/davinci/davinci_c64x.h 1970-01-01 01:00:00.000000000 +0100 -+++ directfb-1.6.3/gfxdrivers/davinci/davinci_c64x.h 2013-04-07 21:33:25.928530187 +0200 -@@ -0,0 +1,935 @@ -+/* -+ TI Davinci driver - C64X+ DSP Library -+ -+ (c) Copyright 2008 directfb.org -+ (c) Copyright 2007 Telio AG -+ -+ Written by Denis Oliver Kropp and -+ Olaf Dreesen . -+ -+ All rights reserved. -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License -+ version 2 as published by the Free Software Foundation. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef __DAVINCI_C64X_H__ -+#define __DAVINCI_C64X_H__ -+ -+#include -+ -+#include -+ -+#include -+#include -+ -+#include -+ -+#define mb() __asm__ __volatile__ ("" : : : "memory") -+ -+/**********************************************************************************************************************/ -+ -+typedef struct { -+ int magic; -+ -+ int fd; -+ c64xTaskControl *ctl; -+ void *mem; -+ -+ c64xTask *QueueL; -+} DavinciC64x; -+ -+typedef struct { -+ int magic; -+ unsigned int max_tasks; -+ unsigned int num_tasks; -+ c64xTask *tasks; -+} DavinciC64xTasks; -+ -+typedef enum { -+ C64X_TEF_NONE = 0x0000, -+ C64X_TEF_RESET = 0x0001 -+} DavinciC64xEmitFlags; -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_open ( DavinciC64x *c64x ); -+ -+DFBResult davinci_c64x_close ( DavinciC64x *c64x ); -+ -+DFBResult davinci_c64x_wait_low( DavinciC64x *c64x ); -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_tasks_init ( DavinciC64xTasks *tasks, -+ unsigned int size ); -+ -+DFBResult davinci_c64x_tasks_destroy( DavinciC64xTasks *tasks ); -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_emit_tasks( DavinciC64x *c64x, -+ DavinciC64xTasks *tasks, -+ DavinciC64xEmitFlags flags ); -+ -+/**********************************************************************************************************************/ -+ -+static const char *state_names[] = { "DONE", "ERROR", "TODO", "RUNNING" }; -+ -+static inline c64xTask * -+c64x_get_task( DavinciC64x *c64x ) -+{ -+ c64xTaskControl *ctl = c64x->ctl; -+ uint32_t idx = ctl->QL_arm; -+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK; -+ c64xTask *task = &c64x->QueueL[idx]; -+ int loops = 0; -+ uint32_t idle = 0; -+ -+ /* Wait for the entry (and next) to be processed by the DSP (rare case). */ -+ while (task->c64x_flags & C64X_FLAG_TODO || ctl->QL_dsp == next) { -+ if (loops > 666 || (idle && ctl->idlecounter - idle > 666)) { -+ c64xTask *dsp_task = &c64x->QueueL[ctl->QL_dsp]; -+ -+ D_PERROR( "Davinci/C64X+: Blocked! [DSP %d / %d (%s), ARM %d / %d (%s)]\n", -+ ctl->QL_dsp, -+ (dsp_task->c64x_function >> 2) & 0x3fff, -+ state_names[dsp_task->c64x_function & 3], -+ ctl->QL_arm, -+ (task->c64x_function >> 2) & 0x3fff, -+ state_names[task->c64x_function & 3] ); -+ -+ break; -+ } -+ -+ idle = ctl->idlecounter; -+ -+ /* Queue is full, waiting 10-20ms should not be too bad. */ -+ if (loops++ > 10) -+ usleep( 5000 ); -+ } -+ -+ return task; -+} -+ -+static inline void -+c64x_submit_task( DavinciC64x *c64x, c64xTask *task ) -+{ -+ c64xTaskControl *ctl = c64x->ctl; -+ uint32_t idx = ctl->QL_arm; -+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK; -+ -+ mb(); -+ -+ ctl->QL_arm = next; -+ -+ mb(); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_wb_inv_range( DavinciC64x *c64x, -+ unsigned long start, -+ u32 length, -+ u32 func ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = start; -+ task->c64x_arg[1] = length; -+ task->c64x_arg[2] = func; -+ -+ task->c64x_function = C64X_WB_INV_RANGE | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_write_back_all( DavinciC64x *c64x ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_function = C64X_WRITE_BACK_ALL | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_load_block__L( DavinciC64xTasks *tasks, -+ unsigned long words, -+ u32 num, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = words; -+ task->c64x_arg[1] = num; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_load_block( DavinciC64x *c64x, -+ unsigned long words, -+ u32 num, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = words; -+ task->c64x_arg[1] = num; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fetch_uyvy( DavinciC64x *c64x, -+ unsigned long dest, -+ unsigned long source, -+ u32 pitch, -+ u32 height, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = source; -+ task->c64x_arg[2] = pitch; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_FETCH_UYVY | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_mc( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long source0, -+ unsigned long source1, -+ u32 spitch, -+ u32 height, -+ int func ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = source0; -+ task->c64x_arg[3] = source1; -+ task->c64x_arg[4] = spitch; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = func | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_idct_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_idct_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_mc_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_mc_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_sum_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_sum_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dva_begin_frame__L( DavinciC64xTasks *tasks, -+ u32 pitch, -+ unsigned long current, -+ unsigned long past, -+ unsigned long future, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = pitch; -+ task->c64x_arg[1] = current; -+ task->c64x_arg[2] = past; -+ task->c64x_arg[3] = future; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dva_begin_frame( DavinciC64x *c64x, -+ u32 pitch, -+ unsigned long current, -+ unsigned long past, -+ unsigned long future, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = pitch; -+ task->c64x_arg[1] = current; -+ task->c64x_arg[2] = past; -+ task->c64x_arg[3] = future; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dva_motion_block__L( DavinciC64xTasks *tasks, -+ unsigned long macroblock ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = macroblock; -+ -+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dva_motion_block( DavinciC64x *c64x, -+ unsigned long macroblock ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = macroblock; -+ -+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_dva_idct( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ unsigned long source ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = source; -+ -+ task->c64x_function = C64X_DVA_IDCT | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_put_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ unsigned long source, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = source; -+ task->c64x_arg[3] = flags; -+ -+ task->c64x_function = C64X_PUT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dither_argb__L( DavinciC64xTasks *tasks, -+ unsigned long dst_rgb, -+ unsigned long dst_alpha, -+ u32 dst_pitch, -+ unsigned long source, -+ u32 src_pitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dst_rgb; -+ task->c64x_arg[1] = dst_alpha; -+ task->c64x_arg[2] = dst_pitch; -+ task->c64x_arg[3] = source; -+ task->c64x_arg[4] = src_pitch; -+ task->c64x_arg[5] = width; -+ task->c64x_arg[6] = height; -+ -+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dither_argb( DavinciC64x *c64x, -+ unsigned long dst_rgb, -+ unsigned long dst_alpha, -+ u32 dst_pitch, -+ unsigned long source, -+ u32 src_pitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dst_rgb; -+ task->c64x_arg[1] = dst_alpha; -+ task->c64x_arg[2] = dst_pitch; -+ task->c64x_arg[3] = source; -+ task->c64x_arg[4] = src_pitch; -+ task->c64x_arg[5] = width; -+ task->c64x_arg[6] = height; -+ -+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fill_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_fill_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fill_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_fill_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_stretch_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 dw, -+ u32 dh, -+ u32 sw, -+ u32 sh, -+ const DFBRegion *clip ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = src; -+ task->c64x_arg[2] = dpitch | (spitch << 16); -+ task->c64x_arg[3] = dh | (dw << 16); -+ task->c64x_arg[4] = sh | (sw << 16); -+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16); -+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16); -+ -+ if (sw > dw && sh > dh) -+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO; -+ else -+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_stretch_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 dw, -+ u32 dh, -+ u32 sw, -+ u32 sh, -+ const DFBRegion *clip ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = src; -+ task->c64x_arg[2] = dpitch | (spitch << 16); -+ task->c64x_arg[3] = dh | (dw << 16); -+ task->c64x_arg[4] = sh | (sw << 16); -+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16); -+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16); -+ -+ if (sw > dw && sh > dh) -+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO; -+ else -+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_blend_32__L( DavinciC64xTasks *tasks, -+ u32 sub_func, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 argb, -+ u8 alpha ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width | (height << 16); -+ task->c64x_arg[5] = argb; -+ task->c64x_arg[6] = alpha; -+ -+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_blend_32( DavinciC64x *c64x, -+ u32 sub_func, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 argb, -+ u8 alpha ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width | (height << 16); -+ task->c64x_arg[5] = argb; -+ task->c64x_arg[6] = alpha; -+ -+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_keyed_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_keyed_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_keyed_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_keyed_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+#endif -+ -diff -puNr -Naur directfb-1.6.3-orig/gfxdrivers/davinci/davincifb.h directfb-1.6.3/gfxdrivers/davinci/davincifb.h ---- directfb-1.6.3-orig/gfxdrivers/davinci/davincifb.h 1970-01-01 01:00:00.000000000 +0100 -+++ directfb-1.6.3/gfxdrivers/davinci/davincifb.h 2013-04-07 21:33:21.488622184 +0200 -@@ -0,0 +1,581 @@ -+/* -+ * Copyright (C) 2006 Texas Instruments Inc -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option)any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * File: davincifb.h -+ */ -+ -+#ifndef DAVINVI_VPBE_H -+#define DAVINVI_VPBE_H -+ -+/* include Linux files */ -+#include -+ -+/* define the custom FBIO_WAITFORVSYNC ioctl */ -+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) -+#define FBIO_SETATTRIBUTE _IOW('F', 0x21, struct fb_fillrect) -+ -+/* Backported IOCTLS. */ -+#define FBIO_SETPOSX _IOW('F', 0x22, u_int32_t) -+#define FBIO_SETPOSY _IOW('F', 0x23, u_int32_t) -+#define FBIO_SETZOOM _IOW('F', 0x24, struct zoom_params) -+#define FBIO_GETSTD _IOR('F', 0x25, u_int32_t) -+#define FBIO_RESIZER _IOW('F', 0x26, struct vpfe_resizer_params) -+#define FBIO_SYNC _IOW('F', 0x27, u_int32_t) -+ -+typedef struct zoom_params { -+ u_int32_t window_id; -+ u_int32_t zoom_h; -+ u_int32_t zoom_v; -+} zoom_params_t; -+ -+typedef struct vpfe_resizer_params -+{ -+ u_int32_t rsz_cnt; //busy-lock -+ u_int32_t out_size; //busy-lock -+ u_int32_t in_start; //busy-lock -+ u_int32_t in_size; //busy-lock -+ u_int32_t sdr_inadd; //shadowed -+ u_int32_t sdr_inoff; //shadowed -+ u_int32_t sdr_outadd; //shadowed -+ u_int32_t sdr_outoff; //shadowed -+ u_int32_t hfilt[16]; //busy-lock -+ u_int32_t vfilt[16]; //busy-lock -+ u_int32_t yenh; //busy-lock -+} vpfe_resizer_params_t; -+ -+typedef struct fb_set_start { -+ int offset; /* offset from smem_start */ -+ unsigned long physical; /* absolute physical address when offset < 0 */ -+ -+ u_int64_t sync; /* input: target sync counter for change or 0 for no sync at all, -+ output: sync counter of actual change or 0 if still pending */ -+} fb_set_start_t; -+ -+ -+#ifdef _IOC_TYPECHECK -+#undef _IOC_TYPECHECK -+#define _IOC_TYPECHECK(x) (sizeof(x)) -+#endif -+ -+#define RAM_CLUT_SIZE 256*3 -+#define FBIO_ENABLE_DISABLE_WIN \ -+ _IOW('F', 0x30, unsigned char) -+#define FBIO_SET_BITMAP_BLEND_FACTOR \ -+ _IOW('F', 0x31, vpbe_bitmap_blend_params_t) -+#define FBIO_SET_BITMAP_WIN_RAM_CLUT \ -+ _IOW('F', 0x32, unsigned char)*RAM_CLUT_SIZE) -+#define FBIO_ENABLE_DISABLE_ATTRIBUTE_WIN \ -+ _IOW('F', 0x33, unsigned int) -+#define FBIO_GET_BLINK_INTERVAL \ -+ _IOR('F', 0x34, vpbe_blink_option_t) -+#define FBIO_SET_BLINK_INTERVAL \ -+ _IOW('F', 0x35, vpbe_blink_option_t) -+#define FBIO_GET_VIDEO_CONFIG_PARAMS \ -+ _IOR('F', 0x36, vpbe_video_config_params_t) -+#define FBIO_SET_VIDEO_CONFIG_PARAMS \ -+ _IOW('F', 0x37, vpbe_video_config_params_t) -+#define FBIO_GET_BITMAP_CONFIG_PARAMS \ -+ _IOR('F', 0x38, vpbe_bitmap_config_params_t) -+#define FBIO_SET_BITMAP_CONFIG_PARAMS \ -+ _IOW('F', 0x39, vpbe_bitmap_config_params_t) -+#define FBIO_SET_DCLK \ -+ _IOW('F', 0x40, vpbe_dclk_t) -+#define FBIO_SET_INTERFACE \ -+ _IOW('F', 0x41, unsigned char) -+#define FBIO_GET_INTERFACE \ -+ _IOR('F', 0x42, unsigned char) -+#define FBIO_QUERY_TIMING \ -+ _IOWR('F', 0x43, struct vpbe_mode_info) -+#define FBIO_SET_TIMING \ -+ _IOW('F', 0x44, struct vpbe_fb_videomode) -+#define FBIO_GET_TIMING \ -+ _IOR('F', 0x45, struct vpbe_fb_videomode) -+#define FBIO_SET_VENC_CLK_SOURCE \ -+ _IOW('F', 0x46, unsigned char) -+#define FBIO_SET_BACKG_COLOR \ -+ _IOW('F', 0x47, vpbe_backg_color_t) -+#define FBIO_ENABLE_DISPLAY \ -+ _IOW('F', 0x48, unsigned char) -+#define FBIO_SETPOS \ -+ _IOW('F', 0x49, u_int32_t) -+#define FBIO_SET_CURSOR \ -+ _IOW('F', 0x50, struct fb_cursor) -+#define FBIO_SET_START \ -+ _IOW('F', 0x66, struct fb_set_start) -+ -+/* -+ * Defines and Constants -+ */ -+#ifdef __KERNEL__ -+#define DAVINCIFB_DEVICE "davincifb" -+#define DAVINCIFB_DRIVER "davincifb" -+ -+#define MULTIPLE_BUFFERING 1 -+ -+#ifdef MULTIPLE_BUFFERING -+#define DOUBLE_BUF 2 -+#define TRIPLE_BUF 3 -+#else -+#define DOUBLE_BUF 1 -+#define TRIPLE_BUF 1 -+#endif -+ -+/* usage: if (is_win(info->fix.id, OSD0)) ... */ -+#define is_win(name, x) ((strcmp(name, x ## _FBNAME) == 0) ? 1 : 0) -+ -+/* -+ * display controller register I/O routines -+ */ -+u32 dispc_reg_in(u32 offset); -+u32 dispc_reg_out(u32 offset, u32 val); -+u32 dispc_reg_merge(u32 offset, u32 val, u32 mask); -+ -+#endif /*__KERNEL__*/ -+ -+/* Error return codes */ -+#define VPBE_INVALID_PARA_VALUE 700 -+#define VPBE_WRONG_WINDOW_ID 701 -+#define VPBE_CURRENTLY_IN_REQUIRED_MODE 702 -+#define VPBE_INSUFFICIENT_CLUT_VALUES 703 -+#define VPBE_CLUT_WRITE_TIMEOUT 704 -+#define VPBE_VID0_BUF_ADR_NULL 705 -+#define VPBE_WINDOW_NOT_DISABLED 706 -+#define VPBE_WINDOW_NOT_ENABLED 707 -+ -+#ifndef __KERNEL__ -+/* Window ID definations */ -+#define OSD0 0 -+#define VID0 1 -+#define OSD1 2 -+#define VID1 3 -+#endif -+ -+/* There are 4 framebuffers, each represented by an fb_info and -+ * a dm_win_info structure */ -+#define OSD0_FBNAME "dm_osd0_fb" -+#define OSD1_FBNAME "dm_osd1_fb" -+#define VID0_FBNAME "dm_vid0_fb" -+#define VID1_FBNAME "dm_vid1_fb" -+ -+/* FIXME: Digital LCD RGB matrix coefficients */ -+#define DLCD_DGY_VAL 0 -+#define DLCD_DRV_VAL 0 -+#define DLCD_DGU_VAL 0 -+#define DLCD_DBU_VAL 0 -+ -+/* Defines for bitmap format */ -+#define VPBE_BITMAP_BIT_1 1 -+#define VPBE_BITMAP_BIT_2 2 -+#define VPBE_BITMAP_BIT_4 4 -+#define VPBE_BITMAP_BIT_8 8 -+#define VPBE_BITMAP_RGB565 16 -+#define VPBE_VIDEO_YUV422 16 -+#define VPBE_VIDEO_RGB888 24 -+ -+/* Defines foe cursor parameter validation*/ -+#define MAX_CURSOR_WIDTH 0x3FF -+#define MAX_CURSOR_HEIGHT 0x1FF -+#define MAX_CURSOR_LINEWIDTH 7 -+ -+#define BASEX 0x80 -+#define BASEY 0x12 -+#define BASEX_DLCD 0x59 -+#define BASEY_DLCD 0x22 -+ -+/* -+ * Enumerations -+ */ -+/* Enum for blending factor */ -+typedef enum vpbe_blend_factor { -+ OSD_CONTRIBUTION_ZERO = 0, -+ OSD_CONTRIBUTION_1_BY_8 = 1, -+ OSD_CONTRIBUTION_2_BY_8 = 2, -+ OSD_CONTRIBUTION_3_BY_8 = 3, -+ OSD_CONTRIBUTION_4_BY_8 = 4, -+ OSD_CONTRIBUTION_5_BY_8 = 5, -+ OSD_CONTRIBUTION_6_BY_8 = 6, -+ OSD_CONTRIBUTION_ONE = 7 -+} vpbe_blend_factor_t; -+ -+/* Enum for Boolean variables */ -+typedef enum { -+ SET_0 = 0, -+ SET_1 = 1 -+} CB_CR_ORDER, ATTRIBUTE, ROM_RAM_CLUT; -+ -+/* Defines for Display Interface */ -+#define PRGB 0 -+#define COMPOSITE 1 -+#define SVIDEO 2 -+#define COMPONENT 3 -+#define RGB 4 -+#define YCC16 5 -+#define YCC8 6 -+#define SRGB 7 -+#define EPSON 8 -+#define CASIO1G 9 -+#define UDISP 10 -+#define STN 11 -+#define VPBE_MAX_INTERFACES 12 -+ -+/* Defines for Display Mode */ -+#define LCD 0 -+#define NTSC 1 -+#define PAL 2 -+#define P525 3 -+#define P625 4 -+ -+#define DEFAULT_MODE 0 -+#define P480 0 -+#define P400 1 -+#define P350 2 -+#define NON_EXISTING_MODE 255 -+/* Enable/Disable enum */ -+typedef enum { -+ VPBE_DISABLE = 0, -+ VPBE_ENABLE = 1 -+} ATTENUATION, TRANSPARENCY, EXPANSION, BLINKING; -+ -+typedef enum clk_source { -+ CLK_SOURCE_CLK27 = 0, -+ CLK_SOURCE_CLK54 = 1, -+ CLK_SOURCE_VPBECLK = 2 -+} CLK_SOURCE; -+ -+/* -+ * Structures and Union Definitions -+ */ -+ -+/* Structure for transparency and the blending factor for the bitmap window */ -+typedef struct vpbe_bitmap_blend_params { -+ unsigned int colorkey; /* color key to be blend */ -+ unsigned int enable_colorkeying; /* enable color keying */ -+ unsigned int bf; /* valid range from 0 to 7 only. */ -+} vpbe_bitmap_blend_params_t; -+ -+/* Structure for window expansion */ -+typedef struct vpbe_win_expansion { -+ EXPANSION horizontal; -+ EXPANSION vertical; /* 1: Enable 0:disable */ -+} vpbe_win_expansion_t; -+ -+/* Structure for OSD window blinking options */ -+typedef struct vpbe_blink_option { -+ BLINKING blinking; /* 1: Enable blinking 0: Disable */ -+ unsigned int interval; /* Valid only if blinking is 1 */ -+} vpbe_blink_option_t; -+ -+/* Structure for DCLK parameters */ -+typedef struct vpbe_dclk { -+ unsigned char dclk_pattern_width; -+ unsigned int dclk_pattern0; -+ unsigned int dclk_pattern1; -+ unsigned int dclk_pattern2; -+ unsigned int dclk_pattern3; -+} vpbe_dclk_t; -+ -+/* Structure for display format */ -+typedef struct vpbe_display_format { -+ unsigned char interface; /* Output interface type */ -+ unsigned char mode; /* output mode */ -+} vpbe_display_format_t; -+ -+/* Structure for background color */ -+typedef struct vpbe_backg_color { -+ unsigned char clut_select; /* 2: RAM CLUT 1:ROM1 CLUT 0:ROM0 CLUT */ -+ unsigned char color_offset; /* index of color */ -+} vpbe_backg_color_t; -+ -+/* Structure for Video window configurable parameters */ -+typedef struct vpbe_video_config_params { -+ CB_CR_ORDER cb_cr_order; /*Cb/Cr order in input data for a pixel. */ -+ /* 0: cb cr 1: cr cb */ -+ vpbe_win_expansion_t exp_info; /* HZ/VT Expansion enable disable */ -+} vpbe_video_config_params_t; -+ -+/*Union of structures giving the CLUT index for the 1, 2, 4 bit bitmap values.*/ -+typedef union vpbe_clut_idx { -+ struct _for_4bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char bitmap_val_1; -+ unsigned char bitmap_val_2; -+ unsigned char bitmap_val_3; -+ unsigned char bitmap_val_4; -+ unsigned char bitmap_val_5; -+ unsigned char bitmap_val_6; -+ unsigned char bitmap_val_7; -+ unsigned char bitmap_val_8; -+ unsigned char bitmap_val_9; -+ unsigned char bitmap_val_10; -+ unsigned char bitmap_val_11; -+ unsigned char bitmap_val_12; -+ unsigned char bitmap_val_13; -+ unsigned char bitmap_val_14; -+ unsigned char bitmap_val_15; -+ } for_4bit_bimap; -+ struct _for_2bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char dummy0[4]; -+ unsigned char bitmap_val_1; -+ unsigned char dummy1[4]; -+ unsigned char bitmap_val_2; -+ unsigned char dummy2[4]; -+ unsigned char bitmap_val_3; -+ } for_2bit_bimap; -+ struct _for_1bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char dummy0[14]; -+ unsigned char bitmap_val_1; -+ } for_1bit_bimap; -+} vpbe_clut_idx_t; -+ -+/* Structure for bitmap window configurable parameters */ -+typedef struct vpbe_bitmap_config_params { -+ /* Only for bitmap width = 1,2,4 bits */ -+ vpbe_clut_idx_t clut_idx; -+ /* Attenuation value for YUV o/p for bitmap window */ -+ unsigned char attenuation_enable; -+ /* 0: ROM DM270, 1:ROM DM320, 2:RAM CLUT */ -+ unsigned char clut_select; -+} vpbe_bitmap_config_params_t; -+ -+/* Unioun for video/OSD configuration parameters */ -+typedef union vpbe_conf_params { -+ -+ struct vpbe_video_params { -+ CB_CR_ORDER cb_cr_order; -+ /* HZ/VT Expansion enable disable */ -+ vpbe_win_expansion_t exp_info; -+ } video_params; -+ -+ struct vpbe_bitmap_params { -+ /* Attenuation value for YUV o/p */ -+ ATTENUATION attenuation_enable; -+ /* 0: ROM DM270, 1: ROM DM320, 2:RAM CLUT */ -+ unsigned char clut_select; -+ /* Only for bitmap width = 1,2,4 bits */ -+ vpbe_clut_idx_t clut_idx; -+ /* 0: OSD window is bitmap window */ -+ /* 1: OSD window is attribute window */ -+ ATTRIBUTE enable_attribute; -+ /* To hold bps value. -+ Used to switch back from attribute to bitmap. */ -+ unsigned int stored_bits_per_pixel; -+ /* Blending information */ -+ vpbe_bitmap_blend_params_t blend_info; -+ /* OSD Blinking information */ -+ vpbe_blink_option_t blink_info; -+ } bitmap_params; -+ -+} vpbe_conf_params_t; -+ -+typedef struct vpbe_video_params vpbe_video_params_t; -+typedef struct vpbe_bitmap_params vpbe_bitmap_params_t; -+ -+/* Structure to hold window position */ -+typedef struct vpbe_window_position { -+ unsigned int xpos; /* X position of the window */ -+ unsigned int ypos; /* Y position of the window */ -+} vpbe_window_position_t; -+ -+#ifdef __KERNEL__ -+/* Structure for each window */ -+typedef struct vpbe_dm_win_info { -+ struct fb_info info; -+ vpbe_window_position_t win_pos; /* X,Y position of window */ -+ /* Size of window is already there in var_info structure. */ -+ -+ dma_addr_t fb_base_phys; /*framebuffer area */ -+ unsigned int fb_base; /*window memory pointer */ -+ unsigned int fb_size; /*memory size */ -+ unsigned int pseudo_palette[17]; -+ int alloc_fb_mem; -+ /*flag to identify if framebuffer area is fixed or not */ -+ unsigned long sdram_address; -+ struct vpbe_dm_info *dm; -+ unsigned char window_enable; /*Additions for all windows */ -+ zoom_params_t zoom; /*Zooming parameters */ -+ unsigned char field_frame_select; /*To select Field or frame */ -+ unsigned char numbufs; /*Number of buffers valid 2 or 3 */ -+ vpbe_conf_params_t conf_params; -+ /*window configuration parameter union pointer */ -+} vpbe_dm_win_info_t; -+#endif /*__KERNEL__*/ -+ -+/* -+ * Videmode structure for display interface and mode settings -+ */ -+typedef struct vpbe_fb_videomode { -+ unsigned char name[10]; /* Mode name ( NTSC , PAL) */ -+ unsigned int vmode; /* FB_MODE_INTERLACED or FB_MODE_NON_INTERLACED */ -+ unsigned int xres; /* X Resolution of the display */ -+ unsigned int yres; /* Y Resolution of the display */ -+ unsigned int fps; /* frames per second */ -+ /* Timing Parameters applicable for std = 0 only */ -+ unsigned int left_margin; -+ unsigned int right_margin; -+ unsigned int upper_margin; -+ unsigned int lower_margin; -+ unsigned int hsync_len; -+ unsigned int vsync_len; -+ unsigned int sync; /* 0: hsync -ve/vsync -ve */ -+ /*1: hsync -ve/vsync +ve */ -+ /*2: hsync +ve/vsync -ve */ -+ /*3: hsync +ve/vsync +ve */ -+ unsigned int basepx; /* Display x,y start position */ -+ unsigned int basepy; -+/* 1= Mode s available in modelist 0=Mode is not available in modelist */ -+ unsigned int std; -+} vpbe_fb_videomode_t; -+ -+/* Structure to interface videomode to application*/ -+typedef struct vpbe_mode_info { -+ vpbe_fb_videomode_t vid_mode; -+ unsigned char interface; -+ unsigned char mode_idx; -+} vpbe_mode_info_t; -+ -+#ifdef __KERNEL__ -+/* -+ * Structure for the driver holding information of windows, -+ * memory base addresses etc. -+ */ -+typedef struct vpbe_dm_info { -+ vpbe_dm_win_info_t *osd0; -+ vpbe_dm_win_info_t *osd1; -+ vpbe_dm_win_info_t *vid0; -+ vpbe_dm_win_info_t *vid1; -+ -+/* to map the registers */ -+ dma_addr_t mmio_base_phys; -+ unsigned int mmio_base; -+ unsigned int mmio_size; -+ -+ wait_queue_head_t vsync_wait; -+ unsigned int vsync_cnt; -+ int timeout; -+ -+ /* this is the function that configures the output device (NTSC/PAL/LCD) -+ * for the required output format (composite/s-video/component/rgb) -+ */ -+ void (*output_device_config) (void); -+ -+ struct device *dev; -+ -+ vpbe_backg_color_t backg; /* background color */ -+ vpbe_dclk_t dclk; /*DCLK parameters */ -+ vpbe_display_format_t display; /*Display interface and mode */ -+ vpbe_fb_videomode_t videomode; /*Cuurent videomode */ -+ char ram_clut[256][3]; /*RAM CLUT array */ -+ struct fb_cursor cursor; /* cursor config params from fb.h */ -+/*Flag that indicates whether any of the display is enabled or not*/ -+ int display_enable; -+} vpbe_dm_info_t; -+ -+/* -+ * Functions Definitions for 'davincifb' module -+ */ -+int vpbe_mem_alloc_window_buf(vpbe_dm_win_info_t *); -+int vpbe_mem_release_window_buf(vpbe_dm_win_info_t *); -+void init_display_function(vpbe_display_format_t *); -+int vpbe_mem_alloc_struct(vpbe_dm_win_info_t **); -+void set_vid0_default_conf(void); -+void set_vid1_default_conf(void); -+void set_osd0_default_conf(void); -+void set_osd1_default_conf(void); -+void set_cursor_default_conf(void); -+void set_dm_default_conf(void); -+void set_win_enable(char *, unsigned int); -+int within_vid0_limits(u32, u32, u32, u32); -+void vpbe_set_display_default(void); -+#ifdef __KERNEL__ -+void set_win_position(char *, u32, u32, u32, u32); -+void change_win_param(int); -+void set_interlaced(char *, unsigned int); -+#endif /* __KERNEL__ */ -+ -+/* -+ * Function definations for 'osd' module -+ */ -+ -+int vpbe_enable_window(vpbe_dm_win_info_t *); -+int vpbe_disable_window(vpbe_dm_win_info_t *); -+int vpbe_vid_osd_select_field_frame(u8 *, u8); -+int vpbe_bitmap_set_blend_factor(u8 *, vpbe_bitmap_blend_params_t *); -+int vpbe_bitmap_set_ram_clut(void); -+int vpbe_enable_disable_attribute_window(u32); -+int vpbe_get_blinking(u8 *, vpbe_blink_option_t *); -+int vpbe_set_blinking(u8 *, vpbe_blink_option_t *); -+int vpbe_set_vid_params(u8 *, vpbe_video_config_params_t *); -+int vpbe_get_vid_params(u8 *, vpbe_video_config_params_t *); -+int vpbe_bitmap_get_params(u8 *, vpbe_bitmap_config_params_t *); -+int vpbe_bitmap_set_params(u8 *, vpbe_bitmap_config_params_t *); -+int vpbe_set_cursor_params(struct fb_cursor *); -+int vpbe_set_vid_expansion(vpbe_win_expansion_t *); -+int vpbe_set_dclk(vpbe_dclk_t *); -+int vpbe_set_display_format(vpbe_display_format_t *); -+int vpbe_set_backg_color(vpbe_backg_color_t *); -+int vpbe_set_interface(u8); -+int vpbe_query_mode(vpbe_mode_info_t *); -+int vpbe_set_mode(struct vpbe_fb_videomode *); -+int vpbe_set_venc_clk_source(u8); -+void set_vid0_default_conf(void); -+void set_osd0_default_conf(void); -+void set_vid1_default_conf(void); -+void set_osd1_default_conf(void); -+void set_cursor_default_conf(void); -+void set_dm_default_conf(void); -+/* -+ * Function definations for 'venc' module -+ */ -+ -+void davincifb_ntsc_composite_config(void); -+void davincifb_ntsc_svideo_config(void); -+void davincifb_ntsc_component_config(void); -+void davincifb_pal_composite_config(void); -+void davincifb_pal_svideo_config(void); -+void davincifb_pal_component_config(void); -+ -+void vpbe_davincifb_ntsc_rgb_config(void); -+void vpbe_davincifb_pal_rgb_config(void); -+void vpbe_davincifb_525p_component_config(void); -+void vpbe_davincifb_625p_component_config(void); -+ -+void vpbe_enable_venc(int); -+void vpbe_enable_dacs(int); -+/* -+ * Function definations for 'dlcd' module -+ */ -+void vpbe_davincifb_480p_prgb_config(void); -+void vpbe_davincifb_400p_prgb_config(void); -+void vpbe_davincifb_350p_prgb_config(void); -+void vpbe_set_display_timing(struct vpbe_fb_videomode *); -+ -+void vpbe_enable_lcd(int); -+/* -+ * Following functions are not implemented -+ */ -+void vpbe_davincifb_default_ycc16_config(void); -+void vpbe_davincifb_default_ycc8_config(void); -+void vpbe_davincifb_default_srgb_config(void); -+void vpbe_davincifb_default_epson_config(void); -+void vpbe_davincifb_default_casio_config(void); -+void vpbe_davincifb_default_UDISP_config(void); -+void vpbe_davincifb_default_STN_config(void); -+#endif /*__KERNEL__*/ -+ -+#endif /* End of #ifndef DAVINCI_VPBE_H */ -diff -puNr -Naur directfb-1.6.3-orig/gfxdrivers/davinci/davinci_gfxdriver.h directfb-1.6.3/gfxdrivers/davinci/davinci_gfxdriver.h ---- directfb-1.6.3-orig/gfxdrivers/davinci/davinci_gfxdriver.h 1970-01-01 01:00:00.000000000 +0100 -+++ directfb-1.6.3/gfxdrivers/davinci/davinci_gfxdriver.h 2013-04-07 21:33:19.560662133 +0200 -@@ -0,0 +1,169 @@ -+/* -+ TI Davinci driver - Graphics Driver -+ -+ (c) Copyright 2007 Telio AG -+ -+ Written by Denis Oliver Kropp -+ -+ Code is derived from VMWare driver. -+ -+ (c) Copyright 2001-2009 The world wide DirectFB Open Source Community (directfb.org) -+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH -+ -+ All rights reserved. -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef __DAVINCI_GFXDRIVER_H__ -+#define __DAVINCI_GFXDRIVER_H__ -+ -+#include -+#include -+ -+#include -+ -+#include "davincifb.h" -+ -+#include "davinci_c64x.h" -+ -+ -+typedef struct { -+ /* validation flags */ -+ int v_flags; -+ -+ /* cached/computed values */ -+ void *dst_addr; -+ unsigned long dst_phys; -+ unsigned int dst_size; -+ unsigned long dst_pitch; -+ DFBSurfacePixelFormat dst_format; -+ unsigned long dst_bpp; -+ -+ void *src_addr; -+ unsigned long src_phys; -+ unsigned long src_pitch; -+ DFBSurfacePixelFormat src_format; -+ unsigned long src_bpp; -+ -+ unsigned long source_mult; -+ -+ unsigned long fillcolor; -+ -+ int blit_blend_sub_function; -+ int draw_blend_sub_function; -+ -+ DFBColor color; -+ unsigned long color_argb; -+ unsigned long colorkey; -+ -+ DFBSurfaceBlittingFlags blitting_flags; -+ -+ DFBRegion clip; -+ -+ /** Add shared data here... **/ -+ struct fb_fix_screeninfo fix[4]; -+ -+ CoreSurfacePool *osd_pool; -+ CoreSurfacePool *video_pool; -+ -+ bool synced; -+} DavinciDeviceData; -+ -+ -+typedef struct { -+ int num; -+ int fd; -+ void *mem; -+ int size; -+} DavinciFB; -+ -+typedef struct { -+ DavinciDeviceData *ddev; -+ -+ CoreDFB *core; -+ -+ CoreScreen *screen; -+ CoreLayer *osd; -+ CoreLayer *video; -+ -+ DavinciFB fb[4]; -+ -+ DavinciC64x c64x; -+ bool c64x_present; -+ -+ DavinciC64xTasks tasks; -+} DavinciDriverData; -+ -+ -+static inline DFBResult -+davincifb_pan_display( const DavinciFB *fb, -+ struct fb_var_screeninfo *var, -+ const CoreSurfaceBufferLock *lock, -+ DFBSurfaceFlipFlags flags, -+ int x, -+ int y ) -+{ -+ int ret; -+ -+ if (lock) { -+#ifdef FBIO_SET_START -+ CoreSurfaceBuffer *buffer = lock->buffer; -+ struct fb_set_start set_start; -+ -+ /* physical mode */ -+ set_start.offset = -1; -+ set_start.sync = (flags & DSFLIP_ONSYNC) ? 1 : 0; -+ -+ /* life's so easy */ -+ set_start.physical = lock->phys + DFB_BYTES_PER_LINE( buffer->format, x ) + y * lock->pitch; -+ -+ ret = ioctl( fb->fd, FBIO_SET_START, &set_start ); -+ if (ret < 0) -+ D_DEBUG( "FBIO_SET_START (0x%08lx, sync %llu) failed!\n", -+ set_start.physical, set_start.sync ); -+ -+ if (ret == 0) { -+ if (flags & DSFLIP_WAIT) -+ ioctl( fb->fd, FBIO_WAITFORVSYNC ); -+ -+ return DFB_OK; -+ } -+ -+ /* fallback */ -+#endif -+ var->xoffset = x; /* poor version */ -+ var->yoffset = y + lock->offset / lock->pitch; -+ } -+ else { -+ var->xoffset = x; -+ var->yoffset = y; -+ } -+ -+ var->activate = /*(flags & DSFLIP_ONSYNC) ? FB_ACTIVATE_VBL :*/ FB_ACTIVATE_NOW; -+ -+ ret = ioctl( fb->fd, FBIOPAN_DISPLAY, var ); -+ if (ret) -+ D_PERROR( "Davinci/FB: FBIOPAN_DISPLAY (fb%d - %d,%d) failed!\n", -+ fb->num, var->xoffset, var->yoffset ); -+ -+ if (flags & DSFLIP_WAIT) -+ ioctl( fb->fd, FBIO_WAITFORVSYNC ); -+ -+ return DFB_OK; -+} -+ -+#endif -diff -puNr -Naur directfb-1.6.3-orig/tests/voodoo/voodoo_test.h directfb-1.6.3/tests/voodoo/voodoo_test.h ---- directfb-1.6.3-orig/tests/voodoo/voodoo_test.h 1970-01-01 01:00:00.000000000 +0100 -+++ directfb-1.6.3/tests/voodoo/voodoo_test.h 2013-04-07 21:33:31.824408024 +0200 -@@ -0,0 +1,10 @@ -+#ifndef __VOODOO_TEST_H__ -+#define __VOODOO_TEST_H__ -+ -+typedef enum { -+ VOODOO_TEST_INCREASE, -+ VOODOO_TEST_QUERY -+} VoodooTestCall; -+ -+#endif -+ diff --git a/package/directfb/0002-imlib2-config.patch b/package/directfb/0002-imlib2-config.patch deleted file mode 100644 index ea2bf8204998..000000000000 --- a/package/directfb/0002-imlib2-config.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8352c434e515f19dd1ba36256bfcc3ec9480838d Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 5 Mar 2015 22:38:52 +0100 -Subject: [PATCH] imlib2 config - -Call the imlib2-conf variable that are set by ac_cv_path_IMLIB2_CONFIG -with the absolute path because the imlib2-config file is not covered -by the PATH variable. -This is important for cross compiler that need to get the staging settings -instead of the host settings. - -Signed-off-by: Carsten Schoenert -[ patch configure.in instead of configure to survive autoreconf ] -Signed-off-by: Peter Seiderer ---- - configure.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index 38d7e78..fa5e87f 100644 ---- a/configure.in -+++ b/configure.in -@@ -1094,8 +1094,8 @@ if test "x$enable_imlib2" = "xyes"; then - AC_MSG_WARN([*** Imlib2 library not found, building without Imlib2 support ***]) - imlib2="no" - else -- IMLIB2_CFLAGS=`imlib2-config --cflags` -- IMLIB2_LIBS=`imlib2-config --libs` -+ IMLIB2_CFLAGS=`$IMLIB2_CONFIG --cflags` -+ IMLIB2_LIBS=`$IMLIB2_CONFIG --libs` - imlib2="yes" - fi - fi --- -2.1.4 - diff --git a/package/directfb/0003-setregion-lock.patch b/package/directfb/0003-setregion-lock.patch deleted file mode 100644 index bec4234645b3..000000000000 --- a/package/directfb/0003-setregion-lock.patch +++ /dev/null @@ -1,99 +0,0 @@ -This patch fixes builderrors while using '--with-gfxdrivers' and -'--with-inputdrivers' with the current DirectFB version 1.6.3. - -Patch is taken from -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch - -Signed-off-by: Carsten Schoenert - -Index: b/gfxdrivers/cyber5k/cyber5k.c -=================================================================== ---- a/gfxdrivers/cyber5k/cyber5k.c -+++ b/gfxdrivers/cyber5k/cyber5k.c -@@ -640,7 +640,8 @@ - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - DFBResult ret; - -@@ -648,7 +649,7 @@ - ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData, - layer_data, region_data, - config, updated, surface, -- palette, lock ); -+ palette, left_lock, right_lock ); - if (ret) - return ret; - -Index: b/gfxdrivers/radeon/radeon_crtc1.c -=================================================================== ---- a/gfxdrivers/radeon/radeon_crtc1.c -+++ b/gfxdrivers/radeon/radeon_crtc1.c -@@ -147,14 +147,15 @@ - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - - if (updated & ~CLRCF_OPTIONS) { - return OldPrimaryLayerFuncs.SetRegion( layer, - OldPrimaryLayerDriverData, - layer_data, region_data, -- config, updated, surface, palette, lock ); -+ config, updated, surface, palette, left_lock, right_lock ); - } - - return DFB_OK; -Index: b/gfxdrivers/cle266/uc_primary.c -=================================================================== ---- a/gfxdrivers/cle266/uc_primary.c -+++ b/gfxdrivers/cle266/uc_primary.c -@@ -142,7 +142,8 @@ - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - DFBResult ret; - UcDriverData *ucdrv = (UcDriverData*) driver_data; -@@ -151,7 +152,7 @@ - ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData, - layer_data, region_data, - config, updated, surface, -- palette, lock ); -+ palette, left_lock, right_lock ); - if (ret) - return ret; - -Index: b/gfxdrivers/unichrome/uc_primary.c -=================================================================== ---- a/gfxdrivers/unichrome/uc_primary.c -+++ b/gfxdrivers/unichrome/uc_primary.c -@@ -139,7 +139,8 @@ - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - DFBResult ret; - UcDriverData *ucdrv = (UcDriverData*) driver_data; -@@ -148,7 +149,7 @@ - ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData, - layer_data, region_data, - config, updated, surface, -- palette, lock ); -+ palette, left_lock, right_lock ); - if (ret) - return ret; - diff --git a/package/directfb/0004-use-gcc-link.patch b/package/directfb/0004-use-gcc-link.patch deleted file mode 100644 index ec6c0ea5012d..000000000000 --- a/package/directfb/0004-use-gcc-link.patch +++ /dev/null @@ -1,35 +0,0 @@ -Add patch to use 'gcc' instead of 'ld' for linking - -The patch has been sent upstream but it has not been merged yet - -Signed-off-by: Markos Chandras - -From 176ce06b40897a357fe76a558af517197325f188 Mon Sep 17 00:00:00 2001 -From: Markos Chandras -Date: Wed, 28 Aug 2013 10:56:32 +0100 -Subject: [PATCH] rules/libobject.make: Use gcc for linking - -Invoking 'ld' directly may miss some necessary linker flags which -are usually passed by gcc. Therefore, use gcc for linking. - -Signed-off-by: Markos Chandras ---- - rules/libobject.make | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rules/libobject.make b/rules/libobject.make -index bc670da..2cba658 100644 ---- a/rules/libobject.make -+++ b/rules/libobject.make -@@ -3,7 +3,7 @@ - if test -d $<.tmp; then rmdir $<.tmp; fi - mkdir $<.tmp - (cd $<.tmp && $(AR) x ../../$<) -- $(LD) -o $@ -r $<.tmp/*.o -+ $(CC) -nostdlib -o $@ -r $<.tmp/*.o - rm -f $<.tmp/*.o && rmdir $<.tmp - - .PHONY: $(LTLIBRARIES:%.la=.libs/%.a) --- -1.8.3.2 - diff --git a/package/directfb/0005-add-missing-idivine-header.patch b/package/directfb/0005-add-missing-idivine-header.patch deleted file mode 100644 index 7823eb76e730..000000000000 --- a/package/directfb/0005-add-missing-idivine-header.patch +++ /dev/null @@ -1,65 +0,0 @@ -Add idivine.h, which is missing from DirectFB tarballs - -The idivine.h file was taken from the DirectFB Git repository. - -Signed-off-by: Thomas Petazzoni - -Index: b/lib/divine/idivine.h -=================================================================== ---- /dev/null -+++ b/lib/divine/idivine.h -@@ -0,0 +1,54 @@ -+/* -+ (c) Copyright 2012-2013 DirectFB integrated media GmbH -+ (c) Copyright 2001-2013 The world wide DirectFB Open Source Community (directfb.org) -+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH -+ -+ All rights reserved. -+ -+ Written by Denis Oliver Kropp , -+ Andreas Shimokawa , -+ Marek Pikarski , -+ Sven Neumann , -+ Ville Syrjälä and -+ Claudio Ciccani . -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+ -+ -+#ifndef __IDIVINE_H__ -+#define __IDIVINE_H__ -+ -+#include -+ -+/* -+ * private data struct of IDiVine -+ */ -+typedef struct { -+ int ref; /* reference counter */ -+ -+ DiVine *divine; -+} IDiVine_data; -+ -+/* -+ * IDiVine constructor/destructor -+ */ -+DFBResult IDiVine_Construct( IDiVine *thiz ); -+ -+void IDiVine_Destruct ( IDiVine *thiz ); -+ -+#endif diff --git a/package/directfb/0006-fix-client-gfx_state-initialisation.patch b/package/directfb/0006-fix-client-gfx_state-initialisation.patch deleted file mode 100644 index 5b7a202ca3ca..000000000000 --- a/package/directfb/0006-fix-client-gfx_state-initialisation.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8e53c0b9cedb62b82e2b7680d793d433b647ae20 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Mon, 13 Jun 2016 13:32:44 -0700 -Subject: [PATCH] fix client->gfx_state initialisation - -Shortly before the DirectFB 1.7.7 release, an optimisation was added -to CoreGraphicsStateClient_Init() to avoid creating an extended -Graphics State object if it will not later be required: - - 4d422fb Client: Create extended Graphics State object when needed for later usage - -Unfortunately the client->gfx_state variable used to track the -extended Graphics State object is not initialised, which can lead to -crashes etc due to creation of the Graphics State object erroneously -being skipped. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy -Signed-off-by: Philippe Reynes ---- - src/core/CoreGraphicsStateClient.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/core/CoreGraphicsStateClient.cpp b/src/core/CoreGraphicsStateClient.cpp -index 5d46f0e..5007755 100644 ---- a/src/core/CoreGraphicsStateClient.cpp -+++ b/src/core/CoreGraphicsStateClient.cpp -@@ -364,6 +364,7 @@ CoreGraphicsStateClient_Init( CoreGraphicsStateClient *client, - client->renderer = NULL; - client->requestor = NULL; - client->throttle = NULL; -+ client->gfx_state = NULL; - - if (dfb_config->task_manager) { - if (dfb_config->call_nodirect) { --- -1.9.1 - diff --git a/package/directfb/0007-libdirect-define-__NR_futex-on-32bit-architectures-u.patch b/package/directfb/0007-libdirect-define-__NR_futex-on-32bit-architectures-u.patch deleted file mode 100644 index 4cbbc5dcc380..000000000000 --- a/package/directfb/0007-libdirect-define-__NR_futex-on-32bit-architectures-u.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8ffd68a8dfa1e8671dd8c01b96faffd681deca4e Mon Sep 17 00:00:00 2001 -From: Steffen Persvold -Date: Tue, 25 Jun 2024 14:14:49 +0200 -Subject: [PATCH] libdirect: define __NR_futex on 32bit architectures using - 64-bit time_t - -Newer 32bit architectures like RISCV32 and ARC are using 64bit time_t -from the get go unlike other 32bit architectures, therefore aliasing -__NR_futex to __NR_futex_time64 helps avoid the below errors : - -system.c:242:21: error: '__NR_futex' undeclared (first use in this function) - 242 | ret = syscall( __NR_futex, uaddr, op, val, timeout, uaddr2, val3 ); - | ^~~~~~~~~~ - -Upstream: dead -Signed-off-by: Steffen Persvold ---- - lib/direct/os/linux/glibc/system.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/direct/os/linux/glibc/system.c b/lib/direct/os/linux/glibc/system.c -index 32086a25..7143442b 100644 ---- a/lib/direct/os/linux/glibc/system.c -+++ b/lib/direct/os/linux/glibc/system.c -@@ -213,6 +213,10 @@ direct_getenv( const char *name ) - - /**********************************************************************************************************************/ - -+#if defined(__NR_futex_time64) && !defined(__NR_futex) -+#define __NR_futex __NR_futex_time64 -+#endif -+ - DirectResult - direct_futex( int *uaddr, int op, int val, const struct timespec *timeout, int *uaddr2, int val3 ) - { -@@ -245,4 +249,3 @@ direct_futex( int *uaddr, int op, int val, const struct timespec *timeout, int * - - return DR_OK; - } -- --- -2.40.1 - diff --git a/package/directfb/Config.in b/package/directfb/Config.in deleted file mode 100644 index 20481f56da19..000000000000 --- a/package/directfb/Config.in +++ /dev/null @@ -1,167 +0,0 @@ -config BR2_PACKAGE_DIRECTFB - bool "directfb" - depends on !BR2_STATIC_LIBS # static link issues - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - depends on !BR2_TOOLCHAIN_USES_MUSL # sigval_t issue - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_ZLIB - help - DirectFB (Direct Frame Buffer) is a set of graphics APIs - implemented on top of the Linux Frame Buffer (fbdev) - abstraction layer. It is an alternative to X11 with a smaller - memory footprint that still has an integrated windowing - system. As of 4 October 2015, DirectFB's website - http://www.directfb.org/ is down. See alternative site listed - below. - - http://elinux.org/DirectFB - -if BR2_PACKAGE_DIRECTFB - -config BR2_PACKAGE_DIRECTFB_MULTI - bool "directfb multi application" - depends on BR2_USE_MMU # madvise() - depends on BR2_LINUX_KERNEL - select BR2_PACKAGE_LINUX_FUSION - help - Enable use of multiple concurrent DirectFB applications - -comment "directfb multi application needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_DIRECTFB_DEBUG_SUPPORT - bool "directfb debugging support" - default y - help - Compile DirectFB with debugging support. It provides - functions to print debug information, for DirectFB as well as - external DirectFB drivers. - - When disabled, DirectFB does not print any debug information. - The drivers will be installed to and loaded from - /usr/lib/directfb--pure instead of - /usr/lib/directfb-. - -config BR2_PACKAGE_DIRECTFB_DEBUG - bool "directfb debugging" - depends on BR2_PACKAGE_DIRECTFB_DEBUG_SUPPORT - help - Compile DirectFB with lots of debug output - -config BR2_PACKAGE_DIRECTFB_TRACE - bool "directfb call trace support" - help - Enable call tracing for DirectFB applications - -config BR2_PACKAGE_DIRECTFB_DIVINE - bool "divine" - help - Enable the DiVine feature (virtual input) - -config BR2_PACKAGE_DIRECTFB_SAWMAN - bool "sawman" - help - Enable the SawMan feature (window manager) - -config BR2_PACKAGE_DIRECTFB_ATI128 - bool "compile ati128 graphics driver" - depends on BR2_i386 || BR2_x86_64 - -config BR2_PACKAGE_DIRECTFB_MATROX - bool "compile matrox graphics driver" - depends on BR2_i386 || BR2_x86_64 - -config BR2_PACKAGE_DIRECTFB_PXA3XX - bool "compile pxa3xx graphics driver" - depends on BR2_arm - help - The Marvell PXA3xx Processor Family is a system-on-chip based - on XScale® microarchitecture. This option enables the graphic - driver support for the PXA3xx processor family. - - http://www.marvell.com/application-processors/pxa-family/ - -config BR2_PACKAGE_DIRECTFB_EP9X - bool "compile ep9x graphics driver" - depends on BR2_arm - help - Enable the graphic driver support for the EP93xx ARMv9 based - processors from Cirrus Logic. - - http://cirrus.com/en/products/arm9.html - -config BR2_PACKAGE_DIRECTFB_I830 - bool "compile i830 graphics driver" - depends on BR2_i386 || BR2_x86_64 - -config BR2_PACKAGE_DIRECTFB_LINUXINPUT - bool "compile /dev/input/eventX input driver" - default y - -config BR2_PACKAGE_DIRECTFB_KEYBOARD - bool "compile keyboard input driver" - default y - -config BR2_PACKAGE_DIRECTFB_PS2MOUSE - bool "compile PS2 mouse input driver" - default y - -config BR2_PACKAGE_DIRECTFB_SERIALMOUSE - bool "compile serial mouse input driver" - default y - -config BR2_PACKAGE_DIRECTFB_TSLIB - bool "enable touchscreen support" - default y - select BR2_PACKAGE_TSLIB - -config BR2_PACKAGE_DIRECTFB_GIF - bool "enable GIF support" - default y - -config BR2_PACKAGE_DIRECTFB_TIFF - bool "enable TIFF support" - select BR2_PACKAGE_TIFF - -config BR2_PACKAGE_DIRECTFB_IMLIB2 - bool "enable IMLIB2 support" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_IMLIB2 - -comment "imlib2 support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_DIRECTFB_JPEG - bool "enable JPEG support" - default y - select BR2_PACKAGE_JPEG - -config BR2_PACKAGE_DIRECTFB_PNG - bool "enable PNG support" - default y - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_DIRECTFB_SVG - bool "enable SVG support" - default y - select BR2_PACKAGE_LIBSVG_CAIRO - -config BR2_PACKAGE_DIRECTFB_DITHER_RGB16 - bool "enable advanced dithering of RGB16 surfaces" - help - Enable dithering when loading images to RGB16 surfaces. - This increases the data section by 64 KBytes. - -config BR2_PACKAGE_DIRECTFB_TESTS - bool "build directfb tests" - -endif # BR2_PACKAGE_DIRECTFB - -comment "directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5, dynamic library" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || BR2_TOOLCHAIN_USES_MUSL || \ - BR2_STATIC_LIBS diff --git a/package/directfb/directfb.hash b/package/directfb/directfb.hash deleted file mode 100644 index f8c4a8303cd4..000000000000 --- a/package/directfb/directfb.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3 DirectFB-1.7.7.tar.gz -sha256 512d2d21b6b3384ba64781abb0208a1b87740bc31e2df48e2b206ddb7e4d5779 COPYING diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk deleted file mode 100644 index 094e87e7e798..000000000000 --- a/package/directfb/directfb.mk +++ /dev/null @@ -1,172 +0,0 @@ -################################################################################ -# -# directfb -# -################################################################################ - -DIRECTFB_VERSION_MAJOR = 1.7 -DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 -DIRECTFB_SITE = http://sources.buildroot.net/directfb -DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz -DIRECTFB_LICENSE = LGPL-2.1+ -DIRECTFB_LICENSE_FILES = COPYING -DIRECTFB_INSTALL_STAGING = YES -DIRECTFB_AUTORECONF = YES - -DIRECTFB_CONF_OPTS = \ - --enable-zlib \ - --enable-freetype \ - --enable-fbdev \ - --disable-sdl \ - --disable-vnc \ - --disable-osx \ - --disable-video4linux \ - --disable-video4linux2 \ - --without-tools \ - --disable-x11 - -ifeq ($(BR2_STATIC_LIBS),y) -DIRECTFB_CONF_OPTS += --disable-dynload -endif - -DIRECTFB_CONFIG_SCRIPTS = directfb-config - -DIRECTFB_DEPENDENCIES = freetype zlib - -ifeq ($(BR2_PACKAGE_DIRECTFB_MULTI),y) -DIRECTFB_CONF_OPTS += --enable-multi --enable-multi-kernel -DIRECTFB_DEPENDENCIES += linux-fusion -else -DIRECTFB_CONF_OPTS += --disable-multi --disable-multi-kernel -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_DEBUG_SUPPORT),y) -DIRECTFB_CONF_OPTS += --enable-debug-support -ifeq ($(BR2_PACKAGE_DIRECTFB_DEBUG),y) -DIRECTFB_CONF_OPTS += --enable-debug -endif -else -DIRECTFB_CONF_OPTS += --disable-debug-support -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_TRACE),y) -DIRECTFB_CONF_OPTS += --enable-trace -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_DIVINE),y) -DIRECTFB_CONF_OPTS += --enable-divine -else -DIRECTFB_CONF_OPTS += --disable-divine -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_SAWMAN),y) -DIRECTFB_CONF_OPTS += --enable-sawman -else -DIRECTFB_CONF_OPTS += --disable-sawman -endif - -DIRECTFB_GFX = \ - $(if $(BR2_PACKAGE_DIRECTFB_ATI128),ati128) \ - $(if $(BR2_PACKAGE_DIRECTFB_MATROX),matrox) \ - $(if $(BR2_PACKAGE_DIRECTFB_PXA3XX),pxa3xx) \ - $(if $(BR2_PACKAGE_DIRECTFB_I830),i830) \ - $(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x) - -ifeq ($(strip $(DIRECTFB_GFX)),) -DIRECTFB_CONF_OPTS += --with-gfxdrivers=none -else -DIRECTFB_CONF_OPTS += \ - --with-gfxdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_GFX))) -endif - -DIRECTFB_INPUT = \ - $(if $(BR2_PACKAGE_DIRECTFB_LINUXINPUT),linuxinput) \ - $(if $(BR2_PACKAGE_DIRECTFB_KEYBOARD),keyboard) \ - $(if $(BR2_PACKAGE_DIRECTFB_PS2MOUSE),ps2mouse) \ - $(if $(BR2_PACKAGE_DIRECTFB_SERIALMOUSE),serialmouse) \ - $(if $(BR2_PACKAGE_DIRECTFB_TSLIB),tslib) - -ifeq ($(BR2_PACKAGE_DIRECTFB_TSLIB),y) -DIRECTFB_DEPENDENCIES += tslib -endif - -ifeq ($(strip $(DIRECTFB_INPUT)),) -DIRECTFB_CONF_OPTS += --with-inputdrivers=none -else -DIRECTFB_CONF_OPTS += \ - --with-inputdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT))) -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_GIF),y) -DIRECTFB_CONF_OPTS += --enable-gif -else -DIRECTFB_CONF_OPTS += --disable-gif -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_TIFF),y) -DIRECTFB_CONF_OPTS += --enable-tiff -DIRECTFB_DEPENDENCIES += tiff -else -DIRECTFB_CONF_OPTS += --disable-tiff -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_PNG),y) -DIRECTFB_CONF_OPTS += --enable-png -DIRECTFB_DEPENDENCIES += libpng -DIRECTFB_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config -else -DIRECTFB_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_JPEG),y) -DIRECTFB_CONF_OPTS += --enable-jpeg -DIRECTFB_DEPENDENCIES += jpeg -else -DIRECTFB_CONF_OPTS += --disable-jpeg -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_SVG),y) -DIRECTFB_CONF_OPTS += --enable-svg -# needs some help to find cairo includes -DIRECTFB_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/cairo" -DIRECTFB_DEPENDENCIES += libsvg-cairo -else -DIRECTFB_CONF_OPTS += --disable-svg -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_IMLIB2),y) -DIRECTFB_CONF_OPTS += --enable-imlib2 -DIRECTFB_DEPENDENCIES += imlib2 -DIRECTFB_CONF_ENV += ac_cv_path_IMLIB2_CONFIG=$(STAGING_DIR)/usr/bin/imlib2-config -else -DIRECTFB_CONF_OPTS += --disable-imlib2 -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_DITHER_RGB16),y) -DIRECTFB_CONF_OPTS += --with-dither-rgb16=advanced -else -DIRECTFB_CONF_OPTS += --with-dither-rgb16=none -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_TESTS),y) -DIRECTFB_CONF_OPTS += --with-tests -endif - -HOST_DIRECTFB_DEPENDENCIES = host-pkgconf host-libpng -HOST_DIRECTFB_CONF_OPTS = \ - --disable-multi \ - --enable-png \ - --with-gfxdrivers=none \ - --with-inputdrivers=none - -HOST_DIRECTFB_BUILD_CMDS = \ - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/tools directfb-csource - -HOST_DIRECTFB_INSTALL_CMDS = \ - $(INSTALL) -m 0755 $(@D)/tools/directfb-csource $(HOST_DIR)/bin - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -# directfb-csource for the host -DIRECTFB_HOST_BINARY = $(HOST_DIR)/bin/directfb-csource diff --git a/package/flatbuffers/flatbuffers.hash b/package/flatbuffers/flatbuffers.hash index ac2c9fc63a9f..be605f50ad97 100644 --- a/package/flatbuffers/flatbuffers.hash +++ b/package/flatbuffers/flatbuffers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 4157c5cacdb59737c5d627e47ac26b140e9ee28b1102f812b36068aab728c1ed flatbuffers-24.3.25.tar.gz +sha256 7e2ef35f1af9e2aa0c6a7d0a09298c2cb86caf3d4f58c0658b306256e5bcab10 flatbuffers-24.12.23.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/flatbuffers/flatbuffers.mk b/package/flatbuffers/flatbuffers.mk index 33481eabf8e9..f526d57ab4df 100644 --- a/package/flatbuffers/flatbuffers.mk +++ b/package/flatbuffers/flatbuffers.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLATBUFFERS_VERSION = 24.3.25 +FLATBUFFERS_VERSION = 24.12.23 FLATBUFFERS_SITE = $(call github,google,flatbuffers,v$(FLATBUFFERS_VERSION)) FLATBUFFERS_LICENSE = Apache-2.0 FLATBUFFERS_LICENSE_FILES = LICENSE diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index e85ec16784c5..158e6a4ed3f3 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -396,11 +396,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK comment "decklink needs a toolchain w/ C++, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB - bool "directfb" - default y - depends on BR2_PACKAGE_DIRECTFB - config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB bool "dvb" # FEC_2_5 / QAM_4_NR definitions diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index 7d36c041cc26..11ce19e7f235 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -73,7 +73,8 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ -Dmagicleap=disabled \ -Disac=disabled \ -Diqa=disabled \ - -Dopencv=disabled + -Dopencv=disabled \ + -Ddirectfb=disabled GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1 @@ -547,13 +548,6 @@ else GST1_PLUGINS_BAD_CONF_OPTS += -Ddecklink=disabled endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB),y) -GST1_PLUGINS_BAD_CONF_OPTS += -Ddirectfb=enabled -GST1_PLUGINS_BAD_DEPENDENCIES += directfb -else -GST1_PLUGINS_BAD_CONF_OPTS += -Ddirectfb=disabled -endif - ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB),y) GST1_PLUGINS_BAD_CONF_OPTS += -Ddvb=enabled GST1_PLUGINS_BAD_DEPENDENCIES += dtv-scan-tables diff --git a/package/igt-gpu-tools/Config.in b/package/igt-gpu-tools/Config.in index 809c8e28ac5b..08fc34e9177a 100644 --- a/package/igt-gpu-tools/Config.in +++ b/package/igt-gpu-tools/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_IGT_GPU_TOOLS depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_USE_WCHAR # elfutils + depends on BR2_USE_WCHAR # elfutils, procps-ng depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11 # linux/dma-buf.h select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps-ng select BR2_PACKAGE_CAIRO diff --git a/package/intel-gmmlib/intel-gmmlib.hash b/package/intel-gmmlib/intel-gmmlib.hash index 9c2f3526bbab..9b421af3ed58 100644 --- a/package/intel-gmmlib/intel-gmmlib.hash +++ b/package/intel-gmmlib/intel-gmmlib.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 08db696071510b7e03aa2d9fb7375c6c35f7c327ecd6747424c664c622bb4377 intel-gmmlib-22.5.5.tar.gz +sha256 2be3de25e45ed6b32d6ea173510b9e4ce141c22f9d6ed18dd5b574b33f34748c intel-gmmlib-22.6.0.tar.gz sha256 8b7446825df3f8b0268307e272aa6aaaf78351c83161d860d02c913c22666c48 LICENSE.md diff --git a/package/intel-gmmlib/intel-gmmlib.mk b/package/intel-gmmlib/intel-gmmlib.mk index 81aa1a9af820..66b0d1629a25 100644 --- a/package/intel-gmmlib/intel-gmmlib.mk +++ b/package/intel-gmmlib/intel-gmmlib.mk @@ -4,7 +4,7 @@ # ################################################################################ -INTEL_GMMLIB_VERSION = 22.5.5 +INTEL_GMMLIB_VERSION = 22.6.0 INTEL_GMMLIB_SITE = https://github.com/intel/gmmlib/archive INTEL_GMMLIB_LICENSE = MIT INTEL_GMMLIB_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash index df9b9242d421..e18c4995a656 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 2fc9a21411f2015ef5d07fc4aad1411588860b2036a5677bde88b2429839192b kodi-pvr-argustv-21.0.2-Omega.tar.gz +sha256 8a4b7029ef620043c44ee2e863a6240573c817fa5d3a4f8498ad6381688c1ad0 kodi-pvr-argustv-21.1.0-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk index d1f05cadf7b3..a785694b4726 100644 --- a/package/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ b/package/kodi-pvr-argustv/kodi-pvr-argustv.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_ARGUSTV_VERSION = 21.0.2-Omega +KODI_PVR_ARGUSTV_VERSION = 21.1.0-Omega KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) KODI_PVR_ARGUSTV_LICENSE = GPL-2.0+ KODI_PVR_ARGUSTV_LICENSE_FILES = LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash index 130bcbe5b26e..976b774dd3c1 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 3df0ed9a1f7dd61feba1fd8281cdd5b6e3ee153f78eba3e645e5d2213f7c5793 kodi-pvr-nextpvr-21.2.0-Omega.tar.gz +sha256 72502b3a57cbc3cfbfef92104d97681d75cdfedb2a4173ac92a8e92fdc60d668 kodi-pvr-nextpvr-21.3.0-Omega.tar.gz sha256 310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af LICENSE.md diff --git a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk index cd0378bff80e..5d3c59dc133d 100644 --- a/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ b/package/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk @@ -4,7 +4,7 @@ # ################################################################################ -KODI_PVR_NEXTPVR_VERSION = 21.2.0-Omega +KODI_PVR_NEXTPVR_VERSION = 21.3.0-Omega KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) KODI_PVR_NEXTPVR_LICENSE = GPL-2.0+ KODI_PVR_NEXTPVR_LICENSE_FILES = LICENSE.md diff --git a/package/libvpl/libvpl.hash b/package/libvpl/libvpl.hash index 0e7abd1e1970..b88972415eee 100644 --- a/package/libvpl/libvpl.hash +++ b/package/libvpl/libvpl.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 1c740e2b58f7853f56b618bdb7d4a7e5d37f8c1a9b30105a0b79ba80873e1cbd libvpl-2.13.0.tar.gz +sha256 7c6bff1c1708d910032c2e6c44998ffff3f5fdbf06b00972bc48bf2dd9e5ac06 libvpl-2.14.0.tar.gz sha256 bf1cfac2e2792b6e1e995ce103d70796aecaf2ec7e4c5fe5474f7acec7b4a677 LICENSE diff --git a/package/libvpl/libvpl.mk b/package/libvpl/libvpl.mk index 8933cbabd142..81ba571e46fb 100644 --- a/package/libvpl/libvpl.mk +++ b/package/libvpl/libvpl.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVPL_VERSION = 2.13.0 +LIBVPL_VERSION = 2.14.0 LIBVPL_SITE = $(call github,intel,libvpl,v$(LIBVPL_VERSION)) LIBVPL_LICENSE = MIT LIBVPL_LICENSE_FILES = LICENSE diff --git a/package/links/Config.in b/package/links/Config.in index cc2389c9f167..e7fffaf130aa 100644 --- a/package/links/Config.in +++ b/package/links/Config.in @@ -10,7 +10,7 @@ if BR2_PACKAGE_LINKS config BR2_PACKAGE_LINKS_GRAPHICS bool "use graphics" - depends on BR2_PACKAGE_GPM || BR2_PACKAGE_DIRECTFB || BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_GPM || BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBPNG help @@ -18,7 +18,7 @@ config BR2_PACKAGE_LINKS_GRAPHICS Framebuffer output requires GPM (console mouse). Otherwise links will be text-mode only. -comment "links graphics needs GPM, DirectFB or X11" - depends on !BR2_PACKAGE_GPM && !BR2_PACKAGE_DIRECTFB && !BR2_PACKAGE_XORG7 +comment "links graphics needs GPM or X11" + depends on !BR2_PACKAGE_GPM && !BR2_PACKAGE_XORG7 endif diff --git a/package/links/links.mk b/package/links/links.mk index 7ebe3af47464..a2833c95142f 100644 --- a/package/links/links.mk +++ b/package/links/links.mk @@ -11,6 +11,7 @@ LINKS_DEPENDENCIES = host-pkgconf LINKS_LICENSE = GPL-2.0+ LINKS_LICENSE_FILES = COPYING LINKS_CPE_ID_VENDOR = twibright +LINKS_CONF_OPTS = --without-directfb ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y) LINKS_CONF_OPTS += --enable-graphics @@ -24,16 +25,6 @@ LINKS_DEPENDENCIES += xlib_libXt else LINKS_CONF_OPTS += --without-x endif -ifeq ($(BR2_PACKAGE_DIRECTFB),y) -LINKS_CONF_ENV = ac_cv_path_DIRECTFB_CONFIG=$(STAGING_DIR)/usr/bin/directfb-config -ifeq ($(BR2_STATIC_LIBS),y) -LINKS_CONF_ENV += LIBS=-lstdc++ -endif -LINKS_CONF_OPTS += --with-directfb -LINKS_DEPENDENCIES += directfb -else -LINKS_CONF_OPTS += --without-directfb -endif ifeq ($(BR2_PACKAGE_JPEG),y) LINKS_CONF_OPTS += --with-libjpeg LINKS_DEPENDENCIES += jpeg diff --git a/package/linux-fusion/0001-fix-for-linux-4-and-above.patch b/package/linux-fusion/0001-fix-for-linux-4-and-above.patch deleted file mode 100644 index bc9e9365106b..000000000000 --- a/package/linux-fusion/0001-fix-for-linux-4-and-above.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix build for linux >= 4.x - -Instead of relying on testing for '3' as the linux kernel major version, -check that it is 2.x to include the proper Makefile, otherwise forcibly -include the .26 Makefile, that is good for 3.x and 4.x too. - -Signed-off-by: "Yann E. MORIN" - -diff -durN linux-fusion-9.0.2.orig/Makefile linux-fusion-9.0.2/Makefile ---- linux-fusion-9.0.2.orig/Makefile 2013-07-15 11:58:03.000000000 +0200 -+++ linux-fusion-9.0.2/Makefile 2015-06-06 19:03:04.059842652 +0200 -@@ -62,10 +62,10 @@ - CPPFLAGS += -DHAVE_LINUX_CONFIG_H - endif - --ifeq ($(K_VERSION),3) -- KMAKEFILE = Makefile-2.6 --else -+ifeq ($(K_VERSION),2) - KMAKEFILE = Makefile-2.$(K_PATCHLEVEL) -+else -+ KMAKEFILE = Makefile-2.6 - endif - - check-version = $(shell expr \( $(K_VERSION) \* 65536 + $(K_PATCHLEVEL) \* 256 + $(K_SUBLEVEL) \) \>= \( $(1) \* 65536 + $(2) \* 256 + $(3) \)) diff --git a/package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch b/package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch deleted file mode 100644 index a3f8bb7812bf..000000000000 --- a/package/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch +++ /dev/null @@ -1,29 +0,0 @@ -From debb9cafe9b7cc2b286399ecc8e3210480061c70 Mon Sep 17 00:00:00 2001 -From: Marc Gonzalez -Date: Mon, 11 Jan 2016 15:42:16 +0100 -Subject: [PATCH] Fix mismatched conversion spec and value in printk - -linux/drivers/char/fusion/fusiondev.c:775:38: warning: -format '%ld' expects argument of type 'long int', but argument 7 has type 'int' - -Subtracting two pointers yields a ptrdiff_t value, and ptrdiff_t is not -necessarily an alias for long int. Cast the value to long int. - -Signed-off-by: Marc Gonzalez ---- - linux/drivers/char/fusion/fusiondev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linux/drivers/char/fusion/fusiondev.c b/linux/drivers/char/fusion/fusiondev.c -index 7003407f7e1e..dfb5f8ecb81a 100644 ---- a/linux/drivers/char/fusion/fusiondev.c -+++ b/linux/drivers/char/fusion/fusiondev.c -@@ -775,7 +775,7 @@ call_ioctl(FusionDev * dev, Fusionee * fusionee, - printk( KERN_ERR "fusion: FUSION_CALL_EXECUTE3 with errorneous call (failed on previous ioctl call), " - "call id %d, flags 0x%08x, arg %d, length %u, serial %u, %ld\n", - execute3.call_id, execute3.flags, execute3.call_arg, execute3.length, execute3.ret_length, -- (execute3_bin - (FusionCallExecute3 *) arg) ); -+ (long int)(execute3_bin - (FusionCallExecute3 *) arg) ); - return -EIO; - } - diff --git a/package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch b/package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch deleted file mode 100644 index b14ec9d90af3..000000000000 --- a/package/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9fcd5003c0363af140a06aba94e62c9e1ea0381e Mon Sep 17 00:00:00 2001 -From: Marc Gonzalez -Date: Mon, 11 Jan 2016 16:45:30 +0100 -Subject: [PATCH] Fix fusion: Unknown symbol tasklist_lock (err 0) - -Commit 28f6569ab7d0 renamed TREE_PREEMPT_RCU to PREEMPT_RCU in 3.19 -As a result, the code incorrectly falls back to using tasklist_lock -(which was made private in 2.6.18) - -Always use rcu_read_lock on modern kernels. - -Signed-off-by: Marc Gonzalez ---- - linux/drivers/char/fusion/fusionee.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/linux/drivers/char/fusion/fusionee.c b/linux/drivers/char/fusion/fusionee.c -index ef067f5bc831..70cd0a665f98 100644 ---- a/linux/drivers/char/fusion/fusionee.c -+++ b/linux/drivers/char/fusion/fusionee.c -@@ -925,7 +925,7 @@ fusionee_kill(FusionDev * dev, - if (f != fusionee && (!target || target == f->id)) { - struct task_struct *p; - --#if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) || defined(CONFIG_TINY_RCU) || defined(rcu_read_lock) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - rcu_read_lock(); - #else - read_lock(&tasklist_lock); -@@ -946,7 +946,7 @@ fusionee_kill(FusionDev * dev, - } - } - --#if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) || defined(CONFIG_TINY_RCU) || defined(rcu_read_unlock) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - rcu_read_unlock(); - #else - read_unlock(&tasklist_lock); diff --git a/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch b/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch deleted file mode 100644 index 3ee4dac48761..000000000000 --- a/package/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch +++ /dev/null @@ -1,118 +0,0 @@ -From be288b60278c78eccfd347aacf4d3dd8771215a9 Mon Sep 17 00:00:00 2001 -From: Marc Gonzalez -Date: Tue, 12 Jan 2016 14:01:42 +0100 -Subject: [PATCH] Port one/one_udp.c to Linux 4.1 - -Kernel commit c0371da6047a replaced msg_iov and msg_iovlen with msg_iter -in struct msghdr since 3.19 - -one/one_udp.c: In function 'ksocket_send_iov': -one/one_udp.c:186:9: error: 'struct msghdr' has no member named 'msg_iov' -one/one_udp.c:187:9: error: 'struct msghdr' has no member named 'msg_iovlen' - -one/one_udp.c: In function 'ksocket_receive': -one/one_udp.c:221:9: error: 'struct msghdr' has no member named 'msg_iov' -one/one_udp.c:222:9: error: 'struct msghdr' has no member named 'msg_iovlen' - -The iov_iter interface -https://lwn.net/Articles/625077/ - -Kernel commit d8725c86aeba dropped the len parameter in sock_sendmsg -since 4.1 - -one/one_udp.c: In function 'ksocket_send_iov': -one/one_udp.c:192:13: error: too many arguments to function 'sock_sendmsg' - -Signed-off-by: Marc Gonzalez - -Kernel commit 2da62906b1e29 dropped the size parameter in sock_recvmsg -since 4.7 - -In function 'ksocket_receive' -one/one_udp.c:235:13: error: too many arguments to function 'sock_recvmsg' - -Signed-off-by: Matthew Shyu ---- - one/one_udp.c | 34 +++++++++++++++++++--------------- - 1 file changed, 19 insertions(+), 15 deletions(-) - -diff --git a/one/one_udp.c b/one/one_udp.c -index 26b9e6a..9b59529 100644 ---- a/one/one_udp.c -+++ b/one/one_udp.c -@@ -161,7 +161,7 @@ ksocket_send_iov( struct socket *sock, - const struct iovec *iov, - size_t iov_count ) - { -- struct msghdr msg; -+ struct msghdr msg = { addr, sizeof *addr }; - mm_segment_t oldfs; - int size = 0; - size_t len = 0; -@@ -178,18 +178,20 @@ ksocket_send_iov( struct socket *sock, - for (i=0; i -Date: Fri, 1 Apr 2011 20:20:26 +0200 -Subject: [PATCH] dfbspy: Build fix for dfbspy example. - ---- - examples/dfbspy.c | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/examples/dfbspy.c b/examples/dfbspy.c -index 5f36f0b..c7f9725 100644 ---- a/examples/dfbspy.c -+++ b/examples/dfbspy.c -@@ -89,9 +89,9 @@ read_stat( FusionStat *stat, int world ) - - /**************************************************************************************************/ - --#define CALC(x) stat.x = (int)(((s.x - last_stat.x) * 1000 / (float) diff) + 0.5f) -+#define CALC(x) stats.x = (int)(((s.x - last_stat.x) * 1000 / (float) diff) + 0.5f) - --static FusionStat last_stat, stat; -+static FusionStat last_stat, stats; - static long long last_millis; - - static int -@@ -145,14 +145,14 @@ static const struct { - void (*update)( LiteLabel *label, void *ctx ); - void *ctx; - } list[] = { -- { "lease/purchase", update_number, &stat.lease_purchase }, -- { "cede", update_number, &stat.cede }, -- { "attach", update_number, &stat.attach }, -- { "detach", update_number, &stat.detach }, -- { "ref up", update_number, &stat.ref_up }, -- { "ref down", update_number, &stat.ref_down }, -- { "prevail/swoop", update_number, &stat.prevail_swoop }, -- { "dismiss", update_number, &stat.dismiss } -+ { "lease/purchase", update_number, &stats.lease_purchase }, -+ { "cede", update_number, &stats.cede }, -+ { "attach", update_number, &stats.attach }, -+ { "detach", update_number, &stats.detach }, -+ { "ref up", update_number, &stats.ref_up }, -+ { "ref down", update_number, &stats.ref_down }, -+ { "prevail/swoop", update_number, &stats.prevail_swoop }, -+ { "dismiss", update_number, &stats.dismiss } - }; - - #define NUM_LIST (sizeof(list)/sizeof(list[0])) --- -1.7.6.3 - diff --git a/package/lite/0002-no-tests.patch b/package/lite/0002-no-tests.patch deleted file mode 100644 index 3a47186512d3..000000000000 --- a/package/lite/0002-no-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in.orig 2008-07-07 13:07:12.000000000 +0200 -+++ b/Makefile.in 2008-07-07 13:07:05.000000000 +0200 -@@ -202,7 +202,7 @@ - target_vendor = @target_vendor@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = data fonts lite leck examples tests -+SUBDIRS = data fonts lite leck examples - EXTRA_DIST = TODO lite.pc.in leck.pc.in - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = lite.pc leck.pc diff --git a/package/lite/0003-pkg-config.patch b/package/lite/0003-pkg-config.patch deleted file mode 100644 index cdd24162c795..000000000000 --- a/package/lite/0003-pkg-config.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7982cccbb6ad58f3802bb266467290200d130a48 Mon Sep 17 00:00:00 2001 -From: Ville Syrjala -Date: Sat, 27 Nov 2010 01:14:25 +0200 -Subject: [PATCH] Too many '\' characters in the .pc file - ---- - lite.pc.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lite.pc.in b/lite.pc.in -index 48eb969..3a21eaa 100644 ---- a/lite.pc.in -+++ b/lite.pc.in -@@ -9,4 +9,4 @@ Description: "LiTE" is a Toolkit Engine - Requires: directfb >= @DFB_REQUIRED_VERSION@ - Version: @VERSION@ - Libs: -L${libdir} -llite --Cflags: -I${includedir} -DLITEFONTDIR=\\\"@LITEFONTDIR@\\\" -+Cflags: -I${includedir} -DLITEFONTDIR=\"@LITEFONTDIR@\" --- -1.7.1 - diff --git a/package/lite/Config.in b/package/lite/Config.in deleted file mode 100644 index 62cd21e53dbf..000000000000 --- a/package/lite/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LITE - bool "LiTE (toolbox engine)" - depends on BR2_PACKAGE_DIRECTFB - help - LiTE stands for LiTE is a Toolbox Engine. - Its role is to facilitate the functions of DirectFB so that a - toolbox could be written on top of DirectFB with less effort. - As such LiTE has abstractions for the underlying graphics and - event systems. - - See http://www.directfb.org/wiki/index.php/LiTE:Architecture diff --git a/package/lite/lite.hash b/package/lite/lite.hash deleted file mode 100644 index 13a494b71456..000000000000 --- a/package/lite/lite.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 1b784cf595c3d5313e3705db210119f77d48826dbc7fcf6328af83a1270c2264 LiTE-0.8.10.tar.gz -sha256 512d2d21b6b3384ba64781abb0208a1b87740bc31e2df48e2b206ddb7e4d5779 COPYING diff --git a/package/lite/lite.mk b/package/lite/lite.mk deleted file mode 100644 index ddb55d46be7c..000000000000 --- a/package/lite/lite.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# lite -# -################################################################################ - -LITE_VERSION = 0.8.10 -LITE_SOURCE = LiTE-$(LITE_VERSION).tar.gz -LITE_SITE = http://www.directfb.org/downloads/Libs -LITE_INSTALL_STAGING = YES -LITE_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install -LITE_CONF_ENV = DFB_CFLAGS=-I$(STAGING_DIR)/usr/include/directfb -LITE_DEPENDENCIES = directfb -LITE_LICENSE = LGPL-2.1+ -LITE_LICENSE_FILES = COPYING - -define LITE_FINALIZE_INSTALL - $(INSTALL) -d $(TARGET_DIR)/usr/share/LiTE/examples/ - $(INSTALL) -d $(TARGET_DIR)/usr/share/fonts/truetype/ - $(INSTALL) -m0644 $(@D)/data/*.png $(TARGET_DIR)/usr/share/LiTE/ - $(INSTALL) -m0644 $(@D)/examples/*.png $(TARGET_DIR)/usr/share/LiTE/examples/ - $(INSTALL) -m0644 $(@D)/fonts/*.ttf $(TARGET_DIR)/usr/share/fonts/truetype/ -endef - -LITE_POST_INSTALL_TARGET_HOOKS += LITE_FINALIZE_INSTALL - -$(eval $(autotools-package)) diff --git a/package/lua-iconv/Config.in b/package/lua-iconv/Config.in index e76019d6767a..73c2af9bfbcd 100644 --- a/package/lua-iconv/Config.in +++ b/package/lua-iconv/Config.in @@ -4,4 +4,4 @@ config BR2_PACKAGE_LUA_ICONV help Lua binding to the POSIX 'iconv' library - http://ittner.github.io/lua-iconv/ + https://github.com/lunarmodules/lua-iconv diff --git a/package/lua-iconv/lua-iconv.hash b/package/lua-iconv/lua-iconv.hash index b28ce0b31cc0..d5342952585b 100644 --- a/package/lua-iconv/lua-iconv.hash +++ b/package/lua-iconv/lua-iconv.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 fb66e785e15376c2d2817f1f1b27d10272b877eacc998c727a10f081a7d768fa lua-iconv-7-1.src.rock -sha256 30227b9571827f3dfcdeb3830594fc415459d64ad7271e9954178d3ef58a9bd4 lua-iconv-7/COPYING +sha256 fdcb6b3fdae53967451054a87b1c977d87aeaa88f2d9518c0e316efb777d65f4 lua-iconv-7.1.0-1.src.rock +sha256 30227b9571827f3dfcdeb3830594fc415459d64ad7271e9954178d3ef58a9bd4 lua-iconv/COPYING diff --git a/package/lua-iconv/lua-iconv.mk b/package/lua-iconv/lua-iconv.mk index ea8e0dd8b6f2..23f4b31b4ce2 100644 --- a/package/lua-iconv/lua-iconv.mk +++ b/package/lua-iconv/lua-iconv.mk @@ -4,7 +4,8 @@ # ################################################################################ -LUA_ICONV_VERSION = 7-1 +LUA_ICONV_VERSION = 7.1.0-1 +LUA_ICONV_SUBDIR = lua-iconv LUA_ICONV_LICENSE = MIT LUA_ICONV_LICENSE_FILES = $(LUA_ICONV_SUBDIR)/COPYING LUA_ICONV_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) diff --git a/package/luadbi-sqlite3/luadbi-sqlite3.hash b/package/luadbi-sqlite3/luadbi-sqlite3.hash index 4096fbb26a8a..96f083dcb81e 100644 --- a/package/luadbi-sqlite3/luadbi-sqlite3.hash +++ b/package/luadbi-sqlite3/luadbi-sqlite3.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 c5b043db43941a3c6e43d3e3699236846ed6d03a6c4cb12fa1a497f965138d9f luadbi-sqlite3-0.7.2-1.src.rock +sha256 ab4b0b47614aa26c143da0e164476779bfdd406d263e0c4184a97d59f0430cdf luadbi-sqlite3-0.7.3-1.src.rock sha256 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928 luadbi/COPYING diff --git a/package/luadbi-sqlite3/luadbi-sqlite3.mk b/package/luadbi-sqlite3/luadbi-sqlite3.mk index 4ae2b5cf38ae..ea016716056b 100644 --- a/package/luadbi-sqlite3/luadbi-sqlite3.mk +++ b/package/luadbi-sqlite3/luadbi-sqlite3.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUADBI_SQLITE3_VERSION = 0.7.2-1 +LUADBI_SQLITE3_VERSION = 0.7.3-1 LUADBI_SQLITE3_SUBDIR = luadbi LUADBI_SQLITE3_LICENSE = MIT LUADBI_SQLITE3_LICENSE_FILES = $(LUADBI_SQLITE3_SUBDIR)/COPYING diff --git a/package/luadbi/luadbi.hash b/package/luadbi/luadbi.hash index e142f5e62e59..992de9571f63 100644 --- a/package/luadbi/luadbi.hash +++ b/package/luadbi/luadbi.hash @@ -1,3 +1,3 @@ # computed by luarocks/buildroot -sha256 9ebbbaf4ea1f48628341e9ff3c1de10a57200c02453734f41b8016b0fc7b4956 luadbi-0.7.2-1.src.rock +sha256 b1b6abd58a7b9cb51ccf67be903d5cbace9721c35dbf799379ffd57f45b40f12 luadbi-0.7.3-1.src.rock sha256 988d73cc2e56f972e8177091e084855fc2904d0fafcfe5c4e02864f25ce2b928 luadbi/COPYING diff --git a/package/luadbi/luadbi.mk b/package/luadbi/luadbi.mk index fbae6b319c46..6f617fdc2be7 100644 --- a/package/luadbi/luadbi.mk +++ b/package/luadbi/luadbi.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUADBI_VERSION = 0.7.2-1 +LUADBI_VERSION = 0.7.3-1 LUADBI_SUBDIR = luadbi LUADBI_LICENSE = MIT LUADBI_LICENSE_FILES = $(LUADBI_SUBDIR)/COPYING diff --git a/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch b/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch index 390cf1258316..28a82da30ab3 100644 --- a/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch +++ b/package/mpd/0001-src-event-meson.build-add-atomic-dependency-for-spar.patch @@ -9,9 +9,11 @@ Linking with libatomic is needed on sparc otherwise build fails on: Fixes: - http://autobuild.buildroot.org/results/7a9fdb7e323892fb6ed85a2441054303e889c089 +Upstream: not sent (the same kind of patch for ncmpc was +refused: https://github.com/MusicPlayerDaemon/ncmpc/pull/45) Signed-off-by: Fabrice Fontaine -[Upstream status: not sent (the same kind of patch for ncmpc was -refused: https://github.com/MusicPlayerDaemon/ncmpc/pull/45)] +[Andreas: adapt upstream formatting] +Signed-off-by: Andreas Ziegler --- src/event/meson.build | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/mpd/0002-lib-fmt-support-build-with-libfmt-11.0.0.patch b/package/mpd/0002-lib-fmt-support-build-with-libfmt-11.0.0.patch deleted file mode 100644 index e0a361fee283..000000000000 --- a/package/mpd/0002-lib-fmt-support-build-with-libfmt-11.0.0.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Fri, 5 Jul 2024 14:27:45 +0000 -Subject: [PATCH] lib/fmt: support build with libfmt-11.0.0 - -Upstream libfmt commit fmtlib/fmt@d707292 -now requires the format function to be const. - -Adjust the function prototype so it is const and can compile. - -Signed-off-by: Rudi Heitbaum - -Context: https://github.com/MusicPlayerDaemon/MPD/issues/2071 -Pull request: https://github.com/MusicPlayerDaemon/MPD/pull/2069 - -Fixes: http://autobuild.buildroot.net/results/73514ea76a5960f59b4c50e2074571b10e4682d4 -Fixes: http://autobuild.buildroot.net/results/a58ddbdfe35bd19021e65db0b8b8cc4c1c884d51 - -Rebase for mpd-0.23.15 - -Upstream: https://github.com/MusicPlayerDaemon/MPD/commit/3648475f871c33daa9e598c102a16e5a1a4d4dfc -Signed-off-by: Andreas Ziegler ---- - src/lib/ffmpeg/LibFmt.hxx | 2 +- - src/lib/fmt/AudioFormatFormatter.hxx | 4 ++-- - src/lib/fmt/ExceptionFormatter.hxx | 2 +- - src/lib/fmt/PathFormatter.hxx | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/lib/ffmpeg/LibFmt.hxx b/src/lib/ffmpeg/LibFmt.hxx -index aa068711f..dee83ed2d 100644 ---- a/src/lib/ffmpeg/LibFmt.hxx -+++ b/src/lib/ffmpeg/LibFmt.hxx -@@ -29,7 +29,7 @@ - struct fmt::formatter : formatter - { - template -- auto format(const AVSampleFormat format, FormatContext &ctx) { -+ auto format(const AVSampleFormat format, FormatContext &ctx) const { - const char *name = av_get_sample_fmt_name(format); - if (name == nullptr) - name = "?"; -diff --git a/src/lib/fmt/AudioFormatFormatter.hxx b/src/lib/fmt/AudioFormatFormatter.hxx -index e0ffb6216..8da98efd4 100644 ---- a/src/lib/fmt/AudioFormatFormatter.hxx -+++ b/src/lib/fmt/AudioFormatFormatter.hxx -@@ -39,7 +39,7 @@ - struct fmt::formatter : formatter - { - template -- auto format(const SampleFormat format, FormatContext &ctx) { -+ auto format(const SampleFormat format, FormatContext &ctx) const { - return formatter::format(sample_format_to_string(format), - ctx); - } -@@ -49,7 +49,7 @@ - struct fmt::formatter : formatter - { - template -- auto format(const AudioFormat &af, FormatContext &ctx) { -+ auto format(const AudioFormat &af, FormatContext &ctx) const { - return formatter::format(ToString(af).c_str(), - ctx); - } -diff --git a/src/lib/fmt/ExceptionFormatter.hxx b/src/lib/fmt/ExceptionFormatter.hxx -index 3f342df67..f08b3bb22 100644 ---- a/src/lib/fmt/ExceptionFormatter.hxx -+++ b/src/lib/fmt/ExceptionFormatter.hxx -@@ -38,7 +38,7 @@ - struct fmt::formatter : formatter - { - template -- auto format(std::exception_ptr e, FormatContext &ctx) { -+ auto format(std::exception_ptr e, FormatContext &ctx) const { - return formatter::format(GetFullMessage(e), ctx); - } - }; -diff --git a/src/lib/fmt/PathFormatter.hxx b/src/lib/fmt/PathFormatter.hxx -index e5ae89dec..add06df81 100644 ---- a/src/lib/fmt/PathFormatter.hxx -+++ b/src/lib/fmt/PathFormatter.hxx -@@ -29,7 +29,7 @@ - struct fmt::formatter : formatter - { - template -- auto format(Path path, FormatContext &ctx) { -+ auto format(Path path, FormatContext &ctx) const { - return formatter::format(path.ToUTF8(), ctx); - } - }; --- -2.43.0 - diff --git a/package/mpd/mpd.hash b/package/mpd/mpd.hash index fe3d449cc5eb..c18a80a9d0a5 100644 --- a/package/mpd/mpd.hash +++ b/package/mpd/mpd.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 550132239ad1acf82ccf8905b56cc13dc2c81a4489b96fba7731b3049907661a mpd-0.23.15.tar.xz +sha256 9668e36df80de485683c962d02845bf314d8a08e6141af7afeff76401e32b2c1 mpd-0.23.16.tar.xz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index e320ad9decb7..fd528aaa8703 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -5,7 +5,7 @@ ################################################################################ MPD_VERSION_MAJOR = 0.23 -MPD_VERSION = $(MPD_VERSION_MAJOR).15 +MPD_VERSION = $(MPD_VERSION_MAJOR).16 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) MPD_DEPENDENCIES = host-pkgconf boost fmt diff --git a/package/nfs-utils/0001-reexport-fsidd-reexport-.c-Re-add-missing-includes.patch b/package/nfs-utils/0001-reexport-fsidd-reexport-.c-Re-add-missing-includes.patch deleted file mode 100644 index 4f79af450ec7..000000000000 --- a/package/nfs-utils/0001-reexport-fsidd-reexport-.c-Re-add-missing-includes.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4710e469cd0f512ac5e2c3c4335d8e21b97f21b0 Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Tue, 5 Dec 2023 20:40:36 +0100 -Subject: [PATCH] reexport/{fsidd,reexport}.c: Re-add missing includes - -Older uClibc-ng requires for close(2), unlink(2) and write(2), - for struct sockaddr_un. - -Fixes: 1a4edb2a ("reexport/fsidd.c: Remove unused headers") -Fixes: bdc79f02 ("support/reexport.c: Remove unused headers") -Signed-off-by: Petr Vorel -Upstream: https://lore.kernel.org/linux-nfs/20231205223543.31443-1-pvorel@suse.cz/ ---- - support/reexport/fsidd.c | 2 ++ - support/reexport/reexport.c | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/support/reexport/fsidd.c b/support/reexport/fsidd.c -index 3e62b3fc..814fb48e 100644 ---- a/support/reexport/fsidd.c -+++ b/support/reexport/fsidd.c -@@ -7,6 +7,8 @@ - #include - #endif - #include -+#include -+#include - - #include "conffile.h" - #include "reexport_backend.h" -diff --git a/support/reexport/reexport.c b/support/reexport/reexport.c -index 78516586..1900b336 100644 ---- a/support/reexport/reexport.c -+++ b/support/reexport/reexport.c -@@ -7,6 +7,7 @@ - #endif - #include - #include -+#include - #include - - #include "nfsd_path.h" --- -2.43.0 diff --git a/package/nfs-utils/0002-support-backend_sqlite.c-Add-missing-sys-syscall.h.patch b/package/nfs-utils/0002-support-backend_sqlite.c-Add-missing-sys-syscall.h.patch deleted file mode 100644 index 88e1a9068d34..000000000000 --- a/package/nfs-utils/0002-support-backend_sqlite.c-Add-missing-sys-syscall.h.patch +++ /dev/null @@ -1,31 +0,0 @@ -From aee92881ba80cf2ae7381d19f09e7fbeda57974c Mon Sep 17 00:00:00 2001 -From: Petr Vorel -Date: Tue, 5 Dec 2023 23:20:33 +0100 -Subject: [PATCH] support/backend_sqlite.c: Add missing - -This fixes build on systems which actually needs getrandom() -(to get SYS_getrandom). - -Fixes: f92fd6ca ("support/backend_sqlite.c: Add getrandom() fallback") -Fixes: http://autobuild.buildroot.net/results/c5fde6099a8b228a8bdc3154d1e47dfa192e94ed/ -Reported-by: Giulio Benetti -Signed-off-by: Petr Vorel -Upstream: https://lore.kernel.org/linux-nfs/20231205223543.31443-2-pvorel@suse.cz/ ---- - support/reexport/backend_sqlite.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/support/reexport/backend_sqlite.c b/support/reexport/backend_sqlite.c -index 0eb5ea37..54dfe447 100644 ---- a/support/reexport/backend_sqlite.c -+++ b/support/reexport/backend_sqlite.c -@@ -7,6 +7,7 @@ - #include - #include - #include -+#include - #include - - #ifdef HAVE_GETRANDOM --- -2.43.0 diff --git a/package/nfs-utils/nfs-utils.hash b/package/nfs-utils/nfs-utils.hash index 9d74991df1d1..ff3f03799d98 100644 --- a/package/nfs-utils/nfs-utils.hash +++ b/package/nfs-utils/nfs-utils.hash @@ -1,4 +1,4 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.6.4/sha256sums.asc -sha256 01b3b0fb9c7d0bbabf5114c736542030748c788ec2fd9734744201e9b0a1119d nfs-utils-2.6.4.tar.xz +# From https://www.kernel.org/pub/linux/utils/nfs-utils/2.8.2/sha256sums.asc +sha256 a39bbea76ac0ab9e6e8699caf3c308b6b310c20d458e8fa8606196d358e7fb15 nfs-utils-2.8.2.tar.xz # Locally computed sha256 576540abf5e95029ad4ad90e32071385a5e95b2c30708c706116f3eb87b9a3de COPYING diff --git a/package/nfs-utils/nfs-utils.mk b/package/nfs-utils/nfs-utils.mk index 9ea3bae79daa..60e9c26695fd 100644 --- a/package/nfs-utils/nfs-utils.mk +++ b/package/nfs-utils/nfs-utils.mk @@ -4,7 +4,7 @@ # ################################################################################ -NFS_UTILS_VERSION = 2.6.4 +NFS_UTILS_VERSION = 2.8.2 NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) NFS_UTILS_LICENSE = GPL-2.0+ @@ -17,6 +17,8 @@ NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no NFS_UTILS_CONF_OPTS = \ --enable-tirpc \ --enable-ipv6 \ + --disable-junction \ + --disable-nfsdctl \ --without-tcp-wrappers \ --with-statedir=/run/nfs \ --with-rpcgen=$(HOST_DIR)/bin/rpcgen @@ -30,6 +32,8 @@ HOST_NFS_UTILS_CONF_OPTS = \ --disable-gss \ --disable-uuid \ --disable-ipv6 \ + --disable-junction \ + --disable-nfsdctl \ --without-tcp-wrappers \ --with-statedir=/run/nfs \ --disable-caps \ diff --git a/package/numactl/0001-Don-t-fail-build-when-set_mempolicy_home_node-syscal.patch b/package/numactl/0001-Don-t-fail-build-when-set_mempolicy_home_node-syscal.patch deleted file mode 100644 index ac532e1fb586..000000000000 --- a/package/numactl/0001-Don-t-fail-build-when-set_mempolicy_home_node-syscal.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c265971648f82464a76f797c4c20a09def078be9 Mon Sep 17 00:00:00 2001 -From: Andi Kleen -Date: Thu, 16 May 2024 09:03:24 -0700 -Subject: [PATCH] Don't fail build when set_mempolicy_home_node syscall is - unknown - -Instead just warn at build and return ENOSYS. This fixes build -on architectures like arm without kernel headers installed. - -Fixes #219 - -Upstream: https://github.com/numactl/numactl/commit/87342c3b9a42aadbe1398ca8233d13ab524aa64f -Signed-off-by: Andi Kleen ---- - syscall.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/syscall.c b/syscall.c -index 63b3e53..392f736 100644 ---- a/syscall.c -+++ b/syscall.c -@@ -144,7 +144,7 @@ - #if defined(__x86_64__) || defined(__aarch64__) - #define __NR_set_mempolicy_home_node 450 - #else --#error "Add syscalls for your architecture or update kernel headers" -+#warning "Add syscalls for your architecture or update kernel headers" - #endif - - #endif -@@ -261,7 +261,12 @@ long WEAK move_pages(int pid, unsigned long count, - - int WEAK set_mempolicy_home_node(void *start, unsigned long len, int home_node, int flags) - { -+#ifndef __NR_set_mempolicy_home_node -+ errno = ENOSYS; -+ return -1; -+#else - return syscall(__NR_set_mempolicy_home_node, start, len, home_node, flags); -+#endif - } - - /* SLES8 glibc doesn't define those */ --- -2.46.2 - diff --git a/package/numactl/numactl.hash b/package/numactl/numactl.hash index c48df0ac69d1..8851c8c4f58e 100644 --- a/package/numactl/numactl.hash +++ b/package/numactl/numactl.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 b4fc0956317680579992d7815bc43d0538960dc73aa1dd8ca7e3806e30bc1274 numactl-2.0.18.tar.gz +sha256 f2672a0381cb59196e9c246bf8bcc43d5568bc457700a697f1a1df762b9af884 numactl-2.0.19.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 diff --git a/package/numactl/numactl.mk b/package/numactl/numactl.mk index 512a5eb96ab9..134d03bc5382 100644 --- a/package/numactl/numactl.mk +++ b/package/numactl/numactl.mk @@ -4,7 +4,7 @@ # ################################################################################ -NUMACTL_VERSION = 2.0.18 +NUMACTL_VERSION = 2.0.19 NUMACTL_SITE = \ https://github.com/numactl/numactl/releases/download/v$(NUMACTL_VERSION) NUMACTL_LICENSE = LGPL-2.1 (libnuma), GPL-2.0 (programs) diff --git a/package/octave/octave.hash b/package/octave/octave.hash index d9313734f16c..5d96f9232c8c 100644 --- a/package/octave/octave.hash +++ b/package/octave/octave.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -# https://ftp.gnu.org/gnu/octave/octave-9.2.0.tar.lz.sig +# https://ftp.gnu.org/gnu/octave/octave-9.3.0.tar.lz.sig # using key DBD9C84E39FE1AAE99F04446B05F05B75D36644B -sha256 dcb2c098701cfcbc083f07e90e146261d15cdbf5e89c031032422112c89b47da octave-9.2.0.tar.lz +sha256 166e3ee492b2b1cade136cca50180c6adbbbd134fd1f34ae46e2948544a598ec octave-9.3.0.tar.lz sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING diff --git a/package/octave/octave.mk b/package/octave/octave.mk index 34d9288c7571..3989b85a4a01 100644 --- a/package/octave/octave.mk +++ b/package/octave/octave.mk @@ -4,7 +4,7 @@ # ################################################################################ -OCTAVE_VERSION = 9.2.0 +OCTAVE_VERSION = 9.3.0 OCTAVE_SITE = $(BR2_GNU_MIRROR)/octave OCTAVE_SOURCE = octave-$(OCTAVE_VERSION).tar.lz OCTAVE_LICENSE = GPL-3.0+ diff --git a/package/opkg/opkg.mk b/package/opkg/opkg.mk index 4922d8fc0f89..42cd0956cd26 100644 --- a/package/opkg/opkg.mk +++ b/package/opkg/opkg.mk @@ -44,6 +44,13 @@ else OPKG_CONF_OPTS += --disable-bzip2 endif +ifeq ($(BR2_PACKAGE_LIBSOLV),y) +OPKG_DEPENDENCIES += libsolv +OPKG_CONF_OPTS += --with-libsolv +else +OPKG_CONF_OPTS += --without-libsolv +endif + ifeq ($(BR2_PACKAGE_LZ4),y) OPKG_DEPENDENCIES += lz4 OPKG_CONF_OPTS += --enable-lz4 diff --git a/package/php/php.hash b/package/php/php.hash index e3a1c6cf2f34..535761f0475e 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From https://www.php.net/downloads.php -sha256 58b4cb9019bf70c0cbcdb814c7df79b9065059d14cf7dbf48d971f8e56ae9be7 php-8.3.14.tar.xz +sha256 3df5d45637283f759eef8fc3ce03de829ded3e200c3da278936a684955d2f94f php-8.3.15.tar.xz # License file sha256 b42e4df5e50e6ecda1047d503d6d91d71032d09ed1027ba1ef29eed26f890c5a LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 89d7766e94f5..468a73667ab5 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 8.3.14 +PHP_VERSION = 8.3.15 PHP_SITE = https://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES diff --git a/package/procps-ng/0001-build-sys-Add-systemd-elogind-to-w.patch b/package/procps-ng/0001-build-sys-Add-systemd-elogind-to-w.patch deleted file mode 100644 index 4a8b2a6a8b74..000000000000 --- a/package/procps-ng/0001-build-sys-Add-systemd-elogind-to-w.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 788248ee631b3b5f82073c36320fc3f4a3c8f9ba Mon Sep 17 00:00:00 2001 -From: Craig Small -Date: Thu, 31 Aug 2023 22:24:23 +1000 -Subject: [PATCH] build-sys: Add systemd/elogind to w - -Depending on the compiler flags, w needs to be explictly linked -to libsystemd or elogind even though libproc2 is linked to it. - -Signed-off-by: Craig Small -Upstream: https://gitlab.com/procps-ng/procps/-/commit/ca004d4657d5e8b468a4552ede429be53193a3a9 -Signed-off-by: Hugo Cornelis ---- - Makefile.am | 7 +++++++ - NEWS | 3 +++ - 2 files changed, 10 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index f70c8fb1..ddfc0141 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -149,6 +149,13 @@ endif - - dist_man_MANS += man/w.1 - src_w_SOURCES = src/w.c local/fileutils.c -+src_w_LDADD = $(LDADD) -+if WITH_SYSTEMD -+src_w_LDADD += @SYSTEMD_LIBS@ -+endif -+if WITH_ELOGIND -+src_w_LDADD += @ELOGIND_LIBS@ -+endif - else - EXTRA_DIST += man/w.1 - endif -diff --git a/NEWS b/NEWS -index 3f2158d4..4ad9f74e 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,3 +1,6 @@ -+procps-ng-NEXT -+--------------- -+ - procps-ng-4.0.4 - --------------- - * library (API & ABI unchanged) --- -2.34.1 - diff --git a/package/procps-ng/0002-fix-ncurses-h-include.patch b/package/procps-ng/0002-fix-ncurses-h-include.patch deleted file mode 100644 index 619126b863fe..000000000000 --- a/package/procps-ng/0002-fix-ncurses-h-include.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 263fe04f9ed6f3f40fdb7ce249221e03dc926c9b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 24 Jul 2024 09:51:00 +0200 -Subject: [PATCH] fix ncurses.h include - -Commit 58559a5b64a3634460536d6397ca382a54b599f0 was not backported from -3.3.17 to 4.0.0 resulting in the following build failure when ncursesw -headers are not installed in ../usr/include/ncursesw/..: - -src/watch.c:56:11: fatal error: ncursesw/ncurses.h: No such file or directory - 56 | # include - | ^~~~~~~~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/b7573be2e78f3d224f48cb3f52087e3d227d58e3 - -Signed-off-by: Fabrice Fontaine - -Upstream: https://gitlab.com/procps-ng/procps/-/commit/263fe04f9ed6f3f40fdb7ce249221e03dc926c9b - -Signed-off-by: Bernd Kuhls -[Bernd: backported to version 4.0.4] ---- - configure.ac | 2 +- - src/watch.c | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d433901f..38350aaf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,7 +64,7 @@ PROCPS_PROG_PO4A - - # Checks for header files. - AC_HEADER_MAJOR --AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h utmpx.h values.h wchar.h wctype.h]) -+AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h langinfo.h libintl.h limits.h locale.h ncursesw/ncurses.h stdint.h stdio_ext.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/time.h termios.h unistd.h utmp.h utmpx.h values.h wchar.h wctype.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_CHECK_HEADER_STDBOOL -diff --git a/src/watch.c b/src/watch.c -index ef638e00..7ec634b6 100644 ---- a/src/watch.c -+++ b/src/watch.c -@@ -53,6 +53,8 @@ - # define _XOPEN_SOURCE_EXTENDED 1 - # include - # include -+#endif -+#ifdef HAVE_NCURSESW_NCURSES_H - # include - #else - # include --- -GitLab diff --git a/package/procps-ng/0003-build-sys-Fix-pidfd_open-checking.patch b/package/procps-ng/0003-build-sys-Fix-pidfd_open-checking.patch deleted file mode 100644 index fc7e092347cc..000000000000 --- a/package/procps-ng/0003-build-sys-Fix-pidfd_open-checking.patch +++ /dev/null @@ -1,99 +0,0 @@ -From f37d178d5c25c547835d054fbb1eda32c25034b3 Mon Sep 17 00:00:00 2001 -From: Craig Small -Date: Mon, 30 Sep 2024 17:26:01 +1000 -Subject: [PATCH] build-sys: Fix pidfd_open checking - -The previous build setup would check for pidfd_open using -AC_CHECK_FUNC and would be incorrectly reported as true. - -Also, if pidfd_open() and __NR_pidfd_open were not present, -pidwait would silently not be built. - -So, changes: - compile a small programin using pidfd_open to test it properly - conditionally try to find NR_pidfd_open if the function fails - complain if neither are present - have --disable-pidwait configure option so you are explicit in - not wanting and knowing you wont get pidwait - -References: - #352 - commit d9c3e3676d86094abaa239b3218f57bf49d70b4f - commit 17f94796a9b3c4f1ff28829107a82107dcb362b4 - -Signed-off-by: Craig Small - -Upstream: https://gitlab.com/procps-ng/procps/-/commit/2507bc475782ff5e0541d37c780dff1e293c9553 - -Signed-off-by: Scott Fan -[Scott: backported to version 4.0.4] ---- - configure.ac | 45 ++++++++++++++++++++++++++++++--------------- - 1 file changed, 30 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fec27e3f..0719fcd1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -170,21 +170,6 @@ AC_TRY_COMPILE([#include ], - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no)) - --AC_CHECK_FUNC([pidfd_open], [enable_pidwait=yes], [ -- AC_MSG_CHECKING([for __NR_pidfd_open]) -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([ --#include --#ifndef __NR_pidfd_open --#error __NR_pidfd_open not defined --#endif -- ])], [enable_pidwait=yes], [enable_pidwait=no]) -- AC_MSG_RESULT([$enable_pidwait]) --]) --if test "$enable_pidwait" = yes; then -- AC_DEFINE([ENABLE_PIDWAIT], [1], [Enable pidwait]) --fi --AM_CONDITIONAL([BUILD_PIDWAIT], [test x$enable_pidwait = xyes]) -- - dnl watch8bit must be before the AC_ARG_WITH set as it sets up ncurses - AC_SUBST([WITH_WATCH8BIT]) - AC_ARG_ENABLE([watch8bit], -@@ -321,6 +306,36 @@ AC_ARG_ENABLE([pidof], - ) - AM_CONDITIONAL(BUILD_PIDOF, test "x$enable_pidof" = xyes) - -+# If pidwait is enabled, we need either pidfd_open() or __NR_pidfd_open need to be defined -+# Cannot use AC_CHECK_FUNC as it (incorrectly) passes with pidfd_open missing -+AC_ARG_ENABLE([pidwait], -+ AS_HELP_STRING([--disable-pidwait], [do not build pidwait]), -+ [], [ -+ enable_pidwait=yes -+ AC_DEFINE(ENABLE_PIDWAIT, 1, [enable pidwait]) -+ ] -+) -+AM_CONDITIONAL(BUILD_PIDWAIT, test "x$enable_pidwait" = xyes) -+AC_MSG_CHECKING([for pidfd_open()]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[ [pidfd_open(1,1)]]])], -+ have_pidfd_open=yes; AC_MSG_RESULT([yes]) , -+ have_pidfd_open=no; AC_MSG_RESULT([no]) -+ ) -+ -+AS_IF([[test "x$enable_pidwait" = xyes -a "x$have_pidfd_open" = xno]], -+ AC_MSG_CHECKING([for __NR_pidfd_open]) -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ -+#include -+#ifndef __NR_pidfd_open -+#error __NR_pidfd_open not defined -+#endif -+ ])], -+ AC_MSG_RESULT([yes]), -+ AC_MSG_RESULT([no]) -+ AC_MSG_ERROR([Neither pidfd_open or __NR_pidfd_open found. Disable pidwait with configure option --disable-pidwait]) -+ ) -+ ,[]) -+ - AC_ARG_ENABLE([kill], - AS_HELP_STRING([--disable-kill], [do not build kill]), - [], [enable_kill=yes] --- -2.43.0 - diff --git a/package/procps-ng/0004-build-sys-Fix-define-of-HAVE_PIDFD_OPEN.patch b/package/procps-ng/0004-build-sys-Fix-define-of-HAVE_PIDFD_OPEN.patch deleted file mode 100644 index aa65df770634..000000000000 --- a/package/procps-ng/0004-build-sys-Fix-define-of-HAVE_PIDFD_OPEN.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 1e2d53e1d86cb75e8f39b42b9a5c409e5d3261ed Mon Sep 17 00:00:00 2001 -From: oli-ben <24815225-oli-ben@users.noreply.gitlab.com> -Date: Wed, 27 Nov 2024 20:17:11 +0000 -Subject: [PATCH] build-sys: Fix define of HAVE_PIDFD_OPEN - -Fix cross-compilation issues when using GCC-12.3 -* configure fails to detect that the sysroot does support the pidfd_open - syscall wrapper -* configure fails to define HAVE_PIDFD_OPEN which is used in pgrep.c, - so it fails building, because __NR_pidfd_open is then undefined - -Upstream: https://gitlab.com/procps-ng/procps/-/commit/587efb47df7ddbfda4e6abdd1e7792a2531a238f - -Signed-off-by: Scott Fan -[Scott: backported to version 4.0.4] ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0719fcd1..6242a8f8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -317,8 +317,8 @@ AC_ARG_ENABLE([pidwait], - ) - AM_CONDITIONAL(BUILD_PIDWAIT, test "x$enable_pidwait" = xyes) - AC_MSG_CHECKING([for pidfd_open()]) --AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[ [pidfd_open(1,1)]]])], -- have_pidfd_open=yes; AC_MSG_RESULT([yes]) , -+AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[pidfd_open(1,1)]])], -+ have_pidfd_open=yes; AC_DEFINE(HAVE_PIDFD_OPEN, 1, [pidfd_open is defined]) AC_MSG_RESULT([yes]), - have_pidfd_open=no; AC_MSG_RESULT([no]) - ) - --- -2.43.0 - diff --git a/package/procps-ng/0005-pgrep-Include-sys-syscall.h-if-making-pidwait.patch b/package/procps-ng/0005-pgrep-Include-sys-syscall.h-if-making-pidwait.patch deleted file mode 100644 index 74f93c8e49e8..000000000000 --- a/package/procps-ng/0005-pgrep-Include-sys-syscall.h-if-making-pidwait.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 81ded587d2484b6f470f2d5c837c5591491377ce Mon Sep 17 00:00:00 2001 -From: Craig Small -Date: Thu, 28 Nov 2024 07:20:42 +1100 -Subject: [PATCH] pgrep: Include sys/syscall.h if making pidwait - -sys/syscall.h would only be included if pidwait was made -and we found pidfd_open() The previous commit fixed the -finding part, but in fact we want sys/syscall.h either -way because syscall() is defined there too. - -Most of the time the header is included by other headers -but adding it explicitly means if that header is removed or -changed it still works. - -Signed-off-by: Craig Small - -Upstream: https://gitlab.com/procps-ng/procps/-/commit/5acbb5dc1587d688de646d739a97251eb893bbb0 - -Signed-off-by: Scott Fan -[Scott: backported to version 4.0.4] ---- - src/pgrep.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/pgrep.c b/src/pgrep.c -index d8e57dff..a2607532 100644 ---- a/src/pgrep.c -+++ b/src/pgrep.c -@@ -44,9 +44,7 @@ - - #ifdef ENABLE_PIDWAIT - #include --#ifndef HAVE_PIDFD_OPEN - #include --#endif /* !HAVE_PIDFD_OPEN */ - #endif - - /* EXIT_SUCCESS is 0 */ --- -2.43.0 - diff --git a/package/procps-ng/Config.in b/package/procps-ng/Config.in index 7af0e97fb4a6..2b97096f00eb 100644 --- a/package/procps-ng/Config.in +++ b/package/procps-ng/Config.in @@ -1,7 +1,13 @@ +comment "procps-ng needs a toolchain w/ wchar" + depends on BR2_USE_MMU + depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_PROCPS_NG bool "procps-ng" depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS + depends on BR2_USE_WCHAR select BR2_PACKAGE_NCURSES help Standard informational utilities and process-handling tools. diff --git a/package/procps-ng/procps-ng.hash b/package/procps-ng/procps-ng.hash index 0d9cd9a8358e..21c661192c64 100644 --- a/package/procps-ng/procps-ng.hash +++ b/package/procps-ng/procps-ng.hash @@ -1,8 +1,8 @@ # From http://sourceforge.net/projects/procps-ng/files/Production/ -md5 2f747fc7df8ccf402d03e375c565cf96 procps-ng-4.0.4.tar.xz -sha1 2b859acd7060e9898ac457dbd26dbebf563cc44b procps-ng-4.0.4.tar.xz +md5 90803e64f51f192f3325d25c3335d057 procps-ng-4.0.5.tar.xz +sha1 a36b8ab95950addb4b34251fcf23195c45a63eda procps-ng-4.0.5.tar.xz # Locally calculated after checking signature -# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-4.0.4.tar.xz.asc -sha256 22870d6feb2478adb617ce4f09a787addaf2d260c5a8aa7b17d889a962c5e42e procps-ng-4.0.4.tar.xz +# http://downloads.sourceforge.net/project/procps-ng/Production/procps-ng-4.0.5.tar.xz.asc +sha256 c2e6d193cc78f84cd6ddb72aaf6d5c6a9162f0470e5992092057f5ff518562fa procps-ng-4.0.5.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 681e386e44a19d7d0674b4320272c90e66b6610b741e7e6305f8219c42e85366 COPYING.LIB diff --git a/package/procps-ng/procps-ng.mk b/package/procps-ng/procps-ng.mk index 9200b6faa66c..f4eadcb547f8 100644 --- a/package/procps-ng/procps-ng.mk +++ b/package/procps-ng/procps-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -PROCPS_NG_VERSION = 4.0.4 +PROCPS_NG_VERSION = 4.0.5 PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production PROCPS_NG_LICENSE = GPL-2.0+, LGPL-2.0+ (libproc and libps) @@ -14,12 +14,6 @@ PROCPS_NG_INSTALL_STAGING = YES PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf $(TARGET_NLS_DEPENDENCIES) PROCPS_NG_CONF_OPTS = LIBS=$(TARGET_NLS_LIBS) -# Applying 0001-build-sys-Add-systemd-elogind-to-w.patch touches Makefile.am -# Applying 0002-fix-ncurses-h-include.patch touches configure.ac -# Applying 0003-build-sys-Fix-pidfd_open-checking.patch touches configure.ac -# Applying 0004-build-sys-Fix-define-of-HAVE_PIDFD_OPEN.patch touches configure.ac -PROCPS_NG_AUTORECONF = YES - ifeq ($(BR2_PACKAGE_SYSTEMD),y) PROCPS_NG_DEPENDENCIES += systemd PROCPS_NG_CONF_OPTS += --with-systemd diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 16a17dfc274e..c45b8c159115 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -128,7 +128,6 @@ config BR2_PACKAGE_QT5BASE_GUI # At least one graphic backend must be enabled, so enable # linuxfb if nothing is enabled. select BR2_PACKAGE_QT5BASE_LINUXFB if \ - !BR2_PACKAGE_QT5BASE_DIRECTFB && \ !BR2_PACKAGE_QT5BASE_XCB && \ !BR2_PACKAGE_QT5BASE_EGLFS help @@ -195,13 +194,6 @@ config BR2_PACKAGE_QT5BASE_VULKAN config BR2_PACKAGE_QT5BASE_LINUXFB bool "linuxfb support" -config BR2_PACKAGE_QT5BASE_DIRECTFB - bool "directfb support" - depends on BR2_PACKAGE_DIRECTFB - -comment "directfb backend available if directfb is enabled" - depends on !BR2_PACKAGE_DIRECTFB - config BR2_PACKAGE_QT5BASE_XCB bool "X.org XCB support" depends on BR2_PACKAGE_XORG7 diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 3fd5d3025168..add460c25716 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -40,7 +40,8 @@ QT5BASE_CONFIGURE_OPTS += \ -system-pcre \ -no-pch \ -shared \ - -no-feature-relocatable + -no-feature-relocatable \ + -no-directfb # starting from version 5.9.0, -optimize-debug is enabled by default # for debug builds and it overrides -O* with -Og which is not what we @@ -173,8 +174,6 @@ QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widge # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb # is to add a link against the "inuxfb" library. QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb) -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y) QT5BASE_CONFIGURE_OPTS += -xkbcommon diff --git a/package/sdl/0002-fix-compilation-with-libx11.patch b/package/sdl/0001-fix-compilation-with-libx11.patch similarity index 100% rename from package/sdl/0002-fix-compilation-with-libx11.patch rename to package/sdl/0001-fix-compilation-with-libx11.patch diff --git a/package/sdl/0001-use-correct-directfb-config.patch b/package/sdl/0001-use-correct-directfb-config.patch deleted file mode 100644 index ef671a1dddae..000000000000 --- a/package/sdl/0001-use-correct-directfb-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH] configure.in: use correct directfb-config in version check - -The configure script has just checked for the correct directfb-config -script, so also use it for the version check instead of whatever -might be in the path. - -Signed-off-by: Peter Korsgaard ---- - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -Index: SDL-1.2.15/configure.in -=================================================================== ---- SDL-1.2.15.orig/configure.in -+++ SDL-1.2.15/configure.in -@@ -1276,7 +1276,7 @@ - else - set -- `echo $DIRECTFB_REQUIRED_VERSION | sed 's/\./ /g'` - NEED_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3` -- set -- `directfb-config --version | sed 's/\./ /g'` -+ set -- `$DIRECTFBCONFIG --version | sed 's/\./ /g'` - HAVE_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3` - if test $HAVE_VERSION -ge $NEED_VERSION; then - DIRECTFB_CFLAGS=`$DIRECTFBCONFIG --cflags` - diff --git a/package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch b/package/sdl/0002-SDL_x11yuv.c-fix-possible-use-after-free.patch similarity index 100% rename from package/sdl/0003-SDL_x11yuv.c-fix-possible-use-after-free.patch rename to package/sdl/0002-SDL_x11yuv.c-fix-possible-use-after-free.patch diff --git a/package/sdl/Config.in b/package/sdl/Config.in index 9f1e34de5c78..1d9887f32434 100644 --- a/package/sdl/Config.in +++ b/package/sdl/Config.in @@ -13,10 +13,6 @@ config BR2_PACKAGE_SDL_FBCON bool "SDL framebuffer console video driver" default y -config BR2_PACKAGE_SDL_DIRECTFB - bool "SDL DirectFB video driver" - depends on BR2_PACKAGE_DIRECTFB - config BR2_PACKAGE_SDL_X11 bool "SDL X11 video driver" depends on BR2_PACKAGE_XORG7 diff --git a/package/sdl/sdl.mk b/package/sdl/sdl.mk index 462600debb33..439c30b2a5e4 100644 --- a/package/sdl/sdl.mk +++ b/package/sdl/sdl.mk @@ -28,7 +28,9 @@ HOST_SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN SDL_DEPENDENCIES += host-automake host-autoconf host-libtool HOST_SDL_DEPENDENCIES += host-automake host-autoconf host-libtool -SDL_CONF_OPTS += --enable-video-qtopia=no +SDL_CONF_OPTS += \ + --enable-video-qtopia=no \ + --enable-video-directfb=no ifeq ($(BR2_PACKAGE_SDL_FBCON),y) SDL_CONF_OPTS += --enable-video-fbcon=yes @@ -36,14 +38,6 @@ else SDL_CONF_OPTS += --enable-video-fbcon=no endif -ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y) -SDL_DEPENDENCIES += directfb -SDL_CONF_OPTS += --enable-video-directfb=yes -SDL_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config -else -SDL_CONF_OPTS += --enable-video-directfb=no -endif - ifeq ($(BR2_PACKAGE_SDL_X11),y) SDL_CONF_OPTS += --enable-video-x11=yes SDL_DEPENDENCIES += \ diff --git a/package/sdl2/Config.in b/package/sdl2/Config.in index 7c8258fe73b3..f1c22e4f801b 100644 --- a/package/sdl2/Config.in +++ b/package/sdl2/Config.in @@ -11,13 +11,6 @@ config BR2_PACKAGE_SDL2 if BR2_PACKAGE_SDL2 -config BR2_PACKAGE_SDL2_DIRECTFB - bool "DirectFB video driver" - depends on BR2_PACKAGE_DIRECTFB - -comment "DirectFB video driver needs directfb" - depends on !BR2_PACKAGE_DIRECTFB - config BR2_PACKAGE_SDL2_X11 bool "X11 video driver" depends on BR2_PACKAGE_XORG7 diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 9eee5c712307..62d6e9189474 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -27,6 +27,7 @@ SDL2_CONF_OPTS += \ --disable-video-dummy \ --disable-video-offscreen \ --disable-video-vulkan \ + --disable-video-directfb \ --disable-ime \ --disable-ibus \ --disable-fcitx \ @@ -77,14 +78,6 @@ else SDL2_CONF_OPTS += --disable-3dnow endif -ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) -SDL2_DEPENDENCIES += directfb -SDL2_CONF_OPTS += --enable-video-directfb -SDL2_CONF_ENV += ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config -else -SDL2_CONF_OPTS += --disable-video-directfb -endif - ifeq ($(BR2_PACKAGE_SDL2_OPENGLES)$(BR2_PACKAGE_RPI_USERLAND),yy) SDL2_DEPENDENCIES += rpi-userland SDL2_CONF_OPTS += --enable-video-rpi diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index 1bb397119153..dc754f12448a 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -23,7 +23,7 @@ define HOST_SKELETON_INSTALL_CMDS $(Q)mkdir -p $(HOST_DIR)/lib $(Q)mkdir -p $(HOST_DIR)/include $(Q)case $(HOSTARCH) in \ - (*64) ln -snf lib $(HOST_DIR)/lib64;; \ + (*64|s390x) ln -snf lib $(HOST_DIR)/lib64;; \ (*) ln -snf lib $(HOST_DIR)/lib32;; \ esac endef diff --git a/package/tekui/tekui.mk b/package/tekui/tekui.mk index 3cb7ff51e521..2ec8a5848799 100644 --- a/package/tekui/tekui.mk +++ b/package/tekui/tekui.mk @@ -42,13 +42,6 @@ TEKUI_MAKE_OPTS += \ X11_DEFS="-D_XOPEN_SOURCE -DENABLE_XFT -DENABLE_XVID -I$(STAGING_DIR)/usr/include/freetype2 -I$(STAGING_DIR)/usr/include/fontconfig" \ DISPLAY_DRIVER=x11 else -ifeq ($(BR2_PACKAGE_DIRECTFB),y) -TEKUI_DEPENDENCIES += directfb -TEKUI_MAKE_OPTS += \ - DIRECTFB_LIBS="-lfreetype -ldirectfb -lpthread" \ - DIRECTFB_DEFS="-D_REENTRANT -I$(STAGING_DIR)/usr/include/directfb -I$(STAGING_DIR)/usr/include/freetype2" \ - DISPLAY_DRIVER=directfb -else TEKUI_MAKE_OPTS += \ FREETYPE_LIBS=-lfreetype \ FREETYPE_DEFS="-I$(STAGING_DIR)/usr/include/freetype2" \ @@ -56,7 +49,6 @@ TEKUI_MAKE_OPTS += \ RAWFB_SUB_DEFS="-DDEF_FONTDIR=\\\"$(TEKUI_FONTDIR)\\\"" \ DISPLAY_DRIVER=rawfb endif -endif define TEKUI_BUILD_CMDS $(TARGET_MAKE_ENV) $(TEKUI_MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all diff --git a/package/vulkan-loader/vulkan-loader.mk b/package/vulkan-loader/vulkan-loader.mk index b1545a497241..7aceb207b53c 100644 --- a/package/vulkan-loader/vulkan-loader.mk +++ b/package/vulkan-loader/vulkan-loader.mk @@ -15,15 +15,9 @@ VULKAN_LOADER_DEPENDENCIES = host-pkgconf vulkan-headers VULKAN_LOADER_CONF_OPTS += \ -DASSEMBLER_WORKS=FALSE \ -DBUILD_WSI_SCREEN_QNX_SUPPORT=OFF \ + -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ -DLOADER_CODEGEN=OFF -ifeq ($(BR2_PACKAGE_DIRECTFB),y) -VULKAN_LOADER_DEPENDENCIES += directfb -VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_DIRECTFB_SUPPORT=ON -else -VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_DIRECTFB_SUPPORT=OFF -endif - ifeq ($(BR2_PACKAGE_LIBXCB),y) VULKAN_LOADER_DEPENDENCIES += libxcb VULKAN_LOADER_CONF_OPTS += -DBUILD_WSI_XCB_SUPPORT=ON diff --git a/package/vulkan-tools/vulkan-tools.mk b/package/vulkan-tools/vulkan-tools.mk index 68f7c1c04d91..9f5bf46b7985 100644 --- a/package/vulkan-tools/vulkan-tools.mk +++ b/package/vulkan-tools/vulkan-tools.mk @@ -17,14 +17,8 @@ VULKAN_TOOLS_CONF_OPTS += \ -DBUILD_CUBE=OFF \ -DBUILD_ICD=OFF \ -DBUILD_VULKANINFO=ON \ - -DINSTALL_ICD=OFF - -ifeq ($(BR2_PACKAGE_DIRECTFB),y) -VULKAN_TOOLS_DEPENDENCIES += directfb -VULKAN_TOOLS_CONF_OPTS += -DBUILD_WSI_DIRECTFB_SUPPORT=ON -else -VULKAN_TOOLS_CONF_OPTS += -DBUILD_WSI_DIRECTFB_SUPPORT=OFF -endif + -DINSTALL_ICD=OFF \ + -DBUILD_WSI_DIRECTFB_SUPPORT=OFF ifeq ($(BR2_PACKAGE_LIBXCB),y) VULKAN_TOOLS_DEPENDENCIES += libxcb diff --git a/package/x11r7/xorgproto/xorgproto.hash b/package/x11r7/xorgproto/xorgproto.hash index 37ad9c7c04a8..941ceabd49e5 100644 --- a/package/x11r7/xorgproto/xorgproto.hash +++ b/package/x11r7/xorgproto/xorgproto.hash @@ -1,6 +1,8 @@ -# From https://lists.x.org/archives/xorg-announce/2023-June/003408.html -sha256 b61fbc7db82b14ce2dc705ab590efc32b9ad800037113d1973811781d5118c2c xorgproto-2023.2.tar.xz -sha512 af0a8c8094fc6a490a886a8c048175762b6334798f2e48b6f6e19a7bb39ddbef05fa1237c4e9d9f1d870d24f5ca7a7c463044c41ceebd108f8ab0816677a582d xorgproto-2023.2.tar.xz +# Verified from https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2024.1.tar.xz.sig +# with key 67DC86F2623FC5FD4BB5225D14706DBE1E4B4540 +# From https://lists.x.org/archives/xorg-announce/2024-March/003495.html +sha256 372225fd40815b8423547f5d890c5debc72e88b91088fbfb13158c20495ccb59 xorgproto-2024.1.tar.xz +sha512 63955cb604ff831575af2193548857c1b99e52d00206ea9421ce99e145094bcd907388c4574bc32174a01cbe2c940b0377bf75ae7d2c0f953157dc9c32e5a07f xorgproto-2024.1.tar.xz # Locally computed sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto diff --git a/package/x11r7/xorgproto/xorgproto.mk b/package/x11r7/xorgproto/xorgproto.mk index f6e5a5a43455..0253167372fc 100644 --- a/package/x11r7/xorgproto/xorgproto.mk +++ b/package/x11r7/xorgproto/xorgproto.mk @@ -4,7 +4,7 @@ # ################################################################################ -XORGPROTO_VERSION = 2023.2 +XORGPROTO_VERSION = 2024.1 XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.xz XORGPROTO_SITE = https://xorg.freedesktop.org/archive/individual/proto XORGPROTO_LICENSE = MIT diff --git a/support/testing/tests/package/test_dpdk.py b/support/testing/tests/package/test_dpdk.py new file mode 100644 index 000000000000..de2828298a18 --- /dev/null +++ b/support/testing/tests/package/test_dpdk.py @@ -0,0 +1,46 @@ +import os + +import infra.basetest + + +class TestDPDK(infra.basetest.BRTest): + config = \ + """ + BR2_x86_64=y + BR2_x86_nehalem=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.58" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y + BR2_PACKAGE_DPDK=y + BR2_PACKAGE_DPDK_TESTS=y + BR2_TARGET_ROOTFS_EXT2=y + BR2_TARGET_ROOTFS_EXT2_SIZE="300M" + # BR2_TARGET_ROOTFS_TAR is not set + """ + + def test_run(self): + img = os.path.join(self.builddir, "images", "rootfs.ext2") + kern = os.path.join(self.builddir, "images", "bzImage") + self.emulator.boot(arch="x86_64", + kernel=kern, + kernel_cmdline=["root=/dev/vda", "console=ttyS0"], + options=["-cpu", "Nehalem", "-m", "512M", + "-smp", "4", + "-device", "virtio-rng-pci", + "-drive", f"file={img},format=raw,if=virtio", + "-net", "nic,model=virtio", + "-net", "user"]) + self.emulator.login() + + # We run few DPDK test cases. + dpdk_tests = [ + "crc_autotest", + "threads_autotest", + "lcores_autotest" + ] + cmd = "dpdk-test --no-huge " + " ".join(dpdk_tests) + self.assertRunOk(cmd, timeout=30) diff --git a/support/testing/tests/package/test_xvisor.py b/support/testing/tests/package/test_xvisor.py new file mode 100644 index 000000000000..b1b7d1a5e039 --- /dev/null +++ b/support/testing/tests/package/test_xvisor.py @@ -0,0 +1,131 @@ +import os +import re + +import infra.basetest + + +class TestXvisor(infra.basetest.BRTest): + # RISC-V 64bit is the "simplest" configuration to run + # Xvisor into QEmu. + config = \ + """ + BR2_riscv=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_PACKAGE_XVISOR=y + BR2_TARGET_ROOTFS_CPIO=y + # BR2_TARGET_ROOTFS_TAR is not set + BR2_TARGET_OPENSBI=y + BR2_TARGET_OPENSBI_CUSTOM_VERSION=y + BR2_TARGET_OPENSBI_CUSTOM_VERSION_VALUE="1.5" + BR2_TARGET_OPENSBI_PLAT="generic" + BR2_PACKAGE_HOST_QEMU=y + BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE=y + """ + xvisor_prompt = "XVisor# " + + def expect_xvisor_prompt(self, timeout=-1): + self.emulator.qemu.expect(self.xvisor_prompt, timeout=timeout) + + def run_xvisor_cmd(self, cmd, timeout=-1): + exit_code = 0 + if timeout != -1: + timeout *= self.emulator.timeout_multiplier + self.emulator.qemu.sendline(cmd) + self.expect_xvisor_prompt(timeout) + output = self.emulator.qemu.before.replace("\r\r", "\r").splitlines()[1:] + # Some Xvisor commands (like "sleep") might not + # produce any output + if len(output) > 0: + last_line = output[-1] + else: + last_line = "" + if last_line.startswith("Error:"): + match = re.search(last_line, r"code (-?\d)") + if match is None: + exit_code = -1 + else: + exit_code = int(match.group(1)) + + return output, exit_code + + def assertXvRunOk(self, cmd, timeout=-1): + out, exit_code = self.run_xvisor_cmd(cmd, timeout) + self.assertEqual( + exit_code, + 0, + "\nFailed to run xvisor command: {}\noutput was:\n{}".format( + cmd, ' '+'\n '.join(out)) + ) + + def test_run(self): + opensbi = os.path.join(self.builddir, "images", "fw_jump.bin") + xvisor = os.path.join(self.builddir, "images", "vmm.bin") + initrd = os.path.join(self.builddir, "images", "rootfs.cpio") + + self.emulator.boot(arch="riscv64", + kernel=xvisor, + options=["-M", "virt", "-cpu", "rv64", "-m", "256M", + "-bios", opensbi, "-initrd", initrd]) + + # There is no emulator.login(), since we start directly in + # Xvisor prompt. + self.expect_xvisor_prompt() + + # Check Xvisor version. + output, exit_code = self.run_xvisor_cmd("version") + self.assertEqual(exit_code, 0) + self.assertTrue(output[0].startswith("Xvisor")) + + # Check a basic echo. + test_str = "Hello Buildroot!" + output, exit_code = self.run_xvisor_cmd("echo " + test_str) + self.assertEqual(exit_code, 0) + self.assertEqual(output[0].strip(), test_str) + + # Check a nonexisting command fails. + _, exit_code = self.run_xvisor_cmd("bad_command") + self.assertNotEqual(exit_code, 0) + + # Check an error of a valid command. + _, exit_code = self.run_xvisor_cmd("vfs ls /nodir") + self.assertNotEqual(exit_code, 0) + + # We mount the initrd... + self.assertXvRunOk("vfs mount initrd /") + + # Check we see an existing file/symlink "os-release" in + # "/etc", from our mounted initrd. + output, exit_code = self.run_xvisor_cmd("vfs ls /etc") + self.assertEqual(exit_code, 0) + self.assertIn("os-release", "\n".join(output)) + + # Check the word "Buildroot" is in the /etc/issue file. + output, exit_code = self.run_xvisor_cmd("vfs cat /etc/issue") + self.assertEqual(exit_code, 0) + self.assertIn("Buildroot", "\n".join(output)) + + # Check qemu is seen in host info. + output, exit_code = self.run_xvisor_cmd("host info") + self.assertEqual(exit_code, 0) + self.assertIn("qemu", "\n".join(output)) + + # Run a batch of status commands... + cmds = [ + "blockdev list", + "rbd list", + "module info 0", + "wallclock get_time", + "heap info", + "thread list", + "vcpu list", + "vcpu dumpreg 0", + "devtree node show /", + "host cpu info", + "host ram info", + "host resources", + "host bus_list", + "host bus_device_list platform" + ] + + for cmd in cmds: + self.assertXvRunOk(cmd)