Packman Build Service PMBS

File build.patch of Package lightspark (Revision 39d5a86fc53013254171389a259ecf32)

Currently displaying revision 39d5a86fc53013254171389a259ecf32 , Show latest

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81b6d9d..b31eacd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -247,6 +247,9 @@ ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 3.4)
 IF(NOT (${LLVM_STRING_VERSION} VERSION_LESS 3.6))
 	ADD_DEFINITIONS(-DLLVM_36)
 ENDIF(NOT (${LLVM_STRING_VERSION} VERSION_LESS 3.6))
+IF(${LLVM_STRING_VERSION} VERSION_GREATER 3.6)
+	ADD_DEFINITIONS(-DLLVM_37)
+ENDIF(${LLVM_STRING_VERSION} VERSION_GREATER 3.6)
 INCLUDE(FindZLIB REQUIRED)
 INCLUDE(FindFreetype REQUIRED)
 IF(NOT(ENABLE_GLES2))
diff --git a/src/backends/decoder.cpp b/src/backends/decoder.cpp
index fbdfcdb..e1d6e95 100755
--- a/src/backends/decoder.cpp
+++ b/src/backends/decoder.cpp
@@ -166,7 +166,7 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(LS_VIDEO_CODEC codecId, uint8_t* initdata
 	else
 		status=INIT;
 
-	frameIn=avcodec_alloc_frame();
+	frameIn=av_frame_alloc();
 }
 
 FFMpegVideoDecoder::FFMpegVideoDecoder(AVCodecContext* _c, double frameRateHint):
@@ -201,7 +201,7 @@ FFMpegVideoDecoder::FFMpegVideoDecoder(AVCodecContext* _c, double frameRateHint)
 	if(fillDataAndCheckValidity())
 		status=VALID;
 
-	frameIn=avcodec_alloc_frame();
+	frameIn=av_frame_alloc();
 }
 
 FFMpegVideoDecoder::~FFMpegVideoDecoder()
@@ -476,7 +476,7 @@ FFMpegAudioDecoder::FFMpegAudioDecoder(LS_AUDIO_CODEC audioCodec, uint8_t* initd
 	else
 		status=INIT;
 #if HAVE_AVCODEC_DECODE_AUDIO4
-	frameIn=avcodec_alloc_frame();
+	frameIn=av_frame_alloc();
 #endif
 }
 
@@ -502,7 +502,7 @@ FFMpegAudioDecoder::FFMpegAudioDecoder(LS_AUDIO_CODEC lscodec, int sampleRate, i
 	if(fillDataAndCheckValidity())
 		status=VALID;
 #if HAVE_AVCODEC_DECODE_AUDIO4
-	frameIn=avcodec_alloc_frame();
+	frameIn=av_frame_alloc();
 #endif
 }
 
@@ -522,7 +522,7 @@ FFMpegAudioDecoder::FFMpegAudioDecoder(AVCodecContext* _c):ownedContext(false),c
 	if(fillDataAndCheckValidity())
 		status=VALID;
 #if HAVE_AVCODEC_DECODE_AUDIO4
-	frameIn=avcodec_alloc_frame();
+	frameIn=av_frame_alloc();
 #endif
 }
 
@@ -607,7 +607,7 @@ uint32_t FFMpegAudioDecoder::decodeData(uint8_t* data, int32_t datalen, uint32_t
 	}
 
 #if HAVE_AVCODEC_DECODE_AUDIO4
-	avcodec_get_frame_defaults(frameIn);
+	av_frame_unref(frameIn);
 	int frameOk=0;
 	int32_t ret=avcodec_decode_audio4(codecContext, frameIn, &frameOk, &pkt);
 	if(frameOk==0)
@@ -664,7 +664,7 @@ uint32_t FFMpegAudioDecoder::decodePacket(AVPacket* pkt, uint32_t time)
 	int maxLen=AVCODEC_MAX_AUDIO_FRAME_SIZE;
 
 #if HAVE_AVCODEC_DECODE_AUDIO4
