add patch - Fixes problems with noad --OSD if vdr is not running

Package-Manager: portage-2.1.1

5 files changed, 143 insertions, 8 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index 76cecdfdccce..994950d4e438 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.10 2006/10/07 11:19:01 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.11 2006/10/16 20:34:00 hd_brummy Exp $
+
+*noad-0.6.0-r6 (16 Oct 2006)
+
+  16 Oct 2006; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/noad-0.6.0-fix-osd.patch, +noad-0.6.0-r6.ebuild:
+  add patch - Fixes problems with noad --OSD if vdr is not running
 
 *noad-0.6.0-r5 (07 Oct 2006)
 
diff --git a/media-video/noad/Manifest b/media-video/noad/Manifest
index 20210c59ac7f..b527b310d053 100644
--- a/media-video/noad/Manifest
+++ b/media-video/noad/Manifest
@@ -49,6 +49,10 @@ AUX noad-0.6.0-directoryfix.diff 1254 RMD160 f7ed26ef2478d7a3a622e288642615b8da4
 MD5 59537f1f5164f2b2bbb0c0a5d3174112 files/noad-0.6.0-directoryfix.diff 1254
 RMD160 f7ed26ef2478d7a3a622e288642615b8da46318b files/noad-0.6.0-directoryfix.diff 1254
 SHA256 edbadaaafcb6677b73cc368062e21dd81c81d35709cd55bd87a759068d5804ed files/noad-0.6.0-directoryfix.diff 1254
+AUX noad-0.6.0-fix-osd.patch 786 RMD160 e6385da0b44bf077c50612a7fee234e9ffba338a SHA1 85bd9023eeb5626c837bc85583cc98b80691400c SHA256 94af6480d5bef48ab7a597facded3c24e3ef68e62a2fa946ef412281f0a4f173
+MD5 c8ded2578d7705b8c4801bc94e3b266b files/noad-0.6.0-fix-osd.patch 786
+RMD160 e6385da0b44bf077c50612a7fee234e9ffba338a files/noad-0.6.0-fix-osd.patch 786
+SHA256 94af6480d5bef48ab7a597facded3c24e3ef68e62a2fa946ef412281f0a4f173 files/noad-0.6.0-fix-osd.patch 786
 AUX noad-0.6.0-framesize.diff 414 RMD160 187c4be6c276f878b3e64ad484ee6cb19d7dc3ad SHA1 93da45091c53e88f51090421aaa5b7e9fddf4eb7 SHA256 f6b7769ef62f5c00de9acb9d5e20fba09c2f745dfb2872405b6780411452eb9f
 MD5 4c7b14d97e7d4c423e169168ce55d265 files/noad-0.6.0-framesize.diff 414
 RMD160 187c4be6c276f878b3e64ad484ee6cb19d7dc3ad files/noad-0.6.0-framesize.diff 414
@@ -78,10 +82,14 @@ EBUILD noad-0.6.0-r5.ebuild 2019 RMD160 532effbeeb9a2d161409e2156922a7604551a660
 MD5 fcaf7a1e4c3ee391f437c98cbe89ef2b noad-0.6.0-r5.ebuild 2019
 RMD160 532effbeeb9a2d161409e2156922a7604551a660 noad-0.6.0-r5.ebuild 2019
 SHA256 4763feaee843daaca522cf3b76b5717b5a5a475f9138ad2104c66ea67f3aa7a9 noad-0.6.0-r5.ebuild 2019
