commit:     8d5b3a8f09ac1ef68121a7b126f6c89b29bacdeb
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  5 18:52:27 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Apr 11 16:19:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d5b3a8f

www-plugins/lightspark: Drop old (requiring LLVM < 4)

 www-plugins/lightspark/Manifest                    |   2 -
 .../files/lightspark-0.8.0-ffmpeg-free.patch       |  31 -------
 .../lightspark/lightspark-0.7.2_p20160107.ebuild   | 102 --------------------
 www-plugins/lightspark/lightspark-0.8.0.ebuild     | 103 ---------------------
 4 files changed, 238 deletions(-)

diff --git a/www-plugins/lightspark/Manifest b/www-plugins/lightspark/Manifest
index d4255c1bae1..579cbb8a401 100644
--- a/www-plugins/lightspark/Manifest
+++ b/www-plugins/lightspark/Manifest
@@ -1,3 +1 @@
-DIST lightspark-0.7.2_p20160107.tar.gz 1803064 BLAKE2B 
95b7522ed5e8c757e6b6de7251dbdd862a3094fd2779d9c49e049ef3518b65ef9747be304e1a6ce2ff1ca8f5ccbfc98516f9d614666c4a37c0fe147d18fcba2d
 SHA512 
937352c8d428579a9ac89a45724db2beb624eba874da59d684e07d9d306305d85937f4b2e692c56750a1b5e6ca485e05d9997409d3bc934fab209124cd471601
-DIST lightspark-0.8.0.tar.gz 1830071 BLAKE2B 
5fe10d3795cdaedc88ffbc6479957c863440b8400fb4d90bc06a302730343c95e24898e115e4c59f0962cce952ccd51c0a21141091cc0e57cfb6635c1c868619
 SHA512 
333de501caf5f5ed9c8581cfda5bf1e6e04170c90f1c2f6150c9c2343f9de20e140a041d066f693e406d24fa24e7a5c3464675a583f4a5c104f5214ebee072b9
 DIST lightspark-f6ed8284810ad91c277ed5d0835b215e7329450e.tar.gz 1880249 
BLAKE2B 
031dc48f40956fcfb5a8b0fd825da8a2a0dba6daa4646296a385d5f90f13027d44cbb09562f6bf57b8d5d415a278fa06974624aee42e14b75892c36798dceda0
 SHA512 
a75ebf5e666daec0f244285bfd1029feb6fcfa2aeba800f175bb07bc148d39e76435d77868c964b2e149019b763498990bf0db25ba632cf21b91ad0958412332

diff --git a/www-plugins/lightspark/files/lightspark-0.8.0-ffmpeg-free.patch 
b/www-plugins/lightspark/files/lightspark-0.8.0-ffmpeg-free.patch
deleted file mode 100644
index 76566e6be79..00000000000
--- a/www-plugins/lightspark/files/lightspark-0.8.0-ffmpeg-free.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 22a85a13a5c3ded942ef59522ad399eb5d9a58d9 Mon Sep 17 00:00:00 2001
-From: Mikhail Vorobyov <vorobyov.mikh...@gmail.com>
-Date: Tue, 18 Jul 2017 23:46:37 +0300
-Subject: [PATCH] Add NullVideoDecoder::switchCodec
-
-Add VideoDecoder::switchCodec implementation to NullVideoDecoder to fix
-ffmpeg-free build.
----
- src/backends/decoder.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/backends/decoder.h b/src/backends/decoder.h
-index 069543d0..f53288bd 100644
---- a/src/backends/decoder.h
-+++ b/src/backends/decoder.h
-@@ -140,6 +140,7 @@ class NullVideoDecoder: public VideoDecoder
- public:
-       NullVideoDecoder() {status=VALID;}
-       ~NullVideoDecoder() { while(fenceCount); }
-+      void switchCodec(LS_VIDEO_CODEC codecId, uint8_t* initdata, uint32_t 
datalen, double frameRateHint){};
-       bool decodeData(uint8_t* data, uint32_t datalen, uint32_t time){return 
false;}
-       bool discardFrame(){return false;}
-       void skipUntil(uint32_t time){}
-@@ -305,6 +306,7 @@ class NullAudioDecoder: public AudioDecoder
-               sampleRate=44100;
-               channelCount=2;
-       }
-+      void switchCodec(LS_AUDIO_CODEC codecId, uint8_t* initdata, uint32_t 
datalen){};
-       uint32_t decodeData(uint8_t* data, int32_t datalen, uint32_t 
time){return 0;}
- };
- 

