[vlc-commits] contribs: goom2k4 wants to install stuff outside of our prefix...

[Dominique Martinet]

vlc | branch: master | Dominique Martinet <asmadeus at codewreck.org> | Sat Apr 16 02:23:29 2011 +0900| [a709408a7d69fd70ccb8408b14d9bf6f66f7c934] | committer: Jean-Baptiste Kempf

contribs: goom2k4 wants to install stuff outside of our prefix...

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a709408a7d69fd70ccb8408b14d9bf6f66f7c934
---

 .../contrib/src/Patches/goom2k4-xmmslibdir.patch   |   11 +++++++++++
 extras/contrib/src/contrib-src.mak                 |    1 +
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Patches/goom2k4-xmmslibdir.patch b/extras/contrib/src/Patches/goom2k4-xmmslibdir.patch
new file mode 100644
index 0000000..3459caa
--- /dev/null
+++ b/extras/contrib/src/Patches/goom2k4-xmmslibdir.patch
@@ -0,0 +1,11 @@
+--- goom/xmms-goom/Makefile.am	2005-02-07 22:46:42.000000000 +0900
++++ goom.new/xmms-goom/Makefile.am	2011-04-16 02:03:15.420291009 +0900
+@@ -2,7 +2,7 @@
+ 
+ if HAVE_XMMS
+ xmms_lib_LTLIBRARIES = libxmmsgoom2.la
+-xmms_libdir = $(XMMS_VISUALIZATION_PLUGIN_DIR)
++xmms_libdir = $(libdir)
+ libxmmsgoom2_la_LIBADD = $(top_builddir)/src/libgoom2.la $(XMMS_LIBS)
+ libxmmsgoom2_la_SOURCES = xmms_goom.c
+ INCLUDES=-DDATADIR=\"@XMMS_DATA_DIR@\" @XMMS_CFLAGS@ -Wall -I../src/
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index c7e50b3..f6da379 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1370,6 +1370,7 @@ ifdef HAVE_MACOSX
 	patch -p0 < Patches/goom2k4-osx.patch
 endif
 	patch -p0 < Patches/goom2k4-noxmmx.patch
+	patch -p0 < Patches/goom2k4-xmmslibdir.patch
 	(cd $@; rm -f configure; autoreconf -ivf)
 
 .goom2k4: goom