ports/133998: [patch] x11-drivers/xf86-input-synaptics: upgrade to 1.1.0

Sat Apr 25 15:30:09 UTC 2009

The following reply was made to PR ports/133998; it has been noted by GNATS.

From: Robert Noland <rnoland at FreeBSD.org>
To: Eygene Ryabinkin <rea-fbsd at codelabs.ru>
Cc: FreeBSD-gnats-submit at freebsd.org
Subject: Re: ports/133998: [patch] x11-drivers/xf86-input-synaptics:
 upgrade to 1.1.0
Date: Sat, 25 Apr 2009 10:22:40 -0500

 --=-gPgjqI0gzkdBSsj7GFCp
 Content-Type: text/plain
 Content-Transfer-Encoding: quoted-printable

 On Sat, 2009-04-25 at 16:35 +0400, Eygene Ryabinkin wrote:
 > >Number:         133998
 > >Category:       ports
 > >Synopsis:       [patch] x11-drivers/xf86-input-synaptics: upgrade to 1.1=
 .0
 > >Confidential:   no
 > >Severity:       serious
 > >Priority:       medium
 > >Responsible:    freebsd-ports-bugs
 > >State:          open
 > >Quarter:       =20
 > >Keywords:      =20
 > >Date-Required:
 > >Class:          sw-bug
 > >Submitter-Id:   current-users
 > >Arrival-Date:   Sat Apr 25 12:40:03 UTC 2009
 > >Closed-Date:
 > >Last-Modified:
 > >Originator:     Eygene Ryabinkin
 > >Release:        FreeBSD 7.2-PRERELEASE amd64
 > >Organization:
 > Code Labs
 > >Environment:
 >=20
 > System: FreeBSD 7.2-PRERELEASE amd64
 >=20
 > >Description:
 >=20
 > Synaptics touchpad driver version 1.1.0 for Xorg is out: [1].
 > FreeBSD port is still at 0.99.3.
 >=20
 > >How-To-Repeat:
 >=20
 > [1] http://cgit.freedesktop.org/xorg/driver/xf86-input-synaptics/tag/?id=
 =3Dxf86-input-synaptics-1.1.0
 >=20
 > >Fix:
 >=20
 > The following patch upgrades the port, adds some new @dirrmtry
 > directives, creates directory for HAL policy and patches configure to
 > install header files to the place specified by the port, not by
 > pkg-config.
 >=20
 > It works for my laptop without problems for around a week.

 Ok, it was the testing part that I hadn't gotten around to yet...  Along
 with the fact that all I have to test with are actually GlidePoint and
 not real Synaptics.  This version is supposed to change around how the
 driver is configured a fair amount, iirc you should be able to do
 configuration via xinput.  Have you tested any of that?

 robert.

 > --- port-upgrade-to-1.1.0.diff begins here ---
 > >From 38b9e6aa03c734daaebd27e87c5deef304f7b1bd Mon Sep 17 00:00:00 2001
 > From: Eygene Ryabinkin <rea-fbsd at codelabs.ru>
 > Date: Sat, 25 Apr 2009 00:25:16 +0400
 >=20
 > Upstream package was recently updated to 1.1.0, so we should catch
 > these changes.
 >=20
 > Signed-off-by: Eygene Ryabinkin <rea-fbsd at codelabs.ru>
 > ---
 >  x11-drivers/xf86-input-synaptics/Makefile          |    4 ++--
 >  x11-drivers/xf86-input-synaptics/distinfo          |    6 +++---
 >  .../xf86-input-synaptics/files/patch-configure     |   15 ++++++++++++++=
 +
 >  x11-drivers/xf86-input-synaptics/pkg-plist         |    4 ++++
 >  4 files changed, 24 insertions(+), 5 deletions(-)
 >  create mode 100644 x11-drivers/xf86-input-synaptics/files/patch-configur=
 e
 >=20
 > diff --git a/x11-drivers/xf86-input-synaptics/Makefile b/x11-drivers/xf86=
 -input-synaptics/Makefile
 > index 4c691d7..e94ccd5 100644
 > --- a/x11-drivers/xf86-input-synaptics/Makefile
 > +++ b/x11-drivers/xf86-input-synaptics/Makefile
 > @@ -6,8 +6,7 @@
 >  #
 > =20
 >  PORTNAME=3D	xf86-input-synaptics
 > -PORTVERSION=3D	0.99.3
 > -PORTREVISION=3D	1
 > +PORTVERSION=3D	1.1.0
 >  CATEGORIES=3D	x11-drivers
 > =20
 >  MAINTAINER=3D	x11 at FreeBSD.org
 > @@ -24,6 +23,7 @@ MAN1=3D		syndaemon.1 \
 >  MAN4=3D		synaptics.4x
 > =20
 >  post-install:
 > +	${MKDIR} ${PREFIX}/share/hal/fdi/policy/10osvendor
 >  	${INSTALL_DATA} ${WRKSRC}/fdi/11-x11-synaptics.fdi \
 >  		${PREFIX}/share/hal/fdi/policy/10osvendor/
 > =20
 > diff --git a/x11-drivers/xf86-input-synaptics/distinfo b/x11-drivers/xf86=
 -input-synaptics/distinfo
 > index b7ce9b8..6df7613 100644
 > --- a/x11-drivers/xf86-input-synaptics/distinfo
 > +++ b/x11-drivers/xf86-input-synaptics/distinfo
 > @@ -1,3 +1,3 @@
 > -MD5 (xorg/driver/xf86-input-synaptics-0.99.3.tar.bz2) =3D 735a798e0f68c6=
 5d98e3d6b092b56d29
 > -SHA256 (xorg/driver/xf86-input-synaptics-0.99.3.tar.bz2) =3D 1a31962e05f=
 f8480e1d97e0cd33b071fdc9a128cf71c5ad05428e5761be4f4b2
 > -SIZE (xorg/driver/xf86-input-synaptics-0.99.3.tar.bz2) =3D 284946
 > +MD5 (xorg/driver/xf86-input-synaptics-1.1.0.tar.bz2) =3D d9a05d53c728400=
 e00e6bc146758c6e5
 > +SHA256 (xorg/driver/xf86-input-synaptics-1.1.0.tar.bz2) =3D a72288348d27=
 dd1d075aacb7286aac4e2182f518c069b177e72f3179de56bfc4
 > +SIZE (xorg/driver/xf86-input-synaptics-1.1.0.tar.bz2) =3D 294645
 > diff --git a/x11-drivers/xf86-input-synaptics/files/patch-configure b/x11=
 -drivers/xf86-input-synaptics/files/patch-configure
 > new file mode 100644
 > index 0000000..89d24af
 > --- /dev/null
 > +++ b/x11-drivers/xf86-input-synaptics/files/patch-configure
 > @@ -0,0 +1,15 @@
 > +sdkdir hunk: we want the port to install header files to the
 > +location specified during the port build and not to the location
 > +specified by Xorg's pkg-config file.
 > +
 > +--- configure.orig	2009-04-25 15:11:21.000000000 +0400
 > ++++ configure	2009-04-25 15:14:27.000000000 +0400
 > +@@ -21128,7 +21128,7 @@
 > + $as_echo "yes" >&6; }
 > + 	:
 > + fi
 > +-sdkdir=3D$(pkg-config --variable=3Dsdkdir xorg-server)
 > ++sdkdir=3D"${prefix}/include/xorg"
 > +=20
 > +=20
 > + CFLAGS=3D"$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
 > diff --git a/x11-drivers/xf86-input-synaptics/pkg-plist b/x11-drivers/xf8=
 6-input-synaptics/pkg-plist
 > index b270639..7fa2267 100644
 > --- a/x11-drivers/xf86-input-synaptics/pkg-plist
 > +++ b/x11-drivers/xf86-input-synaptics/pkg-plist
 > @@ -10,3 +10,7 @@ share/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 >  @dirrmtry lib/xorg/modules
 >  @dirrmtry lib/xorg
 >  @dirrmtry include/xorg
 > + at dirrmtry share/hal/fdi/policy/10osvendor
 > + at dirrmtry share/hal/fdi/policy
 > + at dirrmtry share/hal/fdi
 > + at dirrmtry share/hal
 --=20
 Robert Noland <rnoland at FreeBSD.org>
 FreeBSD

 --=-gPgjqI0gzkdBSsj7GFCp
 Content-Type: application/pgp-signature; name="signature.asc"
 Content-Description: This is a digitally signed message part

 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (FreeBSD)

 iEYEABECAAYFAknzKsAACgkQM4TrQ4qfROOVhQCdGnU7evR3Qh3UnSSgWivq7TpV
 KzMAnAyUNb7ZQZpu5mVUQo+gVyLowtrD
 =46AT
 -----END PGP SIGNATURE-----

 --=-gPgjqI0gzkdBSsj7GFCp--