Added patch to prevent a patch on frontend getting killed/connection lost.

Package-Manager: portage-2.1.2_rc2-r4

diff --git a/media-plugins/vdr-taste/Manifest b/media-plugins/vdr-taste/Manifest
index a09d0df84e90a3e8b28486b6f11787994857fe3b..6ff5484de32b06635dc54cd3567b0d8f2d36a821 100644 (file)
--- a/media-plugins/vdr-taste/Manifest
+++ b/media-plugins/vdr-taste/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX vdr-taste-0.0.2d-uint64.diff 443 RMD160 d008664d54b60b00dd627cd2b19c5c50b2239fc7 SHA1 98d8658ff03a684fd8d842f4a4df6967ce81b45b SHA256 353379eb2da540d912623c0226f68ed3c03378edcc60789fe540d6e862004b8b
+MD5 806c965bd948b7ab1e9a7cd624ef9d71 files/vdr-taste-0.0.2d-uint64.diff 443
+RMD160 d008664d54b60b00dd627cd2b19c5c50b2239fc7 files/vdr-taste-0.0.2d-uint64.diff 443
+SHA256 353379eb2da540d912623c0226f68ed3c03378edcc60789fe540d6e862004b8b files/vdr-taste-0.0.2d-uint64.diff 443
 DIST taste-0.0.2d.patch 1536 RMD160 86c74c1eff479340b2f272b4dc469e5831a142e4 SHA1 def6e667e0853e025a5bc8df73d6d93ff22b059d SHA256 3af5f4e0c567368b9d3feb0e731b1a830ba2e3103ea8111f4f707353d4d12ebf
 DIST vdr-taste-0.0.2d.tgz 14941 RMD160 acaefe747f4e2209f1c1167ff7d27fcdca7e76a9 SHA1 028eaeabb8c000b79cc5c53149e0af214dd9c1cc SHA256 f3584f5a2ccaf41d20f75fb90d7f2bea5707f7bf401eff25f8a7a5619191832f
-EBUILD vdr-taste-0.0.2d.ebuild 595 RMD160 43b04837902f2f202d7c0842d3eba1e3c62f21d2 SHA1 a767ea422f5dad92203f7fbc86a1ed6cf9e38e32 SHA256 2e636824f65db78084348c64ba92eca1a27f7e9a1e9c238d3c4347f45436062c
-MD5 711c6a5759e72baa109bb79aa6dcfacd vdr-taste-0.0.2d.ebuild 595
-RMD160 43b04837902f2f202d7c0842d3eba1e3c62f21d2 vdr-taste-0.0.2d.ebuild 595
-SHA256 2e636824f65db78084348c64ba92eca1a27f7e9a1e9c238d3c4347f45436062c vdr-taste-0.0.2d.ebuild 595
-MISC ChangeLog 482 RMD160 ffa584e37f6222afa8e7c6bb08111630253c237a SHA1 355c7b13b0c74eed22cabfcf99cd9d885bd79eed SHA256 37f38f65996bfe887508d2b74f1e79c43ce70ec8571bfc8f04db2e3cca019ef9
-MD5 e465c7d9ce45d044adbcec3aa6552221 ChangeLog 482
-RMD160 ffa584e37f6222afa8e7c6bb08111630253c237a ChangeLog 482
-SHA256 37f38f65996bfe887508d2b74f1e79c43ce70ec8571bfc8f04db2e3cca019ef9 ChangeLog 482
+EBUILD vdr-taste-0.0.2d.ebuild 625 RMD160 1bba7cf4faf8c97c418391afddd118014cb5940a SHA1 2596b5deb0ed67a052b6ffd0ef8b0d867d74305d SHA256 6a8edd844ab2520678633914fbd3f49e86ca7500abcb351afe3ca28bd488c404
+MD5 c5f3f440317d3dcce29e0895957bb324 vdr-taste-0.0.2d.ebuild 625
+RMD160 1bba7cf4faf8c97c418391afddd118014cb5940a vdr-taste-0.0.2d.ebuild 625
+SHA256 6a8edd844ab2520678633914fbd3f49e86ca7500abcb351afe3ca28bd488c404 vdr-taste-0.0.2d.ebuild 625
+MISC ChangeLog 648 RMD160 f6f356c33bad9f4414b86dc539bd63d38c9d3ed3 SHA1 4642234380b0e3d98c86d949364ac1bec16a1cf6 SHA256 4d39e5ea2d8064b67f1e754d2cc22b16717af371c561baf991daa192aabd03d9
+MD5 575f7d5e093b8b5b3cdfbf2a78fb60ea ChangeLog 648
+RMD160 f6f356c33bad9f4414b86dc539bd63d38c9d3ed3 ChangeLog 648
+SHA256 4d39e5ea2d8064b67f1e754d2cc22b16717af371c561baf991daa192aabd03d9 ChangeLog 648
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 MD5 e0c01eee6ee7e11d5d597aee9f9a2852 metadata.xml 298
 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf metadata.xml 298
@@ -21,7 +25,7 @@ SHA256 81e1d45361f0fe8627e4c59a09aca87962f8031832ea16390da02efa797262fd files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE4ZsEt2vP6XvVdOcRAmxsAJ9+KKBOTDvmD7kVKRUZJDlBWyaDCQCfRc8B
-WQAN5daLc/G11v3DAoKUD8A=
-=tG55
+iD8DBQFFcuQst2vP6XvVdOcRAi+2AJ90BrI8YAEtuDqJBPXPr5ENPlqVTACff4du
+aqmfON8UM1WKaele1BY7YbM=
+=m0QR
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/vdr-xineliboutput/ChangeLog b/media-plugins/vdr-xineliboutput/ChangeLog
index ad767e9c47524044a5721df340167e54e1ca3494..ac0fadd0ffd1696b94024bed246d8e82e2db5883 100644 (file)
--- a/media-plugins/vdr-xineliboutput/ChangeLog
+++ b/media-plugins/vdr-xineliboutput/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-xineliboutput
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.17 2006/12/03 14:42:38 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/ChangeLog,v 1.18 2006/12/03 14:47:44 zzam Exp $
+
+*vdr-xineliboutput-1.0.0_pre6-r2 (03 Dec 2006)
+
+  03 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-xineliboutput-1.0.0_pre6-frontend-close.diff,
+  +vdr-xineliboutput-1.0.0_pre6-r2.ebuild:
+  Added patch to prevent a patch on frontend getting killed/connection lost.
 
   03 Dec 2006; Matthias Schwarzott <zzam@gentoo.org>
   +files/vdr-xineliboutput-1.0.0_pre6-uint64.diff,

diff --git a/media-plugins/vdr-xineliboutput/Manifest b/media-plugins/vdr-xineliboutput/Manifest
index 89fb9b26e051fc39701198a5cdb2ba8ed94b7454..c5d0716542cfa3481f4a23b65e0d715c93c4e2d8 100644 (file)
--- a/media-plugins/vdr-xineliboutput/Manifest
+++ b/media-plugins/vdr-xineliboutput/Manifest
@@ -5,6 +5,10 @@ AUX confd-1.0.0_pre6 856 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b SHA1 5d
 MD5 9c6ae841c1edf3cf7d8199b0e77c8e09 files/confd-1.0.0_pre6 856
 RMD160 0d48271fe6041316f7ad95267f180f896b76c78b files/confd-1.0.0_pre6 856
 SHA256 fd30a70c06553463414e93771306a59fdabbcf674218dac49d4af46096d6089b files/confd-1.0.0_pre6 856
