Re: [x265] [PATCH 2/2] Fix x86_64 build
On 03/05/14 18:08, Steve Borho wrote:
On Wed, Mar 5, 2014 at 4:38 AM, Rafaël Carré fun...@videolan.org wrote:
---
source/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 2febfaa..d2fea1a 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -21,7 +21,7 @@ configure_file(${PROJECT_SOURCE_DIR}/x265_config.h.in
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386 OR ${CMAKE_SYSTEM_PROCESSOR}
STREQUAL x86)
+if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386 OR ${CMAKE_SYSTEM_PROCESSOR}
STREQUAL x86 OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64)
set(X86 1)
add_definitions(-DX265_ARCH_X86=1)
if(${CMAKE_SIZEOF_VOID_P} MATCHES 8)
I suspect there is something wrong with your git clone. This line now
looks like:
string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} SYSPROC)
if(${SYSPROC} STREQUAL i386 OR ${SYSPROC} STREQUAL amd64 OR
${SYSPROC} STREQUAL x86_64 OR ${SYSPROC} STREQUAL x86 OR
${SYSPROC} STREQUAL )
message(STATUS Detected x86 system processor)
The line you have is over a month old.
Hum right, it stops after 31 january.
I'll look it up
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel
[x265] [PATCH 2/2] Fix x86_64 build
---
source/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 2febfaa..d2fea1a 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -21,7 +21,7 @@ configure_file(${PROJECT_SOURCE_DIR}/x265_config.h.in
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386 OR ${CMAKE_SYSTEM_PROCESSOR}
STREQUAL x86)
+if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386 OR ${CMAKE_SYSTEM_PROCESSOR}
STREQUAL x86 OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64)
set(X86 1)
add_definitions(-DX265_ARCH_X86=1)
if(${CMAKE_SIZEOF_VOID_P} MATCHES 8)
--
1.9.0
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel
Re: [x265] [PATCH 2/2] Fix x86_64 build
Can you convert this to an hg patch? Git patches don't apply cleanly
On Wed, Mar 5, 2014 at 4:08 PM, Rafaël Carré fun...@videolan.org wrote:
---
source/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 2febfaa..d2fea1a 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -21,7 +21,7 @@ configure_file(${PROJECT_SOURCE_DIR}/x265_config.h.in
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake
${CMAKE_MODULE_PATH})
-if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386 OR ${CMAKE_SYSTEM_PROCESSOR}
STREQUAL x86)
+if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386 OR ${CMAKE_SYSTEM_PROCESSOR}
STREQUAL x86 OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64)
set(X86 1)
add_definitions(-DX265_ARCH_X86=1)
if(${CMAKE_SIZEOF_VOID_P} MATCHES 8)
--
1.9.0
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel
Re: [x265] [PATCH 2/2] Fix x86_64 build
I know, I sent patches to mercurial to properly apply git patches with utf8,
but never finished them :/
Can you e.g. apply the diff manually and fix my name after?
I'm using git hg clone for all my development so making a hg patch is
not easy for me.
If you have a suggestion I'm all ears though
On 03/05/14 12:15, Deepthi Nandakumar wrote:
Can you convert this to an hg patch? Git patches don't apply cleanly
On Wed, Mar 5, 2014 at 4:08 PM, Rafaël Carré fun...@videolan.org wrote:
---
source/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 2febfaa..d2fea1a 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -21,7 +21,7 @@ configure_file(${PROJECT_SOURCE_DIR}/x265_config.h.in
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake
${CMAKE_MODULE_PATH})
-if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386 OR ${CMAKE_SYSTEM_PROCESSOR}
STREQUAL x86)
+if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386 OR ${CMAKE_SYSTEM_PROCESSOR}
STREQUAL x86 OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64)
set(X86 1)
add_definitions(-DX265_ARCH_X86=1)
if(${CMAKE_SIZEOF_VOID_P} MATCHES 8)
--
1.9.0
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel
Re: [x265] [PATCH 2/2] Fix x86_64 build
On 05 Mar 2014, at 11:38, Rafaël Carré fun...@videolan.org wrote: --- source/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) What was the issue fixed by this (build failure on x86_64, but caused by what)? ___ x265-devel mailing list x265-devel@videolan.org https://mailman.videolan.org/listinfo/x265-devel
Re: [x265] [PATCH 2/2] Fix x86_64 build
On Wed, Mar 5, 2014 at 4:38 AM, Rafaël Carré fun...@videolan.org wrote:
---
source/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 2febfaa..d2fea1a 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -21,7 +21,7 @@ configure_file(${PROJECT_SOURCE_DIR}/x265_config.h.in
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
-if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386 OR ${CMAKE_SYSTEM_PROCESSOR}
STREQUAL x86)
+if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL i386 OR ${CMAKE_SYSTEM_PROCESSOR}
STREQUAL x86 OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64)
set(X86 1)
add_definitions(-DX265_ARCH_X86=1)
if(${CMAKE_SIZEOF_VOID_P} MATCHES 8)
I suspect there is something wrong with your git clone. This line now
looks like:
string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} SYSPROC)
if(${SYSPROC} STREQUAL i386 OR ${SYSPROC} STREQUAL amd64 OR
${SYSPROC} STREQUAL x86_64 OR ${SYSPROC} STREQUAL x86 OR
${SYSPROC} STREQUAL )
message(STATUS Detected x86 system processor)
The line you have is over a month old.
--
Steve Borho
___
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel
