diff options
author | Matthias Schwarzott <zzam@gentoo.org> | 2006-07-08 19:23:15 +0000 |
---|---|---|
committer | Matthias Schwarzott <zzam@gentoo.org> | 2006-07-08 19:23:15 +0000 |
commit | 6aafb513db7ffc6366945affd40e7f4c1ad4b195 (patch) | |
tree | 5e81f5f2db5c6ce7464b2bc2df04828917107561 | |
parent | split USE='tcltk' to 'tcl' & 'tk' per bug #17808. Nuked X USE flag since it w... (diff) | |
download | gentoo-2-6aafb513db7ffc6366945affd40e7f4c1ad4b195.tar.gz gentoo-2-6aafb513db7ffc6366945affd40e7f4c1ad4b195.tar.bz2 gentoo-2-6aafb513db7ffc6366945affd40e7f4c1ad4b195.zip |
Added gcc4-compatibility patch.
(Portage version: 2.1.1_pre2-r6)
-rw-r--r-- | media-plugins/vdr-mp3ng/ChangeLog | 6 | ||||
-rw-r--r-- | media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre3-gcc4.diff | 17 | ||||
-rw-r--r-- | media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild | 3 |
3 files changed, 24 insertions, 2 deletions
diff --git a/media-plugins/vdr-mp3ng/ChangeLog b/media-plugins/vdr-mp3ng/ChangeLog index 9517be2bdca6..1ca91559e820 100644 --- a/media-plugins/vdr-mp3ng/ChangeLog +++ b/media-plugins/vdr-mp3ng/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-mp3ng # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.5 2006/05/16 21:25:47 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/ChangeLog,v 1.6 2006/07/08 19:23:15 zzam Exp $ + + 08 Jul 2006; Matthias Schwarzott <zzam@gentoo.org> + +files/vdr-mp3ng-0.0.1_pre3-gcc4.diff, vdr-mp3ng-0.0.1_pre3.ebuild: + Added gcc4-compatibility patch. 16 May 2006; Matthias Schwarzott <zzam@gentoo.org> vdr-mp3ng-0.0.1_pre3.ebuild: diff --git a/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre3-gcc4.diff b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre3-gcc4.diff new file mode 100644 index 000000000000..16abbd9dc10f --- /dev/null +++ b/media-plugins/vdr-mp3ng/files/vdr-mp3ng-0.0.1_pre3-gcc4.diff @@ -0,0 +1,17 @@ +Nur in mp3ng-0.9.13-MKIV-pre3: decoder.o. +diff -ru mp3ng-0.9.13-MKIV-pre3-orig/decoder-ogg.h mp3ng-0.9.13-MKIV-pre3/decoder-ogg.h +--- mp3ng-0.9.13-MKIV-pre3-orig/decoder-ogg.h 2006-07-08 21:19:14.777181805 +0200 ++++ mp3ng-0.9.13-MKIV-pre3/decoder-ogg.h 2006-07-08 21:19:31.498835576 +0200 +@@ -49,7 +49,7 @@ + ~cOggFile(); + bool Open(bool log=true); + void Close(void); +- long long cOggFile::Seek(long long posMs=0, bool relativ=false); ++ long long Seek(long long posMs=0, bool relativ=false); + int Stream(short *buffer, int samples); + bool CanSeek(void) { return canSeek; } + long long IndexMs(void); +Nur in mp3ng-0.9.13-MKIV-pre3: decoder-ogg.o. +Nur in mp3ng-0.9.13-MKIV-pre3: decoder-snd.o. +Nur in mp3ng-0.9.13-MKIV-pre3: libvdr-mp3ng.so. +Nur in mp3ng-0.9.13-MKIV-pre3: libvdr-mp3ng.so.1.4.1. diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild index 913d90e1d69c..33f60999b26f 100644 --- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild +++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild,v 1.2 2006/05/16 21:25:47 zzam Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre3.ebuild,v 1.3 2006/07/08 19:23:15 zzam Exp $ inherit vdr-plugin eutils @@ -32,6 +32,7 @@ src_unpack() { vdr-plugin_src_unpack epatch ${FILESDIR}/${P}-gentoo.diff + epatch ${FILESDIR}/${P}-gcc4.diff use !vorbis && sed -i "s:#WITHOUT_LIBVORBISFILE:WITHOUT_LIBVORBISFILE:" Makefile use oss && sed -i "s:#WITH_OSS_OUTPUT:WITH_OSS_OUTPUT:" Makefile |