x11r7: xdriver_xf86-input-tslib: new upstream location

PATCH New Martin Kepplinger 2 participants 6 messages Apr 28, 2017 – Apr 29, 2017

Share & tools

Martin Kepplinger

author

2017-04-28 12:36 UTC #0 lore raw

PATCH 1/2 x11r7: xdriver_xf86-input-tslib: new upstream location

This switches upstream to the Github project where xf86-input-tslib is currently maintained - in cooperation with Pengutronix, who had hosted the tarball release up until now.

Signed-off-by Martin Kepplinger <[email protected]>

---
 package/x11r7/xdriver_xf86-input-tslib/Config.in                   | 2 +-
 package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

package/x11r7/xdriver_xf86-input-tslib/Config.in +1 -1

index 9c6e296..08d790c 100644
@@ -8,7 +8,7 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB
 	help
 	  Touch screen library input driver
 
-	  http://www.ptxdist.org/software/xf86-input-tslib/index_en.html
+	  https://github.com/merge/xf86-input-tslib
 
 comment "xf86-input-tslib needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS

package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk +1 -1

index cd8c10a..0a92153 100644
@@ -6,7 +6,7 @@
 
 XDRIVER_XF86_INPUT_TSLIB_VERSION = 0.0.6
 XDRIVER_XF86_INPUT_TSLIB_SOURCE = xf86-input-tslib-$(XDRIVER_XF86_INPUT_TSLIB_VERSION).tar.bz2
-XDRIVER_XF86_INPUT_TSLIB_SITE = http://www.pengutronix.de/software/xf86-input-tslib/download
+XDRIVER_XF86_INPUT_TSLIB_SITE = https://github.com/merge/xf86-input-tslib/releases/download/$(TSLIB_VERSION)
 XDRIVER_XF86_INPUT_TSLIB_LICENSE = MIT
 XDRIVER_XF86_INPUT_TSLIB_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_TSLIB_DEPENDENCIES = \

Signature · 1 line

2.1.4

Martin Kepplinger

author

2017-04-28 12:36 UTC #1 lore raw

PATCH 2/2 x11r7: xdriver_xf86-input-tslib: update to 0.0.7

The patches are removed as they are part of this release. 0.0.7 is a bugfix and compatibility release to keep this usable for on newer systems.

Signed-off-by Martin Kepplinger <[email protected]>

---
 .../0001-fix-segfault.patch                        |  34 ----
 .../0002-port-abi-12.patch                         | 196 ---------------------
 .../xdriver_xf86-input-tslib.hash                  |   4 +-
 .../xdriver_xf86-input-tslib.mk                    |   2 +-
 4 files changed, 3 insertions(+), 233 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-input-tslib/0001-fix-segfault.patch
 delete mode 100644 package/x11r7/xdriver_xf86-input-tslib/0002-port-abi-12.patch

package/x11r7/xdriver_xf86-input-tslib/0001-fix-segfault.patch deleted +0 ~~-34~~

deleted file mode 100644
index adef18b..0000000
@@ -1,34 +0,0 @@
-Fetch from: https://launchpad.net/ubuntu/+archive/primary/+files/xf86-input-tslib_0.0.6-7build3.debian.tar.gz
-
-Signed-off-by: Jesper Baekdahl <[email protected]>
----
---- xf86-input-tslib-0.0.6/src/tslib.c	2009-10-19 18:07:18.000000000 +0300
-+++ xf86-input-tslib-0.0.6.new/src/tslib.c	2010-02-12 16:15:05.000000000 +0200
-@@ -103,8 +103,6 @@
- static void
- PointerControlProc(DeviceIntPtr dev, PtrCtrl * ctrl)
- {
--	ErrorF("%s\n", __FUNCTION__);
--	return;
- }
- 
- static Bool
-@@ -406,7 +404,9 @@
- 		xf86MotionHistoryAllocate(pInfo);
- #endif
- 
--		break;
-+		if (!InitPtrFeedbackClassDeviceStruct(device, PointerControlProc))
-+			return !Success;
-+		break;
- 
- 	case DEVICE_ON:
- 		AddEnabledDevice(pInfo->fd);
-@@ -435,6 +435,7 @@
- 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
- 	ts_close(priv->ts);
- 	xfree(pInfo->private);
-+	pInfo->private = NULL;
- 	xf86DeleteInput(pInfo, 0);
- }
-

