rpms/linuxwacom/devel .cvsignore, 1.11, 1.12 linuxwacom-0.7.6.3-delibcwrap.patch, 1.1, 1.2 linuxwacom-0.7.8.3-sdk-me-harder.patch, 1.1, 1.2 linuxwacom-disable_stack_protector.patch, 1.1, 1.2 linuxwacom.spec, 1.51, 1.52 sources, 1.11, 1.12
Aristeu Sergio Rozanski Filho (arozansk)
fedora-extras-commits at redhat.com
Wed Mar 5 00:54:40 UTC 2008
Author: arozansk
Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11721
Modified Files:
.cvsignore linuxwacom-0.7.6.3-delibcwrap.patch
linuxwacom-0.7.8.3-sdk-me-harder.patch
linuxwacom-disable_stack_protector.patch linuxwacom.spec
sources
Log Message:
* updating to 0.7.9-7
* build fixed
* configuration tools enabled
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 2 Jan 2008 20:33:26 -0000 1.11
+++ .cvsignore 5 Mar 2008 00:53:44 -0000 1.12
@@ -1 +1 @@
-linuxwacom-0.7.9-4.tar.bz2
+linuxwacom-0.7.9-8.tar.bz2
linuxwacom-0.7.6.3-delibcwrap.patch:
Index: linuxwacom-0.7.6.3-delibcwrap.patch
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom-0.7.6.3-delibcwrap.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linuxwacom-0.7.6.3-delibcwrap.patch 27 Nov 2006 22:50:40 -0000 1.1
+++ linuxwacom-0.7.6.3-delibcwrap.patch 5 Mar 2008 00:53:44 -0000 1.2
@@ -1,6 +1,10 @@
---- linuxwacom-0.7.6-3/src/xdrv/xf86Wacom.h.delibcwrap 2006-11-21 19:20:15.000000000 -0500
-+++ linuxwacom-0.7.6-3/src/xdrv/xf86Wacom.h 2006-11-27 17:28:12.000000000 -0500
-@@ -57,17 +57,17 @@
+---
+ src/xdrv/xf86Wacom.h | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- linuxwacom-0.7.9-7.orig/src/xdrv/xf86Wacom.h 2008-01-22 14:22:31.000000000 -0500
++++ linuxwacom-0.7.9-7/src/xdrv/xf86Wacom.h 2008-02-14 10:39:19.000000000 -0500
+@@ -53,10 +53,11 @@
* XFree86 V4.x Headers
****************************************************************************/
@@ -14,10 +18,3 @@
#include <misc.h>
#include <xf86.h>
- #define NEED_XF86_TYPES
- #if !defined(DGUX)
- #include <xisb.h>
--#include <xf86_ansic.h>
- #endif
- #include <xf86_OSproc.h>
- #include <xf86Xinput.h>
linuxwacom-0.7.8.3-sdk-me-harder.patch:
Index: linuxwacom-0.7.8.3-sdk-me-harder.patch
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom-0.7.8.3-sdk-me-harder.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linuxwacom-0.7.8.3-sdk-me-harder.patch 14 Nov 2007 19:01:56 -0000 1.1
+++ linuxwacom-0.7.8.3-sdk-me-harder.patch 5 Mar 2008 00:53:44 -0000 1.2
@@ -1,23 +1,25 @@
-diff -up linuxwacom-0.7.8-3/src/xdrv/Makefile.am.jx linuxwacom-0.7.8-3/src/xdrv/Makefile.am
---- linuxwacom-0.7.8-3/src/xdrv/Makefile.am.jx 2007-08-14 19:12:39.000000000 -0400
-+++ linuxwacom-0.7.8-3/src/xdrv/Makefile.am 2007-11-14 13:24:42.000000000 -0500
-@@ -25,7 +25,7 @@ ARCHITECTURE =@WCM_ARCH@
- XSERVER64 =@WCM_XSERVER64@
+---
+ configure.in | 3 +++
+ src/xdrv/Makefile.am | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+--- linuxwacom-0.7.9-7.orig/src/xdrv/Makefile.am 2008-02-14 10:45:23.000000000 -0500
++++ linuxwacom-0.7.9-7/src/xdrv/Makefile.am 2008-02-14 10:50:50.000000000 -0500
+@@ -15,7 +15,7 @@ EXTRA_DIST = xf86Wacom.c wcmXCommand.c x
+ ../include/Xwacom.h
if WCM_ENV_XORGSDK
--DRIVER_INCLUDES = -I$(XORGSDK_DIR) $(X_CFLAGS) -DWCM_XORG
-+DRIVER_INCLUDES = -I$(XORGSDK_DIR) $(X_CFLAGS) -DWCM_XORG @XORG_CFLAGS@
+-DRIVER_INCLUDES = -I$(WCM_XORGSDK_DIR) $(X_CFLAGS)
++DRIVER_INCLUDES = -I$(WCM_XORGSDK_DIR) $(X_CFLAGS) @XORG_CFLAGS@
endif
- if WCM_ENV_XF86
-diff -up linuxwacom-0.7.8-3/configure.in.jx linuxwacom-0.7.8-3/configure.in
---- linuxwacom-0.7.8-3/configure.in.jx 2007-08-14 19:12:39.000000000 -0400
-+++ linuxwacom-0.7.8-3/configure.in 2007-11-14 13:23:49.000000000 -0500
-@@ -40,6 +40,10 @@ fi
- dnl Check for X source or X SDK
- AC_WCM_CHECK_XSOURCE
- AC_WCM_CHECK_XORG_SDK
-+
+ if WCM_ENV_XFREE86
+--- linuxwacom-0.7.9-7.orig/configure.in 2008-01-22 14:22:31.000000000 -0500
++++ linuxwacom-0.7.9-7/configure.in 2008-02-14 10:55:26.000000000 -0500
+@@ -445,6 +445,9 @@ if test "$WCM_ENV_XFREE86" != yes; then
+ fi
+ AM_CONDITIONAL(WCM_ENV_XORGSDK, [test "$WCM_ENV_XORGSDK" = yes])
+
+PKG_CHECK_MODULES(XORG, [xorg-server])
+AC_SUBST([XORG_CFLAGS])
+
linuxwacom-disable_stack_protector.patch:
Index: linuxwacom-disable_stack_protector.patch
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom-disable_stack_protector.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linuxwacom-disable_stack_protector.patch 21 Aug 2007 15:37:18 -0000 1.1
+++ linuxwacom-disable_stack_protector.patch 5 Mar 2008 00:53:44 -0000 1.2
@@ -1,12 +1,15 @@
-Index: linuxwacom-0.7.8-3/src/xdrv/Makefile.in
-===================================================================
---- linuxwacom-0.7.8-3.orig/src/xdrv/Makefile.in
-+++ linuxwacom-0.7.8-3/src/xdrv/Makefile.in
-@@ -447,6 +447,7 @@ wcmFilter.o: wcmFilter.c wcmFilter.h
+---
+ src/xdrv/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linuxwacom-0.7.9-7.orig/src/xdrv/Makefile.am 2008-01-22 14:22:31.000000000 -0500
++++ linuxwacom-0.7.9-7/src/xdrv/Makefile.am 2008-02-14 10:45:23.000000000 -0500
+@@ -32,7 +32,7 @@ DRIVER_INCLUDES = \
+ endif
- $(XF86OBJS): xf86Wacom.h ../include/Xwacom.h Makefile
- $(CC) $(CFLAGS) $(DEPFLAGS) $(DLLOADER) -pipe -ansi \
-+ -fno-stack-protector \
- -pedantic -Wall -Wpointer-arith $(NO_MERGE_CONSTANTS) \
- -I$(srcdir) $(DRIVER_INCLUDES) -Dlinux \
- -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE \
+ NO_MERGE_CONSTANTS=@WCM_NO_MERGE_CONSTANTS@
+-NO_STACK_PROTECTOR=@WCM_NO_STACK_PROTECTOR@
++NO_STACK_PROTECTOR=-fno-stack-protector
+ WCM_CLEVEL=@WCM_CLEVEL@
+
+ if WCM_DLLOADER
Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- linuxwacom.spec 18 Feb 2008 19:28:16 -0000 1.51
+++ linuxwacom.spec 5 Mar 2008 00:53:44 -0000 1.52
@@ -1,10 +1,9 @@
-%define _x11sdkdir %(pkg-config --variable=sdkdir xorg-server)
-%define tarname %{name}-0.7.9-4
+%define tarname %{name}-0.7.9-8
# Upstream's versioning is goofy. Note the mapping from tarname to version.
Name: linuxwacom
-Version: 0.7.9.4
-Release: 2%{?dist}
+Version: 0.7.9.8
+Release: 1%{?dist}
Summary: Wacom Drivers from Linux Wacom Project
Group: User Interface/X Hardware Support
@@ -15,12 +14,13 @@
Patch1: linuxwacom-0.7.6.3-delibcwrap.patch
Patch2: linuxwacom-disable_stack_protector.patch
Patch3: linuxwacom-0.7.8.3-sdk-me-harder.patch
+Patch4: linuxwacom-0.7.9.7-fix_build.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
BuildRequires: libX11-devel libXi-devel ncurses-devel
BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
-BuildRequires: autoconf automake libtool
-Requires: xorg-x11-server-Xorg >= 1.4.99.1, udev >= 030-21
+BuildRequires: autoconf automake libtool tk-devel tcl-devel xorg-x11-server-Xorg
+Requires: xorg-x11-server-Xorg >= 1.4.99.1, udev >= 030-21 tk tcl
ExclusiveArch: %{ix86} x86_64 alpha ia64 ppc ppc64 sparc sparc64
%description
@@ -44,6 +44,7 @@
#patch1 -p1 -b .delibcwrap
%patch2 -p1
%patch3 -p1 -b .sdk
+%patch4 -p1
%build
@@ -56,10 +57,7 @@
fi
export RPM_LIBDIR=%{_lib}
-%configure --without-gtk --without-tcl --without-tk \
- --disable-wacomxi --disable-libwacomxi \
- --with-xorg-sdk=/usr --with-xlib=%{_libdir} \
- --enable-dlloader $XSERVER64
+%configure --without-gtk --enable-dlloader $XSERVER64
export CFLAGS="$RPM_OPT_FLAGS"
make
@@ -91,7 +89,10 @@
%{_bindir}/wacdump
%{_bindir}/xidump
%{_bindir}/xsetwacom
+%{_bindir}/wacomcpl
+%{_bindir}/wacomcpl-exec
%{_libdir}/libwacomcfg*so.*
+%{_libdir}/TkXInput/*
%{_mandir}/man4/wacom.4*
%{_sysconfdir}/udev/rules.d/60-wacom.rules
@@ -103,6 +104,14 @@
%{_libdir}/libwacomcfg*.so
%changelog
+* Fri Feb 22 2008 Aristeu Rozanski <arozansk at redhat.com> - 0.7.9.8-1
+- Fixed build
+- New upstream version
+- Enabled configuration tools
+- the xorg-server is on the list of buildrequires otherwise the dumb configure
+ scripts will think there's no support for X modules and will build a .o
+ instead of .so. I need to fix this in the future.
+
* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.7.9.4-2
- Autorebuild for GCC 4.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 2 Jan 2008 20:33:26 -0000 1.11
+++ sources 5 Mar 2008 00:53:44 -0000 1.12
@@ -1 +1 @@
-3fd0c86652f85653a61b88c6c582f026 linuxwacom-0.7.9-4.tar.bz2
+8cb221a7ac21d92fa4ddcc3a709ce22c linuxwacom-0.7.9-8.tar.bz2
More information about the fedora-extras-commits
mailing list