From 81e99f1c753d1cb564be29b22dcd8927830c4b9a Mon Sep 17 00:00:00 2001 From: "Anna (navi) Figueiredo Gomes" Date: Sat, 22 Apr 2023 12:02:08 -0300 Subject: media-tv/linuxtv-dvb-apps: fix build w/ -Wint-conversion Closes: https://bugs.gentoo.org/885539 Closes: https://github.com/gentoo/gentoo/pull/30703 Signed-off-by: Anna (navi) Figueiredo Gomes Signed-off-by: Sam James --- .../linuxtv-dvb-apps-1.1.1.20140321-dvbdate.patch | 11 +++ .../linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild | 94 --------------------- .../linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild | 96 ++++++++++++++++++++++ 3 files changed, 107 insertions(+), 94 deletions(-) create mode 100644 media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-dvbdate.patch delete mode 100644 media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild create mode 100644 media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-dvbdate.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-dvbdate.patch new file mode 100644 index 000000000000..87d9a62ad9f5 --- /dev/null +++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-dvbdate.patch @@ -0,0 +1,11 @@ +--- a/util/dvbdate/dvbdate.c ++++ b/util/dvbdate/dvbdate.c +@@ -310,7 +310,7 @@ + int set_time(time_t * new_time) + { + struct timespec s = {0}; +- s.tv_sec = new_time; ++ s.tv_sec = *new_time; + + if (clock_settime(CLOCK_REALTIME, &s)) { + perror("Unable to set time"); diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild deleted file mode 100644 index dcb2c62d3f2c..000000000000 --- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs vcs-snapshot - -HOMEPAGE="https://www.linuxtv.org/" -DESCRIPTION="Small utils for DVB to scan, zap, view signal strength" -SRC_URI="https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> ${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc x86" -IUSE="alevt usb" - -RDEPEND=" - alevt? ( - !media-video/alevt - media-libs/libpng:0= - media-libs/zvbi[v4l] - sys-libs/zlib - x11-libs/libX11 - ) - usb? ( virtual/libusb:0 ) -" -DEPEND="${RDEPEND} - dev-lang/perl - virtual/linuxtv-dvb-headers -" -RDEPEND+=" - media-tv/dtv-scan-tables -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.1.20100223-ldflags.patch - "${FILESDIR}"/${PN}-1.1.1.20100223-alevt.patch - "${FILESDIR}"/${PN}-1.1.1.20100223-perl526.patch - "${FILESDIR}"/${PN}-no-ca_set_pid.patch - "${FILESDIR}"/${PN}-glibc-2.31.patch - "${FILESDIR}"/${PN}-1.1.1.20140321-gcc10.patch -) - -src_prepare() { - default - - # do not compile test-progs, incompatible with videodev2.h - sed -i '/-C test/d' Makefile || die - - # remove copy of header-files - rm -rv "${S}"/include/ || die -} - -src_compile() { - emake V=1 CC="$(tc-getCC)" $(usex usb "ttusb_dec_reset=1" "") - use alevt && emake -C util/alevt CC="$(tc-getCC)" OPT="${CFLAGS}" -} - -src_install() { - emake V=1 prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" \ - $(usex usb "ttusb_dec_reset=1" "") \ - DESTDIR="${D}" INSTDIR="${T}" install - - if use alevt ; then - dodir /usr/share/{applications,man/man1} - emake -C util/alevt DESTDIR="${D}" install - fi - - # rename scan to scan-dvb - mv "${ED}"/usr/bin/scan{,-dvb} || die - - # install zap-files - local dir="" - for dir in dvb-{s,c,t} atsc ; do - insinto /usr/share/dvb/zap/${dir} - doins "${S}"/util/szap/channels-conf/${dir}/* - done - - # install remote-key files - insinto /usr/share/dvb/av7110_loadkeys - doins util/av7110_loadkeys/*.rc* - - # install Documentation - dodoc README - newdoc util/scan/README README.scan-dvb - newdoc util/szap/README README.zap - newdoc util/av7110_loadkeys/README README.av7110_loadkeys - - use usb && newdoc util/ttusb_dec_reset/README README.ttusb_dec_reset -} - -pkg_postinst() { - elog "${EPREFIX}/usr/bin/scan has been installed as scan-dvb." -} diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild new file mode 100644 index 000000000000..2b5377d5ba58 --- /dev/null +++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r2.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs vcs-snapshot + +HOMEPAGE="https://www.linuxtv.org/" +DESCRIPTION="Small utils for DVB to scan, zap, view signal strength" +SRC_URI="https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> ${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 arm arm64 ppc x86" +IUSE="alevt usb" + +RDEPEND=" + alevt? ( + !media-video/alevt + media-libs/libpng:0= + media-libs/zvbi[v4l] + sys-libs/zlib + x11-libs/libX11 + ) + usb? ( virtual/libusb:0 ) +" +DEPEND="${RDEPEND} + dev-lang/perl + virtual/linuxtv-dvb-headers + dev-libs/libusb-compat +" +RDEPEND+=" + media-tv/dtv-scan-tables +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.1.1.20100223-ldflags.patch + "${FILESDIR}"/${PN}-1.1.1.20100223-alevt.patch + "${FILESDIR}"/${PN}-1.1.1.20100223-perl526.patch + "${FILESDIR}"/${PN}-no-ca_set_pid.patch + "${FILESDIR}"/${PN}-glibc-2.31.patch + "${FILESDIR}"/${PN}-1.1.1.20140321-gcc10.patch + "${FILESDIR}"/${PN}-1.1.1.20140321-dvbdate.patch +) + +src_prepare() { + default + + # do not compile test-progs, incompatible with videodev2.h + sed -i '/-C test/d' Makefile || die + + # remove copy of header-files + rm -rv "${S}"/include/ || die +} + +src_compile() { + emake V=1 CC="$(tc-getCC)" $(usex usb "ttusb_dec_reset=1" "") + use alevt && emake -C util/alevt CC="$(tc-getCC)" OPT="${CFLAGS}" +} + +src_install() { + emake V=1 prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" \ + $(usex usb "ttusb_dec_reset=1" "") \ + DESTDIR="${D}" INSTDIR="${T}" install + + if use alevt ; then + dodir /usr/share/{applications,man/man1} + emake -C util/alevt DESTDIR="${D}" install + fi + + # rename scan to scan-dvb + mv "${ED}"/usr/bin/scan{,-dvb} || die + + # install zap-files + local dir="" + for dir in dvb-{s,c,t} atsc ; do + insinto /usr/share/dvb/zap/${dir} + doins "${S}"/util/szap/channels-conf/${dir}/* + done + + # install remote-key files + insinto /usr/share/dvb/av7110_loadkeys + doins util/av7110_loadkeys/*.rc* + + # install Documentation + dodoc README + newdoc util/scan/README README.scan-dvb + newdoc util/szap/README README.zap + newdoc util/av7110_loadkeys/README README.av7110_loadkeys + + use usb && newdoc util/ttusb_dec_reset/README README.ttusb_dec_reset +} + +pkg_postinst() { + elog "${EPREFIX}/usr/bin/scan has been installed as scan-dvb." +} -- cgit v1.2.3-65-gdbad