Drop obsolete elog message, bug #476478. Add patch from Fedora for llvm-3.3 compatibility, bug #479548.

Package-Manager: portage-2.2.1/cvs/Linux x86_64

4 files changed, 218 insertions, 2 deletions

diff --git a/www-plugins/lightspark/ChangeLog b/www-plugins/lightspark/ChangeLog
index 171948638f6c..c803ad10a7eb 100644
--- a/www-plugins/lightspark/ChangeLog
+++ b/www-plugins/lightspark/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/lightspark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.52 2013/03/19 13:45:04 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/ChangeLog,v 1.53 2013/10/04 23:53:41 chithanh Exp $
+
+*lightspark-0.7.2-r1 (04 Oct 2013)
+
+  04 Oct 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/lightspark-0.7.2-llvm33.patch, +lightspark-0.7.2-r1.ebuild:
+  Drop obsolete elog message, bug #476478. Add patch from Fedora for llvm-3.3
+  compatibility, bug #479548.
 
 *lightspark-0.7.2 (19 Mar 2013)
 
diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index 2cca7492b107..2a473551b661 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -1,6 +1,8 @@
+AUX lightspark-0.7.2-llvm33.patch 3809 SHA256 66ba3a932f477e42c4171e1fc29ef382215fb8e5cba6e8167f8527d5f1bd15b5 SHA512 dee691cbaab2e26e788f2d94fd5731084400862868a7f0e06e6c1b269a0c1f30d3d814ec20f63612f786b4c57569ba0e5f888194f3d1f5ad80ce8e98299c96e3 WHIRLPOOL ffcbc2d59542d6ecd5d62c408ab3846a6367ecf4371007a47be6de6cda889c64673d8b7fad98e310af19d77f9cb2ce79c960eb3c7ad481231eda25ac06bc3d7d
 DIST lightspark-0.7.1.tar.gz 920218 SHA256 a6f9ef13ddf3ebd700d4daaeeb4e9497889c18697aeca1ddcb30ac8cdc20e931 SHA512 a8c10782f144cf4b9a39d32ca4c78f441957550f790161671fa52fec686672f22ab977b41c55b5e33d1e65eaa28e78bf48e729ce01f51b56ef24d2d09e62eeae WHIRLPOOL 0842b113070cc679d8e960e558bf4d7562f6796f60b923fc4fe41f3e20f4cb86da0340d8f27543d86c2cf6aefaf1232990c9ef51bcdcb765dc89befee16823cc
 DIST lightspark-0.7.2.tar.gz 955952 SHA256 70479bac90f3455a5ff6d0aaf6bccaedfbaac3c70bd602680f68ce75eab2dd1b SHA512 90442d92b54bef18c20952aefd4dcd5cab446213cf9c186b340c9c8e0dd3ef28d034e888ca26f5b9ffe93d0cfd6e1a3c696fbd6f561aa21ff909d463abd27d29 WHIRLPOOL 9465424e2d8b46adb5aadc54239b6d58105703c519f5073ffbc3eb7a03dacca68cf64d57864de3c0aefd6d7cd4c3a88b0deb8417917980a8b60fa49397dc0631
 EBUILD lightspark-0.7.1.ebuild 2953 SHA256 50b71455dbd2da0f42d45a29b9c0cce4e99c98d1336bb10e9bccf31f49fef020 SHA512 530f6a7543e448e3f8f313620a55b48d7d2b33b0856bb412b3a2befabb2ee74f2722fc0e760434e5298e542e2a24f74d2b0bee58a26d28b632699dd510db37fd WHIRLPOOL 9be201b8d02b9a35d44f694a804775d5d0fe265692923941fe40b4767a6f263a43382ecb98d12da5a6017901de3b5a97d9092ed9b99c6ac7f74bf4bff402b6df
+EBUILD lightspark-0.7.2-r1.ebuild 2634 SHA256 09e543f4e8ddf2409662d7b3d864318492b2f4859fd98e03503c6161db740e4d SHA512 51e4ba4798650e3dea6e48d906a52a94c4d3cf66a3621d7c5d3c25b6e7e817d964360ae7e49207f0b3ad861c9946c9479eb8a8ca56eccb03f6e1484629d1a48c WHIRLPOOL f64f5087fd40ebd055a376d7e5c60220552890dbd6731329147cfab8de1dc2723c7925705955eeb3167f40315474775ea430805aef43acdb71f90349d62e1160
 EBUILD lightspark-0.7.2.ebuild 2953 SHA256 718e1c24772211ce1958e45c5f0d92dfd159ad8cff0efbd4790107ac1fb328e0 SHA512 c54187908f76e1c5585250ed7ca2844f6b54371b1fe3abcce860e952f4974fbaef5d2cb90154fa0d850ef3340ddcfaca04b1eb18652e884b7365d18319ea6932 WHIRLPOOL 7c44d852576a9be81ab7998e2709b733e8b2199b59db11b49db4d3bf29ba274d14272c0d046456a90edfbee9f5af65238b42d3faa5a79e750cbdd5cda8e678b6
