Added a cvs snapshot. Added patch to make live send correct character encoding to the browser.

Package-Manager: portage-2.1.3_rc6

5 files changed, 177 insertions, 10 deletions

diff --git a/media-plugins/vdr-live/ChangeLog b/media-plugins/vdr-live/ChangeLog
index a154a75f9b30..46d435104b82 100644
--- a/media-plugins/vdr-live/ChangeLog
+++ b/media-plugins/vdr-live/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-live
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.5 2007/06/26 17:21:46 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/ChangeLog,v 1.6 2007/07/06 13:42:41 zzam Exp $
+
+*vdr-live-0.1.0.20070704 (06 Jul 2007)
+
+  06 Jul 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/vdr-live-content-type.diff, +vdr-live-0.1.0.20070704.ebuild:
+  Added a cvs snapshot. Added patch to make live send correct character
+  encoding to the browser.
 
   26 Jun 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
   +files/0.1.0/vdr-live-0.1.0_vdr-1.5.3-compile.diff,
diff --git a/media-plugins/vdr-live/Manifest b/media-plugins/vdr-live/Manifest
index ccbd61be0f23..6380b4c61a33 100644
--- a/media-plugins/vdr-live/Manifest
+++ b/media-plugins/vdr-live/Manifest
@@ -29,19 +29,28 @@ AUX rc-addon.sh 180 RMD160 cd41dc99aed6f463dce1d22ca028317fc23a99e1 SHA1 153dc6a
 MD5 e0f1451833529e170e0a3dca8996921f files/rc-addon.sh 180
 RMD160 cd41dc99aed6f463dce1d22ca028317fc23a99e1 files/rc-addon.sh 180
 SHA256 d9c9eca9f12362c1f8c162a9bb948feebdb8acc87413a611ecf5f52a3092878a files/rc-addon.sh 180
+AUX vdr-live-content-type.diff 2947 RMD160 6535db3dff27001e04e5c5a85696cd6664c99e56 SHA1 d3abadca79cfaffaf429529f086c38aa7389f17b SHA256 7de6392dd1d0a896c9a01e06f672c929253d1811bf29dbfbf55b56147ebb1049
+MD5 9260ccf74f6a76124959bf349246c001 files/vdr-live-content-type.diff 2947
+RMD160 6535db3dff27001e04e5c5a85696cd6664c99e56 files/vdr-live-content-type.diff 2947
+SHA256 7de6392dd1d0a896c9a01e06f672c929253d1811bf29dbfbf55b56147ebb1049 files/vdr-live-content-type.diff 2947
 DIST vdr-live-0.1.0.tar.gz 268899 RMD160 303cd0b95520d20c70931fa546533962dd624634 SHA1 c881ca4fbe620e970de53cbde34ba304c53d2146 SHA256 6d8467434e47b1127e7dc61a56f67011cf14cc348036591ef10e2069009d6dc2
+DIST vdr-live-20070704.tar.gz 459512 RMD160 08561b9178dec7f3b0d45e3de815962b75e4ff5f SHA1 e83cc6fb50f8a50d48c5411169dab0c97e9f0d61 SHA256 e282a465548747886670d5fc7dbf6edd2f57442279cd5a03a4ffefd377f631a9
 EBUILD vdr-live-0.1.0-r1.ebuild 718 RMD160 18b2adc998f69b4ca88c9541bd3a79cd027ed1ad SHA1 28d5a7221ff9a5802fa901acf1c06c7b40cda3fc SHA256 b9dc6f12309e185ef00ea00a23682fd5af6c8e226eb0a8978a54fda62b103e97
 MD5 1d4cd4013275d5b80982950903711f23 vdr-live-0.1.0-r1.ebuild 718
 RMD160 18b2adc998f69b4ca88c9541bd3a79cd027ed1ad vdr-live-0.1.0-r1.ebuild 718
 SHA256 b9dc6f12309e185ef00ea00a23682fd5af6c8e226eb0a8978a54fda62b103e97 vdr-live-0.1.0-r1.ebuild 718
+EBUILD vdr-live-0.1.0.20070704.ebuild 1078 RMD160 446aef328fab10c5f0e81f378fb6308463c26aae SHA1 c7365e782a0f62258bf938d15860ab86bb9cc94f SHA256 6d72c7841e28b4472c070f5e8d46cd4b47f27e597b47ae84c8869518477b6855
+MD5 7434a2e008201cdf3312821d145af97b vdr-live-0.1.0.20070704.ebuild 1078
+RMD160 446aef328fab10c5f0e81f378fb6308463c26aae vdr-live-0.1.0.20070704.ebuild 1078
+SHA256 6d72c7841e28b4472c070f5e8d46cd4b47f27e597b47ae84c8869518477b6855 vdr-live-0.1.0.20070704.ebuild 1078
 EBUILD vdr-live-0.1.0.ebuild 627 RMD160 c215e343d431cdf31d690ba97657c495f8cc2f76 SHA1 2edcf2db6fc121027b2c67cb7f54ea4a87119ec9 SHA256 ae1efe7ac4a3de9f14f4928a839aa82831db8e1131a3301820abbac7e4042ef9
 MD5 93937b01eaf8d17cb913a09eea09be75 vdr-live-0.1.0.ebuild 627
 RMD160 c215e343d431cdf31d690ba97657c495f8cc2f76 vdr-live-0.1.0.ebuild 627
 SHA256 ae1efe7ac4a3de9f14f4928a839aa82831db8e1131a3301820abbac7e4042ef9 vdr-live-0.1.0.ebuild 627
