Add alevt videotext decoder support (bug 423687, thanks Tobias Leupold), add perl DEPEND (bug 433155, thanks bay), rename scan to scan-dvb (bug 348371, thanks Bill Prendergast), support LDFLAGS (bug 331095, thanks Olivier Huber and thomasg).

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 159 insertions, 3 deletions

diff --git a/media-tv/linuxtv-dvb-apps/ChangeLog b/media-tv/linuxtv-dvb-apps/ChangeLog
index 4cf2f33a8b02..53b4dac7e3d6 100644
--- a/media-tv/linuxtv-dvb-apps/ChangeLog
+++ b/media-tv/linuxtv-dvb-apps/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-tv/linuxtv-dvb-apps
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.48 2012/02/15 18:27:38 hd_brummy Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.49 2013/06/02 18:40:08 xmw Exp $
+
+*linuxtv-dvb-apps-1.1.1.20100223-r1 (02 Jun 2013)
+
+  02 Jun 2013; Michael Weber <xmw@gentoo.org>
+  +files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch,
+  +files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch,
+  +linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild, metadata.xml:
+  Add alevt videotext decoder support (bug 423687, thanks Tobias Leupold), add
+  perl DEPEND (bug 433155, thanks bay), rename scan to scan-dvb (bug 348371,
+  thanks  Bill Prendergast), support LDFLAGS (bug 331095, thanks Olivier Huber
+  and thomasg).
 
   15 Feb 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
   linuxtv-dvb-apps-1.1.1.20070114.ebuild,
@@ -259,4 +270,3 @@
   04 Jul 2005; Thomas Raschbacher <lordvan@gentoo.org> +linuxtv-dvb-apps-1.1.0.ebuild, +metadata.xml,
   +linuxtv-dvb-apps-1.1.0.ebuild:
   initial import
