diff --git a/media-gfx/blender/blender-2.79b.recipe b/media-gfx/blender/blender-2.79b.recipe index 12a0308aa..a98a84d1e 100644 --- a/media-gfx/blender/blender-2.79b.recipe +++ b/media-gfx/blender/blender-2.79b.recipe @@ -10,7 +10,7 @@ benefit from its unified pipeline and responsive development process." HOMEPAGE="https://www.blender.org/" COPYRIGHT="2002-2017 Blender Foundation" LICENSE="GNU GPL v2" -REVISION="5" +REVISION="6" SOURCE_URI="https://download.blender.org/source/blender-$portVersion.tar.gz" CHECKSUM_SHA256="4c944c304a49e68ac687ea06f5758204def049b66dc211e1cffa1857716393bc" PATCHES="blender-$portVersion.patchset" @@ -190,18 +190,11 @@ BUILD() -Wno-dev" # Release settings breaks build on Haiku - BLENDER_BUGOUS="-DWITH_BOOST=ON \ - -DWITH_CYCLES_NATIVE_ONLY=ON \ - -DWITH_CYCLES_LOGGING=OFF \ + BLENDER_BUGOUS="-DWITH_CYCLES_LOGGING=OFF \ -DWITH_CODEC_FFMPEG=OFF \ -DWITH_GAMEENGINE_DECKLINK=OFF \ -DWITH_GTESTS=OFF \ - -DWITH_LLVM=ON \ - -DWITH_OPENIMAGEIO=ON \ -DWITH_SYSTEM_EIGEN3=ON \ - -DWITH_SYSTEM_GFLAGS=OFF \ - -DWITH_SYSTEM_GLOG=OFF \ - -DWITH_SYSTEM_OPENJPEG=OFF \ -DWITH_SYSTEM_LZO=ON" # Missing deps on Haiku @@ -255,7 +248,7 @@ BUILD() -DWITH_OPENSUBDIV=ON" # Extra CXX Flags - BLENDER_CXX="-DBOOST_NO_CXX11_CONSTEXPR \ + BLENDER_CXX="-L`finddir B_SYSTEM_DIRECTORY`/$relativeDevelopLibDir \ -std=c++11 $COLLADA_INC_FLAGS" mkdir -p build_haiku diff --git a/media-gfx/blender/patches/blender-2.79b.patchset b/media-gfx/blender/patches/blender-2.79b.patchset index 30f08a012..a7d85c481 100644 --- a/media-gfx/blender/patches/blender-2.79b.patchset +++ b/media-gfx/blender/patches/blender-2.79b.patchset @@ -1,11 +1,11 @@ -From adebe8a276834f24205c170b8b09466727519146 Mon Sep 17 00:00:00 2001 +From 9dc7609dbcd261723fe454410419a3d812daf868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Tue, 19 Sep 2017 23:03:48 +0200 Subject: Haiku patchset diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0423781..0704c5e 100644 +index bfea2dd..ebe6bef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -195,7 +195,7 @@ endif() @@ -17,7 +17,7 @@ index 0423781..0704c5e 100644 set(WITH_X11 ON) endif() -@@ -791,7 +791,9 @@ set(CC_REMOVE_STRICT_FLAGS) +@@ -793,7 +793,9 @@ set(CC_REMOVE_STRICT_FLAGS) # libraries to link the binary with passed to target_link_libraries() # known as LLIBS to scons @@ -67,7 +67,7 @@ index 62e0caa..9eb6985 100644 find_package(Threads REQUIRED) list(APPEND PLATFORM_LINKLIBS ${CMAKE_THREAD_LIBS_INIT}) diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h -index a292a2e..9a5848c 100644 +index 4efa236..4b2282a 100644 --- a/intern/guardedalloc/intern/mallocn_intern.h +++ b/intern/guardedalloc/intern/mallocn_intern.h @@ -63,6 +63,9 @@ @@ -151,10 +151,10 @@ index b819c51..9fb3fbf 100644 # include # define USE_STATFS_STATVFS -- -2.15.0 +2.16.4 -From a28c6353e71223779f8e287ff7e37f4180d0400d Mon Sep 17 00:00:00 2001 +From 2caf7afb00c2d0672441fca01de3b78f0f5f0e02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Tue, 19 Sep 2017 23:15:20 +0200 Subject: Haiku SDL2 check fix @@ -174,10 +174,10 @@ index 2a835cf..61b7dee 100644 FIND_LIBRARY(SDL2_LIBRARY -- -2.15.0 +2.16.4 -From dfa0aa38f941503c196fb4c37a852eb3e1a177f1 Mon Sep 17 00:00:00 2001 +From 99dadf68ed78792f9e97d0261908b7e5e9ac2381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Tue, 19 Sep 2017 23:52:27 +0200 Subject: In-tree glog supporting patches @@ -373,10 +373,10 @@ index 0000000..4e6703b +# define NO_FRAME_POINTER +#endif -- -2.15.0 +2.16.4 -From 93800955fcf29cb52b37d78c3bf28cfdcbd63af8 Mon Sep 17 00:00:00 2001 +From 41e370ea7a887817bcb307caeac993e3560da60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sat, 16 Dec 2017 17:04:56 +0100 Subject: OpenCollada support @@ -403,5 +403,128 @@ index 63bc520..28cf0b9 100644 ${_opencollada_SEARCH_DIRS} ) -- -2.15.0 +2.16.4 + + +From 750ac72aca4db0d927ceb3efaba805a07ae3c967 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sat, 4 Aug 2018 12:42:53 +0200 +Subject: FFMPEG4 patches + + +diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp +index e9eea19..84aea33 100644 +--- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp ++++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp +@@ -264,9 +264,9 @@ AUD_FFMPEGReader::AUD_FFMPEGReader(boost::shared_ptr buffer) : + m_membuffer(buffer), + m_membufferpos(0) + { +- m_membuf = reinterpret_cast(av_malloc(FF_MIN_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE)); ++ m_membuf = reinterpret_cast(av_malloc(AV_INPUT_BUFFER_MIN_SIZE + AV_INPUT_BUFFER_PADDING_SIZE)); + +- m_aviocontext = avio_alloc_context(m_membuf, FF_MIN_BUFFER_SIZE, 0, this, ++ m_aviocontext = avio_alloc_context(m_membuf, AV_INPUT_BUFFER_MIN_SIZE, 0, this, + read_packet, NULL, seek_packet); + + if(!m_aviocontext) +diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp +index 3f95ac7..2c2f091 100644 +--- a/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp ++++ b/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp +@@ -163,7 +163,7 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs, + try + { + if(m_formatCtx->oformat->flags & AVFMT_GLOBALHEADER) +- m_codecCtx->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ m_codecCtx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + + AVCodec* codec = avcodec_find_encoder(m_codecCtx->codec_id); + if(!codec) +@@ -185,11 +185,11 @@ AUD_FFMPEGWriter::AUD_FFMPEGWriter(std::string filename, AUD_DeviceSpecs specs, + if(avcodec_open2(m_codecCtx, codec, NULL)) + AUD_THROW(AUD_ERROR_FFMPEG, codec_error); + +- m_output_buffer.resize(FF_MIN_BUFFER_SIZE); ++ m_output_buffer.resize(AV_INPUT_BUFFER_MIN_SIZE); + int samplesize = AUD_MAX(AUD_SAMPLE_SIZE(m_specs), AUD_DEVICE_SAMPLE_SIZE(m_specs)); + + if(m_codecCtx->frame_size <= 1) { +- m_input_size = FF_MIN_BUFFER_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels; ++ m_input_size = AV_INPUT_BUFFER_MIN_SIZE * 8 / m_codecCtx->bits_per_coded_sample / m_codecCtx->channels; + m_input_buffer.resize(m_input_size * samplesize); + } + else +diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c +index a19e414..d586979 100644 +--- a/source/blender/blenkernel/intern/writeffmpeg.c ++++ b/source/blender/blenkernel/intern/writeffmpeg.c +@@ -605,8 +605,6 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int + c->rc_buffer_aggressivity = 1.0; + #endif + +- c->me_method = ME_EPZS; +- + codec = avcodec_find_encoder(c->codec_id); + if (!codec) + return NULL; +@@ -668,14 +666,14 @@ static AVStream *alloc_video_stream(FFMpegContext *context, RenderData *rd, int + ) + { + PRINT("Using global header\n"); +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + /* Determine whether we are encoding interlaced material or not */ + if (rd->mode & R_FIELDS) { + PRINT("Encoding interlaced video\n"); +- c->flags |= CODEC_FLAG_INTERLACED_DCT; +- c->flags |= CODEC_FLAG_INTERLACED_ME; ++ c->flags |= AV_CODEC_FLAG_INTERLACED_DCT; ++ c->flags |= AV_CODEC_FLAG_INTERLACED_ME; + } + + /* xasp & yasp got float lately... */ +@@ -765,7 +763,7 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, RenderData *rd, int + } + + if (of->oformat->flags & AVFMT_GLOBALHEADER) { +- c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + set_ffmpeg_properties(rd, c, "audio", &opts); +@@ -784,14 +782,14 @@ static AVStream *alloc_audio_stream(FFMpegContext *context, RenderData *rd, int + st->codec->time_base.den = st->codec->sample_rate; + + #ifndef FFMPEG_HAVE_ENCODE_AUDIO2 +- context->audio_outbuf_size = FF_MIN_BUFFER_SIZE; ++ context->audio_outbuf_size = AV_INPUT_BUFFER_MIN_SIZE; + #endif + + if (c->frame_size == 0) + // used to be if ((c->codec_id >= CODEC_ID_PCM_S16LE) && (c->codec_id <= CODEC_ID_PCM_DVD)) + // not sure if that is needed anymore, so let's try out if there are any + // complaints regarding some ffmpeg versions users might have +- context->audio_input_samples = FF_MIN_BUFFER_SIZE * 8 / c->bits_per_coded_sample / c->channels; ++ context->audio_input_samples = AV_INPUT_BUFFER_MIN_SIZE * 8 / c->bits_per_coded_sample / c->channels; + else { + context->audio_input_samples = c->frame_size; + #ifndef FFMPEG_HAVE_ENCODE_AUDIO2 +diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c +index e1b3abc..1850ffd 100644 +--- a/source/blender/imbuf/intern/indexer.c ++++ b/source/blender/imbuf/intern/indexer.c +@@ -537,7 +537,7 @@ static struct proxy_output_ctx *alloc_proxy_output_ffmpeg( + av_opt_set_int(rv->c, "qmax", ffmpeg_quality, 0); + + if (rv->of->flags & AVFMT_GLOBALHEADER) { +- rv->c->flags |= CODEC_FLAG_GLOBAL_HEADER; ++ rv->c->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; + } + + if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) { +-- +2.16.4