summaryrefslogtreecommitdiffstats
path: root/package/dvb-apps
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2014-03-28 01:00:24 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-03-29 18:30:37 +0100
commit365ae61c5c30df79801a61910eb72efa3ea9ab45 (patch)
tree086e3a220e72c1276a69806e5ad17d62be91b2b2 /package/dvb-apps
parent3bf6f370200dfdaf00aa6980a344392cc832d189 (diff)
downloadbuildroot-365ae61c5c30df79801a61910eb72efa3ea9ab45.tar.gz
buildroot-365ae61c5c30df79801a61910eb72efa3ea9ab45.zip
package/dvb-apps: bump revision
In this new revision, there is no longer transponders data, so dvb-apps now only installs the dvb-apps utilities. Packages that needs the transponders data have now all been switched to use dtv-scan-tables instead, so we don't need a legacy option for the transponders data. However, we add a legacy option for the utilities option, just to inform the user of the new behaviour. Sadly, a user that had dvb-apps selected just to get the transponders data will now get the full dvb-apps package installed. There's nothing we can really do about this. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/dvb-apps')
-rw-r--r--package/dvb-apps/Config.in24
-rw-r--r--package/dvb-apps/dvb-apps.mk13
2 files changed, 8 insertions, 29 deletions
diff --git a/package/dvb-apps/Config.in b/package/dvb-apps/Config.in
index 76b33aabb7..3f8fdb657e 100644
--- a/package/dvb-apps/Config.in
+++ b/package/dvb-apps/Config.in
@@ -1,25 +1,15 @@
config BR2_PACKAGE_DVB_APPS
- bool "dvb-apps (transponders data)"
- select BR2_PACKAGE_DTV_SCAN_TABLES
- help
- Install the DVB-C, DVB-S, DVB-T and ATSC transponders data.
-
- http://linuxtv.org/projects.php
- http://linuxtv.org/hg/dvb-apps
-
-if BR2_PACKAGE_DVB_APPS
-
-comment "dvb-apps utils needs a toolchain w/ largefile, threads, headers >= 3.3"
- depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
-
-config BR2_PACKAGE_DVB_APPS_UTILS
- bool "dvb-apps utilities"
+ bool "dvb-apps"
depends on BR2_LARGEFILE
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
- A small number of DVB test and utility programs,
+ Install a small number of DVB test and utility programs,
including szap and dvbscan.
-endif
+ http://linuxtv.org/projects.php
+ http://linuxtv.org/hg/dvb-apps
+
+comment "dvb-apps utils needs a toolchain w/ largefile, threads, headers >= 3.3"
+ depends on !BR2_LARGEFILE || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk
index 5f576e079f..c5e1954567 100644
--- a/package/dvb-apps/dvb-apps.mk
+++ b/package/dvb-apps/dvb-apps.mk
@@ -4,15 +4,9 @@
#
################################################################################
-DVB_APPS_VERSION = be76da69f250
+DVB_APPS_VERSION = 3d43b280298c39a67d1d889e01e173f52c12da35
DVB_APPS_SITE = http://linuxtv.org/hg/dvb-apps
DVB_APPS_SITE_METHOD = hg
-
-DVB_APPS_DEPENDENCIES = dtv-scan-tables
-
-ifeq ($(BR2_PACKAGE_DVB_APPS_UTILS),y)
-# Utilitiess are selected, build and install everything
-
DVB_APPS_LICENSE = GPLv2 GPLv2+ LGPLv2.1+
DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL
@@ -38,9 +32,4 @@ define DVB_APPS_INSTALL_TARGET_CMDS
$(MAKE) -C $(@D) V=1 DESTDIR=$(TARGET_DIR) install
endef
-else
-# We do not really install anything, so there's no license
-DVB_APPS_LICENSE = none
-endif
-
$(eval $(generic-package))
OpenPOWER on IntegriCloud