-
diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch
new file mode 100644
index 000000000000..d19ac7e4878f
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-alevt.patch
@@ -0,0 +1,37 @@
+--- linuxtv-dvb-apps-1.1.1.20100223/util/alevt/exp-gfx.c
++++ linuxtv-dvb-apps-1.1.1.20100223/util/alevt/exp-gfx.c
+@@ -137,6 +137,7 @@
+ 
+ #ifdef WITH_PNG
+ 
++#include <zlib.h>
+ #include <png.h>
+ static int png_open(struct export *e);
+ static int png_option(struct export *e, int opt, char *arg);
+--- linuxtv-dvb-apps-1.1.1.20100223/util/alevt/Makefile
++++ linuxtv-dvb-apps-1.1.1.20100223/util/alevt/Makefile
+@@ -25,13 +25,13 @@
+ all: alevt alevt-date alevt-cap alevt.1 alevt-date.1 alevt-cap.1
+ 
+ alevt: $(OBJS)
+-	$(CC) $(OPT) $(OBJS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS)
++	$(CC) $(OPT) $(OBJS) -o alevt -L$(PREFIX)/lib -L$(PREFIX)/lib64 -lX11 $(EXPLIBS) $(LDFLAGS)
+ 
+ alevt-date: $(TOBJS)
+-	$(CC) $(OPT) $(TOBJS) -o alevt-date $(ZVBILIB)
++	$(CC) $(OPT) $(TOBJS) -o alevt-date $(ZVBILIB) $(LDFLAGS)
+ 
+ alevt-cap: $(COBJS)
+-	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS)
++	$(CC) $(OPT) $(COBJS) -o alevt-cap $(EXPLIBS) $(LDFLAGS)
+ 
+ font.o: font1.xbm font2.xbm font3.xbm font4.xbm
+ fontsize.h: font1.xbm font2.xbm font3.xbm font4.xbm
+@@ -73,7 +73,6 @@
+ 	install -m 0644 alevt.1		$(DESTDIR)$(PREFIX)/share/man/man1
+ 	install -m 0644 alevt-date.1	$(DESTDIR)$(PREFIX)/share/man/man1
+ 	install -m 0644 alevt-cap.1	$(DESTDIR)$(PREFIX)/share/man/man1
+-	install -m 0644 alevt.png $(DESTDIR)$(PREFIX)/share/pixmaps
+ 	install -m 0644 alevt.desktop $(DESTDIR)$(PREFIX)/share/applications
+ 
+ uninstall: clean
diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch
new file mode 100644
index 000000000000..063b4b6c479d
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch
@@ -0,0 +1,20 @@
+--- linuxtv-dvb-apps-1.1.1.20100223/Make.rules
++++ linuxtv-dvb-apps-1.1.1.20100223/Make.rules
+@@ -46,7 +46,7 @@
+ %: %.c
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS)
+ %.so:
+-	$(CC) -shared -o $@ $^
++	$(CC) $(LDFLAGS) -Wl,-soname -Wl,$@ -shared -o $@ $^
+ %.a:
+ 	$(AR) rcs $@ $^
+ clean::
+@@ -76,7 +76,7 @@
+ 	@$(CC) $(CPPFLAGS) $(CFLAGS) -MMD $(LDFLAGS) -o $@ $< $(filter-out %.h %.c,$^) $(LOADLIBES) $(LDLIBS)
+ %.so:
+ 	@echo CC $@
+-	@$(CC) -shared -o $@ $^
++	@$(CC) $(LDFLAGS) -Wl,-soname -Wl,$@ -shared -o $@ $^
+ %.a:
+ 	@echo AR $@
+ 	@$(AR) rcs $@ $^
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild
new file mode 100644
index 000000000000..3d878d9ffbc3
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild,v 1.1 2013/06/02 18:40:08 xmw Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+HOMEPAGE="http://www.linuxtv.org/"
+DESCRIPTION="small utils for DVB to scan, zap, view signal strength, ..."
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="alevt test usb"
+
+RDEPEND="alevt? ( !media-video/alevt
+		media-libs/libpng
+		media-libs/zvbi[v4l]
+		sys-libs/zlib
+		x11-libs/libX11 )
+	usb? ( virtual/libusb:0 )
+	!dev-db/xbase"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/linuxtv-dvb-headers"
+# !dev-db/xbase (bug #208596)
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-alevt.patch
+
+	# do not compile test-progs, incompartible with videodev2.h	
+	sed -e '/-C test/d' \
+		-i Makefile || die
+
+	# remove copy of header-files
+	rm -rf "${S}"/include || die
+}
+
+src_compile() {
+	emake V=1 CC=$(tc-getCC) $(usex usb "ttusb_dec_reset=1" "")
+	if use alevt ; then
+		emake -C util/alevt CC=$(tc-getCC) OPT="${CFLAGS}"
+	fi
+}
+
+src_install() {
+	insinto /usr/bin
+	emake V=1 prefix="${EROOT}usr" libdir="${EROOT}usr/$(get_libdir)" \
+		$(usex usb "ttusb_dec_reset=1" "") \
+		DESTDIR="${D}" INSTDIR="${T}" install
+	if use alevt ; then
+		dodir /usr/share/applications
+		dodir /usr/share/man/man1
+		emake -C util/alevt DESTDIR="${D}" install
+	fi
+
+	# rename scan to scan-dvb
+	mv "${D}"/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 "/usr/bin/scan has been installed as scan-dvb."
+}
diff --git a/media-tv/linuxtv-dvb-apps/metadata.xml b/media-tv/linuxtv-dvb-apps/metadata.xml
index a6b9e38a1b93..cd4366c20fb3 100644
--- a/media-tv/linuxtv-dvb-apps/metadata.xml
+++ b/media-tv/linuxtv-dvb-apps/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>media-tv</herd>
+<use>
+	<flag name="alevt">Build videotext decoder</flag>
+</use>
 </pkgmetadata>