From 3dd74712ed7b5a281622af576cf8ffb6c68e9cb0 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 27 Aug 2022 11:10:29 -0700 Subject: dvb-apps: Use tarball for SRC_URI and fix build on musl Convert to using tarball for SRC_URI, this is only recipe in meta-openembedded needing mercurial fetcher Fix the stime replacement patch to fix type errors on time_t | dvbdate.c:313:12: error: incompatible pointer to integer conversion assigning to 'time_t' (aka 'long') from 'time_t **' (aka 'long **') [-Wint-conversion] | ts.tv_sec = &new_time; | ^ ~~~~~~~~~ Signed-off-by: Khem Raj --- .../dvb-apps/dvb-apps_1.1.1.20140321.bb | 102 ++++++++++++++++++++ .../recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb | 103 --------------------- ...-dvbdate-Remove-Obsoleted-stime-API-calls.patch | 15 +-- 3 files changed, 107 insertions(+), 113 deletions(-) create mode 100644 meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb delete mode 100644 meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb b/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb new file mode 100644 index 0000000000..90a69e5e23 --- /dev/null +++ b/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.20140321.bb @@ -0,0 +1,102 @@ +SUMMARY = "Linux DVB API applications and utilities" +HOMEPAGE = "http://www.linuxtv.org" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2;downloadfilename=${BPN}-3d43b280298c.tar.bz2 \ + file://dvb-scan-table \ + file://0001-Fix-generate-keynames.patch \ + file://0003-handle-static-shared-only-build.patch \ + file://0004-Makefile-remove-test.patch \ + file://0005-libucsi-optimization-removal.patch \ + file://0006-CA_SET_PID.patch \ + file://0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch \ + " +SRC_URI[sha256sum] = "f39e2f0ebed7e32bce83522062ad4d414f67fccd5df1b647618524497e15e057" +S = "${WORKDIR}/${BPN}-3d43b280298c" + +inherit perlnative + +export enable_static="no" + +export PERL_USE_UNSAFE_INC = "1" + +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* + cp -R --no-dereference --preserve=mode,links ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/ + cp -R --no-dereference --preserve=mode,links ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/ + cp -R --no-dereference --preserve=mode,links ${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" +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, r'^lib(.*)\.so$', 'lib%s', 'DVB %s package', extra_depends='', allow_links=True) + do_split_packages(d, dvb_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev') + do_split_packages(d, dvb_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev') + do_split_packages(d, dvb_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'DVB %s library', extra_depends='', allow_links=True) +} + +INSANE_SKIP:${PN} = "ldflags" +INSANE_SKIP:${PN}-dev = "ldflags" + +TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb b/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb deleted file mode 100644 index 98970d5b71..0000000000 --- a/meta-multimedia/recipes-multimedia/dvb-apps/dvb-apps_1.1.1.bb +++ /dev/null @@ -1,103 +0,0 @@ -SUMMARY = "Linux DVB API applications and utilities" -HOMEPAGE = "http://www.linuxtv.org" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRCREV = "3d43b280298c39a67d1d889e01e173f52c12da35" - -SRC_URI = "hg://linuxtv.org/hg;module=dvb-apps;protocol=http \ - file://dvb-scan-table \ - file://0001-Fix-generate-keynames.patch \ - file://0003-handle-static-shared-only-build.patch \ - file://0004-Makefile-remove-test.patch \ - file://0005-libucsi-optimization-removal.patch \ - file://0006-CA_SET_PID.patch \ - file://0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch \ - " - -S = "${WORKDIR}/${BPN}" - -inherit perlnative - -export enable_static="no" - -export PERL_USE_UNSAFE_INC = "1" - -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* - cp -R --no-dereference --preserve=mode,links ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/ - cp -R --no-dereference --preserve=mode,links ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/ - cp -R --no-dereference --preserve=mode,links ${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" -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, r'^lib(.*)\.so$', 'lib%s', 'DVB %s package', extra_depends='', allow_links=True) - do_split_packages(d, dvb_libdir, r'^lib(.*)\.la$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev') - do_split_packages(d, dvb_libdir, r'^lib(.*)\.a$', 'lib%s-dev', 'DVB %s development package', extra_depends='${PN}-dev') - do_split_packages(d, dvb_libdir, r'^lib(.*)\.so\.*', 'lib%s', 'DVB %s library', extra_depends='', allow_links=True) -} - -INSANE_SKIP:${PN} = "ldflags" -INSANE_SKIP:${PN}-dev = "ldflags" - -TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch b/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch index 9035b56f4a..e89f9a3cdc 100644 --- a/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch +++ b/meta-multimedia/recipes-multimedia/dvb-apps/files/0001-dvbdate-Remove-Obsoleted-stime-API-calls.patch @@ -11,22 +11,17 @@ Signed-off-by: Khem Raj util/dvbdate/dvbdate.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/util/dvbdate/dvbdate.c b/util/dvbdate/dvbdate.c -index f0df437..492ed79 100644 --- a/util/dvbdate/dvbdate.c +++ b/util/dvbdate/dvbdate.c -@@ -309,7 +309,10 @@ int atsc_scan_date(time_t *rx_time, unsigned int to) +@@ -309,7 +309,10 @@ int atsc_scan_date(time_t *rx_time, unsi */ int set_time(time_t * new_time) { - if (stime(new_time)) { -+ struct timespec ts; -+ ts.tv_sec = &new_time; -+ ts.tv_nsec = 0; -+ if (clock_settime(CLOCK_REALTIME, &ts)) { ++ struct timespec s = {0}; ++ s.tv_sec = *new_time; ++ ++ if (clock_settime(CLOCK_REALTIME, &s)) { perror("Unable to set time"); return -1; } --- -2.24.1 - -- cgit v1.2.3-54-g00ecf