-MISC ChangeLog 11983 SHA256 ed3af95b5f922b5480c28d28693c4e00a4f09bcc59bd862328eddb9b50d4f88f SHA512 dd44dac6e5ed8aef06efd67e7c8408885e2f4f46b3dc6b3fb611e764b7ace1881c08483d21853a0527677f1ffa1eddbf8ca870b7e962d8e9877db87bf47ee07d WHIRLPOOL fc0beb4e285c3d330d3289df89b1e9a5aeb0cd7e9d1e79b546c6fe85a59e3e3606fec07af621b1e9c73b89e24bfff1d65fb5332ee3681b4f83c644387854b4f4
+MISC ChangeLog 12266 SHA256 1ac072b86c53cffcdc77077919364056cb58020b0f3e1b4c75083f333a2b3cc9 SHA512 39fe33713e88fc3782cbffbd9664a04185879c52ef0d6956340fa301e84b6320aa057efe0619a7e212ef95c5f8ea2095ca8cbb162e421086008ceacc602dc82f WHIRLPOOL 4d12ec787085bd0dd2097c9aa8b1268ff6c855623810fe109aa26ecc95959f52fa81f4dd86c310297cec11eb3959f631927d28a655c15125e32203d2e691cdd2
 MISC metadata.xml 416 SHA256 1a4739e3ed47fd391141b1df084195435ad9cc1ac50650eb3b45d1fccb2f87e9 SHA512 d5181074005c87614f42ddfe267092a526acfe8f49b5f621141a026d23c3c7471b5254f0edb0b88af8d8689db8effb819fe08663a904b0984ea9bc2917fc394a WHIRLPOOL 0d2788c7f2af963e5038d71cef665a58b9e49095f90dc7b339c0343974fd40142a1005972a16cfb51fd45b42703b1f2ecbd5c59ba74c6bca60bdf54821d6b8c8
diff --git a/www-plugins/lightspark/files/lightspark-0.7.2-llvm33.patch b/www-plugins/lightspark/files/lightspark-0.7.2-llvm33.patch
new file mode 100644
index 000000000000..2e452331ce38
--- /dev/null
+++ b/www-plugins/lightspark/files/lightspark-0.7.2-llvm33.patch
@@ -0,0 +1,103 @@
+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());
diff --git a/www-plugins/lightspark/lightspark-0.7.2-r1.ebuild b/www-plugins/lightspark/lightspark-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..ad693d192ee7
--- /dev/null
+++ b/www-plugins/lightspark/lightspark-0.7.2-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/lightspark/lightspark-0.7.2-r1.ebuild,v 1.1 2013/10/04 23:53:41 chithanh Exp $
+
+EAPI=4
+inherit cmake-utils nsplugins multilib toolchain-funcs
+
+DESCRIPTION="High performance flash player"
+HOMEPAGE="http://lightspark.sourceforge.net/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl ffmpeg gles nsplugin profile pulseaudio rtmp sdl"
+
+RDEPEND=">=dev-cpp/libxmlpp-2.33.1:2.6
+	>=dev-libs/boost-1.42
+	dev-libs/libpcre[cxx]
+	media-fonts/liberation-fonts
+	media-libs/libpng
+	media-libs/libsdl
+	>=sys-devel/gcc-4.6.0[cxx]
+	>=sys-devel/llvm-3
+	x11-libs/cairo
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/pango
+	curl? (
+		net-misc/curl
+	)
+	ffmpeg? (
+		virtual/ffmpeg
+	)
+	!gles? (
+		>=media-libs/glew-1.5.3
+		virtual/opengl
+	)
+	gles? (
+		media-libs/mesa[gles2]
+	)
+	pulseaudio? (
+		media-sound/pulseaudio
+	)
+	rtmp? (
+		media-video/rtmpdump
+	)
+	virtual/jpeg"
+DEPEND="${RDEPEND}
+	amd64? ( dev-lang/nasm )
+	x86? ( dev-lang/nasm )
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${P/_rc*/}
+
+PATCHES=(
+	"${FILESDIR}/${P}-llvm33.patch"
+)
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if [[ $(gcc-major-version) == 4 && $(gcc-minor-version) -lt 6 || $(gcc-major-version) -lt 4 ]] ; then
+			eerror "You need at least sys-devel/gcc-4.6.0"
+			die "You need at least sys-devel/gcc-4.6.0"
+		fi
+	fi
+}
+
+src_configure() {
+	local audiobackends
+	use pulseaudio && audiobackends+="pulse"
+	use sdl && audiobackends+="sdl"
+
+	local mycmakeargs=(
+		$(cmake-utils_use curl ENABLE_CURL)
+		$(cmake-utils_use gles ENABLE_GLES2)
+		$(cmake-utils_use ffmpeg ENABLE_LIBAVCODEC)
+		$(cmake-utils_use nsplugin COMPILE_PLUGIN)
+		$(cmake-utils_use profile ENABLE_MEMORY_USAGE_PROFILING)
+		$(cmake-utils_use profile ENABLE_PROFILING)
+		$(cmake-utils_use rtmp ENABLE_RTMP)
+		-DAUDIO_BACKEND="${audiobackends}"
+		-DPLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use nsplugin && inst_plugin /usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so
+
+	# default to sdl audio if pulseaudio plugin is not built, bug #406197
+	if use sdl && ! use pulseaudio; then
+		sed -i 's/backend = pulseaudio/backend = sdl/' "${ED}/etc/xdg/${PN}.conf" || die
+	fi
+}
+
+pkg_postinst() {
+	if use nsplugin && ! has_version www-plugins/gnash; then
+		elog "Lightspark now supports gnash fallback for its browser plugin."
+		elog "Install www-plugins/gnash to take advantage of it."
+	fi
+}