diff options
| author |   Michael Januszewski <spock@gentoo.org> | 2004-09-10 19:26:32 +0000 |
|---|---|---|
| committer | Michael Januszewski <spock@gentoo.org> | 2004-09-10 19:26:32 +0000 |
| commit | 9a19852b6088f960e95bdb07079fe50b6b0a69cd (patch) | |
| tree | 462de042c2f265c534fc0c898d60c03e3558bf02 /app-emulation | |
| parent | Add latest version, move former one to stable. (Manifest recommit) (diff) | |
| download | gentoo-2-9a19852b6088f960e95bdb07079fe50b6b0a69cd.tar.gz gentoo-2-9a19852b6088f960e95bdb07079fe50b6b0a69cd.tar.bz2 gentoo-2-9a19852b6088f960e95bdb07079fe50b6b0a69cd.zip | |
Updated the BMP fix patch.
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/uade/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/uade/files/uade-0.91-bmp-fix.patch | 39 |
2 files changed, 29 insertions, 16 deletions
diff --git a/app-emulation/uade/ChangeLog b/app-emulation/uade/ChangeLog index 35fdd34d9aaf..285f3334b50a 100644 --- a/app-emulation/uade/ChangeLog +++ b/app-emulation/uade/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/uade # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/uade/ChangeLog,v 1.15 2004/09/09 14:04:23 spock Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/uade/ChangeLog,v 1.16 2004/09/10 19:26:32 spock Exp $ + + 10 Sep 2004; Michal Januszewski <spock@gentoo.org> + files/uade-0.91-bmp-fix.patch: + Updated the BMP fix. Thanks to Heikki Orsila for the new patch. *uade-0.91-r1 (09 Sep 2004) diff --git a/app-emulation/uade/files/uade-0.91-bmp-fix.patch b/app-emulation/uade/files/uade-0.91-bmp-fix.patch index 97d3f98adc60..8ead959c7d7a 100644 --- a/app-emulation/uade/files/uade-0.91-bmp-fix.patch +++ b/app-emulation/uade/files/uade-0.91-bmp-fix.patch @@ -1,6 +1,6 @@ -diff -Naur uade-0.91-orig/plugindir/beepmp/uade.c uade-0.91/plugindir/beepmp/uade.c ---- uade-0.91-orig/plugindir/beepmp/uade.c 2004-07-27 16:22:37.000000000 +0200 -+++ uade-0.91/plugindir/beepmp/uade.c 2004-09-09 15:37:24.609571008 +0200 +diff -u -r uade-0.91-org/plugindir/beepmp/uade.c uade-0.91/plugindir/beepmp/uade.c +--- uade-0.91-org/plugindir/beepmp/uade.c 2004-09-10 21:36:16.569584744 +0300 ++++ uade-0.91/plugindir/beepmp/uade.c 2004-09-10 21:36:33.496011536 +0300 @@ -305,9 +305,12 @@ /* xmms calls this function to check song */ static int is_our_file(char *filename) { @@ -14,16 +14,25 @@ diff -Naur uade-0.91-orig/plugindir/beepmp/uade.c uade-0.91/plugindir/beepmp/uad ours = check_my_file(filename, 0, 0); if (ours) { FILE *f = fopen(filename, "rb"); -diff -Naur uade-0.91-orig/src/uade.c uade-0.91/src/uade.c ---- uade-0.91-orig/src/uade.c 2004-07-27 16:22:37.000000000 +0200 -+++ uade-0.91/src/uade.c 2004-09-09 15:38:58.252335144 +0200 -@@ -443,6 +443,9 @@ - { - int bytesread, status; - FILE *file; +@@ -648,6 +651,10 @@ + int *songdata; + char *tempname; + int have_name_hash; + const char *prefix = "file://"; -+ if (strncasecmp(name, prefix, strlen(prefix)) == 0) -+ name += strlen(prefix); - file = fopen(name, "rb"); - if (!file) { - fprintf(stderr,"uade: couldn't load %s %s\n", expl, name); ++ ++ if (strncasecmp(filename, prefix, strlen(prefix)) == 0) ++ filename += strlen(prefix); + + if (playingbit) { + fprintf(stderr, "uade: A serious bug has been detected:\n"); +@@ -1059,6 +1066,10 @@ + static void get_song_info(char *filename, char **title, int *length) { + char *temp; + char md5namehash[33]; ++ const char *prefix = "file://"; ++ ++ if (strncasecmp(filename, prefix, strlen(prefix)) == 0) ++ filename += strlen(prefix); + + temp = strrchr(filename, (int) '/'); + if (temp) { |