[pkg-remote-commits] [xrdp] 04/05: Bring back SIMD-on-i386-related control/rules changes

[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 8d27ccfc82ee49ee826fa386c7950c99fef74179
Author: mirabilos <thorsten.glaser at teckids.org>
Date:   Tue Oct 10 20:18:57 2017 +0200

    Bring back SIMD-on-i386-related control/rules changes
    
    This reverts commit c17d7aace3075dd6eee5b7891d2c1ad5961df794.
---
 debian/changelog |  1 +
 debian/control   |  3 +--
 debian/rules     | 22 ----------------------
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a60d9e7..d1c547e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ xrdp (0.9.4-2) UNRELEASED; urgency=medium
   [ Thorsten Glaser ]
   * Place missing log_end_msg in init script.
   * Run libpainter/bootstrap as well.
+  * Re-enable SIMD on any-i386.
 
  -- Dominik George <nik at naturalnet.de>  Mon, 09 Oct 2017 19:39:13 +0200
 
diff --git a/debian/control b/debian/control
index 18fe1da..2b97403 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 e2dfce2..1dfb2a7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,28 +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})
-# The following files must be rewritten to use PIC if -DPIC is passed:
-# - librfxcodec/src/x86/rfxcodec_encode_dwt_shift_x86_sse2.asm
-# - librfxcodec/src/x86/rfxcodec_encode_dwt_shift_x86_sse41.asm
-# - xorgxrdp/module/x86/a8r8g8b8_to_a8b8g8r8_box_x86_sse2.asm
-# - xorgxrdp/module/x86/a8r8g8b8_to_nv12_box_x86_sse2.asm
-# - xorgxrdp/module/x86/i420_to_rgb32_x86_sse2.asm
-# - xorgxrdp/module/x86/uyvy_to_rgb32_x86_sse2.asm
-# - xorgxrdp/module/x86/yuy2_to_rgb32_x86_sse2.asm
-# - xorgxrdp/module/x86/yv12_to_rgb32_x86_sse2.asm
-# Documentation: http://www.nasm.us/doc/nasmdoc9.html#section-9.2
-# Unfortunately, this requires reserving the EBX register, which
-# is used extensively by this code; to avoid crashes or security
-# issues in xrdp, we disable the code on any-i386 for stretch and
-# will revisit this later and with upstream; amd64 isn’t affected
-# (as it uses RIP-relative addressing), x32 and other architectures
-# don’t use the assembly code at all.
-# 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