You might want to patch source/CMakeLists.txt:
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -34,16 +34,16 @@
# System architecture detection
string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
-set(X86_ALIASES x86 i386 i686 x86_64 amd64)
+set(X86_ALIASES x86 i386 i686)
list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
message(STATUS "Detected x86 system processor")
set(X86 1)
add_definitions(-DX265_ARCH_X86=1)
- if("${CMAKE_SIZEOF_VOID_P}" MATCHES 8)
- set(X64 1)
- add_definitions(-DX86_64=1)
- endif()
+elseif(${SYSPROC} STREQUAL "x86_64" OR "amd64")
+ message(STATUS "Detected x64 system processor")
+ set(X64 1)
+ add_definitions(-DX86_64=1)
elseif(${SYSPROC} STREQUAL "armv6l")
message(STATUS "Detected ARM system processor")
set(ARM 1)
@@ -282,11 +282,13 @@
set_target_properties(x265-shared PROPERTIES OUTPUT_NAME x265)
endif()
if(UNIX AND NOT APPLE)
- set_target_properties(x265-shared PROPERTIES LINK_FLAGS
"-Wl,-Bsymbolic,-znoexecstack")
+ set_target_properties(x265-shared PROPERTIES VERSION
${X265_BUILD} LINK_FLAGS "-Wl,-Bsymbolic,-znoexecstack")
+ else()
+ set_target_properties(x265-shared PROPERTIES VERSION
${X265_LATEST_TAG})
endif()
if(X265_LATEST_TAG)
# shared library is not installed if a tag is not found
- set_target_properties(x265-shared PROPERTIES VERSION
${X265_LATEST_TAG} SOVERSION ${X265_BUILD})
+ set_target_properties(x265-shared PROPERTIES SOVERSION
${X265_BUILD})
install(TARGETS x265-shared
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
The first part patches the 64 bit system detection, though it's more
cosmetics.
The second part is more important, it ensures that the library will be
named after its soname and there will only one link be created.
For example: libx265.so.22 (file), libx265.so (link)
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
