Updating liguros repo

5 files changed, 226 insertions, 0 deletions

diff --git a/media-tv/ivtv-utils/Manifest b/media-tv/ivtv-utils/Manifest
new file mode 100644
index 000000000000..e16e0a3fd01b
--- /dev/null
+++ b/media-tv/ivtv-utils/Manifest
@@ -0,0 +1 @@
+DIST ivtv-utils-1.4.1.tar.gz 189918 BLAKE2B 7880b532ffb3a1ffa13c38b74b57f82a199486ba5bc8e310cb5447ad78d05a0380b51070a0dc67e4f1120d49c8c7d9a2b829e3922585484906efccc4f2b96fb5 SHA512 719c922fb819ba7f0ca3d4bbede571c416dc9f282bd8a7e2fbe7d9b4298541a104f8a848e113379eeec052206658b7a0a2e0eea1b7917e90f2aee37fe0010bed
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..5c03e6e737ee
--- /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>
+
+--- a/test/Makefile
++++ b/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)
+--- a/utils/Makefile
++++ b/utils/Makefile
+@@ -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)
+ 
+--- a/Makefile
++++ b/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..24f24d41acaa
--- /dev/null
+++ b/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch
@@ -0,0 +1,71 @@
+http://bugs.gentoo.org/339405
+
+--- a/utils/cx25840ctl/cx25840ctl.c
++++ b/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);
+--- a/utils/ivtv-ctl.c
++++ b/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);
+--- a/utils/v4l2-ctl.cpp
++++ b/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..637e4c6bad13
--- /dev/null
+++ b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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
+		dev-perl/Tk
+		virtual/perl-Getopt-Long
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-gentoo.patch
+	"${FILESDIR}"/${PN}-1.4.1-overflow.patch
+)
+
+src_configure() {
+	tc-export CC CXX
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	dodoc -r 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..2738291a4dfd
--- /dev/null
+++ b/media-tv/ivtv-utils/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>
+    Driver for ivtv based tv tuner cards, currently supports Hauppauge 
+    PVR-[23]50 cards
+  </longdescription>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>