summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2004-09-15 20:58:01 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2004-09-15 20:58:01 +0000
commita15ce6f1315f18c0464069f6d1b7feac92118e0f (patch)
tree1abda4e34e58a77f28f7ea4527b83eca8ef2b540 /media-libs/libvisual
parentapplying fix for gcc3.4 closing bug #63957 (Manifest recommit) (diff)
downloadgentoo-2-a15ce6f1315f18c0464069f6d1b7feac92118e0f.tar.gz
gentoo-2-a15ce6f1315f18c0464069f6d1b7feac92118e0f.tar.bz2
gentoo-2-a15ce6f1315f18c0464069f6d1b7feac92118e0f.zip
Fixed libdir patch to properly support multilib.
Diffstat (limited to 'media-libs/libvisual')
-rw-r--r--media-libs/libvisual/ChangeLog6
-rw-r--r--media-libs/libvisual/files/libvisual-0.1.3-libdir.patch35
2 files changed, 37 insertions, 4 deletions
diff --git a/media-libs/libvisual/ChangeLog b/media-libs/libvisual/ChangeLog
index 63659760d30d..9c6ad6d41680 100644
--- a/media-libs/libvisual/ChangeLog
+++ b/media-libs/libvisual/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libvisual
# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisual/ChangeLog,v 1.1 2004/09/15 20:44:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisual/ChangeLog,v 1.2 2004/09/15 20:58:01 eradicator Exp $
+
+ 15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ files/libvisual-0.1.3-libdir.patch:
+ Fixed libdir patch to properly support multilib.
*libvisual-0.1.3 (15 Sep 2004)
diff --git a/media-libs/libvisual/files/libvisual-0.1.3-libdir.patch b/media-libs/libvisual/files/libvisual-0.1.3-libdir.patch
index de2dde6c3fc1..d9a965e8f998 100644
--- a/media-libs/libvisual/files/libvisual-0.1.3-libdir.patch
+++ b/media-libs/libvisual/files/libvisual-0.1.3-libdir.patch
@@ -1,6 +1,6 @@
diff -Naur libvisual-0.1.3.orig/libvisual/Makefile.am libvisual-0.1.3/libvisual/Makefile.am
--- libvisual-0.1.3.orig/libvisual/Makefile.am 2004-05-12 04:25:16.000000000 -0700
-+++ libvisual-0.1.3/libvisual/Makefile.am 2004-09-15 13:37:06.603814679 -0700
++++ libvisual-0.1.3/libvisual/Makefile.am 2004-09-15 13:53:17.170456850 -0700
@@ -1,6 +1,5 @@
lib_LTLIBRARIES = libvisual.la
@@ -8,10 +8,30 @@ diff -Naur libvisual-0.1.3.orig/libvisual/Makefile.am libvisual-0.1.3/libvisual/
library_includedir = $(includedir)/libvisual
library_include_HEADERS = libvisual.h lv_actor.h \
lv_audio.h lv_bin.h lv_common.h lv_fft.h \
+@@ -9,9 +8,9 @@
+ lv_video.h lv_libvisual.h lv_songinfo.h \
+ lv_morph.h
+
+-LIBS = -L. -L$(prefix)/lib
++LIBS = -L. -L$(libdir)
+
+-PLUGPATH = $(prefix)/lib/libvisual
++PLUGPATH = $(libdir)/libvisual
+
+ CFLAGS = -ggdb -DPLUGPATH="\"$(PLUGPATH)\""
+
diff -Naur libvisual-0.1.3.orig/libvisual/Makefile.in libvisual-0.1.3/libvisual/Makefile.in
--- libvisual-0.1.3.orig/libvisual/Makefile.in 2004-05-27 13:33:20.000000000 -0700
-+++ libvisual-0.1.3/libvisual/Makefile.in 2004-09-15 13:37:19.048740322 -0700
-@@ -89,7 +89,6 @@
++++ libvisual-0.1.3/libvisual/Makefile.in 2004-09-15 13:53:40.104654396 -0700
+@@ -26,6 +26,7 @@
+ sysconfdir = @sysconfdir@
+ sharedstatedir = @sharedstatedir@
+ localstatedir = @localstatedir@
++libdir = @libdir@
+ infodir = @infodir@
+ mandir = @mandir@
+ includedir = @includedir@
+@@ -89,14 +90,13 @@
lib_LTLIBRARIES = libvisual.la
@@ -19,3 +39,12 @@ diff -Naur libvisual-0.1.3.orig/libvisual/Makefile.in libvisual-0.1.3/libvisual/
library_includedir = $(includedir)/libvisual
library_include_HEADERS = libvisual.h lv_actor.h lv_audio.h lv_bin.h lv_common.h lv_fft.h lv_input.h lv_event.h lv_keysym.h lv_list.h lv_log.h lv_palette.h lv_plugin.h lv_video.h lv_libvisual.h lv_songinfo.h lv_morph.h
+
+-LIBS = -L. -L$(prefix)/lib
++LIBS = -L. -L$(libdir)
+
+-PLUGPATH = $(prefix)/lib/libvisual
++PLUGPATH = $(libdir)/libvisual
+
+ CFLAGS = -ggdb -DPLUGPATH="\"$(PLUGPATH)\""
+