+AUX vdr-xineliboutput-1.0.0_pre6-frontend-close.diff 757 RMD160 9b29811415313726d3202daf1d460e1569752ba5 SHA1 3f7a950198fe326db3cfe547bfac34c1e9b9d627 SHA256 be30d77e27afef1cf3a74ee2be62086817dc88cdbacd7c830e6d97f4e0391b96
+MD5 044bc03b4437d776720aaf62289c5c6f files/vdr-xineliboutput-1.0.0_pre6-frontend-close.diff 757
+RMD160 9b29811415313726d3202daf1d460e1569752ba5 files/vdr-xineliboutput-1.0.0_pre6-frontend-close.diff 757
+SHA256 be30d77e27afef1cf3a74ee2be62086817dc88cdbacd7c830e6d97f4e0391b96 files/vdr-xineliboutput-1.0.0_pre6-frontend-close.diff 757
 AUX vdr-xineliboutput-1.0.0_pre6-uint64.diff 578 RMD160 aadccee14a7f8d2a521a3f57de5a2c5bc1a0112e SHA1 cb530366c58e0beb9dcaa5cea3173fbe7ada27ed SHA256 b701192054d2aa2ead5c77534fdf3a13a3d33d58254e5b0c81523995a6e188b5
 MD5 1726eca863d3c81e7d0327a7000dab36 files/vdr-xineliboutput-1.0.0_pre6-uint64.diff 578
 RMD160 aadccee14a7f8d2a521a3f57de5a2c5bc1a0112e files/vdr-xineliboutput-1.0.0_pre6-uint64.diff 578
@@ -14,10 +18,14 @@ EBUILD vdr-xineliboutput-1.0.0_pre6-r1.ebuild 1965 RMD160 c441a24fce66419c89631a
 MD5 50c77abb64b33b1fed61e6a7729e94d2 vdr-xineliboutput-1.0.0_pre6-r1.ebuild 1965
 RMD160 c441a24fce66419c89631a19ab2c7d987c3bdc87 vdr-xineliboutput-1.0.0_pre6-r1.ebuild 1965
 SHA256 b8115523cb2c900d311a6424eb6bbe1738b9f1164b875f2c80cbbf5694bc9e35 vdr-xineliboutput-1.0.0_pre6-r1.ebuild 1965
-MISC ChangeLog 4203 RMD160 124741c2721b0ebe08eb59f52f2cfcf3d49bf686 SHA1 2de3e19beddc49aaf7117e85e648db1b12f22aae SHA256 ef1598d1e7b8a13ed5f77d1f3ed1bdff78231761f7d399f543dc61ed39493d70
-MD5 7b14be71d104d4169f95272e75efa43c ChangeLog 4203
-RMD160 124741c2721b0ebe08eb59f52f2cfcf3d49bf686 ChangeLog 4203
-SHA256 ef1598d1e7b8a13ed5f77d1f3ed1bdff78231761f7d399f543dc61ed39493d70 ChangeLog 4203
+EBUILD vdr-xineliboutput-1.0.0_pre6-r2.ebuild 2003 RMD160 87124ddf37117ffa6c36e716b423a59fdb9c2b49 SHA1 87e52ae4b68898218161db94eedbfe071f1c4a81 SHA256 7a06f4949616bf58fb4951a2c73a8af45ea1fcae1ff9f44707569ec6eaf7c7c3
+MD5 c979f7db68437f2fc4d388cdde6062a5 vdr-xineliboutput-1.0.0_pre6-r2.ebuild 2003
+RMD160 87124ddf37117ffa6c36e716b423a59fdb9c2b49 vdr-xineliboutput-1.0.0_pre6-r2.ebuild 2003
+SHA256 7a06f4949616bf58fb4951a2c73a8af45ea1fcae1ff9f44707569ec6eaf7c7c3 vdr-xineliboutput-1.0.0_pre6-r2.ebuild 2003
+MISC ChangeLog 4484 RMD160 9d5fa11c052e9752246fa390bd148efe7ed0f12a SHA1 df4a9823472d131e0a708e1ad42130a70de760b7 SHA256 23aa5a12a91c47a0d7afec3d526547616a04b182865720ef81eff8d1736638de
+MD5 74b001741b5623785d5819f842f38817 ChangeLog 4484
+RMD160 9d5fa11c052e9752246fa390bd148efe7ed0f12a ChangeLog 4484
+SHA256 23aa5a12a91c47a0d7afec3d526547616a04b182865720ef81eff8d1736638de ChangeLog 4484
 MISC metadata.xml 353 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e SHA1 a8466ebe913ea08351d9415bca28ee107e54a7cb SHA256 48731babb71989233956af5f82f8bd1b24625eab7b26493e43d753621c9ec359
 MD5 3ca7be3c0a30822246151344759d8d7e metadata.xml 353
 RMD160 8098dcdec4e7d627012ff4cc0e1a70fc0061228e metadata.xml 353
