diff options
author | Jeremy Huddleston <eradicator@gentoo.org> | 2004-11-23 02:55:21 +0000 |
---|---|---|
committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-11-23 02:55:21 +0000 |
commit | 5d79535e70971507c778448fad19014d3f388679 (patch) | |
tree | 179b62d870c3c2f099e9b8973a79dcc793027487 /media-sound/gnusound/files | |
parent | dev-libs/lsh -> net-misc/lsh (diff) | |
download | gentoo-2-5d79535e70971507c778448fad19014d3f388679.tar.gz gentoo-2-5d79535e70971507c778448fad19014d3f388679.tar.bz2 gentoo-2-5d79535e70971507c778448fad19014d3f388679.zip |
Cleanup and gcc-3.4 fixes. Added to -amd64, -sparc.
Diffstat (limited to 'media-sound/gnusound/files')
-rw-r--r-- | media-sound/gnusound/files/digest-gnusound-0.6.1 | 1 | ||||
-rw-r--r-- | media-sound/gnusound/files/gnusound-0.6.2-destdir.patch | 41 | ||||
-rw-r--r-- | media-sound/gnusound/files/gnusound-0.6.2-gcc34.patch | 12 |
3 files changed, 53 insertions, 1 deletions
diff --git a/media-sound/gnusound/files/digest-gnusound-0.6.1 b/media-sound/gnusound/files/digest-gnusound-0.6.1 deleted file mode 100644 index d66eec072b8d..000000000000 --- a/media-sound/gnusound/files/digest-gnusound-0.6.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 4dbf15289dabd2367d8e07cdcfb23ad0 gnusound-0.6.1.tar.bz2 254965 diff --git a/media-sound/gnusound/files/gnusound-0.6.2-destdir.patch b/media-sound/gnusound/files/gnusound-0.6.2-destdir.patch new file mode 100644 index 000000000000..9d51eef1b4d7 --- /dev/null +++ b/media-sound/gnusound/files/gnusound-0.6.2-destdir.patch @@ -0,0 +1,41 @@ +--- gnusound-0.6.2/doc/Makefile.in.orig 2004-11-22 18:34:09.525925468 -0800 ++++ gnusound-0.6.2/doc/Makefile.in 2004-11-22 18:35:03.293071290 -0800 +@@ -27,9 +27,9 @@ + + install: + for lang in $(LANGUAGES); do \ +- mkdir -p $(datadir)/$$lang; \ ++ mkdir -p $(DESTDIR)$(datadir)/$$lang; \ + cp $$lang/*.xml $$lang/*.html $$lang/topic.dat \ +- $(datadir)/$$lang; \ ++ $(DESTDIR)$(datadir)/$$lang; \ + done + + dist: +--- gnusound-0.6.2/Makefile.in.orig 2004-11-22 18:38:50.955574862 -0800 ++++ gnusound-0.6.2/Makefile.in 2004-11-22 18:39:27.437565359 -0800 +@@ -86,15 +86,15 @@ + + install: all + $(MAKE) -C doc install +- mkdir -p $(bindir) +- mkdir -p $(moduledir) +- mkdir -p $(pixmapdir) +- mkdir -p $(desktopdir) +- install -m 755 -o root -g root $(name) $(bindir) +- install -m 644 -o root -g root $(module_files) $(moduledir) +- install -m 644 -o root -g root $(pixmap_files) $(pixmapdir) +- install -m 644 -o root -g root $(lib_files) $(libdir) +- install -m 644 -o root -g root $(desktop_files) $(desktopdir) ++ mkdir -p $(DESTDIR)$(bindir) ++ mkdir -p $(DESTDIR)$(moduledir) ++ mkdir -p $(DESTDIR)$(pixmapdir) ++ mkdir -p $(DESTDIR)$(desktopdir) ++ install -m 755 -o root -g root $(name) $(DESTDIR)$(bindir) ++ install -m 644 -o root -g root $(module_files) $(DESTDIR)$(moduledir) ++ install -m 644 -o root -g root $(pixmap_files) $(DESTDIR)$(pixmapdir) ++ install -m 644 -o root -g root $(lib_files) $(DESTDIR)$(libdir) ++ install -m 644 -o root -g root $(desktop_files) $(DESTDIR)$(desktopdir) + + uninstall: + $(MAKE) -C doc uninstall diff --git a/media-sound/gnusound/files/gnusound-0.6.2-gcc34.patch b/media-sound/gnusound/files/gnusound-0.6.2-gcc34.patch new file mode 100644 index 000000000000..ff26389460c1 --- /dev/null +++ b/media-sound/gnusound/files/gnusound-0.6.2-gcc34.patch @@ -0,0 +1,12 @@ +diff -Naur gnusound-0.6.2.orig/play.c gnusound-0.6.2/play.c +--- gnusound-0.6.2.orig/play.c 2003-01-14 21:11:36.000000000 -0800 ++++ gnusound-0.6.2/play.c 2004-11-22 18:19:47.000000000 -0800 +@@ -817,7 +817,7 @@ + + DEBUG("player.draws_requested: %d, player.draws_prevented: %d\n", + shl->player.draws_requested, shl->player.draws_prevented); +- cleanup: ++ cleanup:; + pthread_cleanup_pop(1); + return NULL; + } |