-	avcodec_get_frame_defaults(frameIn);
+	av_frame_unref(frameIn);
 	int frameOk=0;
 	int ret=avcodec_decode_audio4(codecContext, frameIn, &frameOk, pkt);
 	if(frameOk==0)
diff --git a/src/backends/security.cpp b/src/backends/security.cpp
index 7cd8236..6eeffd7 100644
--- a/src/backends/security.cpp
+++ b/src/backends/security.cpp
@@ -1298,7 +1298,7 @@ bool SocketPolicyFile::retrievePolicyFile(vector<unsigned char>& outData)
 	const char *socket_policy_cmd = "<policy-file-request/>\0";
 	unsigned int socket_policy_cmd_len = strlen(socket_policy_cmd)+1;
 	ssize_t nbytes = sock.sendAll(socket_policy_cmd, socket_policy_cmd_len);
-	if (nbytes != socket_policy_cmd_len)
+	if (nbytes != (int)socket_policy_cmd_len)
 	{
 		return false;
 	}
diff --git a/src/scripting/abc.cpp b/src/scripting/abc.cpp
index f159a73..6ce3235 100644
--- a/src/scripting/abc.cpp
+++ b/src/scripting/abc.cpp
@@ -1641,7 +1641,7 @@ void ABCVm::Run(ABCVm* th)
 #else
 		llvm::JITExceptionHandling = true;
 #endif
-#ifndef NDEBUG
+#if defined(NDEBUG) && !defined(LLVM_37)
 #ifdef LLVM_31
 		Opts.JITEmitDebugInfo = true;
 #else
@@ -1665,7 +1665,9 @@ void ABCVm::Run(ABCVm* th)
 
 #ifdef LLVM_36
 		th->FPM=new llvm::legacy::FunctionPassManager(th->module);
+#ifndef LLVM_37
 		th->FPM->add(new llvm::DataLayoutPass());
+#endif
 #else
 		th->FPM=new llvm::FunctionPassManager(th->module);
 #ifdef LLVM_35
diff --git a/src/scripting/avmplus/avmplus.cpp b/src/scripting/avmplus/avmplus.cpp
index 199d679..f525405 100644
--- a/src/scripting/avmplus/avmplus.cpp
+++ b/src/scripting/avmplus/avmplus.cpp
@@ -56,7 +56,7 @@ ASFUNCTIONBODY(avmplusFile,write)
 }
 ASFUNCTIONBODY(avmplusFile,readByteArray)
 {
-	avmplusFile* th=static_cast<avmplusFile*>(obj);
+	//avmplusFile* th=static_cast<avmplusFile*>(obj);
 	tiny_string filename;
 	ARG_UNPACK(filename);
 	
diff --git a/src/scripting/flash/display/BitmapData.cpp b/src/scripting/flash/display/BitmapData.cpp
index b3d3a7e..0292aea 100644
--- a/src/scripting/flash/display/BitmapData.cpp
+++ b/src/scripting/flash/display/BitmapData.cpp
@@ -141,7 +141,7 @@ ASFUNCTIONBODY(BitmapData,_constructor)
 		uint8_t *alpha=reinterpret_cast<uint8_t *>(&c);
 		*alpha=0xFF;
 	}
-	for(uint32_t i=0; i<width*height; i++)
+	for(uint32_t i=0; i<(uint32_t)(width*height); i++)
 		pixelArray[i]=c;
 	th->pixels->fromRGB(reinterpret_cast<uint8_t *>(pixelArray), width, height, BitmapContainer::ARGB32);
 	th->transparent=transparent;
@@ -842,8 +842,6 @@ ASFUNCTIONBODY(BitmapData,compare)
 
 ASFUNCTIONBODY(BitmapData,applyFilter)
 {
-	BitmapData* th = obj->as<BitmapData>();
-	
 	_NR<BitmapData> sourceBitmapData;
 	_NR<Rectangle> sourceRect;
 	_NR<Point> destPoint;
@@ -852,9 +850,9 @@ ASFUNCTIONBODY(BitmapData,applyFilter)
 	LOG(LOG_NOT_IMPLEMENTED,"BitmapData.applyFilter not implemented");
 	return NULL;
 }
