Packman Build Service PMBS

lightspark.changes Changed

lightspark.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package lightspark
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,22 +15,22 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
+%if %packman_bs
+%bcond_without ffmpeg
+%bcond_without rtmp
+%else
 %bcond_with ffmpeg
 %bcond_with rtmp
+%endif
 
 Name:           lightspark
-Version:        0.7.2
+Version:        0.7.2.99+git20140327.1809
 Release:        0
 Summary:        Modern, free, open-source flash player implementation
 License:        LGPL-3.0+
 Group:          Productivity/Multimedia/Other
 Url:            https://launchpad.net/lightspark/
-Source0:        https://launchpad.net/lightspark/trunk/lightspark-%{version}/+download/lightspark-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM lightspark-0.5.7-underlinking.patch lp#1000818 reddwarf@opensuse.org -- Link against GTK
-Patch0:         lightspark-0.5.7-underlinking.patch
-# PATCH-FIX-UPSTREAM llvm-3.3.patch mhrusecky@suse.cz -- Upstream patch for llvm 3.3. support
-Patch1:         llvm-3.3.patch
+Source0:        lightspark.tar.xz
 BuildRequires:  boost-devel
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@@ -53,10 +53,10 @@
 BuildRequires:  pkgconfig(liblzma)
 BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(libpng)
-BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libxml++-2.6) >= 2.33.1
 BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(pangocairo)
+BuildRequires:  pkgconfig(sdl)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(zlib)
 %if %{with rtmp}
@@ -66,7 +66,7 @@
 #BuildRequires:  pkgconfig(libavcodec)
 #BuildRequires:  pkgconfig(libavformat)
 #BuildRequires:  pkgconfig(libavutil)
-BuildRequires:  libffmpeg1-devel
+BuildRequires:  libffmpeg-devel
 %endif
 Recommends:     %{_bindir}/gnash
 
@@ -78,14 +78,14 @@
 Group:          Productivity/Multimedia/Other
 Requires:       %{name} = %{version}
 Enhances:       browser(npapi)
+Conflicts:      flash-player
+Conflicts:      gnash-browser-plugin
 
 %description plugin
 NPAPI plugin for lightspark.
 
 %prep
-%setup -q
-%patch0
-%patch1
+%setup -q -n %{name}
 
 %build
 export CFLAGS='%{optflags}'
@@ -93,14 +93,14 @@
 mkdir build
 cd build
 cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 \
-      -DCMAKE_VERBOSE_MAKEFILE=1 \
+      -DAUDIO_BACKEND=sdl \
       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
       -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \
       -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
       -DPLUGIN_DIRECTORY=%{_libdir}/browser-plugins \
       -DENABLE_LIBAVCODEC=%{?with_ffmpeg:YES}%{!?with_ffmpeg:NO} \
       -DENABLE_RTMP=%{?with_rtmp:YES}%{!?with_rtmp:NO} ..
-make %{?_smp_mflags}
+make %{?jobs:-j%jobs}
 
 %install
 cd build

lightspark-0.5.7-underlinking.patch Deleted

llvm-3.3.patch Deleted

@@ -1,125 +0,0 @@
-From 56f4f48c47983432670d7aaa18614a98bd35961a Mon Sep 17 00:00:00 2001
-From: Antti Ajanki <antti.ajanki@iki.fi>
-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());

lightspark-0.7.2.tar.gz Deleted

lightspark.tar.xz Added

Changes of Revision 57