-MISC ChangeLog 1128 RMD160 783bee095eea1cb7dceb69d752599d202f62f5e6 SHA1 79b77427402e2206c75fe32c6da25e9f2b215543 SHA256 c418e1b1fa088c0d98a9c002e402d79c62c8de0f2ee70e29d1dcaa08fc67133e
-MD5 5b10b936d8512b1cab1ee71676e706a3 ChangeLog 1128
-RMD160 783bee095eea1cb7dceb69d752599d202f62f5e6 ChangeLog 1128
-SHA256 c418e1b1fa088c0d98a9c002e402d79c62c8de0f2ee70e29d1dcaa08fc67133e ChangeLog 1128
+MISC ChangeLog 1386 RMD160 347b2bee1d71779a88d92d26dde448300e6c2521 SHA1 ef6a9c75509e49f3b60b13f71743f6b027ed8752 SHA256 739d29d3ce21a05db61243899171f83470c60497d20cba730d511be6a61bb329
+MD5 f3d2f02fd28cb6989e339d657a8f485f ChangeLog 1386
+RMD160 347b2bee1d71779a88d92d26dde448300e6c2521 ChangeLog 1386
+SHA256 739d29d3ce21a05db61243899171f83470c60497d20cba730d511be6a61bb329 ChangeLog 1386
 MISC metadata.xml 251 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 SHA1 6e174f6e4395999a9dafd53f523e079766c0b094 SHA256 b426b6e6d679a63de74d2c1a21e4da2381fb1b580b0180b041307471d67ab54f
 MD5 3cafef7c72bb98475ad53d15e79ff845 metadata.xml 251
 RMD160 b4bdfc1a9e947ad1d1f76c1942f02057d5cbc993 metadata.xml 251
@@ -52,11 +61,13 @@ SHA256 51e212c94205f9e01019c667d156c77cd2a09cdd63881a1e396b5ac00a5f7d11 files/di
 MD5 3779a82313e23f2c24984f0ca465c0a6 files/digest-vdr-live-0.1.0-r1 244
 RMD160 4bae0e4af78759938dd6a2c5bccc15a6bb7a2772 files/digest-vdr-live-0.1.0-r1 244
 SHA256 51e212c94205f9e01019c667d156c77cd2a09cdd63881a1e396b5ac00a5f7d11 files/digest-vdr-live-0.1.0-r1 244