+
 ASFUNCTIONBODY(BitmapData,noise)
 {
-	BitmapData* th = obj->as<BitmapData>();
 	int randomSeed;
 	uint low;
 	uint high;
diff --git a/src/scripting/flash/events/flashevents.cpp b/src/scripting/flash/events/flashevents.cpp
index 20623c6..e6864b1 100644
--- a/src/scripting/flash/events/flashevents.cpp
+++ b/src/scripting/flash/events/flashevents.cpp
@@ -189,13 +189,13 @@ ASFUNCTIONBODY(Event,clone)
 
 ASFUNCTIONBODY(Event,stopPropagation)
 {
-	Event* th=static_cast<Event*>(obj);
+	//Event* th=static_cast<Event*>(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"Event.stopPropagation not implemented");
 	return NULL;
 }
 ASFUNCTIONBODY(Event,stopImmediatePropagation)
 {
-	Event* th=static_cast<Event*>(obj);
+	//Event* th=static_cast<Event*>(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"Event.stopImmediatePropagation not implemented");
 	return NULL;
 }
@@ -1417,8 +1417,8 @@ void UncaughtErrorEvents::sinit(Class_base* c)
 
 ASFUNCTIONBODY(UncaughtErrorEvents, _constructor)
 {
-	EventDispatcher::_constructor(obj, NULL, 0);
-	UncaughtErrorEvents* th=Class<UncaughtErrorEvents>::cast(obj);
+	//EventDispatcher::_constructor(obj, NULL, 0);
+	//UncaughtErrorEvents* th=Class<UncaughtErrorEvents>::cast(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"UncaughtErrorEvents is not implemented");
 	return NULL;
 }
diff --git a/src/scripting/flash/filesystem/flashfilesystem.cpp b/src/scripting/flash/filesystem/flashfilesystem.cpp
index 1106815..fb56486 100644
--- a/src/scripting/flash/filesystem/flashfilesystem.cpp
+++ b/src/scripting/flash/filesystem/flashfilesystem.cpp
@@ -36,7 +36,7 @@ void FileStream::sinit(Class_base* c)
 ASFUNCTIONBODY(FileStream, _constructor)
 {
 	EventDispatcher::_constructor(obj, NULL, 0);
-	FileStream* th=Class<FileStream>::cast(obj);
+	//FileStream* th=Class<FileStream>::cast(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"FileStream is not implemented");
 	return NULL;
 }
diff --git a/src/scripting/flash/filters/flashfilters.cpp b/src/scripting/flash/filters/flashfilters.cpp
index d230db4..4797809 100644
--- a/src/scripting/flash/filters/flashfilters.cpp
+++ b/src/scripting/flash/filters/flashfilters.cpp
@@ -178,15 +178,14 @@ void GradientGlowFilter::sinit(Class_base* c)
 
 ASFUNCTIONBODY(GradientGlowFilter, _constructor)
 {
-	GradientGlowFilter *th = obj->as<GradientGlowFilter>();
+	//GradientGlowFilter *th = obj->as<GradientGlowFilter>();
 	LOG(LOG_NOT_IMPLEMENTED,"GradientGlowFilter is not implemented");
 	return NULL;
 }
 
 BitmapFilter* GradientGlowFilter::cloneImpl() const
 {
-	GradientGlowFilter *cloned = Class<GradientGlowFilter>::getInstanceS();
-	return cloned;
+	return Class<GradientGlowFilter>::getInstanceS();
 }
 
 BevelFilter::BevelFilter(Class_base* c):
@@ -201,15 +200,14 @@ void BevelFilter::sinit(Class_base* c)
 
 ASFUNCTIONBODY(BevelFilter, _constructor)
 {
-	BevelFilter *th = obj->as<BevelFilter>();
+	//BevelFilter *th = obj->as<BevelFilter>();
 	LOG(LOG_NOT_IMPLEMENTED,"GradientGlowFilter is not implemented");
 	return NULL;
 }
 
 BitmapFilter* BevelFilter::cloneImpl() const
 {
-	BevelFilter *cloned = Class<BevelFilter>::getInstanceS();
-	return cloned;
+	return Class<BevelFilter>::getInstanceS();
 }
 ColorMatrixFilter::ColorMatrixFilter(Class_base* c):
 	BitmapFilter(c),matrix(NULL)
@@ -253,15 +251,14 @@ void BlurFilter::sinit(Class_base* c)
 
 ASFUNCTIONBODY(BlurFilter, _constructor)
 {
-	BlurFilter *th = obj->as<BlurFilter>();
+	//BlurFilter *th = obj->as<BlurFilter>();
 	LOG(LOG_NOT_IMPLEMENTED,"BlurFilter is not implemented");
 	return NULL;
 }
 
 BitmapFilter* BlurFilter::cloneImpl() const
 {
-	BlurFilter *cloned = Class<BlurFilter>::getInstanceS();
-	return cloned;
+	return Class<BlurFilter>::getInstanceS();
 }
 
 ConvolutionFilter::ConvolutionFilter(Class_base* c):
@@ -276,15 +273,14 @@ void ConvolutionFilter::sinit(Class_base* c)
 
 ASFUNCTIONBODY(ConvolutionFilter, _constructor)
 {
-	ConvolutionFilter *th = obj->as<ConvolutionFilter>();
+	//ConvolutionFilter *th = obj->as<ConvolutionFilter>();
 	LOG(LOG_NOT_IMPLEMENTED,"ConvolutionFilter is not implemented");
 	return NULL;
 }
 
 BitmapFilter* ConvolutionFilter::cloneImpl() const
 {
-	ConvolutionFilter *cloned = Class<ConvolutionFilter>::getInstanceS();
-	return cloned;
+	return Class<ConvolutionFilter>::getInstanceS();
 }
 
 DisplacementMapFilter::DisplacementMapFilter(Class_base* c):
@@ -299,15 +295,14 @@ void DisplacementMapFilter::sinit(Class_base* c)
 
 ASFUNCTIONBODY(DisplacementMapFilter, _constructor)
 {
-	DisplacementMapFilter *th = obj->as<DisplacementMapFilter>();
+	//DisplacementMapFilter *th = obj->as<DisplacementMapFilter>();
 	LOG(LOG_NOT_IMPLEMENTED,"DisplacementMapFilter is not implemented");
 	return NULL;
 }
 
 BitmapFilter* DisplacementMapFilter::cloneImpl() const
 {
-	DisplacementMapFilter *cloned = Class<DisplacementMapFilter>::getInstanceS();
-	return cloned;
+	return Class<DisplacementMapFilter>::getInstanceS();
 }
 
 GradientBevelFilter::GradientBevelFilter(Class_base* c):
@@ -322,15 +317,14 @@ void GradientBevelFilter::sinit(Class_base* c)
 
 ASFUNCTIONBODY(GradientBevelFilter, _constructor)
 {
-	GradientBevelFilter *th = obj->as<GradientBevelFilter>();
+	//GradientBevelFilter *th = obj->as<GradientBevelFilter>();
 	LOG(LOG_NOT_IMPLEMENTED,"GradientBevelFilter is not implemented");
 	return NULL;
 }
 
 BitmapFilter* GradientBevelFilter::cloneImpl() const
 {
-	GradientBevelFilter *cloned = Class<GradientBevelFilter>::getInstanceS();
-	return cloned;
+	return Class<GradientBevelFilter>::getInstanceS();
 }
 
 ShaderFilter::ShaderFilter(Class_base* c):
@@ -345,15 +339,14 @@ void ShaderFilter::sinit(Class_base* c)
 
 ASFUNCTIONBODY(ShaderFilter, _constructor)
 {
-	ShaderFilter *th = obj->as<ShaderFilter>();
+	//ShaderFilter *th = obj->as<ShaderFilter>();
 	LOG(LOG_NOT_IMPLEMENTED,"ShaderFilter is not implemented");
 	return NULL;
 }
 
 BitmapFilter* ShaderFilter::cloneImpl() const
 {
-	ShaderFilter *cloned = Class<ShaderFilter>::getInstanceS();
-	return cloned;
+	return Class<ShaderFilter>::getInstanceS();
 }
 
 void BitmapFilterQuality::sinit(Class_base* c)
diff --git a/src/scripting/flash/geom/flashgeom.cpp b/src/scripting/flash/geom/flashgeom.cpp
index 8d93cd9..79268d5 100644
--- a/src/scripting/flash/geom/flashgeom.cpp
+++ b/src/scripting/flash/geom/flashgeom.cpp
@@ -987,7 +987,7 @@ ASFUNCTIONBODY(Transform,_setColorTransform)
 
 ASFUNCTIONBODY(Transform,_getConcatenatedMatrix)
 {
-	Transform* th=Class<Transform>::cast(obj);
+	//Transform* th=Class<Transform>::cast(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"contcatenatedMAtrix not implemented");
 	return Class<Matrix>::getInstanceS();
 }
@@ -1721,7 +1721,7 @@ void Matrix3D::sinit(Class_base* c)
 
 ASFUNCTIONBODY(Matrix3D,_constructor)
 {
-	Matrix3D * th=static_cast<Matrix3D*>(obj);
+	//Matrix3D * th=static_cast<Matrix3D*>(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"Matrix3D is not implemented");
 	return NULL;
 }
@@ -1733,7 +1733,7 @@ void PerspectiveProjection::sinit(Class_base* c)
 
 ASFUNCTIONBODY(PerspectiveProjection,_constructor)
 {
-	PerspectiveProjection * th=static_cast<PerspectiveProjection*>(obj);
+	//PerspectiveProjection * th=static_cast<PerspectiveProjection*>(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"PerspectiveProjection is not implemented");
 	return NULL;
 }
diff --git a/src/scripting/flash/net/XMLSocket.cpp b/src/scripting/flash/net/XMLSocket.cpp
index 8fe5abd..f0f61bc 100644
--- a/src/scripting/flash/net/XMLSocket.cpp
+++ b/src/scripting/flash/net/XMLSocket.cpp
@@ -507,10 +507,10 @@ void XMLSocketThread::sendData(const tiny_string& data)
 
 	tiny_string *packet = new tiny_string(data);
 	g_async_queue_push(sendQueue, packet);
-	write(signalEmitter, &SOCKET_COMMAND_SEND, 1);
+	return write(signalEmitter, &SOCKET_COMMAND_SEND, 1);
 }
 
 void XMLSocketThread::requestClose()
 {
-	write(signalEmitter, &SOCKET_COMMAND_CLOSE, 1);
+	return write(signalEmitter, &SOCKET_COMMAND_CLOSE, 1);
 }