package/x11r7/xdriver_xf86-input-tslib/0002-port-abi-12.patch deleted +0 ~~-196~~

196 lines not on this page · raw message

package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash +2 -2

index 9eb3f1d..b318bd5 100644
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256 5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105  xf86-input-tslib-0.0.6.tar.bz2
+# https://github.com/merge/xf86-input-tslib/releases/download/0.0.7/xf86-input-tslib-0.0.7.tar.bz2.sha256
+sha256 5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105  xf86-input-tslib-0.0.7.tar.bz2

package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk +1 -1

index 0a92153..6f4b64f 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_TSLIB_VERSION = 0.0.6
+XDRIVER_XF86_INPUT_TSLIB_VERSION = 0.0.7
 XDRIVER_XF86_INPUT_TSLIB_SOURCE = xf86-input-tslib-$(XDRIVER_XF86_INPUT_TSLIB_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_TSLIB_SITE = https://github.com/merge/xf86-input-tslib/releases/download/$(TSLIB_VERSION)
 XDRIVER_XF86_INPUT_TSLIB_LICENSE = MIT

Signature · 1 line

2.1.4

Martin Kepplinger

author

2017-04-28 13:33 UTC #2 lore raw

PATCH v2 1/1 x11r7: xdriver_xf86-input-tslib: update to 0.0.7

The patches are removed as they are part of this release. 0.0.7 is a bugfix and compatibility release to keep this usable for on newer systems.

Signed-off-by Martin Kepplinger <[email protected]>

---

damn, I forgot to update the hash

revision history
----------------
v2: fix the hash
v1: initial commit

 .../0001-fix-segfault.patch                        |  34 ----
 .../0002-port-abi-12.patch                         | 196 ---------------------
 .../xdriver_xf86-input-tslib.hash                  |   4 +-
 .../xdriver_xf86-input-tslib.mk                    |   2 +-
 4 files changed, 3 insertions(+), 233 deletions(-)
 delete mode 100644 package/x11r7/xdriver_xf86-input-tslib/0001-fix-segfault.patch
 delete mode 100644 package/x11r7/xdriver_xf86-input-tslib/0002-port-abi-12.patch

package/x11r7/xdriver_xf86-input-tslib/0001-fix-segfault.patch deleted +0 ~~-34~~

deleted file mode 100644
index adef18b..0000000
@@ -1,34 +0,0 @@
-Fetch from: https://launchpad.net/ubuntu/+archive/primary/+files/xf86-input-tslib_0.0.6-7build3.debian.tar.gz
-
-Signed-off-by: Jesper Baekdahl <[email protected]>
----
---- xf86-input-tslib-0.0.6/src/tslib.c	2009-10-19 18:07:18.000000000 +0300
-+++ xf86-input-tslib-0.0.6.new/src/tslib.c	2010-02-12 16:15:05.000000000 +0200
-@@ -103,8 +103,6 @@
- static void
- PointerControlProc(DeviceIntPtr dev, PtrCtrl * ctrl)
- {
--	ErrorF("%s\n", __FUNCTION__);
--	return;
- }
- 
- static Bool
-@@ -406,7 +404,9 @@
- 		xf86MotionHistoryAllocate(pInfo);
- #endif
- 
--		break;
-+		if (!InitPtrFeedbackClassDeviceStruct(device, PointerControlProc))
-+			return !Success;
-+		break;
- 
- 	case DEVICE_ON:
- 		AddEnabledDevice(pInfo->fd);
-@@ -435,6 +435,7 @@
- 	xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
- 	ts_close(priv->ts);
- 	xfree(pInfo->private);
-+	pInfo->private = NULL;
- 	xf86DeleteInput(pInfo, 0);
- }
-

package/x11r7/xdriver_xf86-input-tslib/0002-port-abi-12.patch deleted +0 ~~-196~~

196 lines not on this page · raw message