-MISC ChangeLog 2400 RMD160 e43e49d61016313407c3b72ba32eaae84cd20e4f SHA1 fff87e9242f89232e027c9e4e89a405fd75bb3b3 SHA256 5d0f3a0a7a39b89b7c4a1e81a317c54f839bc08fb24a20760c6db9506ea6acb5
-MD5 07d1196a0500221ab7d186bd451f54db ChangeLog 2400
-RMD160 e43e49d61016313407c3b72ba32eaae84cd20e4f ChangeLog 2400
-SHA256 5d0f3a0a7a39b89b7c4a1e81a317c54f839bc08fb24a20760c6db9506ea6acb5 ChangeLog 2400
+EBUILD noad-0.6.0-r6.ebuild 2063 RMD160 7ff791adaf0f46eb6673a8e708dd1ec540dfdb54 SHA1 d845b762d4c23f2553d9fa906c835a0258765d6b SHA256 95cd0732f78e4e4f416e81bb49942afe87b074497376929441e9467f0ad4f43a
+MD5 8e1a38aa85b1f145cc3f06088b1d344d noad-0.6.0-r6.ebuild 2063
+RMD160 7ff791adaf0f46eb6673a8e708dd1ec540dfdb54 noad-0.6.0-r6.ebuild 2063
+SHA256 95cd0732f78e4e4f416e81bb49942afe87b074497376929441e9467f0ad4f43a noad-0.6.0-r6.ebuild 2063
+MISC ChangeLog 2616 RMD160 9da9ab49dd417152d129e50ea1c4eebf5f831d6f SHA1 f5f48430e9d412eb6dd30952cf50f023a0e40a45 SHA256 07bd2c25d51f724a1b6da797476bc633aa5d9a9f71b8694b595f692e0077f02c
+MD5 9cdfd12f19266fad522667ef58bf983c ChangeLog 2616
+RMD160 9da9ab49dd417152d129e50ea1c4eebf5f831d6f ChangeLog 2616
+SHA256 07bd2c25d51f724a1b6da797476bc633aa5d9a9f71b8694b595f692e0077f02c ChangeLog 2616
 MISC metadata.xml 345 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 SHA1 01fde850e9581b6a2ccdb95b24d90a1a0511417f SHA256 a6ecd52a0597c34de4d3aa2dd428d3fcbc760e35ef9daa31d6c2d911d55bead4
 MD5 0dac6cdf92af4c49732fb6ac660b2132 metadata.xml 345
 RMD160 40fa5fcd3946fb26c10efadbe084eb5f56607153 metadata.xml 345
@@ -95,10 +103,14 @@ SHA256 57903a89cf74860cf7d8e58b307d50def06a591c47a6b947506fe1fef60791c7 files/di
 MD5 d481d5871b1b6a8779050d5a7baeb51e files/digest-noad-0.6.0-r5 235
 RMD160 e1b3720b311c9cafd641d84299b3af913c8d1984 files/digest-noad-0.6.0-r5 235
 SHA256 57903a89cf74860cf7d8e58b307d50def06a591c47a6b947506fe1fef60791c7 files/digest-noad-0.6.0-r5 235
+MD5 d481d5871b1b6a8779050d5a7baeb51e files/digest-noad-0.6.0-r6 235
+RMD160 e1b3720b311c9cafd641d84299b3af913c8d1984 files/digest-noad-0.6.0-r6 235
+SHA256 57903a89cf74860cf7d8e58b307d50def06a591c47a6b947506fe1fef60791c7 files/digest-noad-0.6.0-r6 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: no further Information
 
-iD8DBQFFJ40xt2vP6XvVdOcRAigDAJ4+uNkFWXO00yUdqxEtKxS06HDskACgjN3U
-IeaKltTvClfWKQ7ceHNADyM=
-=58hd
+iD8DBQFFM+2Odn07HTTCgIoRAt8LAJ0bZPcRiNatVnRSkHMjdINkRMqqnwCbBmrH
+6yKej36hs5KjvIevOxlLoSc=
+=9kB5
 -----END PGP SIGNATURE-----