diff --git a/www-plugins/lightspark/lightspark-0.7.2_p20160107.ebuild 
b/www-plugins/lightspark/lightspark-0.7.2_p20160107.ebuild
deleted file mode 100644
index 9e297057383..00000000000
--- a/www-plugins/lightspark/lightspark-0.7.2_p20160107.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils nsplugins vcs-snapshot toolchain-funcs
-
-DESCRIPTION="High performance flash player"
-HOMEPAGE="http://lightspark.github.io/";
-SRC_URI="https://github.com/lightspark/lightspark/archive/308241eb55c5379765033e60f28dfdd956c7abcd.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse2 curl ffmpeg gles libav nsplugin ppapi profile rtmp"
-
-# Note: code-wise llvm-4.0 is fine but due to CMake bug it can't work:
-# https://gitlab.kitware.com/cmake/cmake/issues/16606
-RDEPEND="app-arch/xz-utils:0=
-       dev-cpp/glibmm:2=
-       >=dev-libs/boost-1.42:0=
-       dev-libs/glib:2=
-       dev-libs/libpcre:3=[cxx]
-       media-fonts/liberation-fonts
-       media-libs/freetype:2=
-       media-libs/libpng:0=
-       media-libs/libsdl2:0=
-       media-libs/sdl2-mixer:0=
-       >=sys-devel/gcc-4.6.0:*[cxx]
-       <sys-devel/llvm-4:0=
-       >=sys-devel/llvm-3.4:0=
-       sys-libs/zlib:0=
-       x11-libs/cairo:0=
-       x11-libs/gtk+:2=
-       x11-libs/libX11:0=
-       x11-libs/pango:0=
-       virtual/jpeg:0=
-       curl? ( net-misc/curl:0= )
-       ffmpeg? (
-               libav? ( media-video/libav:0= )
-               !libav? ( media-video/ffmpeg:0= )
-       )
-       gles? ( media-libs/mesa:0=[gles2] )
-       !gles? (
-               >=media-libs/glew-1.5.3:0=
-               virtual/opengl:0=
-       )
-       rtmp? ( media-video/rtmpdump:0= )"
-DEPEND="${RDEPEND}
-       amd64? ( dev-lang/nasm )
-       x86? ( dev-lang/nasm )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_rc*/}
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               if tc-is-gcc && [[ $(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 mycmakeargs=(
-               -DENABLE_CURL=$(usex curl)
-               -DENABLE_GLES2=$(usex gles)
-               -DENABLE_LIBAVCODEC=$(usex ffmpeg)
-               -DENABLE_RTMP=$(usex rtmp)
-
-               -DENABLE_MEMORY_USAGE_PROFILING=$(usex profile)
-               -DENABLE_PROFILING=$(usex profile)
-               -DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
-
-               -DCOMPILE_PLUGIN=$(usex nsplugin)
-               -DPLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins
-               # TODO: install /etc/chromium file? block adobe-flash?
-               -DCOMPILE_PPAPI_PLUGIN=$(usex ppapi)
-               
-DPPAPI_PLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/chromium-browser/${PN}
-       )
-
-       cmake-utils_src_configure
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       use nsplugin && inst_plugin 
/usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so
-}
-
-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
-       if use nsplugin && has_version "www-plugins/gnash[nsplugin]"; then
-               elog "Having two plugins installed for the same MIME type may 
confuse"
-               elog "Mozilla based browsers. It is recommended to disable the 
nsplugin"
-               elog "USE flag for either gnash or lightspark. For details, see"
-               elog "https://bugzilla.mozilla.org/show_bug.cgi?id=581848";
-       fi
-}

diff --git a/www-plugins/lightspark/lightspark-0.8.0.ebuild 
b/www-plugins/lightspark/lightspark-0.8.0.ebuild
deleted file mode 100644
index 1a71cb2ec2d..00000000000
--- a/www-plugins/lightspark/lightspark-0.8.0.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils nsplugins vcs-snapshot toolchain-funcs
-
-DESCRIPTION="High performance flash player"
-HOMEPAGE="http://lightspark.github.io/";
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz";
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cpu_flags_x86_sse2 curl ffmpeg gles libav nsplugin ppapi profile rtmp"
-
-# Note: code-wise llvm-4.0 is fine but due to CMake bug it can't work:
-# https://gitlab.kitware.com/cmake/cmake/issues/16606
-RDEPEND="app-arch/xz-utils:0=
-       dev-cpp/glibmm:2=
-       >=dev-libs/boost-1.42:0=
-       dev-libs/glib:2=
-       dev-libs/libpcre:3=[cxx]
-       media-fonts/liberation-fonts
-       media-libs/freetype:2=
-       media-libs/libpng:0=
-       media-libs/libsdl2:0=
-       media-libs/sdl2-mixer:0=
-       >=sys-devel/gcc-4.6.0:*[cxx]
-       >=sys-devel/llvm-3.4:0=
-       sys-libs/zlib:0=
-       x11-libs/cairo:0=
-       x11-libs/gtk+:2=
-       x11-libs/libX11:0=
-       x11-libs/pango:0=
-       virtual/jpeg:0=
-       curl? ( net-misc/curl:0= )
-       ffmpeg? (
-               libav? ( media-video/libav:0= )
-               !libav? ( media-video/ffmpeg:0= )
-       )
-       gles? ( media-libs/mesa:0=[gles2] )
-       !gles? (
-               >=media-libs/glew-1.5.3:0=
-               virtual/opengl:0=
-       )
-       rtmp? ( media-video/rtmpdump:0= )"
-DEPEND="${RDEPEND}
-       amd64? ( dev-lang/nasm )
-       x86? ( dev-lang/nasm )
-       virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_rc*/}
-
-PATCHES=( "${FILESDIR}"/${P}-ffmpeg-free.patch )
-
-pkg_pretend() {
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               if tc-is-gcc && [[ $(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 mycmakeargs=(
-               -DENABLE_CURL=$(usex curl)
-               -DENABLE_GLES2=$(usex gles)
-               -DENABLE_LIBAVCODEC=$(usex ffmpeg)
-               -DENABLE_RTMP=$(usex rtmp)
-
-               -DENABLE_MEMORY_USAGE_PROFILING=$(usex profile)
-               -DENABLE_PROFILING=$(usex profile)
-               -DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
-
-               -DCOMPILE_NPAPI_PLUGIN=$(usex nsplugin)
-               -DPLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/${PN}/plugins
-               # TODO: install /etc/chromium file? block adobe-flash?
-               -DCOMPILE_PPAPI_PLUGIN=$(usex ppapi)
-               
-DPPAPI_PLUGIN_DIRECTORY="${EPREFIX}"/usr/$(get_libdir)/chromium-browser/${PN}
-       )
-
-       cmake-utils_src_configure
-}
-
-src_install() {
-       cmake-utils_src_install
-
-       use nsplugin && inst_plugin 
/usr/$(get_libdir)/${PN}/plugins/liblightsparkplugin.so
-}
-
-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
-       if use nsplugin && has_version "www-plugins/gnash[nsplugin]"; then
-               elog "Having two plugins installed for the same MIME type may 
confuse"
-               elog "Mozilla based browsers. It is recommended to disable the 
nsplugin"
-               elog "USE flag for either gnash or lightspark. For details, see"
-               elog "https://bugzilla.mozilla.org/show_bug.cgi?id=581848";
-       fi
-}

Reply via email to