blender: Update to 2.79b

mingw-w64-blender/0017-find-pugixml.patch

@@ -0,0 +1,11 @@
+--- blender-2.79b/build_files/cmake/Modules/FindPugiXML.cmake.orig	2018-05-05 10:27:02.255808100 +0300
++++ blender-2.79b/build_files/cmake/Modules/FindPugiXML.cmake	2018-05-05 10:27:41.740066500 +0300
+@@ -43,6 +43,8 @@
+     ${_pugixml_SEARCH_DIRS}
+   PATH_SUFFIXES
+     include
++    include/pugixml-1.8
++    include/pugixml-1.9
+ )
+ 
+ FIND_LIBRARY(PUGIXML_LIBRARY

mingw-w64-blender/0100-ffmpeg-4-compatibility.patch

@@ -0,0 +1,113 @@
+Index: intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+===================================================================
+--- intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
++++ intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
+@@ -264,9 +264,9 @@
+ 		m_membuffer(buffer),
+ 		m_membufferpos(0)
+ {
+-	m_membuf = reinterpret_cast<data_t*>(av_malloc(FF_MIN_BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE));
++	m_membuf = reinterpret_cast<data_t*>(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)
+Index: intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
+===================================================================
+--- intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
++++ intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
+@@ -163,7 +163,7 @@
+ 		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 @@
+ 			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
+Index: source/blender/blenkernel/intern/writeffmpeg.c
+===================================================================
+--- source/blender/blenkernel/intern/writeffmpeg.c
++++ source/blender/blenkernel/intern/writeffmpeg.c
+@@ -619,8 +619,6 @@
+ 	c->rc_buffer_aggressivity = 1.0;
+ #endif
+ 
+-	c->me_method = ME_EPZS;
+-	
+ 	codec = avcodec_find_encoder(c->codec_id);
+ 	if (!codec)
+ 		return NULL;
+@@ -682,14 +680,14 @@
+ 	    )
+ 	{
+ 		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... */
+@@ -779,7 +777,7 @@
+ 	}
+ 
+ 	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);
+@@ -798,14 +796,14 @@
+ 	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
+Index: source/blender/imbuf/intern/indexer.c
+===================================================================
+--- source/blender/imbuf/intern/indexer.c
++++ source/blender/imbuf/intern/indexer.c
+@@ -537,7 +537,7 @@
+ 	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) {

mingw-w64-blender/PKGBUILD

@@ -12,7 +12,7 @@ _realname=blender
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 _basever=2.79
-_minorchar=a
+_minorchar=b
 [[ -z ${_minorchar} ]] && {
   pkgver=${_basever}
 } || {
@@ -42,6 +42,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-boost"
          "${MINGW_PACKAGE_PREFIX}-opencolorio"
          "${MINGW_PACKAGE_PREFIX}-openimageio"
          "${MINGW_PACKAGE_PREFIX}-openshadinglanguage"
+         "${MINGW_PACKAGE_PREFIX}-pugixml"
          "${MINGW_PACKAGE_PREFIX}-python3"
          "${MINGW_PACKAGE_PREFIX}-python3-numpy"
          "${MINGW_PACKAGE_PREFIX}-SDL2"
@@ -66,8 +67,10 @@ source=(https://download.blender.org/source/${_realname}-${_basever}${_minorchar
         0013-provide-sprintf-for-comutil.patch
         0014-libstdc++-not-support-utf-stream.patch
         0015-mingw-python-like-msvc.patch
-        0016-mingw-windres.patch)
-sha256sums=('8ccf5f624ef020c903e0a302bfc6cd367eccb778e36e112c74c0a5e9762d84d7'
+        0016-mingw-windres.patch
+        0017-find-pugixml.patch
+        0100-ffmpeg-4-compatibility.patch)
+sha256sums=('4c944c304a49e68ac687ea06f5758204def049b66dc211e1cffa1857716393bc'
             '5f654367edbdadeae5cb54acd27b5d62788ce4463f6aca8ed973b7c7b43a6069'
             '305977db08dc9ac1ca13ce1b1c49589b7190123f9017593199f51e8e9f44d8b3'
             '9ac81ace5d40a860ea6aa72d3212cc1b9096c350835d0ef8c81b8010fbb02a4c'
@@ -82,7 +85,9 @@ sha256sums=('8ccf5f624ef020c903e0a302bfc6cd367eccb778e36e112c74c0a5e9762d84d7'
             '58e7a84fd67e12457ced9e8d494215fe76ad8372489942695689a8043c054f06'
             '4be69e29a45ccd07ad1a8e59071431b1870412686b1934117c303370e0d4dc38'
             '0e5536cc4e9c571846cce47b6ee5c57807d8c17b20c4b0565c2efb6fab9b8c76'
-            '375535461c8dacd215ca79f7a350f6d4ca8ef48fa97c517363ec3fae640c0472')
+            '375535461c8dacd215ca79f7a350f6d4ca8ef48fa97c517363ec3fae640c0472'
+            '5ce05eed73408045c78cd1be262393b2c6815b77dd2979964a8090e00a3ce5ac'
+            '52c9c20fef6e4570d36c266737412121dd7d52d2f5032635d524e042aa2a943f')
 
 prepare() {
   cd ${srcdir}/${_realname}-${_basever}${_minorchar}
@@ -102,6 +107,8 @@ prepare() {
   patch -p1 -i "${srcdir}"/0014-libstdc++-not-support-utf-stream.patch
   patch -p1 -i "${srcdir}"/0015-mingw-python-like-msvc.patch
   patch -p1 -i "${srcdir}"/0016-mingw-windres.patch
+  patch -p1 -i "${srcdir}"/0017-find-pugixml.patch
+  patch -p0 -i "${srcdir}"/0100-ffmpeg-4-compatibility.patch
 
 }
 
@@ -149,6 +156,8 @@ build() {
     -DWITH_CODEC_FFMPEG=ON \
     -DWITH_CODEC_SNDFILE=ON \
     -DWITH_CYCLES=ON \
+    -DWITH_CYCLES_STANDALONE=ON \
+    -DWITH_CYCLES_STANDALONE_GUI=ON \
     -DWITH_CYCLES_CUDA_BINARIES=OFF \
     -DWITH_CYCLES_OSL=ON \
     -DWITH_FFTW3=ON \