Hello community, here is the log from the commit of package lightspark for openSUSE:Factory checked in at 2012-12-03 10:02:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightspark (Old) and /work/SRC/openSUSE:Factory/.lightspark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightspark", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightspark/lightspark.changes 2012-11-02 17:37:50.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.lightspark.new/lightspark.changes 2012-12-03 10:02:06.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 30 10:45:57 UTC 2012 - [email protected] + +- Add lightspark-0.7.0-llvm32.patch to fix build with LLVM 3.2 + +------------------------------------------------------------------- New: ---- lightspark-0.7.0-llvm32.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightspark.spec ++++++ --- /var/tmp/diff_new_pack.QdAT3v/_old 2012-12-03 10:02:07.000000000 +0100 +++ /var/tmp/diff_new_pack.QdAT3v/_new 2012-12-03 10:02:07.000000000 +0100 @@ -31,6 +31,8 @@ Patch0: lightspark-0.5.7-underlinking.patch # PATCH-FIX-UPSTREAM lightspark-0.7.0-no_glu.patch lp#1073536 [email protected] -- Avoid the need for GLU Patch1: lightspark-0.7.0-no_glu.patch +# PATCH-FIX-UPSTREAM lightspark-0.7.0-llvm32.patch lp#1080123 [email protected] -- Fix build with LLVM 3.2. Took from upstream BZR. +Patch2: lightspark-0.7.0-llvm32.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -85,6 +87,7 @@ %setup -q %patch0 %patch1 +%patch2 %build export CFLAGS='%{optflags}' ++++++ lightspark-0.7.0-llvm32.patch ++++++ === modified file 'conf/FindLLVM.cmake' Index: conf/FindLLVM.cmake =================================================================== --- conf/FindLLVM.cmake.orig +++ conf/FindLLVM.cmake @@ -156,6 +156,23 @@ else (LLVM_INCLUDE_DIR) IF(HAVE_SUPPORT_TARGETSELECT_H) ADD_DEFINITIONS(-DHAVE_SUPPORT_TARGETSELECT_H) ENDIF(HAVE_SUPPORT_TARGETSELECT_H) + + set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) + set(CMAKE_REQUIRED_DEFINITIONS -D__STDC_LIMIT_MACROS=1 -D__STDC_CONSTANT_MACROS=1) + check_include_file_cxx("llvm/IRBuilder.h" HAVE_IRBUILDER_H) + unset(CMAKE_REQUIRED_INCLUDES) + MESSAGE(STATUS "HAVE_IRBUILDER_H: " ${HAVE_IRBUILDER_H}) + IF(HAVE_IRBUILDER_H) + ADD_DEFINITIONS(-DHAVE_IRBUILDER_H) + ENDIF(HAVE_IRBUILDER_H) + + set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) + check_include_file_cxx("llvm/DataLayout.h" HAVE_DATALAYOUT_H) + unset(CMAKE_REQUIRED_INCLUDES) + MESSAGE(STATUS "HAVE_DATALAYOUT_H: " ${HAVE_DATALAYOUT_H}) + IF(HAVE_DATALAYOUT_H) + ADD_DEFINITIONS(-DHAVE_DATALAYOUT_H) + ENDIF(HAVE_DATALAYOUT_H) exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --cxxflags OUTPUT_VARIABLE LLVM_COMPILE_FLAGS ) MESSAGE(STATUS "LLVM CXX flags: " ${LLVM_COMPILE_FLAGS}) Index: src/scripting/abc.cpp =================================================================== --- src/scripting/abc.cpp.orig +++ src/scripting/abc.cpp @@ -28,7 +28,11 @@ #include <llvm/ExecutionEngine/JIT.h> #include <llvm/PassManager.h> #include <llvm/LLVMContext.h> -#include <llvm/Target/TargetData.h> +#ifdef HAVE_DATALAYOUT_H +# include <llvm/DataLayout.h> +#else +# include <llvm/Target/TargetData.h> +#endif #ifdef HAVE_SUPPORT_TARGETSELECT_H #include <llvm/Support/TargetSelect.h> #else @@ -1454,7 +1458,11 @@ void ABCVm::Run(ABCVm* th) assert_and_throw(th->ex); th->FPM=new llvm::FunctionPassManager(th->module); +#ifdef HAVE_DATALAYOUT_H + th->FPM->add(new llvm::DataLayout(*th->ex->getDataLayout())); +#else th->FPM->add(new llvm::TargetData(*th->ex->getTargetData())); +#endif #ifdef EXPENSIVE_DEBUG //This is pretty heavy, do not enable in release th->FPM->add(llvm::createVerifierPass()); Index: src/scripting/abc_codesynt.cpp =================================================================== --- src/scripting/abc_codesynt.cpp.orig +++ src/scripting/abc_codesynt.cpp @@ -29,10 +29,18 @@ #include <llvm/DerivedTypes.h> #include <llvm/ExecutionEngine/ExecutionEngine.h> #include <llvm/PassManager.h> -#include <llvm/Constants.h> -#include <llvm/Support/IRBuilder.h> +#include <llvm/Constants.h> +#ifdef HAVE_IRBUILDER_H +# include <llvm/IRBuilder.h> +#else +# include <llvm/Support/IRBuilder.h> +#endif #include <llvm/LLVMContext.h> -#include <llvm/Target/TargetData.h> +#ifdef HAVE_DATALAYOUT_H +# include <llvm/DataLayout.h> +#else +# include <llvm/Target/TargetData.h> +#endif #include <sstream> #include "scripting/abc.h" #include "swftypes.h" @@ -271,7 +279,11 @@ void ABCVm::registerFunctions() llvm::FunctionType* FT=NULL; //Create types +#ifdef HAVE_DATALAYOUT_H + ptr_type=ex->getDataLayout()->getIntPtrType(llvm_context()); +#else ptr_type=ex->getTargetData()->getIntPtrType(llvm_context()); +#endif //Pointer to 8 bit type, needed for pointer arithmetic voidptr_type=llvm::IntegerType::get(getVm()->llvm_context(),8)->getPointerTo(); number_type=llvm::Type::getDoubleTy(llvm_context()); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
