Version bump, and handle dlloader properly. Patch sent upstream.

(Portage version: 2.0.51.22-r2)

5 files changed, 279 insertions, 2 deletions

diff --git a/x11-misc/linuxwacom/ChangeLog b/x11-misc/linuxwacom/ChangeLog
index 5e0add4b894c..9a5919689abe 100644
--- a/x11-misc/linuxwacom/ChangeLog
+++ b/x11-misc/linuxwacom/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/linuxwacom
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.30 2005/07/26 14:47:33 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/ChangeLog,v 1.31 2005/08/09 00:48:36 eradicator Exp $
+
+*linuxwacom-0.6.9 (09 Aug 2005)
+
+  09 Aug 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/linuxwacom-0.6.9-dlloader.patch, +linuxwacom-0.6.9.ebuild:
+  Version bump, and handle dlloader properly.  Patch sent upstream.
 
   26 Jul 2005; David Holm <dholm@gentoo.org> linuxwacom-0.6.8.ebuild:
   Added to ~ppc.
diff --git a/x11-misc/linuxwacom/Manifest b/x11-misc/linuxwacom/Manifest
index 939f79e8cc6f..566c940d29cf 100644
--- a/x11-misc/linuxwacom/Manifest
+++ b/x11-misc/linuxwacom/Manifest
@@ -1,9 +1,12 @@
 MD5 79586075f9a6219189ae8a123aff3c63 ChangeLog 5033
-MD5 086e8fd79eca51dc3b219ade9fbb9a85 metadata.xml 268
+MD5 2d98bc54ff6438dc9fdf0156b5e9cdd0 linuxwacom-0.6.9.ebuild 3546
 MD5 80b71911286cca0ce9148fd3e86fe4d5 linuxwacom-0.6.6.ebuild 3537
+MD5 086e8fd79eca51dc3b219ade9fbb9a85 metadata.xml 268
 MD5 22abf1918269ba9122ed300afd97e325 linuxwacom-0.6.7.ebuild 3304
 MD5 4d1f188a0157fcf3eadb3164b6055573 linuxwacom-0.6.8.ebuild 3306
+MD5 41099e1bdace48c2ccd9fe1ababddbb7 files/digest-linuxwacom-0.6.9 69
 MD5 fe1457589d41bcc4b2407351e6ae2faf files/digest-linuxwacom-0.6.6 69
+MD5 acadce06f4e40cd3df5263b3b7c11ebd files/linuxwacom-0.6.9-dlloader.patch 4894
 MD5 97ebb9a35c19c6f15f8fb9ac4b847d09 files/linuxwacom-0.6.6-nonx86.patch 609
 MD5 c63cfe07a0a7457ddc796feee5501b6a files/digest-linuxwacom-0.6.7 69
 MD5 5cad69052ceddf84cea16c74fef9b805 files/digest-linuxwacom-0.6.8 69
