lightspark: removed; broken for 2 years.
This commit is contained in:
Juan RP
parent
3a92c544dd
commit
8aebff74b3
4 changed files with 0 additions and 262 deletions
|
|
@ -1,25 +0,0 @@
|
|||
From 508229a1ea169c8de7acf7f4284d6c56f08bedc4 Mon Sep 17 00:00:00 2001
|
||||
From: Antti Ajanki <antti.ajanki@iki.fi>
|
||||
Date: Sun, 12 May 2013 11:19:48 +0300
|
||||
Subject: [PATCH 01/33] Search paths for LLVM 3.1/3.2
|
||||
|
||||
---
|
||||
conf/FindLLVM.cmake | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/conf/FindLLVM.cmake b/conf/FindLLVM.cmake
|
||||
index 7bd52e2..ab8f95d 100644
|
||||
--- a/conf/FindLLVM.cmake
|
||||
+++ b/conf/FindLLVM.cmake
|
||||
@@ -51,6 +51,8 @@ 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.1/bin
|
||||
+ /usr/lib/llvm-3.2/bin
|
||||
)
|
||||
|
||||
find_program(LLVM_GCC_EXECUTABLE
|
||||
--
|
||||
1.8.3
|
||||
|
||||
|
|
@ -1,128 +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 01/29] 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(-)
|
||||
|
||||
diff --git a/conf/FindLLVM.cmake b/conf/FindLLVM.cmake
|
||||
index ab8f95d..c94d7d4 100644
|
||||
--- a/conf/FindLLVM.cmake
|
||||
+++ b/conf/FindLLVM.cmake
|
||||
@@ -53,6 +53,7 @@ else (LLVM_INCLUDE_DIR)
|
||||
/usr/lib/llvm-3.0/bin
|
||||
/usr/lib/llvm-3.1/bin
|
||||
/usr/lib/llvm-3.2/bin
|
||||
+ /usr/lib/llvm-3.3/bin
|
||||
)
|
||||
|
||||
find_program(LLVM_GCC_EXECUTABLE
|
||||
@@ -170,11 +171,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 --git a/src/scripting/abc.cpp b/src/scripting/abc.cpp
|
||||
index 608fe01..49f2e06 100644
|
||||
--- a/src/scripting/abc.cpp
|
||||
+++ b/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>
|
||||
@@ -1516,7 +1523,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 --git a/src/scripting/abc_codesynt.cpp b/src/scripting/abc_codesynt.cpp
|
||||
index 2018be3..bb8e9a5 100644
|
||||
--- a/src/scripting/abc_codesynt.cpp
|
||||
+++ b/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());
|
||||
--
|
||||
1.8.3
|
||||
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
--- a/src/backends/decoder.h.orig 2013-10-30 07:55:05.457153830 +0100
|
||||
+++ b/src/backends/decoder.h 2013-10-30 07:55:36.112654256 +0100
|
||||
@@ -28,6 +28,7 @@ extern "C"
|
||||
{
|
||||
#include <libavcodec/avcodec.h>
|
||||
#include <libavformat/avformat.h>
|
||||
+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000
|
||||
#define MAX_AUDIO_FRAME_SIZE AVCODEC_MAX_AUDIO_FRAME_SIZE
|
||||
}
|
||||
#else
|
||||
--- a/src/backends/decoder.cpp.orig 2013-10-30 08:03:28.810362559 +0100
|
||||
+++ b/src/backends/decoder.cpp 2013-10-30 08:04:01.937708704 +0100
|
||||
@@ -119,7 +119,7 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(L
|
||||
if(codecId==H264)
|
||||
{
|
||||
//TODO: serialize access to avcodec_open
|
||||
- const enum CodecID FFMPEGcodecId=CODEC_ID_H264;
|
||||
+ const enum AVCodecID FFMPEGcodecId=AV_CODEC_ID_H264;
|
||||
codec=avcodec_find_decoder(FFMPEGcodecId);
|
||||
assert(codec);
|
||||
//Ignore the frameRateHint as the rate is gathered from the video data
|
||||
@@ -127,7 +127,7 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(L
|
||||
else if(codecId==H263)
|
||||
{
|
||||
//TODO: serialize access to avcodec_open
|
||||
- const enum CodecID FFMPEGcodecId=CODEC_ID_FLV1;
|
||||
+ const enum AVCodecID FFMPEGcodecId=AV_CODEC_ID_FLV1;
|
||||
codec=avcodec_find_decoder(FFMPEGcodecId);
|
||||
assert(codec);
|
||||
|
||||
@@ -138,7 +138,7 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(L
|
||||
else if(codecId==VP6)
|
||||
{
|
||||
//TODO: serialize access to avcodec_open
|
||||
- const enum CodecID FFMPEGcodecId=CODEC_ID_VP6F;
|
||||
+ const enum AVCodecID FFMPEGcodecId=AV_CODEC_ID_VP6F;
|
||||
codec=avcodec_find_decoder(FFMPEGcodecId);
|
||||
assert(codec);
|
||||
|
||||
@@ -176,13 +176,13 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(A
|
||||
//The tag is the header, initialize decoding
|
||||
switch(codecContext->codec_id)
|
||||
{
|
||||
- case CODEC_ID_H264:
|
||||
+ case AV_CODEC_ID_H264:
|
||||
videoCodec=H264;
|
||||
break;
|
||||
- case CODEC_ID_FLV1:
|
||||
+ case AV_CODEC_ID_FLV1:
|
||||
videoCodec=H263;
|
||||
break;
|
||||
- case CODEC_ID_VP6F:
|
||||
+ case AV_CODEC_ID_VP6F:
|
||||
videoCodec=VP6;
|
||||
break;
|
||||
default:
|
||||
@@ -451,14 +451,14 @@ void AudioDecoder::skipAll()
|
||||
#ifdef ENABLE_LIBAVCODEC
|
||||
FFMpegAudioDecoder::FFMpegAudioDecoder(LS_AUDIO_CODEC audioCodec, uint8_t* initdata, uint32_t datalen):ownedContext(true)
|
||||
{
|
||||
- CodecID codecId;
|
||||
+ AVCodecID codecId;
|
||||
switch(audioCodec)
|
||||
{
|
||||
case AAC:
|
||||
- codecId=CODEC_ID_AAC;
|
||||
+ codecId=AV_CODEC_ID_AAC;
|
||||
break;
|
||||
case MP3:
|
||||
- codecId=CODEC_ID_MP3;
|
||||
+ codecId=AV_CODEC_ID_MP3;
|
||||
break;
|
||||
default:
|
||||
::abort();
|
||||
@@ -711,7 +711,7 @@ FFMpegStreamDecoder::FFMpegStreamDecoder
|
||||
videoFound=true;
|
||||
videoIndex=(int32_t)i;
|
||||
}
|
||||
- else if(formatCtx->streams[i]->codec->codec_type==AVMEDIA_TYPE_AUDIO && formatCtx->streams[i]->codec->codec_id!=CODEC_ID_NONE && audioFound==false)
|
||||
+ else if(formatCtx->streams[i]->codec->codec_type==AVMEDIA_TYPE_AUDIO && formatCtx->streams[i]->codec->codec_id!=AV_CODEC_ID_NONE && audioFound==false)
|
||||
{
|
||||
audioFound=true;
|
||||
audioIndex=(int32_t)i;
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
# Template file for 'lightspark'
|
||||
#
|
||||
# BROKEN FOR A LONG WHILE, SCHEDULED TO BE REMOVED.
|
||||
broken=1
|
||||
|
||||
pkgname=lightspark
|
||||
version=0.7.2
|
||||
revision=5
|
||||
patch_args="-Np1"
|
||||
build_style=cmake
|
||||
configure_args="-DAUDIO_BACKEND=pulse -DENABLE_CURL=1 -DCOMPILE_PLUGIN=1
|
||||
-DCMAKE_SKIP_RPATH=OFF"
|
||||
hostmakedepends="cmake pkg-config nasm"
|
||||
makedepends="zlib-devel pcre-devel libffi-devel libX11-devel
|
||||
libpng-devel fontconfig-devel boost-devel SDL-devel ffmpeg-devel
|
||||
MesaLib-devel ftgl-devel glew-devel libxml2-devel libxml++-devel
|
||||
glibmm-devel gtk+-devel libjpeg-turbo-devel pulseaudio-devel llvm
|
||||
librtmp-devel liblzma-devel libcurl-devel"
|
||||
depends="hicolor-icon-theme desktop-file-utils"
|
||||
conf_files="/etc/xdg/lightspark.conf"
|
||||
short_desc="Modern, free, open-source flash player implementation"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
homepage="http://lightspark.github.com/"
|
||||
license="LGPL-3"
|
||||
distfiles="http://launchpad.net/lightspark/trunk/$pkgname-$version/+download/$pkgname-$version.tar.gz"
|
||||
checksum=70479bac90f3455a5ff6d0aaf6bccaedfbaac3c70bd602680f68ce75eab2dd1b
|
||||
Loading…
Reference in a new issue