Merge pull request SynoCommunity#21 from GuillaumeSmaha/cytec-ffmpeg-update-fix-x265-ppc853x-4.3-gcc-error-2

Fix x265 for ppc853x-4.3: Add a patch only used with a defined var

Author: cytec

cross/x265/Makefile

@@ -61,6 +61,7 @@ endif
 # For ppc853x-4.3, disable atomics
 ifeq ($(ARCH)-$(TCVERSION), ppc853x-4.3)
 CMAKE+= -DNO_ATOMICS=ON
+CMAKE += -DCMAKE_CXX_FLAGS="-DSPKSRC_FIX_PPC853X_4_3"
 endif
 
 myConf:

cross/x265/patches/001-fix-gcc-error-for-ppc853x-4.3.patch

@@ -0,0 +1,14 @@
+--- encoder/sao.h.orig	2016-05-31 10:27:19.096685802 +0200
++++ encoder/sao.h	2016-05-31 10:32:49.833303929 +0200
+@@ -69,7 +69,11 @@
+     typedef int32_t (PerClass[MAX_NUM_SAO_TYPE][MAX_NUM_SAO_CLASS]);
+     typedef int32_t (PerPlane[NUM_PLANE][MAX_NUM_SAO_TYPE][MAX_NUM_SAO_CLASS]);
+ 
++#ifdef SPKSRC_FIX_PPC853X_4_3
++public:
++#else
+ protected:
++#endif
+ 
+     /* allocated per part */
+     PerPlane    m_count;