diff --git a/media-video/noad/files/digest-noad-0.6.0-r6 b/media-video/noad/files/digest-noad-0.6.0-r6
new file mode 100644
index 000000000000..05e249e57c9d
--- /dev/null
+++ b/media-video/noad/files/digest-noad-0.6.0-r6
@@ -0,0 +1,3 @@
+MD5 62947d5afec56cdb9884535d9813530d noad-0.6.0.tar.bz2 151369
+RMD160 762c8efeb89d681a77d83d0df70668b62a7057dd noad-0.6.0.tar.bz2 151369
+SHA256 f473f0137fa9ba8f7a736d9ca019fe5491e1744b17b54a1bdbfc23a9c8001183 noad-0.6.0.tar.bz2 151369
diff --git a/media-video/noad/files/noad-0.6.0-fix-osd.patch b/media-video/noad/files/noad-0.6.0-fix-osd.patch
new file mode 100644
index 000000000000..d25eb0064e00
--- /dev/null
+++ b/media-video/noad/files/noad-0.6.0-fix-osd.patch
@@ -0,0 +1,30 @@
+http://www.e-tobi.net/cgi-bin/viewcvs.cgi/vdr-addon-noad/trunk/debian/patches/10_fix-osd.dpatch?rev=1946&root=vdr+subversion+repository&view=auto
+
+Fixes problems with "noad --OSD" if vdr is not running.
+
+Joerg Bornkessel <hd_brummy@gentoo.org> 16 Oct 2006
+
+--- old/svdrpc.cpp	Tue Jun 22 00:41:57 2004
++++ new/svdrpc.cpp	Sat Dec 18 19:54:44 2004
+@@ -189,6 +189,10 @@
+     {
+       select(1, &set, NULL, NULL, &timeout);
+       n = read(filedes, buf + rbytes, 1);
++      if(n<0) {
++        filedes=-1;
++        break;
++      }
+       rbytes += n;
+       if (rbytes == size)
+          break;
+@@ -214,7 +218,8 @@
+   while( i < 100 && outstandingReply > 0 )
+   {
+     usleep(10000);
+-    ReadReply();
++    if( !ReadReply() )
++      break;
+     i++;
+   }
+   return( outstandingReply <= 0 );
+
diff --git a/media-video/noad/noad-0.6.0-r6.ebuild b/media-video/noad/noad-0.6.0-r6.ebuild
new file mode 100644
index 000000000000..4faeb5f804ce
--- /dev/null
+++ b/media-video/noad/noad-0.6.0-r6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.6.0-r6.ebuild,v 1.1 2006/10/16 20:34:00 hd_brummy Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="Mark commercial Breaks in VDR records"
+HOMEPAGE="http://www.freepgs.com/noad/"
+SRC_URI="http://www.freepgs.com/${PN}/${P}.tar.bz2
+		mirror://vdrfiles/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="ffmpeg imagemagick"
+
+DEPEND="media-libs/libmpeg2
+	media-video/vdr
+	ffmpeg? ( >=media-video/ffmpeg-0.4.8 )
+	imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 )"
+RDEPEND=">=media-tv/gentoo-vdr-scripts-0.3.5"
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-directoryfix.diff
+	epatch ${FILESDIR}/${P}-as-needed.diff
+	epatch ${FILESDIR}/${P}-cflags.diff
+	epatch ${FILESDIR}/${P}-framesize.diff
+	epatch ${FILESDIR}/${P}-delete-while-scanning.diff
+	epatch ${FILESDIR}/${P}-fix-osd.patch
+
+	rm configure
+	eautoreconf
+}
+
+src_compile() {
+
+	econf \
+		$(use_with ffmpeg) \
+		$(use_with imagemagick magick) \
+		--with-tools \
+		--with-mpeginclude=/usr/include/mpeg2dec
+
+	emake || die "emake faild"
+}
+
+src_install() {
+
+	dobin noad showindex
+	use imagemagick && dobin markpics
+
+	dodoc COPYING README INSTALL
+	# example scripts are installed as dokumentation
+	dodoc allnewnoad allnoad allnoadnice clearlogos noadifnew stat2html
+
+	CONF_SOURCE=${FILESDIR}/0.6.0-r5
+	insinto /etc/conf.d
+	newins ${CONF_SOURCE}/confd_vdraddon.noad vdraddon.noad
+
+	insinto /usr/share/vdr/record
+	doins ${CONF_SOURCE}/record-50-noad.sh
+
+	insinto /etc/vdr/reccmds
+	doins ${CONF_SOURCE}/reccmds.noad.conf
+
+	exeinto /usr/share/vdr/bin
+	doexe ${CONF_SOURCE}/noad-reccmd
+}
+
+pkg_postinst() {
+
+	einfo
+	einfo "Congratulations, you have just installed noad!,"
+	einfo "To integrate noad in VDR you should do this:"
+	einfo
+	einfo "start and set Parameter in /etc/conf.d/vdraddon.noad"
+	einfo
+	einfo "Note: You can use here all pararmeters for noad,"
+	einfo "please look in the documentation of noad."
+	einfo
+}