Packman Build Service PMBS

Changes of Revision 13

avidemux.changes Changed

avidemux.spec Changed

@@ -29,9 +29,21 @@
 Source3:        %{name}-qt4.desktop
 Source4:        ffmpeg-%{ffmpeg_version}.tar.bz2
 Source5:        libavcodec_libavcodec.v.patch
+Patch0:         avidemux-cpu_armel.patch
 License:        GPL-2.0
 Group:          Productivity/Multimedia/Video/Editors and Convertors
 
+%ifarch armv6l || armv6hl || armv7l || armv7hl
+BuildRequires:  Mesa-libEGL1
+BuildRequires:  Mesa-libEGL-devel
+BuildRequires:  Mesa-libGLESv1_CM1
+BuildRequires:  Mesa-libGLESv1_CM-devel
+BuildRequires:  Mesa-libGLESv2-2
+BuildRequires:  Mesa-libGLESv2-devel
+BuildRequires:  -raspberrypi-userland
+BuildRequires:  -raspberrypi-userland-devel
+%endif
+
 # Base RPM
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -43,6 +55,7 @@
 BuildRequires:  pkg-config
 BuildRequires:  update-desktop-files
 BuildRequires:  yasm
+BuildRequires:  dos2unix
 BuildRequires:  libSDL-devel
 
 # Codecs
@@ -120,6 +133,8 @@
 
 %prep
 %setup -q -n "%{name}_%{version}"
+dos2unix -q cmake/admDetermineSystem.cmake
+dos2unix -q plugins/ADM_audioDecoders/ADM_ad_mad/CMakeLists.txt
 sed -i -e 's|set(FFMPEG_VERSION 0.9)|set(FFMPEG_VERSION %{ffmpeg_version})|g' cmake/admFFmpegBuild.cmake
 rm -f avidemux/ADM_libraries/ffmpeg-0.9.tar.bz2
 cp %{S:4} avidemux/ADM_libraries/
@@ -127,7 +142,7 @@
 rm -f libavcodec_libavcodec.v.patch
 cp %{S:5} .
 popd
-
+%patch0
 
 %build
 %if 0%{?sles_version}

avidemux-cpu_armel.patch Added

@@ -0,0 +1,194 @@
+--- 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)