[SCM] x265/master: Disable assembler code on x32

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 89a7d9395595a5b7ec88ad35e7073316225c513d
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Jul 19 13:18:01 2015 +0200

    Disable assembler code on x32
    
    Thanks: Thorsten Glaser
    Closes: #792272

diff --git a/debian/patches/fix-x32.patch b/debian/patches/fix-x32.patch
new file mode 100644
index 0000000..f3636cb
--- /dev/null
+++ b/debian/patches/fix-x32.patch
@@ -0,0 +1,34 @@
+Description: detect x32, handle as non-x86 and no-ASM for now, but enable PIC
+Author: Thorsen Glaser <tg at mirbsd.de>
+Last-Update: 2015-07-19
+
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -43,6 +43,10 @@ string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR
+ set(X86_ALIASES x86 i386 i686 x86_64 amd64)
+ list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
+ if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
++  if(CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
++    message(STATUS "Detected x32 target system")
++    set(X32 1)
++  else()
+     message(STATUS "Detected x86 target processor")
+     set(X86 1)
+     add_definitions(-DX265_ARCH_X86=1)
+@@ -50,6 +54,7 @@ if("${SYSPROC}" STREQUAL "" OR X86MATCH
+         set(X64 1)
+         add_definitions(-DX86_64=1)
+     endif()
++  endif()
+ elseif(${SYSPROC} STREQUAL "armv6l")
+     message(STATUS "Detected ARM target processor")
+     set(ARM 1)
+@@ -86,6 +91,8 @@ endif(UNIX)
+ 
+ if(X64 AND NOT WIN32)
+     option(ENABLE_PIC "Enable Position Independent Code" ON)
++elseif(X32)
++    option(ENABLE_PIC "Enable Position Independent Code" ON)
+ else()
+     option(ENABLE_PIC "Enable Position Independent Code" OFF)
+ endif(X64 AND NOT WIN32)
diff --git a/debian/patches/series b/debian/patches/series
index ee836f5..4c5d643 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 compile-flags.patch
 highbit-depth-path.patch
 gcc-check.patch
+fix-x32.patch

-- 
x265 packaging