@@ -25,10 +33,13 @@ SHA256 48731babb71989233956af5f82f8bd1b24625eab7b26493e43d753621c9ec359 metadata
 MD5 fd45b66ef259466d00d5a2c17c68a2a2 files/digest-vdr-xineliboutput-1.0.0_pre6-r1 274
 RMD160 0b9a7728d31ce996bf3ba7f638349e28f20f7a10 files/digest-vdr-xineliboutput-1.0.0_pre6-r1 274
 SHA256 631fa9722e66e214233b9793ba998e6af7d068db0113273d00344248dc94e0d0 files/digest-vdr-xineliboutput-1.0.0_pre6-r1 274
+MD5 fd45b66ef259466d00d5a2c17c68a2a2 files/digest-vdr-xineliboutput-1.0.0_pre6-r2 274
+RMD160 0b9a7728d31ce996bf3ba7f638349e28f20f7a10 files/digest-vdr-xineliboutput-1.0.0_pre6-r2 274
+SHA256 631fa9722e66e214233b9793ba998e6af7d068db0113273d00344248dc94e0d0 files/digest-vdr-xineliboutput-1.0.0_pre6-r2 274
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFcuJlt2vP6XvVdOcRAl/WAJsHZgBOFY1SGWilHTlFtUuChtQmOwCgp+cU
-VQoDwrAgbLrPImTpjVng6i0=
-=LTkW
+iD8DBQFFcuOWt2vP6XvVdOcRAsG3AKC0PIpRci6TGy3fCvrXz93zIvFSsQCfZPG9
+d+nabj4Swk1zHznJnD/cxdk=
+=M6bP
 -----END PGP SIGNATURE-----

diff --git a/media-plugins/vdr-xineliboutput/files/digest-vdr-xineliboutput-1.0.0_pre6-r2 b/media-plugins/vdr-xineliboutput/files/digest-vdr-xineliboutput-1.0.0_pre6-r2
new file mode 100644 (file)
index 0000000..7ed8c05
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/digest-vdr-xineliboutput-1.0.0_pre6-r2
@@ -0,0 +1,3 @@
+MD5 5f413715241228429731a2ea565c0ce9 vdr-xineliboutput-1.0.0pre6.tgz 222439
+RMD160 7874916a5e122fe114d36eeddc0581e8ded3e12e vdr-xineliboutput-1.0.0pre6.tgz 222439
+SHA256 c76ad8fda681b2ddcbae14096885805149544087f2a4e6e4aa41b8c93a8dc6a0 vdr-xineliboutput-1.0.0pre6.tgz 222439