+MD5 440d3e80fd0e94eb38b05b5f92918867 files/digest-vdr-live-0.1.0.20070704 253
+RMD160 346ffed2bd6e4df3422be4c74011915b7d7ad32e files/digest-vdr-live-0.1.0.20070704 253
+SHA256 418ad698480c55fe6024850ad6b7fbc89268abe153f2acf9bf9463b4a2be49c3 files/digest-vdr-live-0.1.0.20070704 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGgUs1dn07HTTCgIoRAsejAJ0Qa3JWBtoZHOMjgqmbCFqo7qRnQQCfYepa
-WuxHE5IZTGNHrGIKVo3RzR8=
-=kH30
+iD8DBQFGjkbdt2vP6XvVdOcRAhsOAKCtEnv/PhXI6ghkb8dvv3mdTNh51ACgiBGe
+WH8NF10axl0Y+qSd4SwKK7o=
+=qiEh
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-live/files/digest-vdr-live-0.1.0.20070704 b/media-plugins/vdr-live/files/digest-vdr-live-0.1.0.20070704
new file mode 100644
index 000000000000..8a9687a54dc2
--- /dev/null
+++ b/media-plugins/vdr-live/files/digest-vdr-live-0.1.0.20070704
@@ -0,0 +1,3 @@
+MD5 4ba29ff0673f4396b423309e0a1f1374 vdr-live-20070704.tar.gz 459512
+RMD160 08561b9178dec7f3b0d45e3de815962b75e4ff5f vdr-live-20070704.tar.gz 459512
+SHA256 e282a465548747886670d5fc7dbf6edd2f57442279cd5a03a4ffefd377f631a9 vdr-live-20070704.tar.gz 459512
diff --git a/media-plugins/vdr-live/files/vdr-live-content-type.diff b/media-plugins/vdr-live/files/vdr-live-content-type.diff
new file mode 100644
index 000000000000..264988781b51
--- /dev/null
+++ b/media-plugins/vdr-live/files/vdr-live-content-type.diff
@@ -0,0 +1,100 @@
+Index: live-20070704/tntconfig.cpp
+===================================================================
+--- live-20070704.orig/tntconfig.cpp
++++ live-20070704/tntconfig.cpp
+@@ -57,6 +57,8 @@ void TntConfig::WriteConfig()
+ 	file << "PropertyFile " << m_propertiesPath << endl;
+ 	file << "SessionTimeout 86400" << endl;
+ 
++	file << "DefaultContentType \"text/html; charset=" << encoding << "\"" << endl;
++
+ 	Setup::IpList const& ips = LiveSetup().GetServerIps();
+ 	int port = LiveSetup().GetServerPort();
+ 	for ( Setup::IpList::const_iterator ip = ips.begin(); ip != ips.end(); ++ip ) {
+Index: live-20070704/pages/xmlresponse.ecpp
+===================================================================
+--- live-20070704.orig/pages/xmlresponse.ecpp
++++ live-20070704/pages/xmlresponse.ecpp
+@@ -2,6 +2,12 @@
+ #include <string>
+ 
+ using namespace std;
++namespace vdrlive {
++extern const char * encoding;
++};
++
++std::string xml_head_1 = "<?xml version=\"1.0\" encoding=\"";
++std::string xml_head_2 = "\"?>";
+ </%pre>
+ 
+ <# ------------------------------------------------------------------------- #>
+@@ -14,7 +20,7 @@ using namespace std;
+ 	bool result;
+ 	string error;
+ </%args>
+-<?xml version="1.0" encoding="ISO-8859-1"?>
++<$$ xml_head_1 $><$ vdrlive::encoding $><$$ xml_head_2 $>
+ <service>
+   <request name="<$ name $>">
+      <param name="<$ pname $>"><$ value $></param>
+@@ -38,7 +44,7 @@ using namespace std;
+ 	string prev_chan;
+ 	string next_chan;
+ </%args>
+-<?xml version="1.0" encoding="ISO-8859-1"?>
++<$$ xml_head_1 $><$ vdrlive::encoding $><$$ xml_head_2 $>
+ <service>
+   <request name="ibox">
+ 	<param name="update"><$ update $></param>
+Index: live-20070704/thread.cpp
+===================================================================
+--- live-20070704.orig/thread.cpp
++++ live-20070704/thread.cpp
+@@ -1,8 +1,10 @@
+ #include <cstdlib>
+ #include <iostream>
+ #include <stdexcept>
++#include <vdr/config.h>
+ #include <vdr/tools.h>
+ #include <tnt/tntnet.h>
++#include <vdr/i18n.h>
+ #include "thread.h"
+ #include "tntconfig.h"
+ 
+@@ -23,6 +25,8 @@ private:
+ 	char* m_string;
+ };
+ 
++const char* encoding = NULL;
++
+ ServerThread::ServerThread()
+ {
+ }
+@@ -43,6 +47,14 @@ void ServerThread::Stop()
+ void ServerThread::Action()
+ {
+ 	try {
++#if VDRVERSNUM >= 10503
++		if ( cCharSetConv::SystemCharacterTable() )
++			encoding = cCharSetConv::SystemCharacterTable();
++		else
++			encoding = "UTF-8";
++#else
++		encoding = I18nCharSets()[::Setup.OSDLanguage];
++#endif
+ 		ProtectedCString configPath( TntConfig::Get().GetConfigPath().c_str() );
+ 
+ 		char* argv[] = { const_cast< char* >( "tntnet" ), const_cast< char* >( "-c" ), configPath };
+Index: live-20070704/thread.h
+===================================================================
+--- live-20070704.orig/thread.h
++++ live-20070704/thread.h
+@@ -22,6 +22,8 @@ private:
+ 	std::auto_ptr< tnt::Tntnet > m_server;
+ };
+ 
++extern const char *encoding;
++
+ } // namespace vdrlive
+ 
+ #endif // VDR_LIVE_THREAD_H
diff --git a/media-plugins/vdr-live/vdr-live-0.1.0.20070704.ebuild b/media-plugins/vdr-live/vdr-live-0.1.0.20070704.ebuild
new file mode 100644
index 000000000000..e10c5368e424
--- /dev/null
+++ b/media-plugins/vdr-live/vdr-live-0.1.0.20070704.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-live/vdr-live-0.1.0.20070704.ebuild,v 1.1 2007/07/06 13:42:41 zzam Exp $
+
+inherit vdr-plugin versionator
+
+MY_PV=$(get_version_component_range 4)
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="VDR Plugin: Web Access To Settings"
+HOMEPAGE="http://live.vdr-developer.org"
+#SRC_URI="http://live.vdr-developer.org/downloads/${MY_PP}.tar.gz"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="media-video/vdr
+	>=dev-libs/boost-1.33.0
+	>=dev-libs/tntnet-1.5.3
+	>=dev-libs/cxxtools-1.4.3"
+
+PATCHES="${FILESDIR}/vdr-live-content-type.diff"
+
+S="${WORKDIR}/${VDRPLUGIN}"
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	cd "${S}"
+#	sed -i live.cpp -e '/m_configDirectory =/s#=.*#= "/usr/share/vdr/live/http";#'
+}
+
+src_install() {
+	vdr-plugin_src_install
+
+	cd "${S}/live"
+	#insinto /usr/share/vdr/live/http
+	insinto /etc/vdr/plugins/live
+	doins -r *
+
+	chown vdr:vdr -R "${D}"/etc/vdr/plugins/live
+}
+