Cześć,
W załączniku poprawki do bluez i wacomlinux umożliwiające używanie Wacom
Bluetooth Tablet + podbicie wersji. Może to ktoś sprawdzić?
--
Przemo
--- ~bluez.spec 2009-06-21 16:46:35.000000000 +0100
+++ bluez.spec 2009-07-13 19:15:35.000000000 +0100
@@ -2,19 +2,19 @@
Summary: Bluetooth utilities
Summary(pl.UTF-8): Narzędzia Bluetooth
Name: bluez
-Version: 4.42
+Version: 4.45
Release: 1
License: GPL v2+
Group: Applications/System
#Source0Download: http://www.bluez.org/download.html
Source0: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
-# Source0-md5: d24dfd3ca42847123e29f58b29af6948
+# Source0-md5: fb1a02a8008326eabe383dc6fb01b05d
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}-udev.rules
Source4: %{name}-udev.script
Patch0: %{name}-etc_dir.patch
-Patch1: %{name}-udev-path.patch
+Patch2: %{name}-wacom-mode-2.patch
URL: http://www.bluez.org/
BuildRequires: alsa-lib-devel >= 1.0.10-1
BuildRequires: autoconf >= 2.50
@@ -30,6 +30,7 @@
BuildRequires: libusb-compat-devel
BuildRequires: openobex-devel >= 1.1
BuildRequires: pkgconfig >= 1:0.9.0
+BuildRequires: udev-devel
BuildRequires: rpmbuild(macros) >= 1.268
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: rc-scripts
@@ -169,7 +170,7 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
+%patch2 -p1
%build
%{__libtoolize}
@@ -195,10 +196,11 @@
--enable-netlink \
--enable-network \
--enable-pand \
- --enable-pcmciarules \
+ --enable-pcmcia \
--enable-serial \
--enable-tools \
- --enable-usb
+ --enable-usb \
+ --enable-udevrules
%{__make} \
cupsdir=%{cupsdir} \
@@ -221,7 +223,7 @@
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/bluetooth
install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/bluetooth
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/udev/rules.d/70-bluetooth.rules
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/udev/rules.d/bluetooth.rules
install %{SOURCE4} $RPM_BUILD_ROOT%{udevdir}/bluetooth.sh
rm -f $RPM_BUILD_ROOT%{_libdir}/alsa-lib/*.{,l}a
rm -f $RPM_BUILD_ROOT%{_libdir}/bluetooth/plugins/*.{,l}a
@@ -262,9 +264,10 @@
%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/bluetooth.conf
%attr(755,root,root) %{udevdir}/bluetooth.sh
%attr(755,root,root) %{udevdir}/bluetooth_serial
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/70-bluetooth.rules
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/bluetooth-hid2hci.rules
-%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/bluetooth-serial.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/bluetooth.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/97-bluetooth.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/97-bluetooth-hid2hci.rules
+%config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/97-bluetooth-serial.rules
%{_mandir}/man[18]/*
%files -n alsa-plugins-bluetooth
--- a/input/device.c
+++ b/input/device.c
@@ -658,6 +658,19 @@ static int hidp_add_connection(const struct input_device *idev,
err = write(sk, buf, sizeof(buf));
}
+ if (req->vendor == 0x056a && req->product == 0x81) {
+ unsigned char buf[3];
+ int sk = g_io_channel_unix_get_fd(iconn->ctrl_io);
+
+ buf[0] = 0x53; /* HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE */
+ buf[1] = 0x03; buf[2] = 0x00;
+ write(sk, buf, sizeof(buf));
+
+ buf[0] = 0x53; /* HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE */
+ /* 0x06 - high reporting speed, 0x05 - low speed */
+ buf[1] = 0x05; buf[2] = 0x00;
+ write(sk, buf, sizeof(buf));
+ }
err = ioctl_connadd(req);
cleanup:
--- ~linuxwacom.spec 2009-07-11 16:50:57.000000000 +0100
+++ linuxwacom.spec 2009-07-11 18:11:36.000000000 +0100
@@ -15,12 +15,12 @@
Summary: Wacom Drivers from Linux Wacom Project
Summary(pl.UTF-8): Sterowniki Wacom z projektu Linux Wacom Project
Name: linuxwacom
-Version: 0.8.2
-Release: 1
+Version: 0.8.3
+Release: 6
License: GPL/X11
Group: X11
-Source0: http://dl.sourceforge.net/linuxwacom/%{name}-%{version}-2.tar.bz2
-# Source0-md5: bdfaf6da49b446e251ac1f98754a89a2
+Source0: http://dl.sourceforge.net/linuxwacom/%{name}-%{version}-6.tar.bz2
+# Source0-md5: 72b119aacbeb1e312a3ced6d30a722c6
Source1: %{name}-rules
URL: http://linuxwacom.sourceforge.net/
%if %{with kernel}
@@ -30,6 +30,7 @@
%if %{with userspace}
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: hal-devel >= 0.5.0
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: tcl-devel
@@ -84,18 +85,18 @@
Statyczna biblioteka linuxwacom.
%prep
-%setup -q -n %{name}-%{version}-2
+%setup -q -n %{name}-%{version}-6
-cat > src/2.6.19/Makefile << EOF
+cat > src/2.6.31/Makefile << EOF
obj-m += wacom.o
wacom-objs := wacom_wac.o wacom_sys.o
%{?debug:CFLAGS += -DCONFIG_MODULE_NAME_DEBUG=1}
EOF
-cp src/2.6.1{6,9}/wacom_wac.h
+#cp src/2.6.28/wacom_wac.h
%build
%if %{with kernel}
-%build_kernel_modules -C src/2.6.19 -m wacom
+%build_kernel_modules -C src/2.6.31 -m wacom
%endif
%if %{with userspace}
@@ -110,6 +111,7 @@
#fi
export CFLAGS="-I/usr/include/ncurses %{rpmcflags}"
%configure \
+ --libexecdir=%{_libexecdir}/hal \
--with-gtk \
--with-tcl \
--with-tk \
@@ -144,7 +146,7 @@
%endif
%if %{with kernel}
-%install_kernel_modules -m src/2.6.19/wacom -d misc
+%install_kernel_modules -m src/2.6.31/wacom -d misc
%endif
%clean
@@ -157,7 +159,7 @@
%defattr(644,root,root,755)
%if %{with userspace}
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README NEWS
+%doc AUTHORS ChangeLog README
%attr(755,root,root) %{_bindir}/wacdump
%attr(755,root,root) %{_bindir}/wacomcpl*
%attr(755,root,root) %{_bindir}/xidump
@@ -170,7 +172,7 @@
%attr(755,root,root) %{_libdir}/libwacomcfg.so.0
%attr(755,root,root) %{_libdir}/xorg/modules/input/wacom_drv.so
%{_sysconfdir}/udev/rules.d/10-wacom.rules
-%{_libdir}/hal-setup-wacom
+%attr(755,root,root) %{_libexecdir}/hal/hal-setup-wacom
%{_datadir}/hal/fdi/policy/20thirdparty/10-linuxwacom.fdi
#%%files tk
_______________________________________________
pld-devel-pl mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-devel-pl
