4:17 p.m.
Author: xavierb
Update of /cvs/free/rpms/lightspark/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23640
Modified Files:
.cvsignore lightspark.spec sources
Added Files:
lightspark-0.7.2-llvm-libs-hack.patch
lightspark-0.7.2-llvm33.patch
Log Message:
merge with master; adapt lightspark-0.7.2-llvm-libs-hack.patch for llvm 3.2
lightspark-0.7.2-llvm-libs-hack.patch:
FindLLVM.cmake | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE lightspark-0.7.2-llvm-libs-hack.patch ---
diff -up lightspark-0.7.2/conf/FindLLVM.cmake~ lightspark-0.7.2/conf/FindLLVM.cmake
--- lightspark-0.7.2/conf/FindLLVM.cmake~ 2013-05-11 11:38:05.000000000 +0200
+++ lightspark-0.7.2/conf/FindLLVM.cmake 2013-05-11 11:56:26.836444660 +0200
@@ -184,12 +184,15 @@ else (LLVM_INCLUDE_DIR)
exec_program(${LLVM_CONFIG_EXECUTABLE} ARGS --ldflags OUTPUT_VARIABLE LLVM_LDFLAGS )
MESSAGE(STATUS "LLVM LD flags: " ${LLVM_LDFLAGS})
FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "core ipa ipo instrumentation bitreader
bitwriter linker" LLVM_LIBS_CORE LLVM_LIBS_CORE_OBJECTS )
+ set(LLVM_LIBS_CORE "-lLLVM-3.2svn")
MESSAGE(STATUS "LLVM core libs: " ${LLVM_LIBS_CORE})
IF(APPLE AND UNIVERSAL)
FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "jit native x86 PowerPC ARM"
LLVM_LIBS_JIT LLVM_LIBS_JIT_OBJECTS )
ELSE(APPLE AND UNIVERSAL)
FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "jit native" LLVM_LIBS_JIT
LLVM_LIBS_JIT_OBJECTS )
ENDIF(APPLE AND UNIVERSAL)
+ set(LLVM_LIBS_JIT "")
+ set(LLVM_LIBS_JIT_OBJECTS "")
MESSAGE(STATUS "LLVM JIT libs: " ${LLVM_LIBS_JIT})
MESSAGE(STATUS "LLVM JIT objs: " ${LLVM_LIBS_JIT_OBJECTS})
lightspark-0.7.2-llvm33.patch:
conf/FindLLVM.cmake | 5 +++++
src/scripting/abc.cpp | 15 +++++++++++----
src/scripting/abc_codesynt.cpp | 25 ++++++++++++++++++-------
3 files changed, 34 insertions(+), 11 deletions(-)
--- NEW FILE lightspark-0.7.2-llvm33.patch ---
diff -up lightspark-0.7.2/conf/FindLLVM.cmake.llvm33 lightspark-0.7.2/conf/FindLLVM.cmake
--- lightspark-0.7.2/conf/FindLLVM.cmake.llvm33 2013-03-16 12:19:18.000000000 +0100
+++ lightspark-0.7.2/conf/FindLLVM.cmake 2013-05-11 11:57:36.455450049 +0200
@@ -168,11 +168,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})
diff -up lightspark-0.7.2/src/scripting/abc.cpp.llvm33
lightspark-0.7.2/src/scripting/abc.cpp
--- lightspark-0.7.2/src/scripting/abc.cpp.llvm33 2013-03-16 12:19:18.000000000 +0100
+++ lightspark-0.7.2/src/scripting/abc.cpp 2013-05-11 11:57:36.451450048 +0200
@@ -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()));
diff -up lightspark-0.7.2/src/scripting/abc_codesynt.cpp.llvm33
lightspark-0.7.2/src/scripting/abc_codesynt.cpp
--- lightspark-0.7.2/src/scripting/abc_codesynt.cpp.llvm33 2013-03-16 12:19:18.000000000
+0100
+++ lightspark-0.7.2/src/scripting/abc_codesynt.cpp 2013-05-11 11:59:23.066458300 +0200
@@ -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());
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/lightspark/F-18/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 2 Jan 2013 19:50:27 -0000 1.4
+++ .cvsignore 17 May 2013 16:17:49 -0000 1.5
@@ -1 +1 @@
-lightspark-0.7.1.tar.gz
+lightspark-0.7.2.tar.gz
Index: lightspark.spec
===================================================================
RCS file: /cvs/free/rpms/lightspark/F-18/lightspark.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- lightspark.spec 2 Jan 2013 19:50:28 -0000 1.33
+++ lightspark.spec 17 May 2013 16:17:49 -0000 1.34
@@ -19,7 +19,7 @@
%define rel 1
-%define major 0.7.1
+%define major 0.7.2
Name: lightspark
Version: %{major}
@@ -43,6 +43,8 @@
%endif
Patch0: %{name}-0.5.5-remove-llvm-version-check.patch
+Patch1: lightspark-0.7.2-llvm33.patch
+Patch2: lightspark-0.7.2-llvm-libs-hack.patch
BuildRequires: cmake
BuildRequires: llvm-devel >= 2.7
@@ -87,6 +89,8 @@
%prep
%setup -q -n %{name}-%{version}%{?pre:~%{pre}}
%patch0 -p1 -b .remove-llvm-version-check
+%patch1 -p1 -b .llvm33
+%patch2 -p1 -b .llvm-libs-hack
%build
%cmake -DCOMPILE_PLUGIN=1 \
@@ -155,6 +159,17 @@
%{_libdir}/mozilla/plugins/lib%{name}plugin.so
%changelog
+* Sat May 11 2013 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.7.2-1
+- New upstream release 0.7.2
+- Fix building with llvm-3.3
+- Rebuild for new boost libs
+
+* Sun Apr 28 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.1-2.1
+- https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Jan 30 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.1-2
+- Rebuilt for ffmpeg
+
* Fri Dec 28 2012 Xavier Bachelot <xavier(a)bachelot.org> - 0.7.1-1
- Update to 0.7.1.
@@ -220,7 +235,7 @@
* Fri Mar 04 2011 Hicham HAOUARI <hicham.haouari(a)gmail.com> -
0.4.5.3-1.20110304git
- Update to 0.4.5.3
-* Sat Feb 09 2011 Hicham HAOUARI <hicham.haouari(a)gmail.com> -
0.4.5.2-1.20110209git
+* Wed Feb 09 2011 Hicham HAOUARI <hicham.haouari(a)gmail.com> -
0.4.5.2-1.20110209git
- Today's snapshot, fixes a youtube crasher
* Sun Jan 09 2011 Hicham HAOUARI <hicham.haouari(a)gmail.com> -
0.4.5.1-3.20110109git
@@ -249,7 +264,7 @@
* Fri Sep 24 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.4.3-1
- New bugfix release
-* Thu Sep 12 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.4.2-1
+* Sun Sep 12 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.4.2-1
- New bugfix release
* Thu Sep 02 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.4.1-1
@@ -270,13 +285,13 @@
* Tue Jul 27 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.2.2-1
- Add gnash fallback
-* Tue Jul 24 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.2.1-1
+* Sat Jul 24 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.2.1-1
- New bugfix release
* Tue Jul 20 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.2-1
- 0.4.2 release
-* Sun Jul 19 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> -
0.4.2-0.4.20100719git.rc2
+* Mon Jul 19 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> -
0.4.2-0.4.20100719git.rc2
- Fix sound synchronization
* Sun Jul 04 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> -
0.4.2-0.3.20100707git.rc2
@@ -285,5 +300,5 @@
* Sun Jul 04 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.2-0.2.rc2
- New release candidate
-* Thu Jun 23 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.2-0.1.rc1
+* Wed Jun 23 2010 Hicham HAOUARI <hicham.haouari(a)gmail.com> - 0.4.2-0.1.rc1
- Initial package for fedora
Index: sources
===================================================================
RCS file: /cvs/free/rpms/lightspark/F-18/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 2 Jan 2013 19:50:28 -0000 1.24
+++ sources 17 May 2013 16:17:50 -0000 1.25
@@ -1 +1 @@
-aedf6ca70c59e9e869604ead0a16cc3b lightspark-0.7.1.tar.gz
+f078d505a354fb66dc5b68ad09a2aa81 lightspark-0.7.2.tar.gz