diff --git a/src/scripting/flash/net/flashnet.cpp b/src/scripting/flash/net/flashnet.cpp
index b9639d2..ea8e6fc 100644
--- a/src/scripting/flash/net/flashnet.cpp
+++ b/src/scripting/flash/net/flashnet.cpp
@@ -1031,8 +1031,8 @@ void NetStreamAppendBytesAction::sinit(Class_base* c)
 
 NetStream::NetStream(Class_base* c):EventDispatcher(c),tickStarted(false),paused(false),closed(true),
 	streamTime(0),frameRate(0),connection(),downloader(NULL),videoDecoder(NULL),
-	audioDecoder(NULL),audioStream(NULL),datagenerationfile(NULL),datagenerationthreadstarted(false),framesdecoded(0),
-	client(NullRef),oldVolume(-1.0),checkPolicyFile(false),rawAccessAllowed(false),playbackBytesPerSecond(0),
+	audioDecoder(NULL),audioStream(NULL),datagenerationfile(NULL),datagenerationthreadstarted(false),client(NullRef),
+	oldVolume(-1.0),checkPolicyFile(false),rawAccessAllowed(false),framesdecoded(0),playbackBytesPerSecond(0),
 	backBufferLength(0),backBufferTime(30),bufferLength(0),bufferTime(0.1),bufferTimeMax(0),
 	maxPauseBufferTime(0)
 {
@@ -2135,31 +2135,31 @@ ASFUNCTIONBODY(LocalConnection, _constructor)
 }
 ASFUNCTIONBODY(LocalConnection, allowDomain)
 {
-	LocalConnection* th=Class<LocalConnection>::cast(obj);
+	//LocalConnection* th=Class<LocalConnection>::cast(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"LocalConnection::allowDomain is not implemented");
 	return NULL;
 }
 ASFUNCTIONBODY(LocalConnection, allowInsecureDomain)
 {
-	LocalConnection* th=Class<LocalConnection>::cast(obj);
+	//LocalConnection* th=Class<LocalConnection>::cast(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"LocalConnection::allowInsecureDomain is not implemented");
 	return NULL;
 }
 ASFUNCTIONBODY(LocalConnection, send)
 {
-	LocalConnection* th=Class<LocalConnection>::cast(obj);
+	//LocalConnection* th=Class<LocalConnection>::cast(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"LocalConnection::send is not implemented");
 	return NULL;
 }
 ASFUNCTIONBODY(LocalConnection, connect)
 {
-	LocalConnection* th=Class<LocalConnection>::cast(obj);
+	//LocalConnection* th=Class<LocalConnection>::cast(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"LocalConnection::connect is not implemented");
 	return NULL;
 }
 ASFUNCTIONBODY(LocalConnection, close)
 {
-	LocalConnection* th=Class<LocalConnection>::cast(obj);
+	//LocalConnection* th=Class<LocalConnection>::cast(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"LocalConnection::close is not implemented");
 	return NULL;
 }