diff --git a/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.9 b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.9
new file mode 100644
index 000000000000..348990fcb020
--- /dev/null
+++ b/x11-misc/linuxwacom/files/digest-linuxwacom-0.6.9
@@ -0,0 +1 @@
+MD5 0407d0869f41a3eae963bcd316c697c9 linuxwacom-0.6.9.tar.bz2 475573
diff --git a/x11-misc/linuxwacom/files/linuxwacom-0.6.9-dlloader.patch b/x11-misc/linuxwacom/files/linuxwacom-0.6.9-dlloader.patch
new file mode 100644
index 000000000000..d69f9800e54f
--- /dev/null
+++ b/x11-misc/linuxwacom/files/linuxwacom-0.6.9-dlloader.patch
@@ -0,0 +1,146 @@
+--- linuxwacom-0.6.9/configure.in.orig	2005-08-08 17:40:18.000000000 -0700
++++ linuxwacom-0.6.9/configure.in	2005-08-08 17:40:20.000000000 -0700
+@@ -293,10 +293,21 @@ if test "$enable_tabletdev" != "no"; the
+ 	fi
+ fi
+ 
++dnl Check for dlloader
++WCM_OPTION_DLLOADER=no
++AC_ARG_ENABLE(dlloader,
++AC_HELP_STRING([--enable-dlloader], [Use dlloader  [[default=no]]]),
++	, enable_dlloader=no)
++if test "$enable_dlloader" != "no"; then
++	WCM_OPTION_DLLOADER=yes
++fi
++
++AM_CONDITIONAL(WCM_DLLOADER, test "$WCM_OPTION_DLLOADER" == "yes")
++
+ dnl Check for wacomdrv build
+ WCM_OPTION_WACOMDRV=no
+ AC_ARG_ENABLE(wacomdrv,
+-AC_HELP_STRING([--enable-wacomdrv], [Enable building wacom_drv.o [[default=yes]]]),
++AC_HELP_STRING([--enable-wacomdrv], [Enable building wacom_drv.{o,so} [[default=yes]]]),
+ 	, enable_wacomdrv=yes)
+ if test "$enable_wacomdrv" != "no"; then
+ 	if test "$WCM_ENV_XF86" != "yes" && test "$WCM_ENV_XORGSDK" != "yes"; then
+@@ -307,8 +318,14 @@ if test "$enable_wacomdrv" != "no"; then
+ 		echo "***"
+ 	else
+ 		WCM_OPTION_WACOMDRV=yes
+-		WCM_XF86MODULES="$WCM_XF86MODULES wacom_drv.o"
+-		WCM_EXPMODULES="$WCM_EXPMODULES wacom_drv.o"
++
++		if test "$WCM_OPTION_DLLOADER" == "yes" ; then
++			WCM_XF86MODULES="$WCM_XF86MODULES wacom_drv.so"
++			WCM_EXPMODULES="$WCM_EXPMODULES wacom_drv.so"
++		else
++			WCM_XF86MODULES="$WCM_XF86MODULES wacom_drv.o"
++			WCM_EXPMODULES="$WCM_EXPMODULES wacom_drv.o"
++		fi
+ 	fi
+ fi
+ 
+@@ -334,18 +351,6 @@ if test "$enable_xserver64" != "no"; the
+ 	fi
+ fi
+ 
+-dnl Check for dlloader
+-WCM_OPTION_DLLOADER=no
+-AC_ARG_ENABLE(dlloader,
+-AC_HELP_STRING([--enable-dlloader], [Use dlloader  [[default=no]]]),
+-	, enable_dlloader=no)
+-if test "$enable_dlloader" != "no"; then
+-	CFLAGS="$CFLAGS -fPIC"
+-	WCM_OPTION_DLLOADER=yes
+-fi
+-
+-AM_CONDITIONAL(WCM_DLLOADER, test "$WCM_OPTION_DLLOADER" == "yes")
+-
+ dnl Check for modver
+ AC_ARG_ENABLE(modver,
+ AC_HELP_STRING([--enable-modver], [Enable kernel module versioning [[default=usually]]]),
+@@ -552,7 +557,13 @@ echo "            evdev.o - $WCM_OPTION_
+ echo "         mousedev.o - $WCM_OPTION_MOUSEDEV"
+ echo "            input.o - $WCM_OPTION_INPUT"
+ echo "        tabletdev.o - $WCM_OPTION_TABLETDEV"
++if test "$WCM_OPTION_DLLOADER" == "yes" ; then
++echo "        wacom_drv.so - $WCM_OPTION_WACOMDRV $WCM_PATCH_WACOMDRV"
++echo "        wacom_drv.o - no"
++else
++echo "        wacom_drv.so - no"
+ echo "        wacom_drv.o - $WCM_OPTION_WACOMDRV $WCM_PATCH_WACOMDRV"
++fi
+ echo "----------------------------------------"
+ 
+ dnl Check for x86_64 kernel
+--- linuxwacom-0.6.9/src/Makefile.am.orig	2005-08-08 17:42:34.000000000 -0700
++++ linuxwacom-0.6.9/src/Makefile.am	2005-08-08 17:43:51.000000000 -0700
+@@ -17,7 +17,7 @@ DEPFLAGS = @WCM_DEPFLAGS@
+ # potentially be built or installed depending on the results of
+ # the configuration.
+ EXTRA_PROGRAMS = wacdump xidump xsetwacom 
+-EXTRA_SCRIPTS = wacom_drv.o wacomcpl wacomcpl-exec
++EXTRA_SCRIPTS = wacom_drv.o wacom_drv.so wacomcpl wacomcpl-exec
+ 
+ # Source dependencies
+ wacdump_SOURCES = wacdump.c wacscrn.c wacscrn.h \
+@@ -75,17 +75,27 @@ LINUX_INPUT=@WCM_LINUX_INPUT@
+ XF86OBJS = xf86Wacom.o wcmSerial.o wcmUSB.o wcmISDV4.o \
+ 		wcmCommon.o wcmCompat.o wcmConfig.o wcmFilter.o
+ 
++XF86OBJS_PIC = $(XF86OBJS:.o=.lo)
++
+ xf86Wacom.o: xf86Wacom.c xf86Wacom.h Makefile
++xf86Wacom.lo: xf86Wacom.c xf86Wacom.h Makefile
+ wcmSerial.o: wcmSerial.c wcmSerial.h xf86Wacom.h
++wcmSerial.lo: wcmSerial.c wcmSerial.h xf86Wacom.h
+ wcmISDV4.o: wcmISDV4.c wcmSerial.h xf86Wacom.h
++wcmISDV4.lo: wcmISDV4.c wcmSerial.h xf86Wacom.h
+ wcmUSB.o: wcmUSB.c xf86Wacom.h
++wcmUSB.lo: wcmUSB.c xf86Wacom.h
+ wcmCommon.o: wcmCommon.c xf86Wacom.h
++wcmCommon.lo: wcmCommon.c xf86Wacom.h
+ wcmCompat.o: wcmCompat.c xf86Wacom.h
++wcmCompat.lo: wcmCompat.c xf86Wacom.h
+ wcmConfig.o: wcmConfig.c xf86Wacom.h
++wcmConfig.lo: wcmConfig.c xf86Wacom.h
+ wcmFilter.o: wcmFilter.c xf86Wacom.h
++wcmFilter.lo: wcmFilter.c xf86Wacom.h
+ 
+ $(XF86OBJS): xf86Wacom.c Makefile
+-	gcc $(CFLAGS) $(DEPFLAGS) -pipe -ansi \
++	$(CC) $(CFLAGS) $(DEPFLAGS) -pipe -ansi \
+ 		-pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \
+ 		-I.  $(DRIVER_INCLUDES) -Dlinux \
+ 		-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE \
+@@ -101,9 +111,25 @@ $(XF86OBJS): xf86Wacom.c Makefile
+ 		-DNARROWPROTO -DIN_MODULE -DXFree86Module $(LINUX_INPUT) \
+ 		-o $@ -c $(subst .o,.c,$@)
+ 
+-wacom_drv.o: $(XF86OBJS)
+-	ld -r $(XF86OBJS) -o wacom_drv.o
++$(XF86OBJS_PIC): xf86Wacom.c Makefile 
++	$(CC) $(CFLAGS) $(DEPFLAGS) -fPIC -pipe -ansi \
++		-pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \
++		-I.  $(DRIVER_INCLUDES) -Dlinux \
++		-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE \
++		-D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE \
++		-DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP -DXCSECURITY \
++		-DTOGCUP -DXF86BIGFONT -DDPMSExtension -DPIXPRIV -DPANORAMIX \
++		-DRENDER -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV \
++		-DSINGLEDEPTH -DXFreeXDGA -DXvExtension -DXFree86LOADER \
++		-DXFree86Server -DXF86VIDMODE -DXvMCExtension \
++		-DSMART_SCHEDULE -DBUILDDEBUG -DXResExtension \
++		-DX_BYTE_ORDER=X_LITTLE_ENDIAN $(XSERVER64) \
++		-DNDEBUG -DFUNCPROTO=15 \
++		-DNARROWPROTO -DIN_MODULE -DXFree86Module $(LINUX_INPUT) \
++		-o $@ -c $(subst .lo,.c,$@)
+ 
+-if WCM_DLLOADER
+-	gcc -fPIC -shared -nostdlib -o wacom_drv.so wacom_drv.o -Bstatic -lgcc
+-endif
++wacom_drv.so: $(XF86OBJS_PIC)
++	$(CC) -shared -nostdlib -o wacom_drv.so $(XF86OBJS_PIC) -Bstatic -lgcc
++
++wacom_drv.o: $(XF86OBJS)
++	$(LD) -r $(XF86OBJS) -o wacom_drv.o
diff --git a/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild b/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild
new file mode 100644
index 000000000000..a6367302571e
--- /dev/null
+++ b/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/linuxwacom/linuxwacom-0.6.9.ebuild,v 1.1 2005/08/09 00:48:36 eradicator Exp $
+
+IUSE="dlloader gtk gtk2 tcltk sdk usb"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Input driver for Wacom tablets and drawing devices"
+HOMEPAGE="http://linuxwacom.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="virtual/x11
+	gtk? (
+		gtk2? ( >=x11-libs/gtk+-2 )
+		!gtk2? ( =x11-libs/gtk+-1.2* )
+	)
+	tcltk? ( dev-lang/tcl dev-lang/tk )
+	sys-libs/ncurses"
+
+DEPEND="${RDEPEND}
+	sdk? ( sys-devel/libtool 
+	       =sys-devel/automake-1.6*
+	       >=sys-devel/autoconf-2.57 )
+	dev-util/pkgconfig
+	usb? ( >=sys-kernel/linux-headers-2.6 )
+	>=sys-apps/sed-4"
+
+pkg_setup() {
+	if use sdk; then
+		if ! built_with_use xorg-x11 sdk
+		then
+			eerror "This package builds against the X.Org SDK, and therefore requires"
+			eerror "that you have emerged xorg-x11 with the sdk USE flag enabled."
+			die "Please remerge xorg-x11 with the sdk USE flag enabled."
+		fi
+		einfo "Building against the X11 SDK. This will install updated X drivers and userland tools."
+	else
+		ewarn "The 'sdk' use flag is not set. Only building userland tools. If you wish to install"
+		ewarn "the updated external driver for your X server, please remerge your X11 package with"
+		ewarn "the USE=sdk flag enabled."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	if use sdk; then
+		cd ${S}
+
+		cp configure.in configure.in.orig
+
+		epatch ${FILESDIR}/${PN}-0.6.9-dlloader.patch
+		export WANT_AUTOMAKE=1.6
+		export WANT_AUTOCONF=2.5
+		libtoolize --force --copy || die
+		aclocal || die
+		automake -a -f -c || die
+		autoheader || die
+		autoconf || die
+
+		# Simple fixes to configure to check the actual location of the XFree86 SDK
+		# No need to check if just building userland tools
+		sed -i -e "s:XF86SUBDIR=.*:XF86SUBDIR=include:" configure
+		sed -i -e "s:XF86V3SUBDIR=.*:XF86V3SUBDIR=include:" configure
+	fi
+}
+
+src_compile() {
+	if use gtk; then
+		if use gtk2; then
+			myconf="${myconf} --with-gtk=2.0"
+		else
+			myconf="${myconf} --with-gtk=1.2"
+		fi
+	else
+		myconf="${myconf} --with-gtk=no"
+	fi
+
+	if use tcltk ; then
+		myconf="${myconf} --with-tcl --with-tk"
+	else
+		myconf="${myconf} --without-tcl --without-tk"
+	fi
+
+	if use amd64 ; then
+		myconf="${myconf} --enable-xserver64"
+	fi
+	myconf="${myconf} --with-xorg-sdk=/usr/$(get_libdir)/Server/ --with-xlib=/usr/$(get_libdir)"
+
+	if use sdk; then
+		myconf="${myconf} --enable-wacomdrv --enable-wacdump --enable-xsetwacom"
+		myconf="${myconf} --with-xf86=/usr/$(get_libdir)/Server --with-xorg-sdk=/usr/$(get_libdir)/Server"
+
+		if use dlloader || has_version ">=x11-base/xorg-x11-6.8.99.15" ; then
+			myconf="${myconf} --enable-dlloader"
+		fi
+
+		econf ${myconf} || die "configure failed."
+
+		# Makefile fix for build against SDK
+		cd ${S}/src
+		sed -i -e "s:/include/extensions:/include:g" Makefile
+	else
+		myconf="${myconf} --disable-wacomdrv --enable-wacdump --enable-xsetwacom"
+		econf ${myconf} || die "configure failed."
+	fi
+	cd ${S}
+	unset ARCH
+	emake || die "build failed."
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed."
+	dohtml -r docs/*
+	dodoc AUTHORS ChangeLog NEWS README
+}