Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
102 changes: 102 additions & 0 deletions meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
SUMMARY = "Linux DVB API applications and utilities"
HOMEPAGE = "http://www.linuxtv.org"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
SRCREV = "3d43b280298c39a67d1d889e01e173f52c12da35"

SRC_URI = "hg://linuxtv.org/hg;module=dvb-apps;protocol=http \
file://dvb-fe-xc5000c-4.1.30.7.fw \
file://dvb-scan-table \
file://0001-Fix-generate-keynames.patch \
file://0002-Fix-compiler-warning-flags.patch \
file://0003-handle-static-shared-only-build.patch \
file://0004-Makefile-remove-test.patch \
file://0005-libucsi-optimization-removal.patch \
"

S = "${WORKDIR}/${BPN}"

do_configure() {
sed -i -e s:/usr/include:${STAGING_INCDIR}:g util/av7110_loadkeys/generate-keynames.sh
}
do_install() {
make DESTDIR=${D} install
install -d ${D}/${bindir}
install -d ${D}/${docdir}/dvb-apps
install -d ${D}/${docdir}/dvb-apps/scan
install -d ${D}/${docdir}/dvb-apps/szap
chmod a+rx ${D}/${libdir}/*.so*
if [ "${DVB_WINTV_TUNER}" = "true" ]; then
install -d ${D}/lib/firmware
install -m 0644 ${WORKDIR}/*.fw ${D}/lib/firmware/
fi
cp -pPR ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/
cp -pPR ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/
cp -pPR ${WORKDIR}/dvb-scan-table/* ${D}/usr/share/dvb
}

PACKAGES =+ "dvb-evtest dvb-evtest-dbg \
dvbapp-tests dvbapp-tests-dbg \
dvbdate dvbdate-dbg \
dvbtraffic dvbtraffic-dbg \
dvbnet dvbnet-dbg \
dvb-scan dvb-scan-dbg dvb-scan-data \
dvb-azap dvb-azap-dbg \
dvb-czap dvb-czap-dbg \
dvb-szap dvb-szap-dbg \
dvb-tzap dvb-tzap-dbg \
dvb-femon dvb-femon-dbg \
dvb-zap-data"
PACKAGES =+ "libdvbapi libdvbcfg libdvben50221 \
libesg libucsi libdvbsec"

RDEPENDS_dvbdate =+ "libdvbapi libucsi"
RDEPENDS_dvbtraffic =+ "libdvbapi"
RDEPENDS_dvb-scan =+ "libdvbapi libdvbcfg libdvbsec"
RDEPENDS_dvb-apps =+ "libdvbapi libdvbcfg libdvbsec libdvben50221 libucsi"
RDEPENDS_dvb-femon =+ "libdvbapi"
RDEPENDS_dvbnet =+ "libdvbapi"

RCONFLICTS_dvb-evtest = "evtest"

FILES_${PN} = "${bindir} ${datadir}/dvb lib/firmware"
FILES_${PN}-doc = ""
FILES_${PN}-dev = "${includedir}"
FILES_dvb-evtest = "${bindir}/evtest"
FILES_dvb-evtest-dbg = "${bindir}/.debug/evtest"
FILES_dvbapp-tests = "${bindir}/*test* "
FILES_dvbapp-tests-dbg = "${bindir}/.debug/*test*"
FILES_dvbdate = "${bindir}/dvbdate"
FILES_dvbdate-dbg = "${bindir}/.debug/dvbdate"
FILES_dvbtraffic = "${bindir}/dvbtraffic"
FILES_dvbtraffic-dbg = "${bindir}/.debug/dvbtraffic"
FILES_dvbnet = "${bindir}/dvbnet"
FILES_dvbnet-dbg = "${bindir}/.debug/dvbnet"
FILES_dvb-scan = "${bindir}/*scan "
FILES_dvb-scan-dbg = "${bindir}/.debug/*scan"
FILES_dvb-scan-data = "${docdir}/dvb-apps/scan"
FILES_dvb-azap = "${bindir}/azap"
FILES_dvb-azap-dbg = "${bindir}/.debug/azap"
FILES_dvb-czap = "${bindir}/czap"
FILES_dvb-czap-dbg = "${bindir}/.debug/czap"
FILES_dvb-szap = "${bindir}/szap"
FILES_dvb-szap-dbg = "${bindir}/.debug/szap"
FILES_dvb-tzap = "${bindir}/tzap"
FILES_dvb-tzap-dbg = "${bindir}/.debug/tzap"
FILES_dvb-femon = "${bindir}/femon"
FILES_dvb-femon-dbg = "${bindir}/.debug/femon"
FILES_dvb-zap-data = "${docdir}/dvb-apps/szap"

python populate_packages_prepend () {
dvb_libdir = bb.data.expand('${libdir}', d)
do_split_packages(d, dvb_libdir, '^lib(.*)\.so$', 'lib%s', 'DVB %s package', extra_depends='', allow_links=True)
do_split_packages(d, dvb_libdir, '^lib(.*)\.la$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev')
do_split_packages(d, dvb_libdir, '^lib(.*)\.a$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev')
do_split_packages(d, dvb_libdir, '^lib(.*)\.so\.*', 'lib%s', 'DVB %s library', extra_depends='', allow_links=True)
}

INSANE_SKIP_${PN} = "ldflags"
INSANE_SKIP_${PN}-dev = "ldflags"

DVB_WINTV_TUNER = "true"
TARGET_CC_ARCH += "${LDFLAGS}"
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Fix generate-keynames.sh script for cross-compilation

generate-keynames.sh reads /usr/include/linux to find the keyname
symbols. However, when cross-compiling, the include path points
somewhere else. Allow the user to pass CROSS_ROOT to point to the
root of the cross-compilation environment.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <[email protected]>
---
diff -rup dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh
--- dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh 2012-12-06 10:38:07.000000000 +0100
+++ dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh 2013-08-29 21:47:09.717991439 +0200
@@ -18,7 +18,7 @@ echo "};" >> $1
echo >> $1
echo >> $1
echo "static struct input_key_name key_name [] = {" >> $1
-for x in $(cat /usr/include/linux/input.h input_fake.h | \
+for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \
egrep "#define[ \t]+KEY_" | grep -v KEY_MAX | \
cut -f 1 | cut -f 2 -d " " | sort -u) ; do
echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1
@@ -26,7 +26,7 @@ done
echo "};" >> $1
echo >> $1
echo "static struct input_key_name btn_name [] = {" >> $1
-for x in $(cat /usr/include/linux/input.h input_fake.h | \
+for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \
egrep "#define[ \t]+BTN_" | \
cut -f 1 | cut -f 2 -d " " | sort -u) ; do
echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From 9b8f1df41f7579da63c27763ff184d351e4c7fef Mon Sep 17 00:00:00 2001
From: Simon Dawson <[email protected]>
Date: Sun, 4 Jan 2015 12:06:18 +0100
Subject: [PATCH] Fix compiler warning flags

When building for bfin, the build fails as follows.

cc1: error: unrecognized command line option "-Wno-packed-bitfield-compat"

An example of an autobuild failure arising from this is the following.

http://autobuild.buildroot.net/results/92e/92e472004812a3616f62d766a9ea07a997a66e89/
http://autobuild.buildroot.net/results/6e7/6e7b48ad9768349d983985c3067c4267cde80541/

Clearly, not all toolchains provide a gcc that understands
the -Wno-packed-bitfield-compat flag; remove usage of this flag.

Wno-packed-bitfield-compat option was added in gcc 4.4.

[Romain:
- This patch is also needed for bfin toolchains which use gcc 4.3.5
- Add a link to bfin build failure]
Signed-off-by: Simon Dawson <[email protected]>
Signed-off-by: Romain Naour <[email protected]>
---
util/scan/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/scan/Makefile b/util/scan/Makefile
index d48c478..88667c5 100644
--- a/util/scan/Makefile
+++ b/util/scan/Makefile
@@ -14,7 +14,7 @@ inst_bin = $(binaries)

removing = atsc_psip_section.c atsc_psip_section.h

-CPPFLAGS += -Wno-packed-bitfield-compat -D__KERNEL_STRICT_NAMES
+CPPFLAGS += -D__KERNEL_STRICT_NAMES

.PHONY: all

--
1.9.3

Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
From a826c7c722db40bfedf00e51ce38411550ae8216 Mon Sep 17 00:00:00 2001
From: Romain Naour <[email protected]>
Date: Thu, 25 Dec 2014 19:22:16 +0100
Subject: [PATCH] Make.rules: Handle static/shared only build

Do not build .a library when enable_static is set to "no"
Do not build .so library when enable_shared is set to "no"

Signed-off-by: Romain Naour <[email protected]>
---
Make.rules | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Make.rules b/Make.rules
index 3410d7b..d274e16 100644
--- a/Make.rules
+++ b/Make.rules
@@ -9,7 +9,13 @@ ifneq ($(lib_name),)
CFLAGS_LIB ?= -fPIC
CFLAGS += $(CFLAGS_LIB)

-libraries = $(lib_name).so $(lib_name).a
+ifneq ($(enable_static),no)
+libraries += $(lib_name).a
+endif
+
+ifneq ($(enable_shared),no)
+libraries += $(lib_name).so
+endif

.PHONY: library

@@ -23,7 +29,7 @@ prerequisites = $(subst .o,.d,$(objects)) $(addsuffix .d,$(binaries))

.PHONY: clean install

-ifeq ($(static),1)
+ifneq ($(enable_static),no)
LDFLAGS += -static
endif

--
1.9.3

Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From c578772d6abc5fdf3ec83f632c371373e5baf9f1 Mon Sep 17 00:00:00 2001
From: Romain Naour <[email protected]>
Date: Fri, 26 Dec 2014 01:04:58 +0100
Subject: [PATCH] Makefile: remove test

Tests needs static libraries, remove them for shared only build.

Signed-off-by: Romain Naour <[email protected]>
---
Makefile | 1 -
1 file changed, 1 deletion(-)

diff --git a/Makefile b/Makefile
index 65a2273..105c460 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,6 @@ DVB_API_MINOR := $(word 3, $(shell grep -m1 "DVB_API_VERSION_MINOR" $(VERSION_FI

all clean install:
$(MAKE) -C lib $@
- $(MAKE) -C test $@
$(MAKE) -C util $@

update:
--
1.9.3

Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff -r 3d43b280298c lib/libucsi/endianops.h
--- a/lib/libucsi/endianops.h Fri Mar 21 20:26:36 2014 +0100
+++ b/lib/libucsi/endianops.h Fri Jan 19 06:56:15 2018 +0000
@@ -33,6 +33,9 @@
#define __ucsi_packed __attribute__((packed))


+#if __GNUC__ >= 6 + (0 >= __GNUC_MINOR__)
+#pragma GCC optimize ("O1")
+#endif


#if __BYTE_ORDER == __BIG_ENDIAN
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#------------------------------------------------------------------------------
# file automatically generated by w_scan
# (http://wirbel.htpc-forum.de/w_scan/index2.html)
#! <w_scan> 20110502 1 0 ATSC CA </w_scan>
#------------------------------------------------------------------------------
# location and provider: Calgary AB, Canada OTA
# date (yyyy-mm-dd) : 2014-01-18

# provided by (opt) : [email protected]
#
# A[2] <freq> <mod> [# comment]
#------------------------------------------------------------------------------
[CHANNEL]
DELIVERY_SYSTEM = ATSC
FREQUENCY = 515000000
MODULATION = VSB/8
INVERSION = AUTO

[CHANNEL]
DELIVERY_SYSTEM = ATSC
FREQUENCY = 563000000
MODULATION = VSB/8
INVERSION = AUTO

[CHANNEL]
DELIVERY_SYSTEM = ATSC
FREQUENCY = 581000000
MODULATION = VSB/8
INVERSION = AUTO

[CHANNEL]
DELIVERY_SYSTEM = ATSC
FREQUENCY = 617000000
MODULATION = VSB/8
INVERSION = AUTO

[CHANNEL]
DELIVERY_SYSTEM = ATSC
FREQUENCY = 635000000
MODULATION = VSB/8
INVERSION = AUTO

[CHANNEL]
DELIVERY_SYSTEM = ATSC
FREQUENCY = 683000000
MODULATION = VSB/8
INVERSION = AUTO

Loading