Projects
home:Aloysius:branches:Multimedia
avidemux
avidemux-cpu_armel.patch
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File avidemux-cpu_armel.patch of Package avidemux
--- cmake/admDetermineSystem.cmake.orig 2014-11-07 22:23:17.710433595 +0100 +++ cmake/admDetermineSystem.cmake 2014-11-07 22:23:17.837431213 +0100 @@ -1,15 +1,11 @@ # Determine CPU and Operating System for GCC # ADM_BIG_ENDIAN - big endian CPU detected # ADM_BSD_FAMILY - BSD family operating system was detected +# ADM_CPU_ARMEL - ARM (min ARCH5) el # ADM_CPU_64BIT - 64-bit CPU was detected -# ADM_CPU_PPC - PowerPC CPU architecture was detected -# ADM_CPU_ALTIVEC - PowerPC CPU with AltiVec instructions is supported -# ADM_CPU_DCBZL - PowerPC CPU with dcbzl instruction is supported # ADM_CPU_X86 - x86 CPU architecture was detected # ADM_CPU_X86_32 - x86 32-bit CPU architecture was detected # ADM_CPU_X86_64 - x86 64-bit CPU architecture was detected -# ADM_CPU_MMX2 - x86 CPU with MMX2 instructions is supported -# ADM_CPU_SSSE3 - x86 CPU with SSSE3 instructions is supported MACRO (PERFORM_SYSTEM_TEST testFile testName testSupportedVarName) IF (${ARGC} EQUAL 4) @@ -27,7 +23,7 @@ ENDIF (${testSupportedVarName}) IF (${testSupportedVarName} OR VERBOSE) - MESSAGE(STATUS "Check if GCC is ${testName} - ${testResult}") + MESSAGE(STATUS "Checking if compiler supports ${testName} - ${testResult}") ENDIF (${testSupportedVarName} OR VERBOSE) IF (NOT ${testSupportedVarName} AND VERBOSE) @@ -35,71 +31,34 @@ ENDIF (NOT ${testSupportedVarName} AND VERBOSE) ENDMACRO (PERFORM_SYSTEM_TEST) -# clear previous settings -SET(APPLE) -SET(CYGWIN) -SET(MINGW) -SET(UNIX) -SET(WIN32) - INCLUDE(TestBigEndian) -MESSAGE(STATUS "Checking GCC support") -MESSAGE(STATUS "********************") +MESSAGE(STATUS "Checking Compiler support") +MESSAGE(STATUS "*************************") ######################################## # Check OS support ######################################## -PERFORM_SYSTEM_TEST(os_unix_check.cpp "Unix" UNIX_SUPPORTED) - -IF (UNIX_SUPPORTED) - SET(UNIX 1) - +IF (UNIX) PERFORM_SYSTEM_TEST(os_bsd_check.cpp "BSD family" BSD_SUPPORTED) IF (BSD_SUPPORTED) SET(ADM_BSD_FAMILY 1) - PERFORM_SYSTEM_TEST(os_apple_check.cpp "Apple" APPLE_SUPPORTED) - - IF (APPLE_SUPPORTED) - SET(APPLE 1) - ENDIF (APPLE_SUPPORTED) - ELSE (BSD_SUPPORTED) - PERFORM_SYSTEM_TEST(os_cygwin_check.cpp "Cygwin" CYGWIN_SUPPORTED) - - IF (CYGWIN_SUPPORTED) - SET(CYGWIN 1) - - PERFORM_SYSTEM_TEST(os_win32_check.cpp "Win32" WIN32_SUPPORTED "-mwin32") - - IF (WIN32_SUPPORTED) - SET(WIN32 1) - ENDIF (WIN32_SUPPORTED) - ENDIF (CYGWIN_SUPPORTED) ENDIF (BSD_SUPPORTED) -ELSE (UNIX_SUPPORTED) - PERFORM_SYSTEM_TEST(os_win32_check.cpp "Win32" WIN32_SUPPORTED) - - IF (WIN32_SUPPORTED) - SET(WIN32 1) - - PERFORM_SYSTEM_TEST(os_mingw_check.cpp "MinGW" MINGW_SUPPORTED) - - IF (MINGW_SUPPORTED) - SET(MINGW 1) - ENDIF (MINGW_SUPPORTED) - ENDIF (WIN32_SUPPORTED) -ENDIF (UNIX_SUPPORTED) +ENDIF (UNIX) ######################################## # Check CPU support ######################################## PERFORM_SYSTEM_TEST(cpu_x86-64_check.cpp "x86 64-bit" X86_64_SUPPORTED) +IF (CMAKE_SIZEOF_VOID_P EQUAL 8) + SET(ADM_CPU_64BIT 1) +ENDIF (CMAKE_SIZEOF_VOID_P EQUAL 8) + IF (X86_64_SUPPORTED) SET(ADM_CPU_X86 1) SET(ADM_CPU_X86_64 1) - SET(ADM_CPU_64BIT 1) ELSE (X86_64_SUPPORTED) PERFORM_SYSTEM_TEST(cpu_x86_check.cpp "x86 32-bit" X86_32_SUPPORTED) @@ -107,48 +66,17 @@ SET(ADM_CPU_X86 1) SET(ADM_CPU_X86_32 1) ELSE (X86_32_SUPPORTED) - PERFORM_SYSTEM_TEST(cpu_ppc_check.cpp "PowerPC" POWERPC_SUPPORTED) + PERFORM_SYSTEM_TEST(cpu_armel_check.cpp "ARM EL" ARMEL_SUPPORTED) - IF (POWERPC_SUPPORTED) - SET(ADM_CPU_PPC 1) - SET(ADM_ALTIVEC_FLAGS "-mabi=altivec -maltivec") - - IF (APPLE) - SET(ADM_ALTIVEC_FLAGS "${ADM_ALTIVEC_FLAGS} -faltivec") - ENDIF (APPLE) - - PERFORM_SYSTEM_TEST(cpu_altivec_check.cpp "AltiVec capable" ALTIVEC_SUPPORTED "${ADM_ALTIVEC_FLAGS}") - - IF (ALTIVEC_SUPPORTED) - SET(ADM_CPU_ALTIVEC 1) - ENDIF (ALTIVEC_SUPPORTED) - - PERFORM_SYSTEM_TEST(cpu_dcbzl_check.cpp "dcbzl capable" DCBZL_SUPPORTED) - - IF (DCBZL_SUPPORTED) - SET(ADM_CPU_DCBZL 1) - ENDIF (DCBZL_SUPPORTED) - ENDIF (POWERPC_SUPPORTED) + IF(ARMEL_SUPPORTED) + SET(ADM_CPU_ARMEL 1) + ENDIF(ARMEL_SUPPORTED) ENDIF (X86_32_SUPPORTED) ENDIF (X86_64_SUPPORTED) -IF (ADM_CPU_X86) - PERFORM_SYSTEM_TEST(cpu_mmx2_check.cpp "MMX2 capable" MMX2_SUPPORTED) - - IF (MMX2_SUPPORTED) - SET(ADM_CPU_MMX2 1) - ENDIF (MMX2_SUPPORTED) - - PERFORM_SYSTEM_TEST(cpu_ssse3_check.cpp "SSSE3 capable" SSSE3_SUPPORTED) - - IF (SSSE3_SUPPORTED) - SET(ADM_CPU_SSSE3 1) - ENDIF (SSSE3_SUPPORTED) -ENDIF (ADM_CPU_X86) - -IF (NOT ADM_CPU_X86_32 AND NOT ADM_CPU_X86_64 AND NOT ADM_CPU_PPC) +IF (NOT MSVC AND NOT ADM_CPU_X86_32 AND NOT ADM_CPU_X86_64 AND NOT ADM_CPU_ARMEL) MESSAGE(FATAL_ERROR "CPU not supported") -ENDIF (NOT ADM_CPU_X86_32 AND NOT ADM_CPU_X86_64 AND NOT ADM_CPU_PPC) +ENDIF (NOT MSVC AND NOT ADM_CPU_X86_32 AND NOT ADM_CPU_X86_64 AND NOT ADM_CPU_ARMEL) TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN) @@ -156,4 +84,4 @@ SET(ADM_BIG_ENDIAN 1) ENDIF (CMAKE_WORDS_BIGENDIAN) -MESSAGE("") \ No newline at end of file +MESSAGE("") --- cmake_compile_check/cpu_armel_check.cpp.orig 1970-01-01 01:00:00.000000000 +0100 +++ cmake_compile_check/cpu_armel_check.cpp 2014-11-07 22:23:10.666565691 +0100 @@ -0,0 +1,10 @@ +int foo(void) +{ + + asm volatile ("mov lr,pc " : : ); +} + +int main(int a, char **b) +{ + return 0; +} --- plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt.orig 2014-11-07 22:23:16.249460993 +0100 +++ plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt 2014-11-07 22:23:16.246461049 +0100 @@ -6,6 +6,8 @@ ADD_DEFINITIONS("-DFPM_DEFAULT") ELSEIF (ADM_CPU_PPC) ADD_DEFINITIONS("-DFPM_PPC") +ELSE (ADM_CPU_PPC) + ADD_DEFINITIONS("-DFPM_DEFAULT") ENDIF (ADM_CPU_X86_32) ADD_SUBDIRECTORY(ADM_libMad)
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.