diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-01 01:52:19 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-01-01 01:52:19 +0000 |
| commit | 8bcac790f4fb017f3222c19e5d9dffa6c6a76397 (patch) | |
| tree | 3a07985063c39966c76aa1defac1b5100aa97959 /x11-misc | |
| parent | adopting (Manifest recommit) (diff) | |
| download | gentoo-2-8bcac790f4fb017f3222c19e5d9dffa6c6a76397.tar.gz gentoo-2-8bcac790f4fb017f3222c19e5d9dffa6c6a76397.tar.bz2 gentoo-2-8bcac790f4fb017f3222c19e5d9dffa6c6a76397.zip | |
Works with newer xorg-x11 now.
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/linuxwacom/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild | 11 | ||||
| -rw-r--r-- | x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild | 13 |
3 files changed, 21 insertions, 9 deletions
diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog index e64f90177bbb..064d994ddf37 100644 --- a/x11-misc/linuxwacom/ChangeLog +++ b/x11-misc/linuxwacom/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/linuxwacom # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.19 2004/12/31 21:40:35 battousai Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.20 2005/01/01 01:52:19 eradicator Exp $ + + 31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org> + linuxwacom-0.6.4.ebuild, linuxwacom-0.6.6.ebuild: + Works with /usr/libdir xorg-x11 installs now. *linuxwacom-0.6.6 (31 Dec 2004) diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild index 6a63289a0a02..6aa182668065 100644 --- a/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild +++ b/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild,v 1.5 2004/11/24 11:40:50 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.4.ebuild,v 1.6 2005/01/01 01:52:19 eradicator Exp $ IUSE="gtk gtk2 tcltk sdk" @@ -110,8 +110,13 @@ src_compile() { # Makefile fix for build against SDK cd ${S}/src cp Makefile Makefile.orig - sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/X11R6/$(get_libdir)/Server:" Makefile - sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/$(get_libdir)/Server:" Makefile + if [ -f "/usr/X11R6/lib/Server/include/xf86Version.h" ]; then + sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/X11R6/$(get_libdir)/Server:" Makefile + sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/$(get_libdir)/Server:" Makefile + else + sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/$(get_libdir)/Server:" Makefile + sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/$(get_libdir)/Server:" Makefile + fi sed -i -e "s:/include/extensions:/include:g" Makefile else myconf="--disable-wacomdrv --enable-wacdump --enable-xsetwacom $withgtk $withtcltk" diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild index 7c22c4d7cc8a..82920d020c4f 100644 --- a/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild +++ b/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild,v 1.1 2004/12/31 21:40:35 battousai Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.6.ebuild,v 1.2 2005/01/01 01:52:19 eradicator Exp $ IUSE="gtk gtk2 tcltk sdk" @@ -104,14 +104,17 @@ src_compile() { fi if use sdk; then - myconf="--enable-wacomdrv --enable-wacdump --enable-xsetwacom --with-xf86=/usr/X11R6/$(get_libdir)/Server $withgtk $withtcltk" + myconf="--enable-wacomdrv --enable-wacdump --enable-xsetwacom $withgtk $withtcltk" + if [ -f "/usr/$(get_libdir)/Server/include/xf86Version.h" ]; then + myconf="${myconf} --with-xf86=/usr/$(get_libdir)/Server --with-xorg-sdk=/usr/$(get_libdir)/Server" + else + myconf="${myconf} --with-xf86=/usr/X11R6/$(get_libdir)/Server --with-xorg-sdk=/usr/X11R6/$(get_libdir)/Server" + fi + econf ${myconf} || die "configure failed." # Makefile fix for build against SDK cd ${S}/src - cp Makefile Makefile.orig - sed -i -e "s:XF86_DIR = .*:XF86_DIR = /usr/X11R6/$(get_libdir)/Server:" Makefile - sed -i -e "s:XF86_V3_DIR = .*:XF86_V3_DIR = /usr/X11R6/$(get_libdir)/Server:" Makefile sed -i -e "s:/include/extensions:/include:g" Makefile else myconf="--disable-wacomdrv --enable-wacdump --enable-xsetwacom $withgtk $withtcltk" |