diff options
| author |   Jan Brinkmann <luckyduck@gentoo.org> | 2005-03-19 17:55:54 +0000 |
|---|---|---|
| committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-03-19 17:55:54 +0000 |
| commit | 30f07b9e943e6e11685586a50fe31734534897bb (patch) | |
| tree | 2252758dc6b8575d550f2ddb0c9a136e01c974e8 /media-video | |
| parent | Removed multiple dirs in sys path. bug# 83109 (diff) | |
| download | historical-30f07b9e943e6e11685586a50fe31734534897bb.tar.gz historical-30f07b9e943e6e11685586a50fe31734534897bb.tar.bz2 historical-30f07b9e943e6e11685586a50fe31734534897bb.zip | |
modified patch to fix #85915
Package-Manager: portage-2.0.51.19
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/vdr/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/vdr/Manifest | 10 | ||||
| -rw-r--r-- | media-video/vdr/files/vdr-1.2.6-gentoo.diff | 46 |
3 files changed, 32 insertions, 30 deletions
diff --git a/media-video/vdr/ChangeLog b/media-video/vdr/ChangeLog index af9c8fde3341..14ea9fbcd53f 100644 --- a/media-video/vdr/ChangeLog +++ b/media-video/vdr/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/vdr # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.11 2005/03/13 00:07:37 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vdr/ChangeLog,v 1.12 2005/03/19 17:55:54 luckyduck Exp $ + + 19 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> + files/vdr-1.2.6-gentoo.diff, vdr-1.2.6-r1.ebuild: + modified patch to fix #85915 13 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> -files/vdr-1.1.27-gentoo.diff, -vdr-1.1.27.ebuild, -vdr-1.2.6.ebuild: diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest index c48b9fc55d68..7d487cbceebe 100644 --- a/media-video/vdr/Manifest +++ b/media-video/vdr/Manifest @@ -2,15 +2,15 @@ Hash: SHA1 MD5 472fcbc096ab4d3187194a64a5b6530a vdr-1.2.6-r1.ebuild 1401 -MD5 858116ee4314daf8c820b1a8cc83f6ab ChangeLog 1478 +MD5 18272eaea33d52308502f81665471d3c ChangeLog 1614 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 MD5 aa18122fb081cdc19d419d53ad1f63de files/vdr-1.2.6_CAN-2005-0071.patch 893 MD5 5df3de1f888e3fc8f8ba27623a19f40b files/digest-vdr-1.2.6-r1 62 -MD5 d0dc33e6e7863372013487b940482044 files/vdr-1.2.6-gentoo.diff 1848 +MD5 aa8d0f66c8831be73c049584d6143c8b files/vdr-1.2.6-gentoo.diff 1995 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCM4RO06ebR+OMO78RAidYAJ40TEmkqNlii5ytpZdRywfYDmScUQCfSJzY -XdDxzUPDJFct/1Cdft3cXBs= -=IFuT +iD8DBQFCPGe006ebR+OMO78RAgdkAJ9qDouMeAVUE5h0hFqtcNX4J5bjTgCeMh4g +uhRFyCbg6HHATF4b0mIP2Kw= +=l6L9 -----END PGP SIGNATURE----- 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 9da18dd1c3f0..a5462331e97d 100644 --- a/media-video/vdr/files/vdr-1.2.6-gentoo.diff +++ b/media-video/vdr/files/vdr-1.2.6-gentoo.diff @@ -1,6 +1,19 @@ ---- Makefile.org 2003-03-11 21:30:41.000000000 +0000 -+++ Makefile 2003-03-11 21:47:14.000000000 +0000 -@@ -16,8 +16,8 @@ +diff -uprN vdr-1.2.6.orig/config.h vdr-1.2.6/config.h +--- vdr-1.2.6.orig/config.h 2005-03-19 18:34:22.799245568 +0100 ++++ vdr-1.2.6/config.h 2005-03-19 18:34:27.120588624 +0100 +@@ -137,7 +137,7 @@ public: + 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 -uprN vdr-1.2.6.orig/Makefile vdr-1.2.6/Makefile +--- vdr-1.2.6.orig/Makefile 2005-03-19 18:34:22.796246024 +0100 ++++ vdr-1.2.6/Makefile 2005-03-19 18:52:32.140640504 +0100 +@@ -16,8 +16,8 @@ CXXFLAGS ?= -g -O2 -Wall -Woverloaded-vi DVBDIR = ../DVB DTVDIR = ./libdtv @@ -10,8 +23,8 @@ +BINDIR = /usr/bin PLUGINDIR= ./PLUGINS - -@@ -117,12 +117,18 @@ + PLUGINLIBDIR= $(PLUGINDIR)/lib +@@ -121,12 +121,15 @@ plugins-clean: # Install the files: install: @@ -19,12 +32,9 @@ - @gzip -c vdr.1 > $(MANDIR)/man1/vdr.1.gz - @gzip -c vdr.5 > $(MANDIR)/man5/vdr.5.gz + @mkdir -p $(DESTDIR)$(BINDIR) -+ @mkdir -p $(BINDIR) + @cp vdr runvdr $(DESTDIR)$(BINDIR) + @mkdir -p $(DESTDIR)$(MANDIR)/man1 + @mkdir -p $(DESTDIR)$(MANDIR)/man5 -+ @mkdir -p $(MANDIR)/man1 -+ @mkdir -p $(MANDIR)/man5 + @gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz + @gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz @if [ ! -d $(VIDEODIR) ]; then\ @@ -35,22 +45,10 @@ 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 @@ +diff -uprN vdr-1.2.6.orig/plugin.c vdr-1.2.6/plugin.c +--- vdr-1.2.6.orig/plugin.c 2005-03-19 18:34:22.810243896 +0100 ++++ vdr-1.2.6/plugin.c 2005-03-19 18:34:27.120588624 +0100 +@@ -162,7 +162,7 @@ bool cDll::Load(bool Log) const char *error = dlerror(); if (!error) { void *(*creator)(void); |