Hello community, here is the log from the commit of package lightspark for openSUSE:Factory checked in at 2013-06-05 13:30:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightspark (Old) and /work/SRC/openSUSE:Factory/.lightspark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightspark" Changes: -------- --- /work/SRC/openSUSE:Factory/lightspark/lightspark.changes 2013-05-07 07:28:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lightspark.new/lightspark.changes 2013-06-05 13:30:01.000000000 +0200 @@ -1,0 +2,5 @@ +Thu May 30 09:33:39 CEST 2013 - [email protected] + +- fixed build with new llvm: llvm-3.3.patch + +------------------------------------------------------------------- New: ---- llvm-3.3.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightspark.spec ++++++ --- /var/tmp/diff_new_pack.4jBacE/_old 2013-06-05 13:30:02.000000000 +0200 +++ /var/tmp/diff_new_pack.4jBacE/_new 2013-06-05 13:30:02.000000000 +0200 @@ -29,6 +29,8 @@ Source0: https://launchpad.net/lightspark/trunk/lightspark-%{version}/+download/lightspark-%{version}.tar.gz # PATCH-FIX-UPSTREAM lightspark-0.5.7-underlinking.patch lp#1000818 [email protected] -- Link against GTK Patch0: lightspark-0.5.7-underlinking.patch +# PATCH-FIX-UPSTREAM llvm-3.3.patch [email protected] -- Upstream patch for llvm 3.3. support +Patch1: llvm-3.3.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -82,6 +84,7 @@ %prep %setup -q %patch0 +%patch1 %build export CFLAGS='%{optflags}' ++++++ llvm-3.3.patch ++++++ >From 56f4f48c47983432670d7aaa18614a98bd35961a Mon Sep 17 00:00:00 2001 From: Antti Ajanki <[email protected]> Date: Sat, 18 May 2013 11:36:52 +0300 Subject: [PATCH] Support for LLVM 3.3 --- conf/FindLLVM.cmake | 6 ++++++ src/scripting/abc.cpp | 15 +++++++++++---- src/scripting/abc_codesynt.cpp | 25 ++++++++++++++++++------- 3 files changed, 35 insertions(+), 11 deletions(-) Index: conf/FindLLVM.cmake =================================================================== --- conf/FindLLVM.cmake.orig +++ conf/FindLLVM.cmake @@ -51,6 +51,7 @@ else (LLVM_INCLUDE_DIR) /usr/lib/llvm-2.8/bin /usr/lib/llvm-2.9/bin /usr/lib/llvm-3.0/bin + /usr/lib/llvm-3.3/bin ) find_program(LLVM_GCC_EXECUTABLE @@ -168,11 +169,16 @@ else (LLVM_INCLUDE_DIR) set(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) check_include_file_cxx("llvm/DataLayout.h" HAVE_DATALAYOUT_H) + check_include_file_cxx("llvm/IR/DataLayout.h" HAVE_IR_DATALAYOUT_H) unset(CMAKE_REQUIRED_INCLUDES) MESSAGE(STATUS "HAVE_DATALAYOUT_H: " ${HAVE_DATALAYOUT_H}) + MESSAGE(STATUS "HAVE_IR_DATALAYOUT_H: " ${HAVE_IR_DATALAYOUT_H}) IF(HAVE_DATALAYOUT_H) ADD_DEFINITIONS(-DHAVE_DATALAYOUT_H) ENDIF(HAVE_DATALAYOUT_H) + IF(HAVE_IR_DATALAYOUT_H) + ADD_DEFINITIONS(-DHAVE_IR_DATALAYOUT_H) + ENDIF(HAVE_IR_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 @@ -23,12 +23,19 @@ #include "compat.h" -#include <llvm/Module.h> #include <llvm/ExecutionEngine/ExecutionEngine.h> #include <llvm/ExecutionEngine/JIT.h> #include <llvm/PassManager.h> -#include <llvm/LLVMContext.h> -#ifdef HAVE_DATALAYOUT_H +#ifdef HAVE_IR_DATALAYOUT_H +# include <llvm/IR/Module.h> +# include <llvm/IR/LLVMContext.h> +#else +# include <llvm/Module.h> +# include <llvm/LLVMContext.h> +#endif +#ifdef HAVE_IR_DATALAYOUT_H +# include <llvm/IR/DataLayout.h> +#elif defined HAVE_DATALAYOUT_H # include <llvm/DataLayout.h> #else # include <llvm/Target/TargetData.h> @@ -1489,7 +1496,7 @@ void ABCVm::Run(ABCVm* th) assert_and_throw(th->ex); th->FPM=new llvm::FunctionPassManager(th->module); -#ifdef HAVE_DATALAYOUT_H +#if defined HAVE_DATALAYOUT_H || defined HAVE_IR_DATALAYOUT_H th->FPM->add(new llvm::DataLayout(*th->ex->getDataLayout())); #else th->FPM->add(new llvm::TargetData(*th->ex->getTargetData())); Index: src/scripting/abc_codesynt.cpp =================================================================== --- src/scripting/abc_codesynt.cpp.orig +++ src/scripting/abc_codesynt.cpp @@ -25,18 +25,29 @@ #endif #include "compat.h" -#include <llvm/Module.h> -#include <llvm/DerivedTypes.h> #include <llvm/ExecutionEngine/ExecutionEngine.h> #include <llvm/PassManager.h> -#include <llvm/Constants.h> -#ifdef HAVE_IRBUILDER_H +#ifdef HAVE_IR_DATALAYOUT_H +# include <llvm/IR/Constants.h> +# include <llvm/IR/DerivedTypes.h> +# include <llvm/IR/Module.h> +# include <llvm/IR/LLVMContext.h> +#else +# include <llvm/Constants.h> +# include <llvm/DerivedTypes.h> +# include <llvm/Module.h> +# include <llvm/LLVMContext.h> +#endif +#ifdef HAVE_IR_DATALAYOUT_H +# include <llvm/IR/IRBuilder.h> +#elif defined HAVE_IRBUILDER_H # include <llvm/IRBuilder.h> #else # include <llvm/Support/IRBuilder.h> #endif -#include <llvm/LLVMContext.h> -#ifdef HAVE_DATALAYOUT_H +#ifdef HAVE_IR_DATALAYOUT_H +# include <llvm/IR/DataLayout.h> +#elif defined HAVE_DATALAYOUT_H # include <llvm/DataLayout.h> #else # include <llvm/Target/TargetData.h> @@ -279,7 +290,7 @@ void ABCVm::registerFunctions() llvm::FunctionType* FT=NULL; //Create types -#ifdef HAVE_DATALAYOUT_H +#if defined HAVE_DATALAYOUT_H || defined HAVE_IR_DATALAYOUT_H ptr_type=ex->getDataLayout()->getIntPtrType(llvm_context()); #else ptr_type=ex->getTargetData()->getIntPtrType(llvm_context()); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
