Attachment 139984 Details for Bug 186395 – file.diff

[patch] file.diff

file.diff (text/plain), 3.17 KB, created by craig001 on 2014-02-03 01:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: craig001

Created: 2014-02-03 01:20:00 UTC

Size: 3.17 KB

patch

obsolete

>diff -ruN freerdp.orig/files/patch-config.h.in freerdp/files/patch-config.h.in
>--- freerdp.orig/files/patch-config.h.in	1970-01-01 01:00:00.000000000 +0100
>+++ freerdp/files/patch-config.h.in	2014-01-30 10:26:24.310205195 +0000
>@@ -0,0 +1,10 @@
>+--- config.h.in.orig	2014-01-30 10:24:02.141682858 +0000
>++++ config.h.in	2014-01-30 10:24:22.330677704 +0000
>+@@ -36,7 +36,6 @@
>+ /* Options */
>+ #cmakedefine WITH_PROFILER
>+ #cmakedefine WITH_SSE2
>+-#cmakedefine WITH_NEON
>+ #cmakedefine WITH_IPP
>+ #cmakedefine WITH_NATIVE_SSPI
>+ #cmakedefine WITH_JPEG
>diff -ruN freerdp.orig/files/patch-noneon freerdp/files/patch-noneon
>--- freerdp.orig/files/patch-noneon	1970-01-01 01:00:00.000000000 +0100
>+++ freerdp/files/patch-noneon	2014-01-30 11:17:21.805194456 +0000
>@@ -0,0 +1,48 @@
>+diff -ruN ../FreeRDP-FreeRDP-780d451.orig/cmake/AndroidToolchain.cmake ./cmake/AndroidToolchain.cmake
>+--- ../FreeRDP-FreeRDP-780d451.orig/cmake/AndroidToolchain.cmake	2013-07-10 09:00:21.000000000 +0100
>++++ ./cmake/AndroidToolchain.cmake	2014-01-30 11:12:22.989675950 +0000
>+@@ -1196,7 +1196,7 @@
>+ if( ARMEABI_V7A )
>+  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -march=armv7-a -mfloat-abi=softfp" )
>+  if( NEON )
>+-  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=neon" )
>++  set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS}" )
>+  elseif( VFPV3 )
>+   set( ANDROID_CXX_FLAGS "${ANDROID_CXX_FLAGS} -mfpu=vfpv3" )
>+  else()
>+diff -ruN ../FreeRDP-FreeRDP-780d451.orig/libfreerdp/codec/CMakeLists.txt ./libfreerdp/codec/CMakeLists.txt
>+--- ../FreeRDP-FreeRDP-780d451.orig/libfreerdp/codec/CMakeLists.txt	2013-07-10 09:00:21.000000000 +0100
>++++ ./libfreerdp/codec/CMakeLists.txt	2014-01-30 11:13:18.167681417 +0000
>+@@ -71,7 +71,7 @@
>+ 
>+ if(WITH_NEON)
>+ 	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${${MODULE_PREFIX}_NEON_SRCS})
>+-	set_source_files_properties(${${MODULE_PREFIX}_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-mfpu=neon -mfloat-abi=${ARM_FP_ABI} -Wno-unused-variable")
>++	set_source_files_properties(${${MODULE_PREFIX}_NEON_SRCS} PROPERTIES COMPILE_FLAGS "-Wno-unused-variable")
>+ endif()
>+ 
>+ if(WITH_JPEG)
>+diff -ruN ../FreeRDP-FreeRDP-780d451.orig/libfreerdp/primitives/CMakeLists.txt ./libfreerdp/primitives/CMakeLists.txt
>+--- ../FreeRDP-FreeRDP-780d451.orig/libfreerdp/primitives/CMakeLists.txt	2013-07-10 09:00:21.000000000 +0100
>++++ ./libfreerdp/primitives/CMakeLists.txt	2014-01-30 11:14:11.661680959 +0000
>+@@ -58,7 +58,7 @@
>+ 	endif()
>+ elseif(WITH_NEON)
>+ 	if(CMAKE_COMPILER_IS_GNUCC)
>+-	    set(OPTIMIZATION "${OPTIMIZATION} -mfpu=neon -mfloat-abi=${ARM_FP_ABI}")
>++	    set(OPTIMIZATION "${OPTIMIZATION}")
>+ 	endif()
>+ 	# TODO: Add MSVC equivalent
>+ endif()
>+diff -ruN ../FreeRDP-FreeRDP-780d451.orig/libfreerdp/primitives/test/CMakeLists.txt ./libfreerdp/primitives/test/CMakeLists.txt
>+--- ../FreeRDP-FreeRDP-780d451.orig/libfreerdp/primitives/test/CMakeLists.txt	2013-07-10 09:00:21.000000000 +0100
>++++ ./libfreerdp/primitives/test/CMakeLists.txt	2014-01-30 11:13:51.405675967 +0000
>+@@ -92,7 +92,7 @@
>+ 	endif()
>+ elseif(WITH_NEON)
>+ 	if(CMAKE_COMPILER_IS_GNUCC)
>+-	    set(OPTFLAGS "${OPTFLAGS} -mfpu=neon -mfloat-abi=${ARM_FP_ABI} -O2")
>++	    set(OPTFLAGS "${OPTFLAGS} -O2")
>+ 	endif()
>+ 	# TODO: Add MSVC equivalent
>+ endif()

Actions: View | Diff

Attachments on bug 186395: 139984