summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Schwarzott <zzam@gentoo.org>2009-04-21 20:35:38 +0000
committerMatthias Schwarzott <zzam@gentoo.org>2009-04-21 20:35:38 +0000
commit4fcc25e88570d496bdbe7ef489a2fab595e7e183 (patch)
treef39ec722a2a3abea0bc636a518f267029700d351
parentRemove old stuff - sync to gentoo.org (diff)
downloadtesting-4fcc25e88570d496bdbe7ef489a2fab595e7e183.tar.gz
testing-4fcc25e88570d496bdbe7ef489a2fab595e7e183.tar.bz2
testing-4fcc25e88570d496bdbe7ef489a2fab595e7e183.zip
moved to extra overlay called vdr-xine
svn path=/testing/; revision=544
-rw-r--r--media-plugins/vdr-xine/ChangeLog52
-rw-r--r--media-plugins/vdr-xine/Manifest32
-rw-r--r--media-plugins/vdr-xine/files/confd8
-rw-r--r--media-plugins/vdr-xine/files/digest-vdr-xine-0.7.103
-rw-r--r--media-plugins/vdr-xine/files/digest-vdr-xine-0.7.113
-rw-r--r--media-plugins/vdr-xine/files/digest-vdr-xine-0.7.9-r13
-rw-r--r--media-plugins/vdr-xine/files/digest-vdr-xine-0.8.03
-rw-r--r--media-plugins/vdr-xine/files/vdr-xine-0.7.10-gentoo.diff33
-rw-r--r--media-plugins/vdr-xine/files/vdr-xine-0.7.10-network.diff284
-rw-r--r--media-plugins/vdr-xine/files/vdr-xine-0.7.11-gentoo.diff26
-rw-r--r--media-plugins/vdr-xine/files/vdr-xine-0.7.11_gcc-4.2.x-compilefix.diff64
-rw-r--r--media-plugins/vdr-xine/files/vdr-xine-0.7.9-network.diff273
-rw-r--r--media-plugins/vdr-xine/files/vdr-xine-0.8.0-gentoo.diff26
-rw-r--r--media-plugins/vdr-xine/files/vdr-xine-0.9.0-gentoo.diff24
-rw-r--r--media-plugins/vdr-xine/metadata.xml14
-rw-r--r--media-plugins/vdr-xine/vdr-xine-0.7.10.ebuild59
-rw-r--r--media-plugins/vdr-xine/vdr-xine-0.7.11.ebuild60
-rw-r--r--media-plugins/vdr-xine/vdr-xine-0.7.9-r1.ebuild55
-rw-r--r--media-plugins/vdr-xine/vdr-xine-0.8.0.ebuild59
-rw-r--r--media-plugins/vdr-xine/vdr-xine-0.8.2.ebuild59
-rw-r--r--media-plugins/vdr-xine/vdr-xine-0.9.0.ebuild63
21 files changed, 0 insertions, 1203 deletions
diff --git a/media-plugins/vdr-xine/ChangeLog b/media-plugins/vdr-xine/ChangeLog
deleted file mode 100644
index 0dd6e20..0000000
--- a/media-plugins/vdr-xine/ChangeLog
+++ /dev/null
@@ -1,52 +0,0 @@
-# ChangeLog for media-plugins/vdr-xine
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 18 Jan 2009; Matthias Schwarzott <zzam@gentoo.org>
- +files/vdr-xine-0.9.0-gentoo.diff, metadata.xml, +vdr-xine-0.9.0.ebuild:
- Version bumped. Now use a use-dependency to guarantee xine-lib has
- USE=vdr.
-
- 01 Apr 2008; Matthias Schwarzott <zzam@gentoo.org> +vdr-xine-0.8.2.ebuild:
- Version bumped.
-
- 02 Dec 2007; Matthias Schwarzott <zzam@gentoo.org>
- vdr-xine-0.7.9-r1.ebuild, vdr-xine-0.7.10.ebuild, vdr-xine-0.7.11.ebuild,
- vdr-xine-0.8.0.ebuild:
- Fixed quoting.
-
- 24 Oct 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
- files/vdr-xine-0.7.11_gcc-4.2.x-compilefix.diff, +vdr-xine-0.8.0.ebuild,
- +files/vdr-xine-0.8.0-gentoo.diff:
- version bump; use-flag vdr-net is deprecated
-
- 04 Sep 2007; Joerg Bornkessel <hd_brummy@gentoo.org> ChangeLog:
- Manifest fixed
-
- 04 Sep 2007; Matthias Schwarzott <zzam@gentoo.org>
- +files/vdr-xine-0.7.11-gentoo.diff,
- files/vdr-xine-0.7.11_gcc-4.2.x-compilefix.diff, vdr-xine-0.7.11.ebuild:
- Improved gcc-4.2 patch and gentoo-patch.
-
- 04 Sep 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
- +vdr-xine-0.7.11.ebuild, +files/vdr-xine-0.7.11_gcc-4.2.x-compilefix.diff:
- verion bump, need xine-lib-1.1.8
-
- 03 Jan 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
- vdr-xine-0.7.10.ebuild:
- typo fixed
-
- 03 Jan 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
- vdr-xine-0.7.10.ebuild, +files/vdr-xine-0.7.10-gentoo.diff,
- +files/vdr-xine-0.7.10-network.diff:
- ebuild rewritten
-
- 03 Jan 2007; Matthias Schwarzott <zzam@gentoo.org>
- +vdr-xine-0.7.10.ebuild:
- Version bumped.
-
- 03 Jan 2007; Matthias Schwarzott <zzam@gentoo.org>
- +vdr-xine-0.7.9-r1.ebuild, +files/vdr-xine-0.7.9-network.diff,
- +metadata.xml:
- Initial import to vdr-testing overlay (from gentoo.de).
-
diff --git a/media-plugins/vdr-xine/Manifest b/media-plugins/vdr-xine/Manifest
deleted file mode 100644
index 859ffa2..0000000
--- a/media-plugins/vdr-xine/Manifest
+++ /dev/null
@@ -1,32 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX confd 133 RMD160 7acd7828a918e636097e340c1b88c2fdaa40f0d0 SHA1 549c83d6ed682f0f01d3be9fe1ab39649123c521 SHA256 126756249851995101f27e9bbc0a87a011f5c7a5f1cd480ac6638b8c0722868b
-AUX vdr-xine-0.7.10-gentoo.diff 1538 RMD160 3fe5fe671bc16eed5fe6b3137214e365373ce495 SHA1 179402f335b7b9d224e5707a1579bc7874fd329f SHA256 a36a8db7364244e5b398cc39c349064ad951c80c128fd81b3de1adc5a1dd0091
-AUX vdr-xine-0.7.10-network.diff 7976 RMD160 ad468d9f24a702ebf5e2776b3f1ff365fe8cd118 SHA1 31b7d1a591f596d7801ce9e0b751d42437f17f73 SHA256 0e3be10b30d3ebf8066cbddd8a0525ba150150f989d2526b0bd531e07e641105
-AUX vdr-xine-0.7.11-gentoo.diff 956 RMD160 4efe1615df3599c60e0b9ade45d80f4419d35520 SHA1 f6cb410c47c9f777d3e05e3302a46c67c122e0d7 SHA256 09061119b6a6e39edb152b27f892099ecf06031b059f5b8082b6c91d4b8c86ee
-AUX vdr-xine-0.7.11_gcc-4.2.x-compilefix.diff 1643 RMD160 d78c53afedc853dc98ba979dbb11944b3f4ddcc9 SHA1 7cb01878957aee5880424f85e7177e046ace50cb SHA256 e1873d83ed84059a8ddd3d3c5defbb2253cfbe3758988f77c162724cbf26b087
-AUX vdr-xine-0.7.9-network.diff 7772 RMD160 31187f9abad7abfaa801367c36f9f3fb9d6e8888 SHA1 df880bc1d8e51132c48ee8527337ee8d1814f7a9 SHA256 6fd6a361d1d8310536f2528940b7e8374ed5e2e0543169d6161f9cc7a2e3daf9
-AUX vdr-xine-0.8.0-gentoo.diff 956 RMD160 4efe1615df3599c60e0b9ade45d80f4419d35520 SHA1 f6cb410c47c9f777d3e05e3302a46c67c122e0d7 SHA256 09061119b6a6e39edb152b27f892099ecf06031b059f5b8082b6c91d4b8c86ee
-AUX vdr-xine-0.9.0-gentoo.diff 1020 RMD160 c6e82b7f5e8dff2721bff41fd070192ae7fcd860 SHA1 ec5755fcd052a2e3e780304cd48a00345d6ec81e SHA256 11868563eed4bd40bc609817455c33ceac58d0957db10f45694d13bb8c5dd346
-DIST vdr-xine-0.7.10.tgz 147269 RMD160 af780dbbf1938dd0537e9f5fc660bf10c74e4cab SHA1 49df96e46910b2424dce531f6a1cd5e64eee0144 SHA256 c7f9b6b50e5812f5adeaa70a39612db1b72c156264fc3a7875f311aec6e2ec1f
-DIST vdr-xine-0.7.11.tgz 152889 RMD160 a4102c5332e757b37de4d19cb44fa971e8eac574 SHA1 9d3ffe3d783f7999e3b5f67f1a27e6c141887d7f SHA256 3c2446c88685b4bb787ad7429b108ef5ee300b9515cf02dbee57725f26b0028e
-DIST vdr-xine-0.7.9.tgz 131525 RMD160 e116ca204516e1d5660814c1efa0eeb2da8c41a2 SHA1 79b0f2886a2c2fb7fcc9c65bc0f2a487ccdab4de SHA256 99fb1b6757762c311c0aec33f218881d59914a50881f76990b3912ffad9a59ea
-DIST vdr-xine-0.8.0.tgz 192760 RMD160 4be96674613d119640ab437f5f0d7b80f9cd7402 SHA1 17e593a885b5e8cf422e93895ac8da852a7fb4eb SHA256 1dd9b555204621d53ead82e855c4dd84e00b82f12bbb49e8fb7ec55421ee824a
-DIST vdr-xine-0.8.2.tgz 186487 RMD160 6c0a777b0787535b5a0ca91dd1bd870d34a470d9 SHA1 df96a5c06984454e6cf11dce4ecc6d5ebd0482ed SHA256 39b36ccd7d4bbf52a2078926de76fa91e0ff989a2a9e2ba8a58c31405de8271e
-DIST vdr-xine-0.9.0.tgz 327208 RMD160 b3707c2c7dd52a9765aed87949b62cd8bb06f4c2 SHA1 798c1a7e3aecab2f5ec79881020fbc03acf50cec SHA256 9fdc9b5ca64a53c0c179d0619220ad06ae8713f44b95c5e27f6b76a2cb4751c5
-EBUILD vdr-xine-0.7.10.ebuild 1289 RMD160 5055d80315b0a028138d8f1ea12bf3fc50497116 SHA1 ff708639d5242aacf420768ce94d233396433f50 SHA256 03e476ef5e48cbd7895df8428d31846406b6f17ea1cdebe80fc387cf1d3e9408
-EBUILD vdr-xine-0.7.11.ebuild 1350 RMD160 a63f1031ab5ca5afeb3f6e371c0fae68b9a1ac14 SHA1 bc33b4ccaebf19da3af8416e219d5eeabb7bc573 SHA256 f17b5a19535f6888277de4a0fc2332d0cb3322c54d329d4be2d6116173c8dd6c
-EBUILD vdr-xine-0.7.9-r1.ebuild 1319 RMD160 978a49d9cdd8d452a6cd182aa89c0d711dafee0d SHA1 e4508f4dbf1d4996a98e30d8c08590205d4b12db SHA256 518d2e2996c5092fada3183353cca58090328aa28954ef11a0301c1a521e2fbc
-EBUILD vdr-xine-0.8.0.ebuild 1323 RMD160 ebe925359d7e94a80807de69d7f9f49383bba88c SHA1 ba1fb672134529af882d2973cea1a7dbe8b16a24 SHA256 d092da437c813279408620da5b52c1f2e2fcd95c2349e8f57c37db6b26a6a346
-EBUILD vdr-xine-0.8.2.ebuild 1324 RMD160 9e88e8dc9e334a9a1cadd09e89a3454d56e14754 SHA1 4b286b5ef4fae66301318c7b63b390f6b26e7c0d SHA256 1c642268c1cbaf8b0912131f873732608085ac7a3915bb91a367fff4ffdf2811
-EBUILD vdr-xine-0.9.0.ebuild 1404 RMD160 f1bedaee30461e67a37c23a278dc44522123a9f3 SHA1 3ecab5a6703972ed740ab143b7cc5cea0d8d7df0 SHA256 cc535e34bde9fbeb2f8869d994b28e0c93de1e50874c5efdbd93395d652d496d
-MISC ChangeLog 1841 RMD160 c95ddbe53058f181ea630fdf30ca298c08f158b2 SHA1 3fd392771cd562d2099aa1012bdcc36e8f9d74fb SHA256 fd493104420e3a61ae51a67bfa4a548f19b9be28a9f2a7ce58a2ac3ed0ef0758
-MISC metadata.xml 474 RMD160 faf31eff7beb774b4b572f5050125841822b2970 SHA1 b6a8bcd89510181fc73a7f22709eb9668f549ed5 SHA256 4f0649950b15fb67266d739311f0bf3a557b8e6505fb9bdb829e81b3953d789c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklzgS4ACgkQt2vP6XvVdOczRACgrQkwBbrDk3oBu8ky1bE+ZaTg
-7/gAnAkQ90ktGqmG02xJpqTy9zBhA+XF
-=baLd
------END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-xine/files/confd b/media-plugins/vdr-xine/files/confd
deleted file mode 100644
index d728819..0000000
--- a/media-plugins/vdr-xine/files/confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/conf.d/vdr.xine:
-
-# Global config file for vdr rc-scripts
-
-# -r:
-# Enable xine to send keys to vdr-process
-
-_EXTRAOPTS="-r"
diff --git a/media-plugins/vdr-xine/files/digest-vdr-xine-0.7.10 b/media-plugins/vdr-xine/files/digest-vdr-xine-0.7.10
deleted file mode 100644
index 908a3cf..0000000
--- a/media-plugins/vdr-xine/files/digest-vdr-xine-0.7.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0e84869de7c24ef8fa056d906907ed0b vdr-xine-0.7.10.tgz 147269
-RMD160 af780dbbf1938dd0537e9f5fc660bf10c74e4cab vdr-xine-0.7.10.tgz 147269
-SHA256 c7f9b6b50e5812f5adeaa70a39612db1b72c156264fc3a7875f311aec6e2ec1f vdr-xine-0.7.10.tgz 147269
diff --git a/media-plugins/vdr-xine/files/digest-vdr-xine-0.7.11 b/media-plugins/vdr-xine/files/digest-vdr-xine-0.7.11
deleted file mode 100644
index 4c8af13..0000000
--- a/media-plugins/vdr-xine/files/digest-vdr-xine-0.7.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3b74f3d643ddeba401c9d7b6b1eb5e3c vdr-xine-0.7.11.tgz 152889
-RMD160 a4102c5332e757b37de4d19cb44fa971e8eac574 vdr-xine-0.7.11.tgz 152889
-SHA256 3c2446c88685b4bb787ad7429b108ef5ee300b9515cf02dbee57725f26b0028e vdr-xine-0.7.11.tgz 152889
diff --git a/media-plugins/vdr-xine/files/digest-vdr-xine-0.7.9-r1 b/media-plugins/vdr-xine/files/digest-vdr-xine-0.7.9-r1
deleted file mode 100644
index a3d1953..0000000
--- a/media-plugins/vdr-xine/files/digest-vdr-xine-0.7.9-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7716059253a0eebd5c4d40f7031b34a9 vdr-xine-0.7.9.tgz 131525
-RMD160 e116ca204516e1d5660814c1efa0eeb2da8c41a2 vdr-xine-0.7.9.tgz 131525
-SHA256 99fb1b6757762c311c0aec33f218881d59914a50881f76990b3912ffad9a59ea vdr-xine-0.7.9.tgz 131525
diff --git a/media-plugins/vdr-xine/files/digest-vdr-xine-0.8.0 b/media-plugins/vdr-xine/files/digest-vdr-xine-0.8.0
deleted file mode 100644
index 0bc8595..0000000
--- a/media-plugins/vdr-xine/files/digest-vdr-xine-0.8.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d02dc74a9894a294ca669d153d3c3eb0 vdr-xine-0.8.0.tgz 192760
-RMD160 4be96674613d119640ab437f5f0d7b80f9cd7402 vdr-xine-0.8.0.tgz 192760
-SHA256 1dd9b555204621d53ead82e855c4dd84e00b82f12bbb49e8fb7ec55421ee824a vdr-xine-0.8.0.tgz 192760
diff --git a/media-plugins/vdr-xine/files/vdr-xine-0.7.10-gentoo.diff b/media-plugins/vdr-xine/files/vdr-xine-0.7.10-gentoo.diff
deleted file mode 100644
index 5aab1a3..0000000
--- a/media-plugins/vdr-xine/files/vdr-xine-0.7.10-gentoo.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur xine-0.7.10.orig/Makefile xine-0.7.10/Makefile
---- xine-0.7.10.orig/Makefile 2007-01-03 19:27:55.672892461 +0100
-+++ xine-0.7.10/Makefile 2007-01-03 19:31:23.820754133 +0100
-@@ -38,7 +38,7 @@
- INCLUDES += `xine-config --cflags`
-
- # where to create fifos (xine expects them at /tmp/vdr-xine)
--VDR_XINE_FIFO_DIR ?= /tmp/vdr-xine
-+VDR_XINE_FIFO_DIR ?= /var/vdr/xine/
-
- # enable to fully support yaepg plugin
- #VDR_XINE_SET_VIDEO_WINDOW = 1
-@@ -51,7 +51,7 @@
-
- ### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
--APIVERSION ?= $(shell (sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h ; sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) | sed -ne 1p)
-+APIVERSION ?= $(shell (sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h ; sed -ne '/define VDRVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/vdr/config.h) | sed -ne 1p)
-
- ### The name of the distribution archive:
-
-diff -Naur xine-0.7.10.orig/xineLib.c xine-0.7.10/xineLib.c
---- xine-0.7.10.orig/xineLib.c 2007-01-03 19:27:55.684893146 +0100
-+++ xine-0.7.10/xineLib.c 2007-01-03 19:42:35.759045712 +0100
-@@ -2052,7 +2052,7 @@
- ::memset(m_osdWindowSupportTransparency, 0, sizeof (m_osdWindowSupportTransparency));
- #endif
-
-- string noSignalFileName = plugin->ConfigDirectory(PLUGIN_NAME_I18N);
-+ string noSignalFileName = plugin->ConfigDirectory("../../../usr/share/vdr/xine");
- // noSignalFileName += "/noSignal.pes";
- noSignalFileName += "/noSignal.mpg";
-
diff --git a/media-plugins/vdr-xine/files/vdr-xine-0.7.10-network.diff b/media-plugins/vdr-xine/files/vdr-xine-0.7.10-network.diff
deleted file mode 100644
index 84d743a..0000000
--- a/media-plugins/vdr-xine/files/vdr-xine-0.7.10-network.diff
+++ /dev/null
@@ -1,284 +0,0 @@
-patch rewritten to fix Hunk's and Fuzz's
-basic vdr-xine-0.7.9-network.diff
-
-Joerg Bornkessel <hd_brummy@gentoo.org> 2007.01.03
-diff -Naur xine-0.7.10.orig/xine.c xine-0.7.10/xine.c
---- xine-0.7.10.orig/xine.c 2007-01-03 17:53:07.502935839 +0100
-+++ xine-0.7.10/xine.c 2007-01-03 17:56:58.600105316 +0100
-@@ -33,7 +33,7 @@
-
- public:
- PluginXine::cXineLib *m_xineLib;
-- int m_instanceNo;
-+ in_addr_t m_bindIp;
-
- cPluginXine(void);
- virtual ~cPluginXine();
-@@ -65,7 +65,7 @@
- , m_remote(0)
- , m_remoteOn(false)
- , m_xineLib(0)
-- , m_instanceNo(-1)
-+ , m_bindIp(0)
- {
- // Initialize any member variables here.
- // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
-@@ -82,7 +82,7 @@
- //Return a string that describes all known command line options.
- //" - -- x \n"
- return
-- " -i N instance number to append to FIFO directory\n"
-+ " -i ip ip address to bind to\n"
- " -q turn off debug messages on console\n"
- " -r turn on remote (pressing keys in xine controls VDR)\n"
- #if APIVERSNUM >= 10320
-@@ -106,11 +106,9 @@
- {
- case 'i':
- {
-- const int no = ::atoi(::optarg);
-- if (no < 0)
-+ m_bindIp = inet_addr(::optarg);
-+ if (m_bindIp == INADDR_NONE)
- return false;
--
-- m_instanceNo = no;
- }
- break;
-
-@@ -259,9 +257,9 @@
-
- namespace PluginXine
- {
-- int GetInstanceNo(cPlugin *const plugin)
-+ int GetBindIp(cPlugin *const plugin)
- {
-- return ((cPluginXine *)plugin)->m_instanceNo;
-+ return ((cPluginXine *)plugin)->m_bindIp;
- }
-
- cXineLib *&GetXineLib(cPlugin *const plugin)
-diff -Naur xine-0.7.10.orig/xineLib.c xine-0.7.10/xineLib.c
---- xine-0.7.10.orig/xineLib.c 2007-01-03 17:53:07.510936296 +0100
-+++ xine-0.7.10/xineLib.c 2007-01-03 18:08:55.626772628 +0100
-@@ -1985,7 +1985,7 @@
-
- #endif
-
-- extern int GetInstanceNo(cPlugin *const plugin);
-+ extern int GetBindIp(cPlugin *const plugin);
- extern cXineLib *&GetXineLib(cPlugin *const plugin);
-
- cXineLib::cXineLib(cPlugin *const plugin, const cXineSettings &settings, cMutex &osdMutex, cXineRemote *const remote)
-@@ -1993,6 +1993,10 @@
- , m_plugin(plugin)
- , m_settings(settings)
- , m_osdFlushRequired(false)
-+ , fd_fifo0_serv(-1)
-+ , fd_result_serv(-1)
-+ , fd_control_serv(-1)
-+ , fd_remote_serv(-1)
- , fd_fifo0(-1)
- , fd_result(-1)
- , fd_control(-1)
-@@ -2011,13 +2015,8 @@
- {
- m_fifoDir = FIFO_DIR;
-
-- if (GetInstanceNo(plugin) >= 0)
-- {
-- char s[ 20 ];
-- ::sprintf(s, "%d", GetInstanceNo(plugin));
--
-- m_fifoDir += s;
-- }
-+ m_bindIp = GetBindIp(plugin);
-+ m_fifoDir += itoa(m_bindIp);
-
- m_fifoNameControl = m_fifoDir + "/stream.control";
- m_fifoNameResult = m_fifoDir + "/stream.result";
-@@ -2113,9 +2112,37 @@
- m_eventSink = eventSink;
- }
-
-+ int cXineLib::CreateServerSocket(unsigned short port)
-+ {
-+ int fd;
-+ int onoff = 1;
-+ struct sockaddr_in sain;
-+
-+ if ((fd = ::socket(PF_INET,SOCK_STREAM,0)) < 0) {
-+ perror("socket failed.");
-+ return -1;
-+ }
-+
-+ sain.sin_addr.s_addr = m_bindIp;
-+ sain.sin_port = htons(port);
-+
-+ ::setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,&onoff, sizeof(int) );
-+
-+ if (::bind(fd,(struct sockaddr*)&sain, sizeof(sain)) != 0) {
-+ perror("bind failed.");
-+ return -1;
-+ }
-+
-+ if (::listen(fd,1) != 0) {
-+ printf("listen failed.");
-+ return -1;
-+ }
-+ return fd;
-+ }
-+
- bool cXineLib::Open()
- {
-- ::unlink(m_fifoNameExtControl.c_str());
-+/* ::unlink(m_fifoNameExtControl.c_str());
- ::unlink(m_fifoNameExtResult.c_str());
- ::unlink(m_fifoNameControl.c_str());
- ::unlink(m_fifoNameResult.c_str());
-@@ -2132,6 +2159,7 @@
- perror(msg.c_str()); \
- esyslog("%s", msg.c_str()); \
- ::umask(origUmask); \
-+
- return false; \
- } } while (0)
-
-@@ -2154,7 +2182,27 @@
- #undef MkFifo
-
- ::umask(origUmask);
--
-+*/
-+/*
-+{ .path = FIFO_STREAM, .mode = 0644, .port = 18701 },
-+{ .path = FIFO_STREAM_CONTROL, .mode = 0644, .port = 18702 },
-+{ .path = FIFO_STREAM_RESULT, .mode = 0666, .port = 18703 },
-+{ .path = FIFO_STREAM_EVENT, .mode = 0666, .port = 18704 },
-+
-+*/
-+ /* sockets - create the server sockets */
-+ if ((fd_fifo0_serv = CreateServerSocket(18701)) == -1)
-+ return false;
-+
-+ if ((fd_control_serv = CreateServerSocket(18702)) == -1)
-+ return false;
-+
-+ if ((fd_result_serv = CreateServerSocket(18703)) == -1)
-+ return false;
-+
-+ if ((fd_remote_serv = CreateServerSocket(18704)) == -1)
-+ return false;
-+
- if (!Start())
- return false;
-
-@@ -2179,13 +2227,18 @@
- disconnect();
- }
-
-- ::unlink(m_fifoNameExtControl.c_str());
-+/* ::unlink(m_fifoNameExtControl.c_str());
- ::unlink(m_fifoNameExtResult.c_str());
- ::unlink(m_fifoNameControl.c_str());
- ::unlink(m_fifoNameResult.c_str());
- ::unlink(m_fifoNameRemote.c_str());
- ::unlink(m_fifoNameStream.c_str());
-- ::rmdir(m_fifoDir.c_str());
-+ ::rmdir(m_fifoDir.c_str()); */
-+
-+ ::close(fd_remote_serv);
-+ ::close(fd_result_serv);
-+ ::close(fd_control_serv);
-+ ::close(fd_fifo0_serv);
- }
-
- void cXineLib::internalPaused(const bool paused)
-@@ -2437,6 +2490,27 @@
-
- // fprintf(stderr, "Action done\n");
- }
-+
-+int cXineLib::SocketAcceptHelper(int fd)
-+{
-+ // use cPoller for checking server socket for incoming requests
-+ cPoller poller(fd,0); /* POLLIN */
-+ struct sockaddr sain;
-+ socklen_t len = sizeof(sain);
-+ int client;
-+
-+// ::fprintf(stderr,"vdr-xine: polling for connection on %d...\n",fd);
-+ if (!poller.Poll(100))
-+ return -1;
-+
-+// ::fprintf(stderr,"vdr-xine: incoming requests on %d\n",fd);
-+ if ((client = ::accept(fd,(struct sockaddr *) &sain,&len)) == -1) {
-+ ::fprintf(stderr,"vdr-xine: fifo0 failed to accept...\n");
-+ return -1;
-+ }
-+// ::fprintf(stderr,"vdr-xine: successful request on %d (client: %d)\n",fd,client);
-+ return client;
-+}
-
- bool cXineLib::checkXineVersion()
- {
-@@ -2458,6 +2532,7 @@
-
- // if (-1 == fd_fifo0)
- // {
-+/*
- fd_fifo0 = ::open(m_fifoNameStream.c_str(), O_WRONLY | O_NONBLOCK);
- if (-1 == fd_fifo0)
- return false;
-@@ -2473,7 +2548,24 @@
-
- ::fcntl(fd_fifo0 , F_SETFL, ~O_NONBLOCK & ::fcntl(fd_fifo0 , F_GETFL, 0));
- ::fcntl(fd_remote, F_SETFL, ~O_NONBLOCK & ::fcntl(fd_remote, F_GETFL, 0));
--
-+*/
-+ /* sockets */
-+
-+ if (fd_fifo0_serv == -1)
-+ return false;
-+
-+ if ((fd_fifo0 = SocketAcceptHelper(fd_fifo0_serv)) == -1)
-+ return false;
-+
-+ if ((fd_control = SocketAcceptHelper(fd_control_serv)) == -1)
-+ return false;
-+
-+ if ((fd_result = SocketAcceptHelper(fd_result_serv)) == -1)
-+ return false;
-+
-+ if ((fd_remote = SocketAcceptHelper(fd_remote_serv)) == -1)
-+ return false;
-+
- internalPaused(false);
-
- m_frozen = false;
-diff -Naur xine-0.7.10.orig/xineLib.h xine-0.7.10/xineLib.h
---- xine-0.7.10.orig/xineLib.h 2007-01-03 17:53:07.510936296 +0100
-+++ xine-0.7.10/xineLib.h 2007-01-03 18:11:13.306618554 +0100
-@@ -88,6 +88,7 @@
- string m_fifoNameStream;
- string m_fifoNameExtControl;
- string m_fifoNameExtResult;
-+ in_addr_t m_bindIp;
-
- private:
- cPlugin *const m_plugin;
-@@ -139,8 +140,13 @@
- return fd_remote;
- }
-
-- private:
-+ private:
-+ /* sockets */
-+ int CreateServerSocket(unsigned short port);
-+ int SocketAcceptHelper(int fd);
-+ int fd_fifo0_serv, fd_result_serv, fd_control_serv, fd_remote_serv;
- int fd_fifo0, fd_result, fd_control, fd_remote;
-+
- cMutex m_ioMutex, m_dataMutex, m_disconnectMutex;
- cMutex &m_osdMutex;
-
diff --git a/media-plugins/vdr-xine/files/vdr-xine-0.7.11-gentoo.diff b/media-plugins/vdr-xine/files/vdr-xine-0.7.11-gentoo.diff
deleted file mode 100644
index 527325d..0000000
--- a/media-plugins/vdr-xine/files/vdr-xine-0.7.11-gentoo.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: xine-0.7.11/Makefile
-===================================================================
---- xine-0.7.11.orig/Makefile
-+++ xine-0.7.11/Makefile
-@@ -36,7 +36,7 @@ TMPDIR = /tmp
- INCLUDES += `xine-config --cflags`
-
- # where to create fifos (xine expects them at /tmp/vdr-xine)
--VDR_XINE_FIFO_DIR ?= /tmp/vdr-xine
-+VDR_XINE_FIFO_DIR ?= /var/vdr/xine
-
- # enable to fully support yaepg plugin
- #VDR_XINE_SET_VIDEO_WINDOW = 1
-Index: xine-0.7.11/xineLib.c
-===================================================================
---- xine-0.7.11.orig/xineLib.c
-+++ xine-0.7.11/xineLib.c
-@@ -2053,7 +2053,7 @@ namespace PluginXine
- ::memset(m_osdWindowSupportTransparency, 0, sizeof (m_osdWindowSupportTransparency));
- #endif
-
-- string noSignalFileName = plugin->ConfigDirectory(PLUGIN_NAME_I18N);
-+ string noSignalFileName = "/usr/share/vdr/xine";
- // noSignalFileName += "/noSignal.pes";
- noSignalFileName += "/noSignal.mpg";
-
diff --git a/media-plugins/vdr-xine/files/vdr-xine-0.7.11_gcc-4.2.x-compilefix.diff b/media-plugins/vdr-xine/files/vdr-xine-0.7.11_gcc-4.2.x-compilefix.diff
deleted file mode 100644
index 8f84284..0000000
--- a/media-plugins/vdr-xine/files/vdr-xine-0.7.11_gcc-4.2.x-compilefix.diff
+++ /dev/null
@@ -1,64 +0,0 @@
-fix some compile warnings with gcc-4.2.x
-
-Joerg Bornkessel <hd_brummy@gentoo.org> 2007 Sep 04
-Matthias Schwarzott <zzam@gentoo.org> 2007 Sep 04
-Index: xine-0.7.11/xineLib.c
-===================================================================
---- xine-0.7.11.orig/xineLib.c
-+++ xine-0.7.11/xineLib.c
-@@ -2273,9 +2273,9 @@ namespace PluginXine
-
- int cXineLib::xwrite(int f, const void *b, int n)
- {
-- char *yyy[] = { "i", "I", "d", "D" };
-+ const char *yyy[] = { "i", "I", "d", "D" };
- // char *yyy[] = { "", "", "d", "D" };
-- char **xxx = yyy;
-+ const char **xxx = yyy;
- if (f == fd_fifo0)
- xxx += 2;
-
-Index: xine-0.7.11/xineSettings.c
-===================================================================
---- xine-0.7.11.orig/xineSettings.c
-+++ xine-0.7.11/xineSettings.c
-@@ -514,7 +514,7 @@ namespace PluginXine
- setupPage->SetupStore("image16:9.zoomY", m_zoomParams[ image16_9 ].m_zoomY);
-
- {
-- char *mode = 0;
-+ const char *mode = 0;
-
- switch (m_osdMode)
- {
-@@ -537,7 +537,7 @@ namespace PluginXine
- #endif
-
- {
-- char *mode = 0;
-+ const char *mode = 0;
-
- switch (m_volumeMode)
- {
-@@ -550,7 +550,7 @@ namespace PluginXine
- }
-
- {
-- char *mode = 0;
-+ const char *mode = 0;
-
- switch (m_muteMode)
- {
-Index: xine-0.7.11/xineplayer.c
-===================================================================
---- xine-0.7.11.orig/xineplayer.c
-+++ xine-0.7.11/xineplayer.c
-@@ -6,7 +6,7 @@
- static int fdControl = -1;
- static int fdResult = -1;
-
--bool writeString(char *s)
-+bool writeString(const char *s)
- {
- int l = ::strlen(s);
-
diff --git a/media-plugins/vdr-xine/files/vdr-xine-0.7.9-network.diff b/media-plugins/vdr-xine/files/vdr-xine-0.7.9-network.diff
deleted file mode 100644
index f34be76..0000000
--- a/media-plugins/vdr-xine/files/vdr-xine-0.7.9-network.diff
+++ /dev/null
@@ -1,273 +0,0 @@
--------------- next part --------------
-diff -Nru xine-0.7.7.orig/xine.c xine-0.7.7/xine.c
---- xine-0.7.7.orig/xine.c 2006-01-15 00:47:12.000000000 +0100
-+++ xine-0.7.7/xine.c 2006-02-20 17:36:48.000000000 +0100
-@@ -33,7 +33,7 @@
-
- public:
- PluginXine::cXineLib *m_xineLib;
-- int m_instanceNo;
-+ in_addr_t m_bindIp;
-
- cPluginXine(void);
- virtual ~cPluginXine();
-@@ -56,7 +56,7 @@
- , m_remote(0)
- , m_remoteOn(false)
- , m_xineLib(0)
-- , m_instanceNo(-1)
-+ , m_bindIp(0)
- {
- // Initialize any member variables here.
- // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL
-@@ -73,7 +73,7 @@
- //Return a string that describes all known command line options.
- //" - -- x \n"
- return
-- " -i N instance number to append to FIFO directory\n"
-+ " -i ip ip address to bind to\n"
- " -q turn off debug messages on console\n"
- " -r turn on remote (pressing keys in xine controls VDR)\n"
- " -s switch to curses skin, while xine is disconnected\n"
-@@ -93,11 +93,9 @@
- {
- case 'i':
- {
-- const int no = ::atoi(::optarg);
-- if (no < 0)
-+ m_bindIp = inet_addr(::optarg);
-+ if (m_bindIp == INADDR_NONE)
- return false;
--
-- m_instanceNo = no;
- }
- break;
-
-@@ -203,9 +201,9 @@
-
- namespace PluginXine
- {
-- int GetInstanceNo(cPlugin *const plugin)
-+ int GetBindIp(cPlugin *const plugin)
- {
-- return ((cPluginXine *)plugin)->m_instanceNo;
-+ return ((cPluginXine *)plugin)->m_bindIp;
- }
-
- cXineLib *&GetXineLib(cPlugin *const plugin)
-diff -Nru xine-0.7.7.orig/xineLib.c xine-0.7.7/xineLib.c
---- xine-0.7.7.orig/xineLib.c 2006-02-12 22:36:48.000000000 +0100
-+++ xine-0.7.7/xineLib.c 2006-02-20 18:06:02.000000000 +0100
-@@ -1847,7 +1847,7 @@
-
- #endif
-
-- extern int GetInstanceNo(cPlugin *const plugin);
-+ extern int GetBindIp(cPlugin *const plugin);
- extern cXineLib *&GetXineLib(cPlugin *const plugin);
-
- cXineLib::cXineLib(cPlugin *const plugin, const cXineSettings &settings, cMutex &osdMutex, cXineRemote *const remote)
-@@ -1855,6 +1855,10 @@
- , m_plugin(plugin)
- , m_settings(settings)
- , m_osdFlushRequired(false)
-+ , fd_fifo0_serv(-1)
-+ , fd_result_serv(-1)
-+ , fd_control_serv(-1)
-+ , fd_remote_serv(-1)
- , fd_fifo0(-1)
- , fd_result(-1)
- , fd_control(-1)
-@@ -1873,14 +1877,9 @@
- {
- m_fifoDir = FIFO_DIR;
-
-- if (GetInstanceNo(plugin) >= 0)
-- {
-- char s[ 20 ];
-- ::sprintf(s, "%d", GetInstanceNo(plugin));
--
-- m_fifoDir += s;
-- }
--
-+ m_bindIp = GetBindIp(plugin);
-+ m_fifoDir += itoa(m_bindIp);
-+
- m_fifoNameControl = m_fifoDir + "/stream.control";
- m_fifoNameResult = m_fifoDir + "/stream.result";
- m_fifoNameRemote = m_fifoDir + "/stream.event";
-@@ -1962,9 +1961,37 @@
- m_eventSink = eventSink;
- }
-
-+ int cXineLib::CreateServerSocket(unsigned short port)
-+ {
-+ int fd;
-+ int onoff = 1;
-+ struct sockaddr_in sain;
-+
-+ if ((fd = ::socket(PF_INET,SOCK_STREAM,0)) < 0) {
-+ perror("socket failed.");
-+ return -1;
-+ }
-+
-+ sain.sin_addr.s_addr = m_bindIp;
-+ sain.sin_port = htons(port);
-+
-+ ::setsockopt(fd,SOL_SOCKET,SO_REUSEADDR,&onoff, sizeof(int) );
-+
-+ if (::bind(fd,(struct sockaddr*)&sain, sizeof(sain)) != 0) {
-+ perror("bind failed.");
-+ return -1;
-+ }
-+
-+ if (::listen(fd,1) != 0) {
-+ printf("listen failed.");
-+ return -1;
-+ }
-+ return fd;
-+ }
-+
- bool cXineLib::Open()
- {
-- ::unlink(m_fifoNameExtControl.c_str());
-+/* ::unlink(m_fifoNameExtControl.c_str());
- ::unlink(m_fifoNameExtResult.c_str());
- ::unlink(m_fifoNameControl.c_str());
- ::unlink(m_fifoNameResult.c_str());
-@@ -2003,6 +2030,26 @@
- #undef MkFifo
-
- ::umask(origUmask);
-+*/
-+/*
-+{ .path = FIFO_STREAM, .mode = 0644, .port = 18701 },
-+{ .path = FIFO_STREAM_CONTROL, .mode = 0644, .port = 18702 },
-+{ .path = FIFO_STREAM_RESULT, .mode = 0666, .port = 18703 },
-+{ .path = FIFO_STREAM_EVENT, .mode = 0666, .port = 18704 },
-+
-+*/
-+ /* sockets - create the server sockets */
-+ if ((fd_fifo0_serv = CreateServerSocket(18701)) == -1)
-+ return false;
-+
-+ if ((fd_control_serv = CreateServerSocket(18702)) == -1)
-+ return false;
-+
-+ if ((fd_result_serv = CreateServerSocket(18703)) == -1)
-+ return false;
-+
-+ if ((fd_remote_serv = CreateServerSocket(18704)) == -1)
-+ return false;
-
- if (!Start())
- return false;
-@@ -2028,13 +2075,18 @@
- disconnect();
- }
-
-- ::unlink(m_fifoNameExtControl.c_str());
-+/* ::unlink(m_fifoNameExtControl.c_str());
- ::unlink(m_fifoNameExtResult.c_str());
- ::unlink(m_fifoNameControl.c_str());
- ::unlink(m_fifoNameResult.c_str());
- ::unlink(m_fifoNameRemote.c_str());
- ::unlink(m_fifoNameStream.c_str());
-- ::rmdir(m_fifoDir.c_str());
-+ ::rmdir(m_fifoDir.c_str()); */
-+
-+ ::close(fd_remote_serv);
-+ ::close(fd_result_serv);
-+ ::close(fd_control_serv);
-+ ::close(fd_fifo0_serv);
- }
-
- void cXineLib::internalPaused(const bool paused)
-@@ -2286,6 +2338,28 @@
- // fprintf(stderr, "Action done\n");
- }
-
-+int cXineLib::SocketAcceptHelper(int fd)
-+{
-+ // use cPoller for checking server socket for incoming requests
-+ cPoller poller(fd,0); /* POLLIN */
-+ struct sockaddr sain;
-+ socklen_t len = sizeof(sain);
-+ int client;
-+
-+// ::fprintf(stderr,"vdr-xine: polling for connection on %d...\n",fd);
-+ if (!poller.Poll(100))
-+ return -1;
-+
-+// ::fprintf(stderr,"vdr-xine: incoming requests on %d\n",fd);
-+ if ((client = ::accept(fd,(struct sockaddr *) &sain,&len)) == -1) {
-+ ::fprintf(stderr,"vdr-xine: fifo0 failed to accept...\n");
-+ return -1;
-+ }
-+// ::fprintf(stderr,"vdr-xine: successful request on %d (client: %d)\n",fd,client);
-+ return client;
-+}
-+
-+
- bool cXineLib::checkXineVersion()
- {
- int32_t version = 0;
-@@ -2306,7 +2380,8 @@
-
- // if (-1 == fd_fifo0)
- // {
-- fd_fifo0 = ::open(m_fifoNameStream.c_str(), O_WRONLY | O_NONBLOCK);
-+/*
-+ fd_fifo0 = ::open(m_fifoNameStream.c_str(), O_WRONLY | O_NONBLOCK);
- if (-1 == fd_fifo0)
- return false;
-
-@@ -2321,6 +2396,23 @@
-
- ::fcntl(fd_fifo0 , F_SETFL, ~O_NONBLOCK & ::fcntl(fd_fifo0 , F_GETFL, 0));
- ::fcntl(fd_remote, F_SETFL, ~O_NONBLOCK & ::fcntl(fd_remote, F_GETFL, 0));
-+*/
-+ /* sockets */
-+
-+ if (fd_fifo0_serv == -1)
-+ return false;
-+
-+ if ((fd_fifo0 = SocketAcceptHelper(fd_fifo0_serv)) == -1)
-+ return false;
-+
-+ if ((fd_control = SocketAcceptHelper(fd_control_serv)) == -1)
-+ return false;
-+
-+ if ((fd_result = SocketAcceptHelper(fd_result_serv)) == -1)
-+ return false;
-+
-+ if ((fd_remote = SocketAcceptHelper(fd_remote_serv)) == -1)
-+ return false;
-
- internalPaused(false);
-
-diff -Nru xine-0.7.7.orig/xineLib.h xine-0.7.7/xineLib.h
---- xine-0.7.7.orig/xineLib.h 2006-02-03 22:16:46.000000000 +0100
-+++ xine-0.7.7/xineLib.h 2006-02-20 17:36:48.000000000 +0100
-@@ -88,6 +88,7 @@
- string m_fifoNameStream;
- string m_fifoNameExtControl;
- string m_fifoNameExtResult;
-+ in_addr_t m_bindIp;
-
- private:
- cPlugin *const m_plugin;
-@@ -137,7 +138,13 @@
- }
-
- private:
-+ /* sockets */
-+ int CreateServerSocket(unsigned short port);
-+ int SocketAcceptHelper(int fd);
-+ int fd_fifo0_serv, fd_result_serv, fd_control_serv, fd_remote_serv;
- int fd_fifo0, fd_result, fd_control, fd_remote;
-+
-+
- cMutex m_ioMutex, m_dataMutex, m_disconnectMutex;
- cMutex &m_osdMutex;
-
diff --git a/media-plugins/vdr-xine/files/vdr-xine-0.8.0-gentoo.diff b/media-plugins/vdr-xine/files/vdr-xine-0.8.0-gentoo.diff
deleted file mode 100644
index 527325d..0000000
--- a/media-plugins/vdr-xine/files/vdr-xine-0.8.0-gentoo.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: xine-0.7.11/Makefile
-===================================================================
---- xine-0.7.11.orig/Makefile
-+++ xine-0.7.11/Makefile
-@@ -36,7 +36,7 @@ TMPDIR = /tmp
- INCLUDES += `xine-config --cflags`
-
- # where to create fifos (xine expects them at /tmp/vdr-xine)
--VDR_XINE_FIFO_DIR ?= /tmp/vdr-xine
-+VDR_XINE_FIFO_DIR ?= /var/vdr/xine
-
- # enable to fully support yaepg plugin
- #VDR_XINE_SET_VIDEO_WINDOW = 1
-Index: xine-0.7.11/xineLib.c
-===================================================================
---- xine-0.7.11.orig/xineLib.c
-+++ xine-0.7.11/xineLib.c
-@@ -2053,7 +2053,7 @@ namespace PluginXine
- ::memset(m_osdWindowSupportTransparency, 0, sizeof (m_osdWindowSupportTransparency));
- #endif
-
-- string noSignalFileName = plugin->ConfigDirectory(PLUGIN_NAME_I18N);
-+ string noSignalFileName = "/usr/share/vdr/xine";
- // noSignalFileName += "/noSignal.pes";
- noSignalFileName += "/noSignal.mpg";
-
diff --git a/media-plugins/vdr-xine/files/vdr-xine-0.9.0-gentoo.diff b/media-plugins/vdr-xine/files/vdr-xine-0.9.0-gentoo.diff
deleted file mode 100644
index f1bf6f3..0000000
--- a/media-plugins/vdr-xine/files/vdr-xine-0.9.0-gentoo.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru xine-0.9.0-orig/Makefile xine-0.9.0/Makefile
---- xine-0.9.0-orig/Makefile 2009-01-18 17:40:13.228935882 +0100
-+++ xine-0.9.0/Makefile 2009-01-18 17:40:39.315595879 +0100
-@@ -37,7 +37,7 @@
- INCLUDES += `pkg-config --cflags libxine`
-
- # where to create fifos (xine expects them at /tmp/vdr-xine)
--VDR_XINE_FIFO_DIR ?= /tmp/vdr-xine
-+VDR_XINE_FIFO_DIR ?= /var/vdr/xine
-
- # can be used to detect inefficient OSD drawing
- # 0 - do not verify whether the dirty area of a bitmap is really dirty
-diff -ru xine-0.9.0-orig/xineLib.c xine-0.9.0/xineLib.c
---- xine-0.9.0-orig/xineLib.c 2009-01-18 17:40:13.228935882 +0100
-+++ xine-0.9.0/xineLib.c 2009-01-18 17:41:28.815595331 +0100
-@@ -2118,7 +2118,7 @@
-
- bool cXineLib::readNoSignalStream(const int index, const string &suffix)
- {
-- string noSignalFileName = m_plugin->ConfigDirectory(PLUGIN_NAME_I18N);
-+ string noSignalFileName = "/usr/share/vdr/xine";
- // noSignalFileName += "/noSignal.pes";
- noSignalFileName += "/noSignal" + suffix + ".mpg";
-
diff --git a/media-plugins/vdr-xine/metadata.xml b/media-plugins/vdr-xine/metadata.xml
deleted file mode 100644
index 02cb730..0000000
--- a/media-plugins/vdr-xine/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
- <email>vdr@gentoo.org</email>
- <name>Gentoo VDR Project</name>
- </maintainer>
- <use>
- <flag name="vdr-net">use network connection to VDR instead of local socket</flag>
- <flag name="yaepg">Enables support for the plugin vdr-yaepg (showing scaled video besides OSD)</flag>
- </use>
-</pkgmetadata>
-
diff --git a/media-plugins/vdr-xine/vdr-xine-0.7.10.ebuild b/media-plugins/vdr-xine/vdr-xine-0.7.10.ebuild
deleted file mode 100644
index 42ef33d..0000000
--- a/media-plugins/vdr-xine/vdr-xine-0.7.10.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: for 'software only' playback using xine"
-HOMEPAGE="http://home.vr-web.de/~rnissl/"
-SRC_URI="http://home.vr-web.de/~rnissl/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE="vdr-net"
-
-DEPEND=">=media-video/vdr-1.3.9
- >=media-libs/xine-lib-1.1.3"
-
-pkg_setup() {
- vdr-plugin_pkg_setup
-
- if [[ -f /usr/include/xine/input_vdr.h ]] ; then
- einfo "detected vdr-patched xine-lib."
- else
- echo
- eerror "detected unpatched xine-lib!"
- echo
- einfo "you need to reemerge xine-lib with use-flag vdr!"
- einfo "you will find a VDR supported xine-lib ONLY on overlay vdr-testing"
- die "you need to reemerge xine-lib with use-flag vdr!"
- fi
-}
-
-src_unpack() {
- vdr-plugin_src_unpack
-
- epatch "${FILESDIR}/${P}-gentoo.diff"
-
- use vdr-net && epatch "${FILESDIR}/${P}-network.diff"
-}
-
-src_install() {
- vdr-plugin_src_install
-
- dobin xineplayer
-
- insinto /usr/share/vdr/xine
- doins data/*
-}
-
-pkg_postinst() {
- vdr-plugin_pkg_postinst
-
- if [[ -d ${ROOT}/etc/vdr/plugins/xine ]]; then
- ewarn "You have a leftover directory of vdr-xine."
- ewarn "You can safely remove it with:"
- ewarn "# rm -rf /etc/vdr/plugins/xine"
- fi
-}
diff --git a/media-plugins/vdr-xine/vdr-xine-0.7.11.ebuild b/media-plugins/vdr-xine/vdr-xine-0.7.11.ebuild
deleted file mode 100644
index a2c1256..0000000
--- a/media-plugins/vdr-xine/vdr-xine-0.7.11.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: for 'software only' playback using xine"
-HOMEPAGE="http://home.vr-web.de/~rnissl/"
-SRC_URI="http://home.vr-web.de/~rnissl/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE="vdr-net"
-
-DEPEND=">=media-video/vdr-1.3.9
- >=media-libs/xine-lib-1.1.8"
-
-pkg_setup() {
- vdr-plugin_pkg_setup
-
- if [[ -f /usr/include/xine/input_vdr.h ]] ; then
- einfo "detected vdr-patched xine-lib."
- else
- echo
- eerror "detected unpatched xine-lib!"
- echo
- einfo "you need to reemerge xine-lib with use-flag vdr!"
- einfo "you will find a VDR supported xine-lib ONLY on overlay vdr-testing"
- die "you need to reemerge xine-lib with use-flag vdr!"
- fi
-}
-
-src_unpack() {
- vdr-plugin_src_unpack
-
- epatch "${FILESDIR}/${P}-gentoo.diff"
- epatch "${FILESDIR}/${P}_gcc-4.2.x-compilefix.diff"
-
- use vdr-net && epatch "${FILESDIR}/${PN}-0.7.10-network.diff"
-}
-
-src_install() {
- vdr-plugin_src_install
-
- dobin xineplayer
-
- insinto /usr/share/vdr/xine
- doins data/*
-}
-
-pkg_postinst() {
- vdr-plugin_pkg_postinst
-
- if [[ -d ${ROOT}/etc/vdr/plugins/xine ]]; then
- ewarn "You have a leftover directory of vdr-xine."
- ewarn "You can safely remove it with:"
- ewarn "# rm -rf /etc/vdr/plugins/xine"
- fi
-}
diff --git a/media-plugins/vdr-xine/vdr-xine-0.7.9-r1.ebuild b/media-plugins/vdr-xine/vdr-xine-0.7.9-r1.ebuild
deleted file mode 100644
index 8add4a8..0000000
--- a/media-plugins/vdr-xine/vdr-xine-0.7.9-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-xine/vdr-xine-0.7.9-r1.ebuild,v 1.1 2006/07/01 14:52:37 hd_brummy Exp $
-
-RESTRICT="mirror"
-
-inherit vdr-plugin
-
-DESCRIPTION="Video Disk Recorder Xine PlugIn"
-HOMEPAGE="http://home.vr-web.de/~rnissl/"
-SRC_URI="http://home.vr-web.de/~rnissl/${P}.tgz
- http://home.vr-web.de/~rnissl/attic/${P}.tgz
- mirror://vdrfiles/${PN}/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-IUSE="vdr-net"
-
-DEPEND=">=media-video/vdr-1.3.9
- >=media-libs/xine-lib-1.1.3"
-
-src_unpack() {
- vdr-plugin_src_unpack
-
- use vdr-net && epatch "${FILESDIR}/${P}-network.diff"
-
- sed -i "s/^VDR_XINE_FIFO_DIR.*$/VDR_XINE_FIFO_DIR = \/var\/vdr\/xine/" "${S}"/Makefile
-
- sed -i "s:config.h):vdr/config.h):" "${S}"/Makefile
-
- if [[ -f /usr/include/xine/input_vdr.h ]] ; then
- einfo "detected vdr-patched xine-lib."
- else
- eerror "detected unpatched xine-lib!"
- einfo "you need to reemerge xine-lib with use-flag vdr!"
- die "you need to reemerge xine-lib with use-flag vdr!"
- fi
-}
-
-src_install() {
- vdr-plugin_src_install
-
- cd "${S}"
- exeinto /usr/bin
- doexe xineplayer
-
- insopts -m0644 -ovdr -gvideo
- insinto /etc/vdr/plugins/xine
- doins data/*
-
- diropts -ovdr -gvideo
- keepdir /var/vdr
-}
-
diff --git a/media-plugins/vdr-xine/vdr-xine-0.8.0.ebuild b/media-plugins/vdr-xine/vdr-xine-0.8.0.ebuild
deleted file mode 100644
index 385aa0a..0000000
--- a/media-plugins/vdr-xine/vdr-xine-0.8.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: for 'software only' playback using xine"
-HOMEPAGE="http://home.vr-web.de/~rnissl/"
-SRC_URI="http://home.vr-web.de/~rnissl/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-IUSE="yaepg"
-
-DEPEND=">=media-video/vdr-1.3.9
- >=media-libs/xine-lib-1.1.8"
-
-pkg_setup() {
- vdr-plugin_pkg_setup
-
- if [[ -f /usr/include/xine/input_vdr.h ]] ; then
- einfo "detected vdr-patched xine-lib."
- else
- echo
- eerror "detected unpatched xine-lib!"
- echo
- einfo "you need to reemerge xine-lib with use-flag vdr!"
- einfo "you will find a VDR supported xine-lib ONLY on overlay vdr-testing"
- die "you need to reemerge xine-lib with use-flag vdr!"
- fi
-}
-
-src_unpack() {
- vdr-plugin_src_unpack
-
- epatch "${FILESDIR}/${P}-gentoo.diff"
-
- use yaepg && sed -i Makefile -e "s:#VDR_XINE_SET_VIDEO_WINDOW:VDR_XINE_SET_VIDEO_WINDOW:"
-}
-
-src_install() {
- vdr-plugin_src_install
-
- dobin xineplayer
-
- insinto /usr/share/vdr/xine
- doins data/*
-}
-
-pkg_postinst() {
- vdr-plugin_pkg_postinst
-
- if [[ -d ${ROOT}/etc/vdr/plugins/xine ]]; then
- ewarn "You have a leftover directory of vdr-xine."
- ewarn "You can safely remove it with:"
- ewarn "# rm -rf /etc/vdr/plugins/xine"
- fi
-}
diff --git a/media-plugins/vdr-xine/vdr-xine-0.8.2.ebuild b/media-plugins/vdr-xine/vdr-xine-0.8.2.ebuild
deleted file mode 100644
index 99cbf7b..0000000
--- a/media-plugins/vdr-xine/vdr-xine-0.8.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: for 'software only' playback using xine"
-HOMEPAGE="http://home.vr-web.de/~rnissl/"
-SRC_URI="http://home.vr-web.de/~rnissl/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="yaepg"
-
-DEPEND=">=media-video/vdr-1.3.9
- >=media-libs/xine-lib-1.1.8"
-
-pkg_setup() {
- vdr-plugin_pkg_setup
-
- if [[ -f /usr/include/xine/vdr.h ]] ; then
- einfo "detected vdr-patched xine-lib."
- else
- echo
- eerror "detected unpatched xine-lib!"
- echo
- einfo "you need to reemerge xine-lib with use-flag vdr!"
- einfo "you will find a VDR supported xine-lib ONLY on overlay vdr-testing"
- die "you need to reemerge xine-lib with use-flag vdr!"
- fi
-}
-
-src_unpack() {
- vdr-plugin_src_unpack
-
- epatch "${FILESDIR}/${PN}-0.8.0-gentoo.diff"
-
- use yaepg && sed -i Makefile -e "s:#VDR_XINE_SET_VIDEO_WINDOW:VDR_XINE_SET_VIDEO_WINDOW:"
-}
-
-src_install() {
- vdr-plugin_src_install
-
- dobin xineplayer
-
- insinto /usr/share/vdr/xine
- doins data/*
-}
-
-pkg_postinst() {
- vdr-plugin_pkg_postinst
-
- if [[ -d ${ROOT}/etc/vdr/plugins/xine ]]; then
- ewarn "You have a leftover directory of vdr-xine."
- ewarn "You can safely remove it with:"
- ewarn "# rm -rf /etc/vdr/plugins/xine"
- fi
-}
diff --git a/media-plugins/vdr-xine/vdr-xine-0.9.0.ebuild b/media-plugins/vdr-xine/vdr-xine-0.9.0.ebuild
deleted file mode 100644
index c66caef..0000000
--- a/media-plugins/vdr-xine/vdr-xine-0.9.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit vdr-plugin
-
-DESCRIPTION="VDR plugin: for 'software only' playback using xine"
-HOMEPAGE="http://home.vr-web.de/~rnissl/"
-SRC_URI="http://home.vr-web.de/~rnissl/${P}.tgz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="yaepg"
-
-DEPEND=">=media-video/vdr-1.3.9
- >=media-libs/xine-lib-1.1.8[vdr]"
-
-pkg_setup() {
- vdr-plugin_pkg_setup
-
- # we have use depend now, but better check it nevertheless :)
- if [[ -f /usr/include/xine/vdr.h ]] ; then
- einfo "detected vdr-patched xine-lib."
- else
- echo
- eerror "detected unpatched xine-lib!"
- echo
- einfo "you need to reemerge xine-lib with use-flag vdr!"
- einfo "you will find a VDR supported xine-lib ONLY on overlay vdr-testing"
- die "you need to reemerge xine-lib with use-flag vdr!"
- fi
-}
-
-src_unpack() {
- vdr-plugin_src_unpack
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-gentoo.diff"
-
- use yaepg && sed -i Makefile -e "s:#VDR_XINE_SET_VIDEO_WINDOW:VDR_XINE_SET_VIDEO_WINDOW:"
-}
-
-src_install() {
- vdr-plugin_src_install
-
- dobin xineplayer
-
- insinto /usr/share/vdr/xine
- doins data/*
-}
-
-pkg_postinst() {
- vdr-plugin_pkg_postinst
-
- if [[ -d ${ROOT}/etc/vdr/plugins/xine ]]; then
- ewarn "You have a leftover directory of vdr-xine."
- ewarn "You can safely remove it with:"
- ewarn "# rm -rf /etc/vdr/plugins/xine"
- fi
-}