aboutsummaryrefslogtreecommitdiffstats
path: root/unmaintained/xrdp-git
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2016-08-25 15:26:24 +0200
committerCarlo Landmeter <clandmeter@gmail.com>2016-08-25 15:26:24 +0200
commitb6af1e02efe594039707cd882517663d5370f375 (patch)
treeff9c2d55873e051e82972ba64c017352d3a75d34 /unmaintained/xrdp-git
parenta71346b7acebc600960a98c84fb32cfd72fe864b (diff)
downloadaports-b6af1e02efe594039707cd882517663d5370f375.tar.bz2
aports-b6af1e02efe594039707cd882517663d5370f375.tar.xz
testing/[multiple]: move unmaintained packages
This moves all packages from testing to unmaintained which have not been updated for atleast 6 months. If you are affected by this commit please follow this proceddure: * make sure your packages build on all architectures * move your pacakge(s) back to testing * if you want to keep this package and can maintain it (or find somebody to maintain it for you) for a minimum of 6 months ask it to be moved to community
Diffstat (limited to 'unmaintained/xrdp-git')
-rw-r--r--unmaintained/xrdp-git/APKBUILD87
-rw-r--r--unmaintained/xrdp-git/cd077979ebeb81a6e85a9ba7f9c463beda1606ba.patch100
2 files changed, 187 insertions, 0 deletions
diff --git a/unmaintained/xrdp-git/APKBUILD b/unmaintained/xrdp-git/APKBUILD
new file mode 100644
index 0000000000..74de1776a8
--- /dev/null
+++ b/unmaintained/xrdp-git/APKBUILD
@@ -0,0 +1,87 @@
+# Contributor: Carlo Landmeter <clandmeter@gmail.com>
+# Maintainer:
+pkgname=xrdp-git
+pkgver=20150719
+pkgrel=1
+pkgdesc="an open source RDP server"
+url="http://www.xrdp.org/"
+arch="x86_64"
+license="GPLv2"
+depends=""
+depends_dev=""
+makedepends="$depends_dev autoconf automake libtool openssl-dev libx11-dev
+ libxfixes-dev libxrandr-dev libjpeg-turbo-dev fuse-dev linux-headers
+ perl jq nasm xorg-server-dev"
+install=""
+subpackages="$pkgname-doc $pkgname-xorgxrdp"
+source="http://dev.alpinelinux.org/archive/xrdp-git/xrdp-git-2015-01-08.tar.gz
+ cd077979ebeb81a6e85a9ba7f9c463beda1606ba.patch"
+
+_builddir="$srcdir"/xrdp
+
+prepare() {
+ local i
+ cd "$_builddir"
+ for i in $source; do
+ case $i in
+ *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+ esac
+ done
+}
+
+build() {
+ cd "$_builddir"
+ ./bootstrap
+ ./configure \
+ --prefix=/usr \
+ --disable-static \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --sbindir=/usr/sbin \
+ --enable-nopam \
+ --enable-fuse \
+ --enable-jpeg \
+ || return 1
+ make || return 1
+
+ # xorgxrpd drivers
+ msg "Building xorgxrdp drivers"
+ cd "$_builddir"/xorgxrdp
+ ./bootstrap
+ ./configure \
+ --prefix=/usr \
+ --disable-static \
+ --sysconfdir=/etc \
+ || return 1
+ make || return 1
+}
+
+package() {
+ cd "$_builddir"
+ make DESTDIR="$pkgdir" install || return 1
+}
+
+xorgxrdp() {
+ pkgdesc="$pkgdesc (xorg drivers)"
+ cd "$_builddir"/xorgxrdp
+ make DESTDIR="$subpkgdir" install || return 1
+}
+
+snapshot() {
+ abuild clean
+ abuild deps
+ mkdir "$srcdir" && cd "$srcdir"
+ git clone --recursive https://github.com/neutrinolabs/xrdp.git
+ local sha=$(curl -s https://api.github.com/repos/neutrinolabs/xrdp/git/refs/heads/master | jq -r '.object.sha')
+ local date=$(curl -s https://api.github.com/repos/neutrinolabs/xrdp/git/commits/$sha | jq -r '.committer.date')
+ date=${date%%T*}
+ tar zcvf xrdp-git-${date}.tar.gz xrdp
+
+ msg "Set \$pkgver to $date"
+}
+md5sums="fa1dd8c18a9da6dd3aebe0fc42fab681 xrdp-git-2015-01-08.tar.gz
+f4c995827a65bc0e267dc4938b1820eb cd077979ebeb81a6e85a9ba7f9c463beda1606ba.patch"
+sha256sums="a7eebc83132d3a5334c0edc7d488c0a2e34cf3294f372d112b68192a4ed7256b xrdp-git-2015-01-08.tar.gz
+1f01a14a1afe8d32177aceba043ccfe04ea2d7574edd662c2caaade306b9d880 cd077979ebeb81a6e85a9ba7f9c463beda1606ba.patch"
+sha512sums="cb9a314ea5b38489f4cacd94d23423c25d341f5fce596dc2cd4ecc3df816ab5453a02fc81ee89dc8c7a79561e7e73c61ac85e7425e5c7f84339c1b97d34abee2 xrdp-git-2015-01-08.tar.gz
+8f9ef1ab081d224cec3221c92856f16f8e743e21a5d762c4c89f671dcbb71bdd8ab2929718219e9f08f821a83b4f577f04b189305155b188b6d2cf6454df498f cd077979ebeb81a6e85a9ba7f9c463beda1606ba.patch"
diff --git a/unmaintained/xrdp-git/cd077979ebeb81a6e85a9ba7f9c463beda1606ba.patch b/unmaintained/xrdp-git/cd077979ebeb81a6e85a9ba7f9c463beda1606ba.patch
new file mode 100644
index 0000000000..c50e7b1184
--- /dev/null
+++ b/unmaintained/xrdp-git/cd077979ebeb81a6e85a9ba7f9c463beda1606ba.patch
@@ -0,0 +1,100 @@
+From cd077979ebeb81a6e85a9ba7f9c463beda1606ba Mon Sep 17 00:00:00 2001
+From: Jay Sorg <jay.sorg@gmail.com>
+Date: Thu, 30 Jul 2015 14:09:00 -0700
+Subject: [PATCH] fix for clientClipType removed in newer xorg versions
+
+---
+ module/rdpDraw.c | 64 +++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 35 insertions(+), 29 deletions(-)
+
+diff --git a/module/rdpDraw.c b/module/rdpDraw.c
+index 5772923..605c511 100644
+--- a/xorgxrdp/module/rdpDraw.c
++++ b/xorgxrdp/module/rdpDraw.c
+@@ -50,6 +50,21 @@ misc draw calls
+ #define LLOGLN(_level, _args) \
+ do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0)
+
++#if !defined(XORG_VERSION_CURRENT)
++#warning XORG_VERSION_CURRENT not defined
++#endif
++
++/******************************************************************************/
++static int
++is_clientClip_region(GCPtr gc)
++{
++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 16, 99, 901, 0)
++ return gc->clientClipType == CT_REGION;
++#else
++ return gc->clientClip != NULL;
++#endif
++}
++
+ /******************************************************************************/
+ /* return 0, draw nothing */
+ /* return 1, draw with no clip */
+@@ -66,19 +81,15 @@ rdpDrawGetClip(rdpPtr dev, RegionPtr pRegion, DrawablePtr pDrawable, GCPtr pGC)
+
+ if (pDrawable->type == DRAWABLE_PIXMAP)
+ {
+- switch (pGC->clientClipType)
++ if (is_clientClip_region(pGC))
+ {
+- case CT_NONE:
+- rv = 1;
+- break;
+- case CT_REGION:
+- rv = 2;
+- rdpRegionCopy(pRegion, pGC->clientClip);
+- break;
+- default:
+- LLOGLN(0, ("rdpDrawGetClip: unimp clip type %d",
+- pGC->clientClipType));
+- break;
++ miComputeCompositeClip(pGC, pDrawable);
++ RegionCopy(pRegion, pGC->pCompositeClip);
++ rv = 2;
++ }
++ else
++ {
++ rv = 1;
+ }
+
+ if (rv == 2) /* check if the clip is the entire pixmap */
+@@ -111,24 +122,19 @@ rdpDrawGetClip(rdpPtr dev, RegionPtr pRegion, DrawablePtr pDrawable, GCPtr pGC)
+
+ if (rdpRegionNotEmpty(temp))
+ {
+- switch (pGC->clientClipType)
++ if (is_clientClip_region(pGC))
++ {
++ rdpRegionCopy(pRegion, pGC->clientClip);
++ rdpRegionTranslate(pRegion,
++ pDrawable->x + pGC->clipOrg.x,
++ pDrawable->y + pGC->clipOrg.y);
++ rdpRegionIntersect(pRegion, pRegion, temp);
++ rv = 2;
++ }
++ else
+ {
+- case CT_NONE:
+- rv = 2;
+- rdpRegionCopy(pRegion, temp);
+- break;
+- case CT_REGION:
+- rv = 2;
+- rdpRegionCopy(pRegion, pGC->clientClip);
+- rdpRegionTranslate(pRegion,
+- pDrawable->x + pGC->clipOrg.x,
+- pDrawable->y + pGC->clipOrg.y);
+- rdpRegionIntersect(pRegion, pRegion, temp);
+- break;
+- default:
+- LLOGLN(0, ("rdpDrawGetClip: unimp clip type %d",
+- pGC->clientClipType));
+- break;
++ rdpRegionCopy(pRegion, temp);
++ rv = 2;
+ }
+
+ if (rv == 2) /* check if the clip is the entire screen */