Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 51

lightspark.spec Changed

@@ -1,86 +1,90 @@
 #
 # spec file for package lightspark
-#  
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.  
-# Copyright (c) 2012 Benjamin Denisart <p.drouand@gmail.com>   
-#  
-# All modifications and additions to the file contributed by third parties  
-# remain the property of their copyright owners, unless otherwise agreed  
-# upon. The license for this file, and modifications and additions to the  
-# file, is the same license as for the pristine package itself (unless the  
-# license for the pristine package is not an Open Source License, in which  
-# case the license is the MIT License). An "Open Source License" is a  
-# license that conforms to the Open Source Definition (Version 1.9)  
+#
+# Copyright (c) 2012 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+%bcond_with ffmpeg
+%bcond_with rtmp
+
 Name:           lightspark
-Version:        0.6.0.1
-Release:        1
+Version:        0.7.0
+Release:        0
+Summary:        Modern, free, open-source flash player implementation
 License:        LGPL-3.0+
-Summary:        SWF desktop reader
-Url:            http://lightspark.github.com/
 Group:          Productivity/Multimedia/Other
-Source0:        %{name}-%{version}.tar.bz2
+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 lightspark-0.7.0-no_glu.patch lp#1073536 reddwarf@opensuse.org -- Avoid the need for GLU
+Patch1:         lightspark-0.7.0-no_glu.patch
 BuildRequires:  boost-devel
 BuildRequires:  cmake
-BuildRequires:  curl-devel
-BuildRequires:  libffmpeg-devel
-BuildRequires:  freetype2-devel
+BuildRequires:  desktop-file-utils
 BuildRequires:  gcc-c++
-BuildRequires:  glew-devel
+BuildRequires:  gettext-tools
 BuildRequires:  hicolor-icon-theme
-BuildRequires:  libjpeg62-devel
-BuildRequires:  libpulse-devel
-BuildRequires:  libxml++-devel
-BuildRequires:  llvm-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  llvm-devel >= 2.8
 BuildRequires:  nasm
-BuildRequires:  pcre-devel
-BuildRequires:  pkg-config
-BuildRequires:  update-desktop-files
-BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(gdk-2.0)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glew)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(glibmm-2.4)
+BuildRequires:  pkgconfig(gmodule-2.0)
+BuildRequires:  pkgconfig(gthread-2.0)
 BuildRequires:  pkgconfig(gtk+-2.0)
-Requires:	lightspark-common
-Recommends:     %{name}-lang
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%lang_package
+BuildRequires:  pkgconfig(libcurl)
+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(x11)
+BuildRequires:  pkgconfig(zlib)
+%if %{with rtmp}
+BuildRequires:  pkgconfig(librtmp)
+%endif
+%if %{with ffmpeg}
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavutil)
+%endif
+Recommends:     %{_bindir}/gnash
 
 %description
-Lightspark is an LGPL-3.0+ licensed Flash player and browser
-plugin written in C++/C that runs on Linux. It aims to support
-Adobe's newer Flash formats and AVM2 virtual machine.
-
-%package browser-plugin
-Summary:	This package contains the browser plugin
-Group:		Productivity/Multimedia/Other
-Requires:	lightspark-common
-
-%description browser-plugin
-Lightspark is a free Flash player for Linux which aims for high-performance
-by using modern technologies such as JIT compilation and OpenGL shaders.
+Lightspark is a modern, free, open-source flash player implementation.
 
-The project is currently in an alpha status and provides the standalone
-player and browser plugin for testing purposes only.
-
-Nice features:
- * JIT compilation of ActionScript to native x86 bytecode
- * Hardware accelerated rendering using OpenGL shaders (GLSL)
- * Aims to support current-generation ActionScript 3
- * A new, clean, codebase exploiting multithreading and optimized for modern
-   hardware. Designed from scratch after the official Flash documentation was
-   released.
-
-%package 	common
-Summary:	This package contains the common library and data
-Group:		Productivity/Multimedia/Other
+%package plugin
+Summary:        NPAPI plugin for lightspark
+Group:          Productivity/Multimedia/Other
+Requires:       %{name} = %{version}
+Enhances:       browser(npapi)
 
-%description 	common
-Lightspark is an LGPL-3.0+ licensed Flash player and browser
-plugin written in C++/C that runs on Linux. It aims to support
-Adobe's newer Flash formats and AVM2 virtual machine.
+%description plugin
+NPAPI plugin for lightspark.
 
 %prep
 %setup -q
+%patch0
+%patch1
 
 %build
 export CFLAGS='%{optflags}'
@@ -93,58 +97,41 @@
       -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \
       -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
       -DPLUGIN_DIRECTORY=%{_libdir}/browser-plugins \
-      -DCMAKE_BUILD_TYPE=Release \
-      -DENABLE_LIBAVCODEC=1 ..
+      -DENABLE_LIBAVCODEC=%{?with_ffmpeg:YES}%{!?with_ffmpeg:NO} \
+      -DENABLE_RTMP=%{?with_rtmp:YES}%{!?with_rtmp:NO} ..
 make %{?_smp_mflags}
+
 %install
 cd build
 %make_install
 cd ..
-
-# Remove non-standard icon directory
-pushd %{buildroot}%{_datadir}/icons/hicolor
-rm -rf 20x20
-popd
-%suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
 rm -f %{buildroot}%{_libdir}/%{name}/lib%{name}.so
 # Not in hicolor theme (lp#1000840)
 rm -rf %{buildroot}%{_datadir}/icons/hicolor/20x20
-pushd $RPM_BUILD_ROOT%{_datadir}/man/man1
-    ln -s %{name}.1.gz tightspark.1.gz
-popd
 
-%clean
-%{?buildroot:rm -rf %{buildroot}}
+%post
+%icon_theme_cache_post
+%desktop_database_post
 
-%files browser-plugin
-%defattr(0755,root,root)
-%{_libdir}/browser-plugins/lib%{name}plugin.so
-%dir %{_libdir}/%{name}/
-%dir %{_libdir}/%{name}/plugins/
-%{_libdir}/%{name}/plugins/lib%{name}pulseplugin.so
+%postun
+%desktop_database_postun
+%icon_theme_cache_postun
 
-%files
-%defattr(0755,root,root)
-%{_bindir}/lightspark