Author: xavierb Update of /cvs/free/rpms/lightspark/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24295 Modified Files: lightspark-0.7.2-llvm-libs-hack.patch lightspark.spec sources Added Files: lightspark-0.7.2-fix_ffmpeg_include_dir.patch Removed Files: lightspark-0.5.5-remove-llvm-version-check.patch lightspark-0.7.2-llvm33.patch Log Message: sync with devel for llvm 3.4 support lightspark-0.7.2-fix_ffmpeg_include_dir.patch: CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE lightspark-0.7.2-fix_ffmpeg_include_dir.patch --- --- lightspark-0.7.2/CMakeLists.txt.orig 2014-03-11 11:00:44.637922643 +0100 +++ lightspark-0.7.2/CMakeLists.txt 2014-03-11 11:01:18.696029090 +0100 @@ -298,7 +298,7 @@ INCLUDE(CheckFunctionExists REQUIRED) INCLUDE(CheckCSourceCompiles) SET(FFMPEG_FLAGS "${LIBAVCODEC_CFLAGS} ${LIBAVRESAMPLE_FLAGS}") - SET(FFMPEG_INCLUDE_DIRS "${FFMPEG_INCLUDE_DIRS} ${LIBAVRESAMPLE_INCLUDE_DIRS}") + SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS}) SET(FFMPEG_LIBRARIES "${FFMPEG_LIBRARIES};${LIBAVRESAMPLE_LIBRARIES}") SET(CMAKE_REQUIRED_FLAGS ${FFMPEG_FLAGS}) SET(CMAKE_REQUIRED_INCLUDES ${FFMPEG_INCLUDE_DIRS}) lightspark-0.7.2-llvm-libs-hack.patch: FindLLVM.cmake | 3 +++ 1 file changed, 3 insertions(+) Index: lightspark-0.7.2-llvm-libs-hack.patch =================================================================== RCS file: /cvs/free/rpms/lightspark/F-20/lightspark-0.7.2-llvm-libs-hack.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lightspark-0.7.2-llvm-libs-hack.patch 11 Jun 2013 21:54:59 -0000 1.2 +++ lightspark-0.7.2-llvm-libs-hack.patch 22 Apr 2014 08:24:05 -0000 1.3 @@ -5,7 +5,7 @@ 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.3") ++ set(LLVM_LIBS_CORE "-lLLVM-3.4") 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 ) Index: lightspark.spec =================================================================== RCS file: /cvs/free/rpms/lightspark/F-20/lightspark.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- lightspark.spec 7 Jan 2014 14:39:39 -0000 1.43 +++ lightspark.spec 22 Apr 2014 08:24:05 -0000 1.44 @@ -9,15 +9,15 @@ %define pre_release 0 %if %{?git} -%define commit 50819e3ab957af9a39e04655b28ea98267448232 -%define date 20130827 +%define commit c974834f93d93bc0f2713a75da62025984cb02f3 +%define date 20140219 %endif %if %{pre_release} %define pre rc1 %endif -%define rel 6 +%define rel 8 %define major 0.7.2 @@ -43,6 +43,7 @@ %endif Patch2: lightspark-0.7.2-llvm-libs-hack.patch +Patch3: lightspark-0.7.2-fix_ffmpeg_include_dir.patch BuildRequires: cmake BuildRequires: llvm-devel >= 2.7 @@ -87,6 +88,7 @@ %prep %setup -q -n %{name}-%{version}%{?pre:~%{pre}} %patch2 -p1 -b .llvm-libs-hack +%patch3 -p1 -b .ffmpeg-include-dir %build %cmake -DCOMPILE_PLUGIN=1 \ @@ -155,10 +157,17 @@ %{_libdir}/mozilla/plugins/lib%{name}plugin.so %changelog +* Tue Mar 25 2014 Xavier Bachelot <xavier(a)bachelot.org&gt; 0.7.2-8.20130827git +- Rebuild for ffmpeg 2.2. + +* Tue Mar 11 2014 Xavier Bachelot <xavier(a)bachelot.org&gt; 0.7.2-7.20140219git +- New snapshot with LLVM 3.4 support. +- Add patch to properly set FFmpeg include directory. + * Tue Jan 07 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.7.2-6.20130827git - Rebuilt for librtmp -* Tue Nov 05 2013 Xavier Bachelot <xavier(a)bachelot.org&gt; 0.7.2-5..20130827git +* Tue Nov 05 2013 Xavier Bachelot <xavier(a)bachelot.org&gt; 0.7.2-5.20130827git - Rebuild for ffmpeg 2.1. * Tue Aug 27 2013 Xavier Bachelot <xavier(a)bachelot.org&gt; - 0.7.2-4.20130827git Index: sources =================================================================== RCS file: /cvs/free/rpms/lightspark/F-20/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 10 Sep 2013 20:44:17 -0000 1.26 +++ sources 22 Apr 2014 08:24:05 -0000 1.27 @@ -1 +1 @@ -0cbf76bf768c31879921ba5698db6671 lightspark-0.7.2-20130827git.tar.bz2 +ada0a48a123df8df0f5aeeeffec9aef8 lightspark-0.7.2-20140219git.tar.bz2 --- lightspark-0.5.5-remove-llvm-version-check.patch DELETED --- --- lightspark-0.7.2-llvm33.patch DELETED ---