package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash +2 -2

index 9eb3f1d..b8eb2b8 100644
@@ -1,2 +1,2 @@
-# Locally calculated
-sha256 5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105  xf86-input-tslib-0.0.6.tar.bz2
+# https://github.com/merge/xf86-input-tslib/releases/download/0.0.7/xf86-input-tslib-0.0.7.tar.bz2.sha256
+sha256 6f23cc9702b0ae16086d364b275335c094efbf6acde57f8a030e4db5b9aece03  xf86-input-tslib-0.0.7.tar.bz2

package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk +1 -1

index 0a92153..6f4b64f 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-XDRIVER_XF86_INPUT_TSLIB_VERSION = 0.0.6
+XDRIVER_XF86_INPUT_TSLIB_VERSION = 0.0.7
 XDRIVER_XF86_INPUT_TSLIB_SOURCE = xf86-input-tslib-$(XDRIVER_XF86_INPUT_TSLIB_VERSION).tar.bz2
 XDRIVER_XF86_INPUT_TSLIB_SITE = https://github.com/merge/xf86-input-tslib/releases/download/$(TSLIB_VERSION)
 XDRIVER_XF86_INPUT_TSLIB_LICENSE = MIT

Signature · 1 line

2.1.4

Thomas Petazzoni

Applied

2017-04-29 11:58 UTC #3 lore raw

PATCH v2 1/1 x11r7: xdriver_xf86-input-tslib: update to 0.0.7

Hello,

Quoted 5 lines · Martin Kepplinger

The patches are removed as they are part of this release. 0.0.7 is a bugfix and compatibility release to keep this usable for on newer systems.
Signed-off-by Martin Kepplinger <[email protected]>
---

Applied to master, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Thomas Petazzoni

2017-04-29 11:58 UTC #4 lore raw

PATCH 1/2 x11r7: xdriver_xf86-input-tslib: new upstream location

In reply to Martin Kepplinger

Hello,

package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk line 9

Quoted 4 lines · Martin Kepplinger

XDRIVER_XF86_INPUT_TSLIB_VERSION = 0.0.6
XDRIVER_XF86_INPUT_TSLIB_SOURCE = xf86-input-tslib-$(XDRIVER_XF86_INPUT_TSLIB_VERSION).tar.bz2
package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk +1 -1
-XDRIVER_XF86_INPUT_TSLIB_SITE = http://www.pengutronix.de/software/xf86-input-tslib/download
+XDRIVER_XF86_INPUT_TSLIB_SITE = https://github.com/merge/xf86-input-tslib/releases/download/$(TSLIB_VERSION)

This couldn't work: TSLIB_VERSION comes from tslib.mk and is set to 1.9, which prevents the download from working. Changing this to XDRIVER_XF86_INPUT_TSLIB_VERSION fixed the problem.

Applied with this fix. Thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

Martin Kepplinger

author

2017-04-29 12:42 UTC #5 lore raw

PATCH 1/2 x11r7: xdriver_xf86-input-tslib: new upstream location

Am 2017-04-29 um 13:58 schrieb Thomas Petazzoni:

Quoted 13 lines

Hello,
package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk line 9
Quoted 4 lines · Martin Kepplinger
XDRIVER_XF86_INPUT_TSLIB_VERSION = 0.0.6
XDRIVER_XF86_INPUT_TSLIB_SOURCE = xf86-input-tslib-$(XDRIVER_XF86_INPUT_TSLIB_VERSION).tar.bz2
package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk +1 -1
-XDRIVER_XF86_INPUT_TSLIB_SITE = http://www.pengutronix.de/software/xf86-input-tslib/download
+XDRIVER_XF86_INPUT_TSLIB_SITE = https://github.com/merge/xf86-input-tslib/releases/download/$(TSLIB_VERSION)
This couldn't work: TSLIB_VERSION comes from tslib.mk and is set to 1.9, which prevents the download from working. Changing this to XDRIVER_XF86_INPUT_TSLIB_VERSION fixed the problem.

Quoted 2 lines

Applied with this fix. Thanks!

oops. sorry. Should have taken more time to check everything. Thanks!