[pkg-remote-commits] [xrdp] 01/02: Bring back SIMD-on-i386-related, xorgxrdp v0.2.5 is fixed

[Thorsten Glaser]

This is an automated email from the git hooks/post-receive script.

tg pushed a commit to branch master
in repository xrdp.

commit db6bb6b4315061913c4a9c544658c265c8ac3256
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Sat Jan 13 17:02:21 2018 +0100

    Bring back SIMD-on-i386-related, xorgxrdp v0.2.5 is fixed
    
    This reverts commit d204f45179f5bf67c4b1bba34618838853acfdb3.
---
 debian/control | 3 +--
 debian/rules   | 7 -------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 40483a0..227fbcc 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,7 @@ Build-Depends:
  libx11-dev,
  libxfixes-dev,
  libxrandr-dev,
-# for now; see debian/rules for details
- nasm [amd64 kfreebsd-amd64],
+ nasm [amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386],
  openssl,
  pkg-config,
  systemd [linux-any],
diff --git a/debian/rules b/debian/rules
index 2c38c1e..1dfb2a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,13 +27,6 @@ ifneq (${DEB_BUILD_GNU_TYPE},${DEB_HOST_GNU_TYPE})
 CONFIGURE_ARGS+=	--host=${DEB_HOST_GNU_TYPE}
 endif
 
-ifeq (i386,${DEB_HOST_ARCH_CPU})
-# A fix is present in xorgxrdp v0.2.5 but we use v0.2.4 currently.
-# When fixed, change Build-Depends’ nasm component to:
-# nasm [amd64 hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386],
-CONFIGURE_ARGS+=	--without-simd
-endif
-
 ifeq (x32,${DEB_HOST_ARCH})
 # autodetection fails on x32 (wrongly recognised as amd64)
 CONFIGURE_ARGS+=	--without-simd

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/xrdp.git