Lightspark

Merge lp:~invernizzi/lightspark/readme-update into lp:~a-pignotti/lightspark/master

  1. readme-update
  2. Merge into master
Proposed by Alessandro Pignotti
Status: Merged
Merge reported by: Alessandro Pignotti
Merged at revision: not available
Proposed branch: lp:~invernizzi/lightspark/readme-update
Merge into: lp:~a-pignotti/lightspark/master
Diff against target: 107 lines (+7/-15)
5 files modified
CMakeLists.txt (+2/-2)
README (+2/-1)
abc.cpp (+2/-7)
debian/control (+1/-1)
swftypes.h (+0/-4)
To merge this branch: bzr merge lp:~invernizzi/lightspark/readme-update
Reviewer Review Type Date Requested Status
Alessandro Pignotti Pending
Review via email: mp+24027@code.launchpad.net
To post a comment you must log in.
lp:~invernizzi/lightspark/readme-update updated
600. By Luca Invernizzi

llvm 2.7

601. By Luca Invernizzi

debian control file accepts both libcurl4-*

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2010-04-19 17:58:30 +0000
3+++ CMakeLists.txt 2010-04-23 19:41:01 +0000
4@@ -40,7 +40,7 @@
5 INCLUDE(FindPkgConfig REQUIRED)
6 INCLUDE(FindZLIB REQUIRED)
7
8-pkg_check_modules(EXTRA_LIBS REQUIRED gl libpcre libpcrecpp libavcodec libxml-2.0 ftgl)
9+pkg_check_modules(EXTRA_LIBS REQUIRED gl libpcre libpcrecpp libavcodec libxml-2.0 ftgl x11)
10
11 INCLUDE_DIRECTORIES(${SDL_INCLUDE_DIR})
12 INCLUDE_DIRECTORIES(${LLVM_INCLUDE_DIR})
13@@ -83,7 +83,7 @@
14 ENDIF(USE_VAAPI)
15
16 IF(COMPILE_LIGHTSPARK OR COMPILE_TIGHTSPARK)
17- SET(CMAKE_CXX_FLAGS "-Wall -Wnon-virtual-dtor -Woverloaded-virtual -pipe")
18+ SET(CMAKE_CXX_FLAGS "-Wall -Wnon-virtual-dtor -Woverloaded-virtual -pipe -lrt -lX11 -ldl -lavutil")
19 SET(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -D_GLIBCXX_NO_DEBUG")
20 SET(CMAKE_CXX_FLAGS_PROFILE "-g -pg -O2 -DNDEBUG")
21 SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
22
23=== modified file 'README'
24--- README 2010-03-29 22:28:03 +0000
25+++ README 2010-04-23 19:41:01 +0000
26@@ -22,7 +22,8 @@
27 be ready soon.
28
29 INSTALLATION:
30-To compile this software you need to install development packages for llvm-2.6, sdl, opengl and curl
31+To compile this software you need to install development packages for llvm-2.6, sdl, opengl, curl, libavcodec, ftgl, libglew
32+Install also cmake and nasm.
33 To build the software please follow those steps.
34
35 1) cd lightspark
36
37=== modified file 'abc.cpp'
38--- abc.cpp 2010-04-21 19:57:16 +0000
39+++ abc.cpp 2010-04-23 19:41:01 +0000
40@@ -22,7 +22,6 @@
41 #include <llvm/ExecutionEngine/ExecutionEngine.h>
42 #include <llvm/ExecutionEngine/JIT.h>
43 #include <llvm/LLVMContext.h>
44-#include <llvm/ModuleProvider.h>
45 #include <llvm/Target/TargetData.h>
46 #include <llvm/Target/TargetSelect.h>
47 #include <llvm/Analysis/Verifier.h>
48@@ -1246,19 +1245,17 @@
49 sys=th->m_sys;
50 iManager=th->int_manager;
51 dManager=th->number_manager;
52- llvm::ExistingModuleProvider* mp=NULL;
53 if(sys->useJit)
54 {
55 llvm::InitializeNativeTarget();
56 th->module=new llvm::Module(llvm::StringRef("abc jit"),th->llvm_context);
57- mp = new llvm::ExistingModuleProvider(th->module);
58- llvm::EngineBuilder eb(mp);
59+ llvm::EngineBuilder eb(th->module);
60 eb.setEngineKind(llvm::EngineKind::JIT);
61 eb.setOptLevel(llvm::CodeGenOpt::Default);
62 th->ex=eb.create();
63 assert(th->ex);
64
65- th->FPM=new llvm::FunctionPassManager(mp);
66+ th->FPM=new llvm::FunctionPassManager(th->module);
67
68 th->FPM->add(new llvm::TargetData(*th->ex->getTargetData()));
69 #ifndef NDEBUG
70@@ -1293,8 +1290,6 @@
71 if(sys->useJit)
72 {
73 th->ex->clearAllGlobalMappings();
74- mp->releaseModule();
75- delete mp;
76 delete th->module;
77 }
78 }
79
80=== modified file 'debian/control'
81--- debian/control 2010-04-20 23:31:52 +0000
82+++ debian/control 2010-04-23 19:41:01 +0000
83@@ -2,7 +2,7 @@
84 Section: utils
85 Priority: optional
86 Maintainer: Alessandro Pignotti <a.pignotti@sssup.it>
87-Build-Depends: cdbs, debhelper (>= 7), llvm-dev (>=2.5), libsdl1.2-dev, libgl1-mesa-dev, libxext-dev, libcurl4-gnutls-dev, libxml2-dev, zlib1g-dev, libnspr4-dev, libavcodec-dev, libpcre3-dev, libftgl-dev
88+Build-Depends: cdbs, debhelper (>= 7), llvm-dev (>=2.5), libsdl1.2-dev, libgl1-mesa-dev, libxext-dev, libcurl4-gnutls-dev | libcurl4-openssl-dev , libxml2-dev, zlib1g-dev, libnspr4-dev, libavcodec-dev, libpcre3-dev, libftgl-dev
89 Standards-Version: 3.8.4
90 Homepage: http://lightspark.sf.net
91 Vcs-git: git://github.com/alexp-sssup/lightspark.git
92
93=== modified file 'swftypes.h'
94--- swftypes.h 2010-04-21 19:57:16 +0000
95+++ swftypes.h 2010-04-23 19:41:01 +0000
96@@ -21,11 +21,7 @@
97 #define SWFTYPES_H
98
99 #include "compat.h"
100-#ifdef WIN32
101 #include <llvm/System/DataTypes.h>
102-#else
103-#include <llvm/Support/DataTypes.h>
104-#endif
105 #include <iostream>
106 #include <fstream>
107 #include <vector>

Subscribers

People subscribed via source and target branches

to all changes: