diff options
| -rw-r--r-- | media-video/vdr/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/vdr/Manifest | 8 | ||||
| -rw-r--r-- | media-video/vdr/files/digest-vdr-1.2.6 | 1 | ||||
| -rw-r--r-- | media-video/vdr/files/vdr-1.2.6-gentoo.diff | 24 | ||||
| -rw-r--r-- | media-video/vdr/vdr-1.2.6.ebuild | 16 |
5 files changed, 45 insertions, 10 deletions
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog index 7fad3d660ad5..7a63aedaa4a6 100644 --- a/media-video/vdr/ChangeLog +++ b/media-video/vdr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/vdr # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.6 2004/08/12 21:12:32 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.7 2004/10/27 08:12:07 phosphan Exp $ + + 27 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> + files/vdr-1.2.6-gentoo.diff, vdr-1.2.6.ebuild: + Modified patch for gcc 3.4, removed dvb dependency (native for 2.6 kernels). 13 Aug 2004; Chris White <chriswhite@gentoo.org> +metadata.xml: Adding missing metadata.xml. diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest index 42f64e6df16f..9ddb10e32788 100644 --- a/media-video/vdr/Manifest +++ b/media-video/vdr/Manifest @@ -1,8 +1,8 @@ -MD5 3221505f0b14cf0575374e0f51de573b vdr-1.2.6.ebuild 1122 +MD5 6ce20cefdcb696fc58317638e5df03bb vdr-1.2.6.ebuild 1353 MD5 597613e960e8e76193eced3db475acfb vdr-1.1.27.ebuild 1095 -MD5 c0a67dbbb59769bbfab0057eead57eb4 ChangeLog 687 +MD5 554a53727bbf6714d2e5f98bbb62c8e7 ChangeLog 867 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 -MD5 b3a6e3e266b35959b76b35fbd9468bae files/digest-vdr-1.2.6 131 +MD5 5df3de1f888e3fc8f8ba27623a19f40b files/digest-vdr-1.2.6 62 MD5 ba8d55fa3c89f6743f01007e67529e37 files/digest-vdr-1.1.27 63 -MD5 f9cb5e275f4c900343205158c2b0d4fb files/vdr-1.2.6-gentoo.diff 1018 +MD5 d0dc33e6e7863372013487b940482044 files/vdr-1.2.6-gentoo.diff 1848 MD5 c83ab35c3973b06f5c72e1efc4c37c31 files/vdr-1.1.27-gentoo.diff 1015 diff --git a/media-video/vdr/files/digest-vdr-1.2.6 b/media-video/vdr/files/digest-vdr-1.2.6 index 3f28909b08b9..dee985edb6e9 100644 --- a/media-video/vdr/files/digest-vdr-1.2.6 +++ b/media-video/vdr/files/digest-vdr-1.2.6 @@ -1,2 +1 @@ MD5 2ccef18b8418da429bad230732603603 vdr-1.2.6.tar.bz2 367069 -MD5 d9bb0429b06a4204f5db8b17f4dee0a0 linuxtv-dvb-1.0.1.tar.gz 676625 diff --git a/media-video/vdr/files/vdr-1.2.6-gentoo.diff b/media-video/vdr/files/vdr-1.2.6-gentoo.diff index 3ffcb9972a70..9da18dd1c3f0 100644 --- a/media-video/vdr/files/vdr-1.2.6-gentoo.diff +++ b/media-video/vdr/files/vdr-1.2.6-gentoo.diff @@ -35,3 +35,27 @@ fi # Source documentation: +diff -ru ./config.h ../vdr-1.2.6-new/config.h +--- ./config.h 2003-11-14 14:29:13.000000000 +0100 ++++ ../vdr-1.2.6-new/config.h 2004-10-27 08:48:41.652515906 +0200 +@@ -137,7 +137,7 @@ + bool Save(void) + { + bool result = true; +- T *l = (T *)First(); ++ T *l = (T *)cList<T>::First(); + cSafeFile f(fileName); + if (f.Open()) { + while (l) { +diff -ru ./plugin.c ../vdr-1.2.6-new/plugin.c +--- ./plugin.c 2003-08-30 16:52:58.000000000 +0200 ++++ ../vdr-1.2.6-new/plugin.c 2004-10-27 08:54:26.068755758 +0200 +@@ -162,7 +162,7 @@ + const char *error = dlerror(); + if (!error) { + void *(*creator)(void); +- (void *)creator = dlsym(handle, "VDRPluginCreator"); ++ creator = (void *(*)())dlsym(handle, "VDRPluginCreator"); + if (!(error = dlerror())) + plugin = (cPlugin *)creator(); + } diff --git a/media-video/vdr/vdr-1.2.6.ebuild b/media-video/vdr/vdr-1.2.6.ebuild index 1aed0958f53e..5dcad37d428c 100644 --- a/media-video/vdr/vdr-1.2.6.ebuild +++ b/media-video/vdr/vdr-1.2.6.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.2.6.ebuild,v 1.3 2004/07/17 13:33:30 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/vdr-1.2.6.ebuild,v 1.4 2004/10/27 08:12:07 phosphan Exp $ -inherit eutils +inherit eutils check-kernel DESCRIPTION="Klaus Schmidingers Video Disk Recorder" HOMEPAGE="http://www.cadsoft.de/people/kls/vdr" @@ -13,11 +13,19 @@ SLOT="0" KEYWORDS="~x86 ~ppc" IUSE="lirc" -DEPEND="media-tv/linuxtv-dvb - sys-libs/ncurses +# media-tv/linuxtv-dvb removed since dvb support is included in 2.6 kernels +DEPEND="sys-libs/ncurses lirc? ( app-misc/lirc ) media-libs/jpeg" +pkg_setup() { + if is_kernel_2_4; then + if ! has_version media-tv/linuxtv-dvb; then + eerror "For 2.4 kernels, media-tv/linuxtv-dvb is required" + fi + fi +} + src_unpack() { unpack ${A} cd ${S} |