diff options
Diffstat (limited to 'media-tv/ivtv-utils')
| -rw-r--r-- | media-tv/ivtv-utils/Manifest | 7 | ||||
| -rw-r--r-- | media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch | 99 | ||||
| -rw-r--r-- | media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch | 71 | ||||
| -rw-r--r-- | media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild | 46 | ||||
| -rw-r--r-- | media-tv/ivtv-utils/metadata.xml | 12 |
5 files changed, 235 insertions, 0 deletions
diff --git a/media-tv/ivtv-utils/Manifest b/media-tv/ivtv-utils/Manifest new file mode 100644 index 000000000000..b3e7e127bf49 --- /dev/null +++ b/media-tv/ivtv-utils/Manifest @@ -0,0 +1,7 @@ +AUX ivtv-utils-1.4.0-gentoo.patch 2488 SHA256 2e0801ca1724c6b1feb1335321ffb05bde8402335fb13a06eb878bb6825cbf82 SHA512 552b98643cef842087a47a6bd88a64d8943770356e8d6860a4c40ab43bd4cc550dd452e783d134cf14ee6e2dd22722257fbebf4b6103c7fee3d678f1ceab09f5 WHIRLPOOL 67d8c93364bef52ee22cb246be0648fdd5b63b059e5dac44d05a1d4172743c68aaf709b8c79c4e56660117e60378def21a89566f497c0f4b92f88347cc07a253 +AUX ivtv-utils-1.4.1-overflow.patch 1762 SHA256 6f733004df4c266a9fb9685a9e2da880b3f46b96573ecfdf0a33e904fb1f2a79 SHA512 775acf1bc8b13e811a4aad1d9f7ab3051634e8a7d521a1a594e06262cb9a0d782d55b37bdc93618390253403b5ed98af5756d24522a5f61489401f4ffc71903e WHIRLPOOL 66217d215a387957dfbf90fd57ead1ef2b5e1e06b175d801713257482f6cbb628c7e049fc56cf8ca9c877e672c6b9c0375af275a4e90d1eeb2d6f677325e8c31 +DIST ivtv-utils-1.4.1.tar.gz 189918 SHA256 8eebe8bda62f348779c24522f78fb3c0231e33d303b6381185eeb795fe761ef6 SHA512 719c922fb819ba7f0ca3d4bbede571c416dc9f282bd8a7e2fbe7d9b4298541a104f8a848e113379eeec052206658b7a0a2e0eea1b7917e90f2aee37fe0010bed WHIRLPOOL 2782635126541de34aa78968222baa576171ec1c806b7279eab751805cabbcf2e299dc4f2569bec31f3acc0270ec95bc700c181c5e9994e241af2cc968aec9d5 +EBUILD ivtv-utils-1.4.1.ebuild 901 SHA256 27b151ada5004f36958f79f59652e99e40b776dc18a8d6b554a7f394a3a37ba8 SHA512 de39ffc9d653bace3d8885159ad902f1c726dcc37d430c03a3bf83c53aa93ab6de5ac7e554eae1aaec8271e246240e778678ce91b66098bd5bc548135d5a565f WHIRLPOOL ad48906a6adbb65f7ea369954b479851bc1372c6dfed38b4d6ff0630dbcb86f0a1e9c5d0ee2efb8163e7565510b303a5c7b8331334ac5ccc411da6cb405ebaa6 +MISC ChangeLog 2670 SHA256 88a704d0c47bc00b73ad41803d8ce76eccc1aeb759eecb509944019f0b97df7d SHA512 671bc32008135bc9dc122a38fe88cfc82437bded7c59e754f17c036eabce97e2c0a17a4b378086098d0a496de22088ea0a235f9f0968d8726b52067fbbe4d22f WHIRLPOOL 14fb837eecf1e88ba635904414c49a7da4641f81245abce4358d127b410756f87154e5a07709100407a4d9043f24ec5060475e42041f2cc66590133a2e4e41de +MISC ChangeLog-2015 3512 SHA256 bb5e85e6e4916859cfa2291d0d42a0f3ab8739dd61f50b0b15b97b9432756590 SHA512 fd3f2e3ea3253b877bafb44aaddc853109a5fa4ee3675c00b25905676af84ac6208bcf826feaef6be968c8fec0c17bf9bf46eb7e7edbd4408f537bff0c899dfa WHIRLPOOL a2900cebd22559a8ca62d798ee65c634e83148ecccb5ea32f52ba871824c1b1a62ddd0bffc30719cf9e25ca76bb4cd2bd90bdff319343ac20404ff2282005314 +MISC metadata.xml 387 SHA256 76294106cddf2c0f498db97493692ca042da2abef03c71eba3f4ab0bbc484dc6 SHA512 22ed4f0b1e523a49f89d2cbd0d8d760fe2b96098d2ed311d7a9fb873337730e822734085a7574e3133e993451e2980815134795f28131fc8398aa537c7d7c3db WHIRLPOOL e37da366ef596a17744d2752bd63ab6fe0338e7485eca2ba42bba4749ce7f4e9184446907670d97e765ea088981beb2ffbcd9801c93a933327e356f475b19a6a diff --git a/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch b/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch new file mode 100644 index 000000000000..4b75d177e391 --- /dev/null +++ b/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch @@ -0,0 +1,99 @@ +Fixing multiple QA issues + * respect user {CC,CXX,LD}FLAGS + * fix linking order + * make job server for install phase + +Don't install ivtv-ctl (bug #333291) and v4l2-ctl (bug #278255) +Don't install duplicate kernel headers (bug #244584) + +https://bugs.gentoo.org/show_bug.cgi?id=321303 + +Patch written by Kacper Kowalik <xarthisius.kk@gmail.com> + +--- test/Makefile ++++ test/Makefile +@@ -7,13 +7,13 @@ + ivtv-osd-dma-test ivtv-fb-colormap-test \ + ivtv-fb-16-bit-test ps-analyzer + +-CFLAGS = -I../utils -D_GNU_SOURCE -O2 -Wall +-CXXFLAGS = $(CFLAGS) +-LDFLAGS = -lm ++CFLAGS += -I../utils -D_GNU_SOURCE -Wall ++CXXFLAGS += -I../utils -D_GNU_SOURCE -Wall ++LDLIBS = -lm + + all: $(EXES) + +-install: all ++install: + + clean: + rm -f *.o $(EXES) +--- utils/Makefile.orig 2010-05-24 15:35:11.321677941 +0000 ++++ utils/Makefile 2010-05-24 15:35:15.595615306 +0000 +@@ -9,41 +9,39 @@ + X86_EXES := ivtvplay ivtv-mpegindex #ivtv-encoder + endif + +-EXES := v4l2-ctl ivtv-ctl ivtv-radio $(X86_EXES) ++EXES := ivtv-radio $(X86_EXES) + + BIN := $(EXES) ivtv-tune/ivtv-tune cx25840ctl/cx25840ctl + + + HEADERS := linux/ivtv.h linux/ivtvfb.h + +-CFLAGS = -D_GNU_SOURCE -O2 -Wall -g -I. +-CXXFLAGS = $(CFLAGS) ++CFLAGS += -D_GNU_SOURCE -Wall -I. ++CXXFLAGS += -D_GNU_SOURCE -Wall -I. + +-all:: $(EXES) +- $(MAKE) CFLAGS="$(CFLAGS)" -C ivtv-tune +- $(MAKE) CFLAGS="$(CFLAGS)" -C cx25840ctl ++all: $(EXES) ++ $(MAKE) $(MAKEOPTS) CFLAGS="$(CFLAGS)" -C ivtv-tune ++ $(MAKE) $(MAKEOPTS) CFLAGS="$(CFLAGS)" -C cx25840ctl + + ivtv-ctl: ivtv-ctl.o +- $(CC) -lm -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lm + + v4l2-ctl: v4l2-ctl.o +- $(CXX) -lm -o $@ $^ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm + + v4l2-dbg: v4l2-dbg.o v4l2-driverids.o v4l2-chipids.o +- $(CXX) -lm -o $@ $^ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm + + ivtvplay: ivtvplay.cc +- $(CXX) $(CXXFLAGS) -lm -lpthread -o $@ $^ ++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -lm -lpthread + + encoder.o: encoder.c + $(CC) $(CFLAGS) -DVIDEO_PORT=0 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -c $^ + + ivtv-encoder: enc_mindex.o enc_chann.o encoder.o +- $(CC) -lpthread -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lpthread + +-install: all +- install -d $(DESTDIR)/$(HDRDIR) +- install -m 0644 $(HEADERS) $(DESTDIR)/$(HDRDIR) ++install: + install -d $(DESTDIR)/$(BINDIR) + install -m 0755 $(BIN) $(DESTDIR)/$(BINDIR) + +--- Makefile ++++ Makefile +@@ -1,6 +1,6 @@ + all clean install: +- make -C utils $@ +- make -C test $@ ++ $(MAKE) -C utils $@ ++ $(MAKE) -C test $@ + + distclean: clean + diff --git a/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch b/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch new file mode 100644 index 000000000000..1c2a66159639 --- /dev/null +++ b/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch @@ -0,0 +1,71 @@ +http://bugs.gentoo.org/339405 + +--- utils/cx25840ctl/cx25840ctl.c ++++ utils/cx25840ctl/cx25840ctl.c +@@ -57,7 +57,7 @@ + return 0; + } + +- sprintf(device, "/dev/i2c-%s", opt.inputs[0]); ++ snprintf(device, sizeof(device), "/dev/i2c-%s", opt.inputs[0]); + + // open the device + if ((fd = open(device, O_RDWR)) < 0) +@@ -67,7 +67,7 @@ + exit(1); + } + +- sprintf(sysfile, "/sys/bus/i2c/devices/%s-%04x/name", opt.inputs[0], address); ++ snprintf(sysfile, sizeof(sysfile), "/sys/bus/i2c/devices/%s-%04x/name", opt.inputs[0], address); + if ((fp = fopen(sysfile, "r")) != NULL) + { + fgets(name, sizeof(name), fp); +--- utils/ivtv-ctl.c ++++ utils/ivtv-ctl.c +@@ -358,7 +358,7 @@ + __u32 reset = 0; + int new_debug_level, gdebug_level; + double timestamp; +- char ptsstr[64]; ++ char ptsstr[256]; + char short_options[26 * 2 * 2 + 1]; + + if (argc == 1) { +@@ -420,7 +420,7 @@ + static char newdev[20]; + char dev = device[0]; + +- sprintf(newdev, "/dev/video%c", dev); ++ snprintf(newdev, sizeof(newdev), "/dev/video%c", dev); + device = newdev; + } + break; +@@ -600,7 +600,7 @@ + char buf[20]; + new_debug_level = debug_level; + +- sprintf(buf, "%d", debug_level); ++ snprintf(buf, sizeof(buf), "%d", debug_level); + if (dowrite(buf, "/sys/module/ivtv/parameters/debug") == 0) { + printf(" set debug level: "); + print_debug_mask(new_debug_level); +--- utils/v4l2-ctl.cpp ++++ utils/v4l2-ctl.cpp +@@ -416,7 +416,7 @@ + { + char buf[10]; + +- sprintf(buf, "%08x", num); ++ snprintf(buf, sizeof(buf), "%08x", num); + return buf; + } + +@@ -1449,7 +1449,7 @@ + static char newdev[20]; + char dev = device[0]; + +- sprintf(newdev, "/dev/video%c", dev); ++ snprintf(newdev, sizeof(newdev), "/dev/video%c", dev); + device = newdev; + } + break; diff --git a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild new file mode 100644 index 000000000000..14f05778ee08 --- /dev/null +++ b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +inherit eutils toolchain-funcs + +DESCRIPTION="IVTV utilities for Hauppauge PVR PCI cards" +HOMEPAGE="http://www.ivtvdriver.org/" +SRC_URI="http://dl.ivtvdriver.org/ivtv/archive/1.4.x/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ~ppc x86" +IUSE="perl" + +DEPEND="!media-tv/ivtv" +RDEPEND="${DEPEND} + media-tv/v4l-utils + perl? ( + dev-perl/Video-Frequencies + dev-perl/Video-ivtv + dev-perl/Config-IniFiles + virtual/perl-Getopt-Long + dev-perl/Tk + )" + +src_prepare() { + epatch \ + "${FILESDIR}"/${PN}-1.4.0-gentoo.patch \ + "${FILESDIR}"/${PN}-1.4.1-overflow.patch +} + +src_compile() { + tc-export CC CXX + emake +} + +src_install() { + emake DESTDIR="${D}" PREFIX="/usr" install + dodoc ChangeLog README doc/* + + if use perl; then + dobin utils/perl/*.pl + dodoc utils/perl/README.ptune + fi +} diff --git a/media-tv/ivtv-utils/metadata.xml b/media-tv/ivtv-utils/metadata.xml new file mode 100644 index 000000000000..c66a729df574 --- /dev/null +++ b/media-tv/ivtv-utils/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>cardoe@gentoo.org</email> + <name>Doug Goldstein</name> + </maintainer> + <longdescription> + Driver for ivtv based tv tuner cards, currently supports Hauppauge + PVR-[23]50 cards + </longdescription> +</pkgmetadata> |