Misc bumps and implied changes (branch yem/bumps)
cover Misc bumps and implied changes (branch yem/bumps)
From: "Yann E. MORIN" <[email protected]>
Hello All!
Here is a series with a few bumps. Apart from the now-usual RPi-related bumps, to be noted:
- bumping dvb-apps makes us loose our provider of transponders data,
- which are now provided by dtv-scan-tables
So, the sequence is a bit comvoluted:
- first add dtv-scan-tables, exclusive with dvb-apps (our currently packages version still installs them
- make dvb-apps use scan-tables from dtv-scan-tables; this has the adverse effect that transponders data from dtv-scan-tables get overwritten by those from dvb-apps. But that's a temporary situation
- switch our two transponders data users (tvheadend and /gst1-plugins-bad) to now depend on dtv-scan-tables
- finally bump dvb-apps, to a version that no longer has the scan-tables
As a bonus, some coding-rules fixes in the affected packages.
Regards,
Yann E. MORIN.
The following changes since commit 9cfd429c1c3d6c7b793f58210f39bb041e680bac:
xbmc: Add comment for host-sdl_images dependency (2014-03-27 23:48:56 +0100)
are available in the git repository at:
git://gitorious.org/buildroot/buildroot.git yem/bumps
for you to fetch changes up to 4f298ad3beb7ace204437c079c353fa641fe14ae:
package/tvheadend: do not line-up variables (2014-03-28 00:52:03 +0100)
----------------------------------------------------------------
Yann E. MORIN (10):
package/rpi-firmware: bump revision
package/rpi-userland: bump revision
package/dtv-scan-tables: new package
package/dvb-apps: rely on dtv-scan-tables to provide transponder data package/tvheadend: transponders data now provided by dtv-scan-tables package/gst1-plugins-bad: transponders data now provided by dtv-scan-tables package/dvb-apps: bump revision
package/tvheadend: bump revision
package/dvb-apps: do not line-up variables
package/tvheadend: do not line-up variables
Config.in.legacy | 7 ++++ package/Config.in | 1 + package/dtv-scan-tables/Config.in | 6 ++++ package/dtv-scan-tables/dtv-scan-tables.mk | 27 +++++++++++++++ package/dvb-apps/Config.in | 23 ++++--------- package/dvb-apps/dvb-apps.mk | 38 ++++------------------ package/gstreamer1/gst1-plugins-bad/Config.in | 2 +- .../gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- package/rpi-firmware/rpi-firmware.mk | 2 +- package/rpi-userland/rpi-userland.mk | 2 +- package/tvheadend/Config.in | 2 +- package/tvheadend/tvheadend.mk | 18 +++++----- 12 files changed, 69 insertions(+), 61 deletions(-) create mode 100644 package/dtv-scan-tables/Config.in create mode 100644 package/dtv-scan-tables/dtv-scan-tables.mk
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/10 package/rpi-firmware: bump revision
From: "Yann E. MORIN" <[email protected]>
Fixes in firmware:
- misc: SDRAM calibration
- camera: burst performance, exposure, EXIF
- audio: noise in multichannel output, 8-bit input, float input/output, non-power-of-2 multi-channel
- video: SEI in h264 encoder
--- package/rpi-firmware/rpi-firmware.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/rpi-firmware/rpi-firmware.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 089cfb05ec350505ee84a99d567474c5bdc0505e +RPI_FIRMWARE_VERSION = 9c7c2cd698ae24022c7aa74b16436c2966e82624 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3c RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
Signature · 1 line
1.8.3.2
PATCH 2/10 package/rpi-userland: bump revision
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Changes for:
- sync with latest firmware API
- fix bitrate of video encoder
--- package/rpi-userland/rpi-userland.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/rpi-userland/rpi-userland.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -RPI_USERLAND_VERSION = 7beec2158da8229598f8e471ab5ca834078f5ad2 +RPI_USERLAND_VERSION = 58ab02e820df719440816534f4534ab1dfd66ce6 RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) RPI_USERLAND_LICENSE = BSD-3c RPI_USERLAND_LICENSE_FILES = LICENCE
Signature · 1 line
1.8.3.2
PATCH 3/10 package/dtv-scan-tables: new package
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
The dvb-apps package used to carry pre-scanned transponders data. These transponders data have now been moved out of dvb-apps, and into their own repository.
So, until we bump the dvb-apps package (to come in a follow-up patch), dtv-scan-tables is exclusive to dvb-apps.
To be noted: the licensing information for those data is dubious. The package carries the COPYING and COPYING.LIB files, hinting that the data is covered by the GPLv2 *and* the LGPLv2.1. This is incoherent, and dubious:
- since GPLv2 is a superset of LGPLv2.1, the actual license would be
just plan GPLv2;
- the transponders data is just a collection of 'facts': the frequencies of each transponder; as such, it is usally not considered to be a 'work' as per traditional copyright, and thus should be in the public domain [cue the zoneinfo DB not so long ago].
But since this is a difficult question, we'll leave to the user to sort these things out.
--- package/Config.in | 1 + package/dtv-scan-tables/Config.in | 8 ++++++++ package/dtv-scan-tables/dtv-scan-tables.mk | 27 +++++++++++++++++++++++++++ 3 files changed, 36 insertions(+) create mode 100644 package/dtv-scan-tables/Config.in create mode 100644 package/dtv-scan-tables/dtv-scan-tables.mk
package/Config.in +1 -0
@@ -280,6 +280,7 @@ source "package/dmidecode/Config.in" source "package/dmraid/Config.in" source "package/dvb-apps/Config.in" source "package/dvbsnoop/Config.in" +source "package/dtv-scan-tables/Config.in" source "package/eeprog/Config.in" source "package/eudev/Config.in" source "package/evemu/Config.in"
package/dtv-scan-tables/Config.in new file +8 -0
@@ -0,0 +1,8 @@ +config BR2_PACKAGE_DTV_SCAN_TABLES + bool "dtv-scan-tables" + # dvb-apps installs its own set of transponder data + depends on !BR2_PACKAGE_DVB_APPS + help + The Digital TV scan tables. + + http://git.linuxtv.org/dtv-scan-tables.git
package/dtv-scan-tables/dtv-scan-tables.mk new file +27 -0
@@ -0,0 +1,27 @@ +################################################################################ +# +# dtv-scan-tables +# +################################################################################ + +DTV_SCAN_TABLES_VERSION = cfc29758d1357b724f3bf27c3b1b277e242841fa +DTV_SCAN_TABLES_SITE = http://linuxtv.org/git/dtv-scan-tables.git +DTV_SCAN_TABLES_SITE_METHOD = git + +# This package only contains the transponders data. This is not a 'work' +# as per traditional copyright, but just a collection of 'facts', so there's +# probably no license to apply to these data files. +# However, the package prominently contains the COPYING and COPYING.LIB +# license files (respectively for the GPLv2 and the LGPLv2.1), so we use +# that as the licensing information. +DTV_SCAN_TABLES_LICENSE = GPLv2 LGPLv2.1 +DTV_SCAN_TABLES_LICENSE_FILES = COPYING COPYING.LIB + +define DTV_SCAN_TABLES_INSTALL_TARGET_CMDS + for f in atsc dvb-c dvb-s dvb-t; do \ + $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/dvb/$$f; \ + $(INSTALL) $(@D)/$$f/* $(TARGET_DIR)/usr/share/dvb/$$f; \ + done +endef + +$(eval $(generic-package))
Signature · 1 line
1.8.3.2
PATCH 4/10 package/dvb-apps: rely on dtv-scan-tables to provide transponder data
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
This is a transitioning solution before switching packages that need the transponders data, to use dtv-scan-tables instead of dvb-apps.
--- package/dtv-scan-tables/Config.in | 2 -- package/dvb-apps/Config.in | 1 + package/dvb-apps/dvb-apps.mk | 23 +++++------------------ 3 files changed, 6 insertions(+), 20 deletions(-)
package/dtv-scan-tables/Config.in +0 -2
@@ -1,7 +1,5 @@ config BR2_PACKAGE_DTV_SCAN_TABLES bool "dtv-scan-tables" - # dvb-apps installs its own set of transponder data - depends on !BR2_PACKAGE_DVB_APPS help The Digital TV scan tables.
package/dvb-apps/Config.in +1 -0
@@ -1,5 +1,6 @@ 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.
package/dvb-apps/dvb-apps.mk +5 -18
@@ -8,21 +8,13 @@ DVB_APPS_VERSION = be76da69f250 DVB_APPS_SITE = http://linuxtv.org/hg/dvb-apps DVB_APPS_SITE_METHOD = hg -# We just install the transponders data. As this is not a 'work' as per -# traditional copyright, but just a collection of 'facts', there's probably -# no license to apply to these data files. -# To be noted however, is that the dvb-apps package bundles a copy of the -# GPLv2 and a copy of the LGPLv2.1, and that some of the source files refer -# to either the GPLv2+ or the LGPLv2.1+. -# But since we do not use any of those source files, their license do not -# apply to us. -DVB_APPS_LICENSE = unknown (probably public domain) +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 +DVB_APPS_LICENSE = GPLv2 GPLv2+ LGPLv2.1+ +DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL DVB_APPS_LDFLAGS = $(TARGET_LDFLAGS)
@@ -47,13 +39,8 @@ define DVB_APPS_INSTALL_TARGET_CMDS endef else -# Utilities are not selected, just install the scan files -define DVB_APPS_INSTALL_TARGET_CMDS - for i in atsc dvb-c dvb-s dvb-t; do \ - mkdir -p $(TARGET_DIR)/usr/share/dvb/$$i; \ - $(INSTALL) $(@D)/util/scan/$$i/* $(TARGET_DIR)/usr/share/dvb/$$i; \ - done -endef +# We do not really install anything, so there's no license +DVB_APPS_LICENSE = none endif $(eval $(generic-package))
Signature · 1 line
1.8.3.2
PATCH 5/10 package/tvheadend: transponders data now provided by dtv-scan-tables
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- package/tvheadend/Config.in | 2 +- package/tvheadend/tvheadend.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-)
package/tvheadend/Config.in +1 -1
@@ -12,7 +12,7 @@ config BR2_PACKAGE_TVHEADEND # context of Buildroot, the only really problematic # architecture is avr32, which uses gcc 4.2. depends on !BR2_avr32 - select BR2_PACKAGE_DVB_APPS + select BR2_PACKAGE_DTV_SCAN_TABLES select BR2_PACKAGE_OPENSSL help Tvheadend is a TV streaming server for Linux supporting DVB-S,
package/tvheadend/tvheadend.mk +3 -3
@@ -16,11 +16,11 @@ endif #---------------------------------------------------------------------------- # tvheadend is a little smuggler and thief! ;-) -# During the ./configure, it downloads some files from the dvb-apps +# During the ./configure, it downloads some files from the dtv-scan-tables # package, so it has a list of pre-scanned tunner configurations. # For buildroot, we add a patch that avoids doing that, but uses the -# scan files installed by the dvb-apps package -TVHEADEND_DEPENDENCIES += dvb-apps +# scan files installed by the dtv-scan-tables package +TVHEADEND_DEPENDENCIES += dtv-scan-tables define TVHEADEND_CONFIGURE_CMDS (cd $(@D); \
Signature · 1 line
1.8.3.2
PATCH 6/10 package/gst1-plugins-bad: transponders data now provided by dtv-scan-tables
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- package/gstreamer1/gst1-plugins-bad/Config.in | 2 +- package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
package/gstreamer1/gst1-plugins-bad/Config.in +1 -1
@@ -481,7 +481,7 @@ comment "gst-plugins-bad-plugin-sndfile needs a toolchain w/ largefile" config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB bool "dvb" - select BR2_PACKAGE_DVB_APPS + select BR2_PACKAGE_DTV_SCAN_TABLES help DVB elements
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +1 -1
@@ -683,7 +683,7 @@ endif ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB),y) GST1_PLUGINS_BAD_CONF_OPT += --enable-dvb -GST1_PLUGINS_BAD_DEPENDENCIES += dvb-apps +GST1_PLUGINS_BAD_DEPENDENCIES += dtv-scan-tables else GST1_PLUGINS_BAD_CONF_OPT += --disable-dvb endif
Signature · 1 line
1.8.3.2
PATCH 7/10 package/dvb-apps: bump revision
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
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.
--- Config.in.legacy | 7 +++++++ package/dvb-apps/Config.in | 24 +++++++----------------- package/dvb-apps/dvb-apps.mk | 13 +------------ 3 files changed, 15 insertions(+), 29 deletions(-)
Config.in.legacy +7 -0
@@ -101,6 +101,13 @@ endif ############################################################################### comment "Legacy options removed in 2014.05" +config BR2_PACKAGE_DVB_APPS_UTILS + bool "dvb-apps utilities now built by default" + select BR2_LEGACY + help + The dvb-apps utilities are now always built when the dvb-apps + package is selected. + config BR2_KERNEL_HEADERS_SNAP bool "Local Linux snapshot support removed" select BR2_LEGACY
package/dvb-apps/Config.in +7 -17
@@ -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
package/dvb-apps/dvb-apps.mk +1 -12
@@ -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))
Signature · 1 line
1.8.3.2
PATCH 8/10 package/tvheadend: bump revision
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
Adds a bunch of fixes all over the place.
--- package/tvheadend/tvheadend.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/tvheadend/tvheadend.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -TVHEADEND_VERSION = c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3 +TVHEADEND_VERSION = 6482d33ba90848018c530018e5c38992b8ac921c TVHEADEND_SITE = git://github.com/tvheadend/tvheadend.git TVHEADEND_LICENSE = GPLv3+ TVHEADEND_LICENSE_FILES = LICENSE
Signature · 1 line
1.8.3.2
PATCH 9/10 package/dvb-apps: do not line-up variables
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- package/dvb-apps/dvb-apps.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
package/dvb-apps/dvb-apps.mk +7 -7
@@ -4,17 +4,17 @@ # ################################################################################ -DVB_APPS_VERSION = 3d43b280298c39a67d1d889e01e173f52c12da35 -DVB_APPS_SITE = http://linuxtv.org/hg/dvb-apps -DVB_APPS_SITE_METHOD = hg -DVB_APPS_LICENSE = GPLv2 GPLv2+ LGPLv2.1+ -DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL +DVB_APPS_VERSION = 3d43b280298c39a67d1d889e01e173f52c12da35 +DVB_APPS_SITE = http://linuxtv.org/hg/dvb-apps +DVB_APPS_SITE_METHOD = hg +DVB_APPS_LICENSE = GPLv2 GPLv2+ LGPLv2.1+ +DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL DVB_APPS_LDFLAGS = $(TARGET_LDFLAGS) ifeq ($(BR2_ENABLE_LOCALE),) -DVB_APPS_DEPENDENCIES = libiconv -DVB_APPS_LDFLAGS += -liconv +DVB_APPS_DEPENDENCIES = libiconv +DVB_APPS_LDFLAGS += -liconv endif DVB_APPS_INSTALL_STAGING = YES
Signature · 1 line
1.8.3.2
PATCH 10/10 package/tvheadend: do not line-up variables
In reply to Yann E. MORINFrom: "Yann E. MORIN" <[email protected]>
--- package/tvheadend/tvheadend.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
package/tvheadend/tvheadend.mk +7 -7
@@ -4,14 +4,14 @@ # ################################################################################ -TVHEADEND_VERSION = 6482d33ba90848018c530018e5c38992b8ac921c -TVHEADEND_SITE = git://github.com/tvheadend/tvheadend.git -TVHEADEND_LICENSE = GPLv3+ -TVHEADEND_LICENSE_FILES = LICENSE -TVHEADEND_DEPENDENCIES = host-pkgconf host-python openssl +TVHEADEND_VERSION = 6482d33ba90848018c530018e5c38992b8ac921c +TVHEADEND_SITE = git://github.com/tvheadend/tvheadend.git +TVHEADEND_LICENSE = GPLv3+ +TVHEADEND_LICENSE_FILES = LICENSE +TVHEADEND_DEPENDENCIES = host-pkgconf host-python openssl ifeq ($(BR2_PACKAGE_AVAHI),y) -TVHEADEND_DEPENDENCIES += avahi +TVHEADEND_DEPENDENCIES += avahi endif #----------------------------------------------------------------------------
@@ -20,7 +20,7 @@ endif # package, so it has a list of pre-scanned tunner configurations. # For buildroot, we add a patch that avoids doing that, but uses the # scan files installed by the dtv-scan-tables package -TVHEADEND_DEPENDENCIES += dtv-scan-tables +TVHEADEND_DEPENDENCIES += dtv-scan-tables define TVHEADEND_CONFIGURE_CMDS (cd $(@D); \
Signature · 1 line
1.8.3.2
cover Misc bumps and implied changes (branch yem/bumps)
In reply to Yann E. MORINDear Yann E. MORIN,
Quoted 11 lines · Yann E. MORIN
Yann E. MORIN (10):
package/rpi-firmware: bump revision
package/rpi-userland: bump revision
package/dtv-scan-tables: new package
package/dvb-apps: rely on dtv-scan-tables to provide transponder data package/tvheadend: transponders data now provided by dtv-scan-tables package/gst1-plugins-bad: transponders data now provided by dtv-scan-tables package/dvb-apps: bump revision
package/tvheadend: bump revision
package/dvb-apps: do not line-up variables
package/tvheadend: do not line-up variables
Series applied, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com