Hello community, here is the log from the commit of package lmms for openSUSE:Factory checked in at 2012-08-07 21:50:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lmms (Old) and /work/SRC/openSUSE:Factory/.lmms.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lmms", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lmms/lmms.changes 2012-05-23 08:53:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lmms.new/lmms.changes 2012-08-07 21:50:28.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 6 20:20:40 UTC 2012 - [email protected] + +- set libdir on powerpc correctly + +------------------------------------------------------------------- New: ---- lmms-0.4.13-powerpc_libdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lmms.spec ++++++ --- /var/tmp/diff_new_pack.kV9fC4/_old 2012-08-07 21:50:29.000000000 +0200 +++ /var/tmp/diff_new_pack.kV9fC4/_new 2012-08-07 21:50:29.000000000 +0200 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without distributable %bcond_without crippled_stk @@ -39,6 +40,8 @@ Patch2: lmms-0.4.12-return.patch Patch3: lmms-0.4.13-gcc47.patch Patch4: lmms-0.4.13-crippled_stk.patch +# PATCH-FIX-OPENSUSE lmms-0.4.13-powerpc_libdir.patch [email protected] -- fix libdir on ppc +Patch5: lmms-0.4.13-powerpc_libdir.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: fltk-devel @@ -93,6 +96,7 @@ %if %{with crippled_stk} %patch4 %endif +%patch5 -p1 # Ensure we use system fltk rm -r plugins/zynaddsubfx/fltk ++++++ lmms-0.4.13-powerpc_libdir.patch ++++++ Index: lmms-0.4.13/cmake/modules/DetectMachine.cmake =================================================================== --- lmms-0.4.13.orig/cmake/modules/DetectMachine.cmake +++ lmms-0.4.13/cmake/modules/DetectMachine.cmake @@ -11,6 +11,8 @@ ENDIF(WIN32) MESSAGE("PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}") SET(LMMS_HOST_X86 FALSE) SET(LMMS_HOST_X86_64 FALSE) +SET(LMMS_HOST_PPC FALSE) +SET(LMMS_HOST_PPC64 FALSE) IF(WIN32) IF(WIN64) @@ -24,6 +26,11 @@ ELSE(WIN32) MESSAGE("Machine: ${Machine}") STRING(REGEX MATCH "i.86" IS_X86 "${Machine}") STRING(REGEX MATCH "86_64" IS_X86_64 "${Machine}") + IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc") + SET(IS_PPC TRUE) + ELSEIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc64") + SET(IS_PPC64 TRUE) + ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ppc") ENDIF(WIN32) IF(IS_X86) @@ -32,6 +39,12 @@ IF(IS_X86) ELSEIF(IS_X86_64) MESSAGE("-- Target host is 64 bit") SET(LMMS_HOST_X86_64 TRUE) +ELSEIF(IS_PPC) + MESSAGE("-- Target host is 32 bit") + SET(LMMS_HOST_PPC TRUE) +ELSEIF(IS_PPC64) + MESSAGE("-- Target host is 64 bit") + SET(LMMS_HOST_PPC64 TRUE) ELSE(IS_X86) MESSAGE("Can't identify target host. Assuming 32 bit platform.") ENDIF(IS_X86) @@ -39,11 +52,11 @@ ENDIF(IS_X86) IF(CMAKE_INSTALL_LIBDIR) SET(LIB_DIR "${CMAKE_INSTALL_LIBDIR}") ELSE(CMAKE_INSTALL_LIBDIR) - IF(LMMS_HOST_X86_64) + IF(LMMS_HOST_X86_64 OR LMMS_HOST_PPC64) SET(LIB_DIR lib64) - ELSE(LMMS_HOST_X86_64) + ELSEIF(LMMS_HOST_X86 OR LMMS_HOST_PPC) SET(LIB_DIR lib) - ENDIF(LMMS_HOST_X86_64) + ENDIF(LMMS_HOST_X86_64 OR LMMS_HOST_PPC64) ENDIF(CMAKE_INSTALL_LIBDIR) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
