Packman Build Service PMBS

Changes of Revision 79

lightspark.spec Changed

build.patch Added

@@ -0,0 +1,94 @@
+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/scripting/abc.cpp b/src/scripting/abc.cpp
+index f159a73..7ed7126 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