From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- x11-drivers/xf86-input-tslib/Manifest | 1 + .../files/fix-overlapped-variable.patch | 20 +++ ...f86-input-tslib-0.0.6-xf86XInputSetScreen.patch | 23 +++ .../files/xf86-input-tslib-port-ABI-12-r48.patch | 191 +++++++++++++++++++++ x11-drivers/xf86-input-tslib/metadata.xml | 6 + .../xf86-input-tslib-0.0.6-r2.ebuild | 31 ++++ .../xf86-input-tslib-0.0.6-r3.ebuild | 32 ++++ 7 files changed, 304 insertions(+) create mode 100644 x11-drivers/xf86-input-tslib/Manifest create mode 100644 x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch create mode 100644 x11-drivers/xf86-input-tslib/files/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch create mode 100644 x11-drivers/xf86-input-tslib/files/xf86-input-tslib-port-ABI-12-r48.patch create mode 100644 x11-drivers/xf86-input-tslib/metadata.xml create mode 100644 x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild create mode 100644 x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r3.ebuild (limited to 'x11-drivers/xf86-input-tslib') diff --git a/x11-drivers/xf86-input-tslib/Manifest b/x11-drivers/xf86-input-tslib/Manifest new file mode 100644 index 000000000000..58f1a19717c7 --- /dev/null +++ b/x11-drivers/xf86-input-tslib/Manifest @@ -0,0 +1 @@ +DIST xf86-input-tslib_0.0.6-3.tar.gz 307751 SHA256 546083a3d70b0da4403fb2add28036ed48f6a91adb802044ac0e4f3bcbc429f5 SHA512 abc6060ba595790dab02a191861ee128a729916a6ea2df2a818a0b3388839dac933a0d7ee5530735f376f917f33bf8db40d42a7dce90b20a7682344370bc7b48 WHIRLPOOL ebaff4f9afb00ea49254faf1a858fafe885f904b14d682a6ad9731df334c42797d68f0bf3dff9487817e173e9ef450c7b5154edf9e4adb4f9b0b6fd989e908d5 diff --git a/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch b/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch new file mode 100644 index 000000000000..7a4363e97277 --- /dev/null +++ b/x11-drivers/xf86-input-tslib/files/fix-overlapped-variable.patch @@ -0,0 +1,20 @@ +--- src/tslib.c.orig 2010-05-19 19:01:01.000000000 +0200 ++++ src/tslib.c 2010-05-19 19:02:00.000000000 +0200 +@@ -543,7 +543,7 @@ + return (pInfo); + } + +-_X_EXPORT InputDriverRec TSLIB = { ++_X_EXPORT InputDriverRec TSLIB_DRIVER = { + 1, /* driver version */ + "tslib", /* driver name */ + NULL, /* identify */ +@@ -580,7 +580,7 @@ + { + static Bool Initialised = FALSE; + +- xf86AddInputDriver(&TSLIB, module, 0); ++ xf86AddInputDriver(&TSLIB_DRIVER, module, 0); + + return module; + } diff --git a/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch b/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch new file mode 100644 index 000000000000..d3738bfecb96 --- /dev/null +++ b/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-0.0.6-xf86XInputSetScreen.patch @@ -0,0 +1,23 @@ +diff -ur xf86-input-tslib-0.0.6.orig/src/tslib.c xf86-input-tslib-0.0.6/src/tslib.c +--- xf86-input-tslib-0.0.6.orig/src/tslib.c 2012-12-05 01:12:16.286597071 +0100 ++++ xf86-input-tslib-0.0.6/src/tslib.c 2012-12-05 01:11:02.686598595 +0100 +@@ -75,6 +75,19 @@ + #define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options)) + #endif + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 13 ++static void ++xf86XInputSetScreen(InputInfoPtr pInfo, ++ int screen_number, ++ int x, ++ int y) ++{ ++ if (miPointerGetScreen(pInfo->dev) != ++ screenInfo.screens[screen_number]) { ++ miPointerSetScreen(pInfo->dev, screen_number, x, y); ++ } ++} ++#endif + + enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 }; + diff --git a/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-port-ABI-12-r48.patch b/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-port-ABI-12-r48.patch new file mode 100644 index 000000000000..a4288fdc1350 --- /dev/null +++ b/x11-drivers/xf86-input-tslib/files/xf86-input-tslib-port-ABI-12-r48.patch @@ -0,0 +1,191 @@ +Index: xf86-input-tslib-trunk/src/tslib.c +=================================================================== +--- xf86-input-tslib-trunk/src/tslib.c (revision 48) ++++ xf86-input-tslib-trunk/src/tslib.c (working copy) +@@ -69,6 +69,13 @@ + #define DEFAULT_HEIGHT 240 + #define DEFAULT_WIDTH 320 + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 ++#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options), NULL) ++#else ++#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options)) ++#endif ++ ++ + enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 }; + + enum button_state { BUTTON_NOT_PRESSED = 0, BUTTON_1_PRESSED = 1, BUTTON_3_CLICK = 3, BUTTON_3_CLICKED=4, BUTTON_EMULATION_OFF=-1 }; +@@ -106,7 +113,7 @@ + } + + static Bool +-ConvertProc( LocalDevicePtr local, ++ConvertProc( InputInfoPtr local, + int first, + int num, + int v0, +@@ -135,7 +142,7 @@ + return t; + } + +-static void ReadInput (LocalDevicePtr local) ++static void ReadInput (InputInfoPtr local) + { + struct ts_priv *priv = (struct ts_priv *) (local->private); + struct ts_sample samp; +@@ -382,7 +389,11 @@ + axiswidth - 1, /* max val */ + axiswidth, /* resolution */ + 0, /* min_res */ +- axiswidth); /* max_res */ ++ axiswidth /* max_res */ ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 ++ ,Absolute ++#endif ++ ); + + InitValuatorAxisStruct(device, 1, + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 +@@ -392,7 +403,11 @@ + axisheight - 1, /* max val */ + axisheight, /* resolution */ + 0, /* min_res */ +- axisheight); /* max_res */ ++ axisheight /* max_res */ ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 ++ ,Absolute ++#endif ++ ); + + if (InitProximityClassDeviceStruct (device) == FALSE) { + ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n"); +@@ -434,7 +449,7 @@ + ErrorF("%s\n", __FUNCTION__); + xf86TslibControlProc(pInfo->dev, DEVICE_OFF); + ts_close(priv->ts); +- xfree(pInfo->private); ++ free(pInfo->private); + pInfo->private = NULL; + xf86DeleteInput(pInfo, 0); + } +@@ -444,47 +459,57 @@ + * + * called when the module subsection is found in XF86Config + */ ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 ++static int ++xf86TslibInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) ++#else + static InputInfoPtr + xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags) ++#endif + { + struct ts_priv *priv; + char *s; ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 + InputInfoPtr pInfo; ++#endif + +- priv = xcalloc (1, sizeof (struct ts_priv)); ++ priv = calloc (1, sizeof (struct ts_priv)); + if (!priv) +- return NULL; ++ return BadValue; + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 + if (!(pInfo = xf86AllocateInput(drv, 0))) { +- xfree(priv); +- return NULL; ++ free(priv); ++ return BadValue; + } + + /* Initialise the InputInfoRec. */ + pInfo->name = dev->identifier; +- pInfo->type_name = XI_TOUCHSCREEN; + pInfo->flags = + XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE | + XI86_SEND_DRAG_EVENTS; +- pInfo->device_control = xf86TslibControlProc; +- pInfo->read_input = ReadInput; + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 + pInfo->motion_history_proc = xf86GetMotionEvents; + pInfo->history_size = 0; + #endif +- pInfo->control_proc = NULL; ++ pInfo->conf_idev = dev; + pInfo->close_proc = NULL; +- pInfo->switch_mode = NULL; + pInfo->conversion_proc = ConvertProc; + pInfo->reverse_conversion_proc = NULL; +- pInfo->dev = NULL; + pInfo->private_flags = 0; + pInfo->always_core_feedback = 0; +- pInfo->conf_idev = dev; ++#endif ++ ++ pInfo->type_name = XI_TOUCHSCREEN; ++ pInfo->control_proc = NULL; ++ pInfo->read_input = ReadInput; ++ pInfo->device_control = xf86TslibControlProc; ++ pInfo->switch_mode = NULL; + pInfo->private = priv; ++ pInfo->dev = NULL; + + /* Collect the options, and process the common options. */ +- xf86CollectInputOptions(pInfo, NULL, NULL); ++ COLLECT_INPUT_OPTIONS(pInfo, NULL); + xf86ProcessCommonOptions(pInfo, pInfo->options); + + priv->screen_num = xf86SetIntOption(pInfo->options, "ScreenNumber", 0 ); +@@ -510,23 +535,31 @@ + priv->rotate = TSLIB_ROTATE_NONE; + } + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 + s = xf86CheckStrOption(dev->commonOptions, "path", NULL); ++#else ++ s = xf86CheckStrOption(pInfo->options, "path", NULL); ++#endif + if (!s) ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 + s = xf86CheckStrOption(dev->commonOptions, "Device", NULL); ++#else ++ s = xf86CheckStrOption(pInfo->options, "Device", NULL); ++#endif + + priv->ts = ts_open(s, 1); +- xfree(s); ++ free(s); + + if (!priv->ts) { + ErrorF("ts_open failed (device=%s)\n",s); + xf86DeleteInput(pInfo, 0); +- return NULL; ++ return BadValue; + } + + if (ts_config(priv->ts)) { + ErrorF("ts_config failed\n"); + xf86DeleteInput(pInfo, 0); +- return NULL; ++ return BadValue; + } + + pInfo->fd = ts_fd(priv->ts); +@@ -536,11 +569,13 @@ + priv->state = BUTTON_EMULATION_OFF; + } + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 + /* Mark the device configured */ + pInfo->flags |= XI86_CONFIGURED; ++#endif + + /* Return the configured device */ +- return (pInfo); ++ return Success; + } + + _X_EXPORT InputDriverRec TSLIB = { diff --git a/x11-drivers/xf86-input-tslib/metadata.xml b/x11-drivers/xf86-input-tslib/metadata.xml new file mode 100644 index 000000000000..83fba9ad767e --- /dev/null +++ b/x11-drivers/xf86-input-tslib/metadata.xml @@ -0,0 +1,6 @@ + + + +embedded +x11 + diff --git a/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild b/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild new file mode 100644 index 000000000000..f8f3d6f5c5eb --- /dev/null +++ b/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r2.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +inherit xorg-2 + +PATCHLEVEL=3 +DEBSOURCES="${PN}_${PV}-${PATCHLEVEL}.tar.gz" + +DESCRIPTION="xorg input driver for use of tslib based touchscreen devices" +HOMEPAGE="http://www.pengutronix.de/software/xf86-input-tslib/index_en.html" +SRC_URI="ftp://cdn.debian.net/debian/pool/main/x/${PN}/${DEBSOURCES}" + +LICENSE="GPL-2" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86" +IUSE="" + +RDEPEND="x11-libs/tslib" +DEPEND="${RDEPEND} + x11-proto/randrproto" + +S=${WORKDIR}/${PN}-trunk + +DOCS=( COPYING ChangeLog ) + +PATCHES=( + "${FILESDIR}"/fix-overlapped-variable.patch + "${FILESDIR}"/${PN}-port-ABI-12-r48.patch +) diff --git a/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r3.ebuild b/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r3.ebuild new file mode 100644 index 000000000000..061312c06dd4 --- /dev/null +++ b/x11-drivers/xf86-input-tslib/xf86-input-tslib-0.0.6-r3.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit xorg-2 + +PATCHLEVEL=3 +DEBSOURCES="${PN}_${PV}-${PATCHLEVEL}.tar.gz" + +DESCRIPTION="xorg input driver for use of tslib based touchscreen devices" +HOMEPAGE="http://www.pengutronix.de/software/xf86-input-tslib/index_en.html" +SRC_URI="ftp://cdn.debian.net/debian/pool/main/x/${PN}/${DEBSOURCES}" + +LICENSE="GPL-2" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86" +IUSE="" + +RDEPEND="x11-libs/tslib" +DEPEND="${RDEPEND} + x11-proto/randrproto" + +S=${WORKDIR}/${PN}-trunk + +DOCS=( COPYING ChangeLog ) + +PATCHES=( + "${FILESDIR}"/fix-overlapped-variable.patch + "${FILESDIR}"/${PN}-port-ABI-12-r48.patch + "${FILESDIR}"/${P}-xf86XInputSetScreen.patch +) -- cgit v1.2.3-65-gdbad