Projects
Essentials
lightspark
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 103
View file
lightspark.spec
Changed
@@ -28,6 +28,7 @@ Url: https://launchpad.net/lightspark/ Source0: lightspark.tar.xz Patch: 0001-s-PIX_FMT_YUV420P-AV_PIX_FMT_YUV420P-compatibility.patch +Patch2: 0002-Fix-build-with-newer-LLVM.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -87,6 +88,7 @@ %prep %setup -q -n %{name} %patch -p1 +%patch2 -p1 %build export CFLAGS='%{optflags}'
View file
0001-s-PIX_FMT_YUV420P-AV_PIX_FMT_YUV420P-compatibility.patch
Changed
@@ -1,14 +1,14 @@ -From c0ba608054ab53a424414e4bc165a1d4cebfe8b9 Mon Sep 17 00:00:00 2001 +From 0071cb20db3166dbef561ef4007158b13c5c68af Mon Sep 17 00:00:00 2001 From: Johannes Obermayr <johannesobermayr@gmx.de> Date: Mon, 21 Mar 2016 22:34:36 +0100 -Subject: [PATCH] s/PIX_FMT_YUV420P/AV_PIX_FMT_YUV420P + compatibility. +Subject: [PATCH 1/2] s/PIX_FMT_YUV420P/AV_PIX_FMT_YUV420P + compatibility. --- src/backends/decoder.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/backends/decoder.cpp b/src/backends/decoder.cpp -index 3f84fd8..c6df46c 100755 +index 3f84fd8..10aafdc 100755 --- a/src/backends/decoder.cpp +++ b/src/backends/decoder.cpp @@ -39,6 +39,10 @@
View file
0002-Fix-build-with-newer-LLVM.patch
Added
@@ -0,0 +1,66 @@ +From c7e27875f28fc5a716c1fa83cff89860569554be Mon Sep 17 00:00:00 2001 +From: Johannes Obermayr <johannesobermayr@gmx.de> +Date: Tue, 22 Mar 2016 21:37:43 +0100 +Subject: [PATCH 2/2] Fix build with newer LLVM. + +--- + CMakeLists.txt | 11 +++++++++++ + src/scripting/abc_codesynt.cpp | 7 +++++-- + 2 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0b9790d..06d9a23 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -250,6 +250,17 @@ ENDIF(NOT (${LLVM_STRING_VERSION} VERSION_LESS 3.6)) + IF(NOT ${LLVM_STRING_VERSION} VERSION_LESS 3.7) + ADD_DEFINITIONS(-DLLVM_37) + ENDIF(NOT ${LLVM_STRING_VERSION} VERSION_LESS 3.7) ++ ++INCLUDE(CheckCXXSourceCompiles) ++SET(CMAKE_REQUIRED_FLAGS ${LLVM_COMPILE_FLAGS}) ++SET(CMAKE_REQUIRED_INCLUDES ${LLVM_INCLUDE_DIR}) ++CHECK_CXX_SOURCE_COMPILES("#include <llvm/ExecutionEngine/ExecutionEngine.h>\nbool main() { return DL.isLittleEndian(); }" EXECUTIONENGINE_OWNING_DATALAYOUT) ++IF(EXECUTIONENGINE_OWNING_DATALAYOUT) ++ ADD_DEFINITIONS(-DEXECUTIONENGINE_OWNING_DATALAYOUT) ++ENDIF(EXECUTIONENGINE_OWNING_DATALAYOUT) ++SET(CMAKE_REQUIRED_FLAGS) ++SET(CMAKE_REQUIRED_INCLUDES) ++ + INCLUDE(FindZLIB REQUIRED) + INCLUDE(FindFreetype REQUIRED) + IF(NOT(ENABLE_GLES2)) +diff --git a/src/scripting/abc_codesynt.cpp b/src/scripting/abc_codesynt.cpp +index d07ccd6..0cb6581 100644 +--- a/src/scripting/abc_codesynt.cpp ++++ b/src/scripting/abc_codesynt.cpp +@@ -294,11 +294,15 @@ void ABCVm::registerFunctions() + llvm::FunctionType* FT=NULL; + + //Create types ++#if EXECUTIONENGINE_OWNING_DATALAYOUT ++ ptr_type=ex->getDataLayout().getIntPtrType(llvm_context()); ++#else + #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()); + #endif ++#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()); +@@ -1883,9 +1887,8 @@ SyntheticFunction::synt_function method_info::synt_method() + constant = llvm::ConstantInt::get(ptr_type, (uintptr_t)this); + llvm::Value* th = llvm::ConstantExpr::getIntToPtr(constant, voidptr_type); + +- llvm::Function::ArgumentListType::iterator it=llvmf->getArgumentList().begin(); + //The first and only argument to this function is the call_context* +- llvm::Value* context=it; ++ llvm::Value* context=llvmf->getArgumentList().begin(); + + //let's give access to local data storage + value=Builder.CreateStructGEP( +-- +2.7.3 +
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
.