diff --git a/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_pre6-frontend-close.diff b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_pre6-frontend-close.diff
new file mode 100644 (file)
index 0000000..501f42b
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/files/vdr-xineliboutput-1.0.0_pre6-frontend-close.diff
@@ -0,0 +1,24 @@
+diff -ru xineliboutput-1.0.0pre6-orig/frontend_svr.c xineliboutput-1.0.0pre6/frontend_svr.c
+--- xineliboutput-1.0.0pre6-orig/frontend_svr.c        2006-12-03 15:43:32.601759070 +0100
++++ xineliboutput-1.0.0pre6/frontend_svr.c     2006-12-03 15:45:25.524741697 +0100
+@@ -1240,7 +1240,8 @@
+ 
+ void cXinelibServer::Read_Control(int cli)
+ {
+-  while(read(fd_control[cli], &m_CtrlBuf[ cli ][ m_CtrlBufPos[cli] ], 1) == 1) {
++  int n;
++  while((n = read(fd_control[cli], &m_CtrlBuf[ cli ][ m_CtrlBufPos[cli] ], 1)) == 1) {
+ 
+     ++m_CtrlBufPos[cli];
+ 
+@@ -1264,6 +1265,10 @@
+       m_CtrlBufPos[cli] = 0;
+     }
+   }
++  if (n == 0) {
++    LOGMSG("Client connection %d closed", cli);
++    CloseConnection(cli);
++  }
+ }
+ 
+ void cXinelibServer::Handle_ClientConnected(int fd)

diff --git a/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre6-r2.ebuild b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre6-r2.ebuild
new file mode 100644 (file)
index 0000000..4ff99d9
--- /dev/null
+++ b/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre6-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xineliboutput/vdr-xineliboutput-1.0.0_pre6-r2.ebuild,v 1.1 2006/12/03 14:47:44 zzam Exp $
+
+inherit vdr-plugin eutils multilib
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Video Disk Recorder Xinelib PlugIn"
+HOMEPAGE="http://users.tkk.fi/~phintuka/vdr/vdr-xineliboutput/"
+SRC_URI="http://users.tkk.fi/~phintuka/vdr/${PN}/${MY_P}.tgz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE="fbcon X"
+
+RDEPEND=">=media-video/vdr-1.3.42
+               >=media-libs/xine-lib-1.1.1
+               media-libs/jpeg
+               X? (
+                       || ( (
+                                       x11-proto/xextproto
+                                       x11-proto/xf86vidmodeproto
+                                       x11-proto/xproto
+                               )
+                               virtual/x11
+                       )
+               )"
+
+DEPEND="${RDEPEND}
+               sys-kernel/linux-headers
+               X? (
+                       || ( (
+                                       x11-libs/libX11
+                                       x11-libs/libXv
+                                       x11-libs/libXext
+                               )
+                               virtual/x11
+                       )
+               )"
+
+S=${WORKDIR}/xineliboutput-${MY_PV}
+
+VDR_CONFD_FILE=${FILESDIR}/confd-1.0.0_pre6
+
+PATCHES="${FILESDIR}/${P}-uint64.diff
+       ${FILESDIR}/${P}-frontend-close.diff"
+
+enable_in_makefile() {
+       local opt
+       for opt; do
+               sed -i "/^#${opt}.*= 1/s-^#--" Makefile
+       done
+}
+
+
+src_unpack() {
+       vdr-plugin_src_unpack
+
+       cd ${S}
+
+       XINE_LIB_VERSION=$(awk -F'"' '/XINE_VERSION/ {print $2}' /usr/include/xine.h)
+
+       enable_in_makefile XINELIBOUTPUT_VDRPLUGIN XINELIBOUTPUT_XINEPLUGIN
+       use fbcon && enable_in_makefile XINELIBOUTPUT_FB
+       use X && enable_in_makefile XINELIBOUTPUT_X11
+
+       # patching makefile to work with this
+       # $ rm ${outdir}/file; cp file ${outdir}/file
+       # work in the sandbox
+       sed -i Makefile \
+               -e 's:XINEPLUGINDIR.*=.*:XINEPLUGINDIR = '"${WORKDIR}/lib:"
+       mkdir -p ${WORKDIR}/lib
+}
+
+src_install() {
+       vdr-plugin_src_install
+
+       dobin vdr-fbfe vdr-sxfe
+
+       insinto ${VDR_PLUGIN_DIR}
+       doins *.so.${MY_PV}
+
+       insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION}
+       doins xineplug_inp_*.so
+
+       insinto /usr/$(get_libdir)/xine/plugins/${XINE_LIB_VERSION}/post
+       doins xineplug_post_*.so
+}