@@ -2177,7 +2177,7 @@ void NetGroup::sinit(Class_base* c)
 ASFUNCTIONBODY(NetGroup, _constructor)
 {
 	EventDispatcher::_constructor(obj, NULL, 0);
-	NetGroup* th=Class<NetGroup>::cast(obj);
+	//NetGroup* th=Class<NetGroup>::cast(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"NetGroup is not implemented");
 	return NULL;
 }
@@ -2196,7 +2196,7 @@ void ASSocket::sinit(Class_base* c)
 ASFUNCTIONBODY(ASSocket, _constructor)
 {
 	EventDispatcher::_constructor(obj, NULL, 0);
-	ASSocket* th=Class<ASSocket>::cast(obj);
+	//ASSocket* th=Class<ASSocket>::cast(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"ASSocket is not implemented");
 	return NULL;
 }
diff --git a/src/scripting/flash/printing/flashprinting.cpp b/src/scripting/flash/printing/flashprinting.cpp
index 2d46b4b..f1ba9a7 100644
--- a/src/scripting/flash/printing/flashprinting.cpp
+++ b/src/scripting/flash/printing/flashprinting.cpp
@@ -39,7 +39,7 @@ ASFUNCTIONBODY_GETTER(PrintJob, isSupported);
 ASFUNCTIONBODY(PrintJob, _constructor)
 {
 	EventDispatcher::_constructor(obj, NULL, 0);
-	PrintJob* th=Class<PrintJob>::cast(obj);
+	//PrintJob* th=Class<PrintJob>::cast(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"PrintJob is not implemented");
 	return NULL;
 }
@@ -56,7 +56,7 @@ void PrintJobOptions::sinit(Class_base* c)
 
 ASFUNCTIONBODY(PrintJobOptions, _constructor)
 {
-	PrintJobOptions* th=Class<PrintJobOptions>::cast(obj);
+	//PrintJobOptions* th=Class<PrintJobOptions>::cast(obj);
 	LOG(LOG_NOT_IMPLEMENTED,"PrintJobOptions is not implemented");
 	return NULL;
 }