summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2004-09-10 19:26:32 +0000
committerMichael Januszewski <spock@gentoo.org>2004-09-10 19:26:32 +0000
commit27faaf236fcbe429995dc9c312b3226e398e26ef (patch)
tree9673a658c8a17f134ad88d37daefa263588d637e /app-emulation
parentAdd latest version, move former one to stable. (diff)
downloadhistorical-27faaf236fcbe429995dc9c312b3226e398e26ef.tar.gz
historical-27faaf236fcbe429995dc9c312b3226e398e26ef.tar.bz2
historical-27faaf236fcbe429995dc9c312b3226e398e26ef.zip
Updated the BMP fix patch.
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/uade/ChangeLog6
-rw-r--r--app-emulation/uade/Manifest10
-rw-r--r--app-emulation/uade/files/uade-0.91-bmp-fix.patch39
3 files changed, 34 insertions, 21 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/Manifest b/app-emulation/uade/Manifest
index f53237c556dc..f243ae407f8c 100644
--- a/app-emulation/uade/Manifest
+++ b/app-emulation/uade/Manifest
@@ -4,16 +4,16 @@ Hash: SHA1
MD5 2290dc4035301212d0df7b5b348b7a50 uade-0.91.ebuild 1540
MD5 ae6376aa5e84e1e09c1419e25aac648e uade-0.91-r1.ebuild 1693
MD5 5e0e693bfb3862a705778fa4518184c1 uade-0.81.ebuild 1594
-MD5 7533c6c892c3f7a61aa79930c2e03217 ChangeLog 2079
+MD5 92fa8d253a2f457cfdb94546cf723ed4 ChangeLog 2232
MD5 a715d9de7a6423e88a804a562c2220a9 metadata.xml 219
-MD5 9e378de0863e2aaa880f4351dc743cb3 files/uade-0.91-bmp-fix.patch 1111
+MD5 ef3c7fc767538fbeb54e89c600038bdd files/uade-0.91-bmp-fix.patch 1252
MD5 4df754504fa84b727b0d21eccfcbf1c5 files/digest-uade-0.81 63
MD5 1f90b1c9ed54563fc4371e3976a2b4bb files/digest-uade-0.91 63
MD5 1f90b1c9ed54563fc4371e3976a2b4bb files/digest-uade-0.91-r1 63
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
-iD8DBQFBQGL0chej4aZK9/cRAlcaAJ9JHbDJ950S0LZaC+Xt7pNElWfxLQCcDTS1
-5p1cQvesAF6S1tqrPaGpxjI=
-=Wtw0
+iD8DBQFBQf/7chej4aZK9/cRAgs+AJ4/Rk/4R4fVlIZrK/F2eltMcFY7ZgCcDBSy
+/rBWweNTh5F9efYALLdIhUc=
+=6Nzt
-----END PGP SIGNATURE-----
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) {