summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-10 16:50:57 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2005-12-10 16:50:57 +0000
commit1fad516993b5835418214b735048d78b153a9c5a (patch)
tree66b459c0bd205777fd42b21c178a43c62cb24e2b /media-plugins
parentremoved append-flags statment as it does not make any difference without shar... (diff)
downloadgentoo-2-1fad516993b5835418214b735048d78b153a9c5a.tar.gz
gentoo-2-1fad516993b5835418214b735048d78b153a9c5a.tar.bz2
gentoo-2-1fad516993b5835418214b735048d78b153a9c5a.zip
Added patch from bug #112706 to actually make it compile on modular xorg.
(Portage version: 2.0.53)
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/libvisual-plugins/ChangeLog7
-rw-r--r--media-plugins/libvisual-plugins/files/libvisual-plugins-0.2.0-mkdirhier.patch30
-rw-r--r--media-plugins/libvisual-plugins/libvisual-plugins-0.2.0.ebuild5
3 files changed, 39 insertions, 3 deletions
diff --git a/media-plugins/libvisual-plugins/ChangeLog b/media-plugins/libvisual-plugins/ChangeLog
index c76f62dba81c..826b71187275 100644
--- a/media-plugins/libvisual-plugins/ChangeLog
+++ b/media-plugins/libvisual-plugins/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-plugins/libvisual-plugins
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/ChangeLog,v 1.8 2005/12/10 16:40:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/ChangeLog,v 1.9 2005/12/10 16:50:57 flameeyes Exp $
+
+ 10 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +files/libvisual-plugins-0.2.0-mkdirhier.patch,
+ libvisual-plugins-0.2.0.ebuild:
+ Added patch from bug #112706 to actually make it compile on modular xorg.
10 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
libvisual-plugins-0.2.0.ebuild:
diff --git a/media-plugins/libvisual-plugins/files/libvisual-plugins-0.2.0-mkdirhier.patch b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.2.0-mkdirhier.patch
new file mode 100644
index 000000000000..87a232a8ee6b
--- /dev/null
+++ b/media-plugins/libvisual-plugins/files/libvisual-plugins-0.2.0-mkdirhier.patch
@@ -0,0 +1,30 @@
+Patch to use mkinstalldirs instead of mkdirhier to be friendly with modular
+Xorg.
+Patch from Fedora package.
+
+See Gentoo Bug #112706.
+
+diff -Naur libvisual-plugins-0.2.0.orig/plugins/actor/G-Force/Makefile.am libvisual-plugins-0.2.0/plugins/actor/G-Force/Makefile.am
+--- libvisual-plugins-0.2.0.orig/plugins/actor/G-Force/Makefile.am 2005-01-21 16:25:08.000000000 +0100
++++ libvisual-plugins-0.2.0/plugins/actor/G-Force/Makefile.am 2005-11-21 13:05:43.000000000 +0100
+@@ -26,7 +26,7 @@
+ unix/libvisual/libactor_gforce.la
+
+ install-data-local:
+- test -d "$(DESTDIR)$(pkgdatadir)" || mkdirhier "$(DESTDIR)$(pkgdatadir)"
++ test -d "$(DESTDIR)$(pkgdatadir)" || $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)"
+ cp -r deffont "GForceColorMaps" "GForceDeltaFields" "GForceParticles" "GForceWaveShapes" "$(DESTDIR)$(pkgdatadir)"
+
+ uninstall-local:
+diff -Naur libvisual-plugins-0.2.0.orig/plugins/actor/G-Force/Makefile.in libvisual-plugins-0.2.0/plugins/actor/G-Force/Makefile.in
+--- libvisual-plugins-0.2.0.orig/plugins/actor/G-Force/Makefile.in 2005-01-24 15:44:21.000000000 +0100
++++ libvisual-plugins-0.2.0/plugins/actor/G-Force/Makefile.in 2005-11-21 13:06:56.000000000 +0100
+@@ -613,7 +613,7 @@
+
+
+ install-data-local:
+- test -d "$(DESTDIR)$(pkgdatadir)" || mkdirhier "$(DESTDIR)$(pkgdatadir)"
++ test -d "$(DESTDIR)$(pkgdatadir)" || $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)"
+ cp -r deffont "GForceColorMaps" "GForceDeltaFields" "GForceParticles" "GForceWaveShapes" "$(DESTDIR)$(pkgdatadir)"
+
+ uninstall-local:
diff --git a/media-plugins/libvisual-plugins/libvisual-plugins-0.2.0.ebuild b/media-plugins/libvisual-plugins/libvisual-plugins-0.2.0.ebuild
index 702795f5eca3..138ea4dc40fe 100644
--- a/media-plugins/libvisual-plugins/libvisual-plugins-0.2.0.ebuild
+++ b/media-plugins/libvisual-plugins/libvisual-plugins-0.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/libvisual-plugins-0.2.0.ebuild,v 1.4 2005/12/10 16:40:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/libvisual-plugins/libvisual-plugins-0.2.0.ebuild,v 1.5 2005/12/10 16:50:57 flameeyes Exp $
inherit eutils
@@ -34,7 +34,8 @@ DEPEND="${RDEPEND}
src_compile() {
# stupid configure assumes $x_libaries cannot be empty
- epatch ${FILESDIR}/${P}-configure.patch
+ epatch "${FILESDIR}/${P}-configure.patch"
+ epatch "${FILESDIR}/${P}-mkdirhier.patch"
econf $(use_enable debug) || die
emake || die