diff --git a/.checkpackageignore b/.checkpackageignore index 194a2d1c72..6b45fb9e94 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1261,8 +1261,6 @@ package/vte/0002-build-Fix-check-for-fstack-protector-compiler-support.patch lib package/vtun/0001-fix-installation.patch lib_patch.Upstream package/vtun/0002-fix-ssl-headers-checks.patch lib_patch.Upstream package/vtun/0003-openssl11.patch lib_patch.Upstream -package/w_scan/0001-musl.patch lib_patch.Upstream -package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch lib_patch.Upstream package/waffle/0001-cmake-forward-cflags-from-.pc-files-to-waffle-cflags.patch lib_patch.Upstream package/waffle/0002-wayland-fix-build-against-version-1-20.patch lib_patch.Upstream package/waffle/0003-drop-C-dependency.patch lib_patch.Upstream diff --git a/Config.in.legacy b/Config.in.legacy index fbabe784ba..2cb7cbd51f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2025.02" +config BR2_PACKAGE_W_SCAN + bool "w_scan has been removed" + select BR2_LEGACY + help + The w_scan package was removed as it is not maintained + anymore and the upstream URL is gone. + config BR2_PACKAGE_GENROMFS bool "genromfs" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index da88832d37..0759a9df47 100644 --- a/package/Config.in +++ b/package/Config.in @@ -656,7 +656,6 @@ endmenu source "package/usbip/Config.in" source "package/usbmount/Config.in" source "package/usbutils/Config.in" - source "package/w_scan/Config.in" source "package/wf111/Config.in" source "package/wilc-driver/Config.in" source "package/wipe/Config.in" diff --git a/package/w_scan/0001-musl.patch b/package/w_scan/0001-musl.patch deleted file mode 100644 index 46d67677a8..0000000000 --- a/package/w_scan/0001-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix musl build - -Signed-off-by: Bernd Kuhls - -diff -uNr w_scan-20141122.org/descriptors.h w_scan-20141122/descriptors.h ---- w_scan-20141122.org/descriptors.h 2014-11-22 09:49:26.000000000 +0100 -+++ w_scan-20141122/descriptors.h 2016-01-24 14:05:21.000000000 +0100 -@@ -28,6 +28,7 @@ - #ifndef __DESCRIPTORS_H__ - #define __DESCRIPTORS_H__ - -+#include - #include "extended_frontend.h" - - /****************************************************************************** -diff -uNr w_scan-20141122.org/version.h w_scan-20141122/version.h ---- w_scan-20141122.org/version.h 2014-11-22 11:59:56.000000000 +0100 -+++ w_scan-20141122/version.h 2016-01-24 14:06:33.000000000 +0100 -@@ -1,6 +1,6 @@ - /* AUTOMATICALLY GENERATED - DO NOT EDIT MANUALLY */ - #ifndef W_SCAN_VERSION_H - #define W_SCAN_VERSION_H --uint version=20170107; -+unsigned int version=20170107; - #endif - diff --git a/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch b/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch deleted file mode 100644 index 50d2488190..0000000000 --- a/package/w_scan/0002-si_types-h-fix-build-with-gcc-10.patch +++ /dev/null @@ -1,37 +0,0 @@ -si_types.h: fix build with gcc 10 - -Drop service_t, p_service_t, transponder_t and p_transponder_t to avoid -the following build failure with gcc 10 (which defaults to -fno-common): - -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-gcc -Wall -Wextra -Wno-comment -Wswitch-default -Wno-unused-parameter -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -lrt -o w_scan atsc_psip_section.o countries.o descriptors.o diseqc.o dump-dvbscan.o dump-vdr.o dump-xine.o dump-mplayer.o dump-vlc-m3u.o dvbscan.o lnb.o parse-dvbscan.o satellites.o scan.o section.o tools.o emulate.o dump-xml.o iconv_codes.o char-coding.o -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x404): multiple definition of `p_transponder_t'; countries.o:(.bss+0x0): first defined here -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x408): multiple definition of `transponder_t'; countries.o:(.bss+0x4): first defined here -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x480): multiple definition of `p_service_t'; countries.o:(.bss+0x7c): first defined here -/home/giuliobenetti/autobuild/run/instance-3/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: descriptors.o:(.bss+0x484): multiple definition of `service_t'; countries.o:(.bss+0x80): first defined here - -Fixes: - - http://autobuild.buildroot.org/results/5640442cb4ba06bcbcf31540a64f5665862d39f7 - -Signed-off-by: Fabrice Fontaine - -diff -Nura w_scan-20170107.orig/si_types.h w_scan-20170107/si_types.h ---- w_scan-20170107.orig/si_types.h 2020-09-20 11:09:56.776963441 +0200 -+++ w_scan-20170107/si_types.h 2020-09-20 11:13:13.149232478 +0200 -@@ -114,7 +114,7 @@ - uint32_t logical_channel_number; - uint8_t running; - void * priv; --} service_t, * p_service_t; -+}; - - /******************************************************************************* - /* transponder type. -@@ -201,7 +201,7 @@ - /*----------------------------*/ - char * network_name; - network_change_t network_change; --} __attribute__((packed)) transponder_t, * p_transponder_t; -+} __attribute__((packed)); - - /******************************************************************************* - /* satellite channel routing type. diff --git a/package/w_scan/Config.in b/package/w_scan/Config.in deleted file mode 100644 index d5471200ad..0000000000 --- a/package/w_scan/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -comment "w_scan needs a toolchain w/ headers >= 3.7" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - -config BR2_PACKAGE_W_SCAN - bool "w_scan" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - w_scan is a small command line utility used to perform - frequency scans for DVB and ATSC transmissions. It is - capable of creating channels.conf files (in different output - formats !) as well as initial tuning data for scan. - - https://www.gen2vdr.de/wirbel/w_scan/index2.html diff --git a/package/w_scan/w_scan.hash b/package/w_scan/w_scan.hash deleted file mode 100644 index fcb0e611bc..0000000000 --- a/package/w_scan/w_scan.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe w_scan-20170107.tar.bz2 -sha256 ddb9db7630752f8fdc6898f7c99a99eaeeac5213627ecb093df9c82f56175dc7 COPYING diff --git a/package/w_scan/w_scan.mk b/package/w_scan/w_scan.mk deleted file mode 100644 index c63f20cc9e..0000000000 --- a/package/w_scan/w_scan.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# w_scan -# -################################################################################ - -W_SCAN_VERSION = 20170107 -W_SCAN_SOURCE = w_scan-$(W_SCAN_VERSION).tar.bz2 -W_SCAN_SITE = http://wirbel.htpc-forum.de/w_scan -W_SCAN_LICENSE = GPL-2.0+ -W_SCAN_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -W_SCAN_DEPENDENCIES += libiconv -W_SCAN_CONF_ENV += LIBS=-liconv -endif - -$(eval $(autotools-package))