sdk: update builds on linux hosts

git-svn-id: svn://kolibrios.org@6303 a494cfbc-eb01-0410-851d-a64ba20cac60
2016-03-04 23:19:28 +00:00
parent 96876d8cc7
commit 8982c8cd10
8 changed files with 72 additions and 1870 deletions
--- a/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/Makefile
+++ b/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/Makefile
@@ -103,8 +103,6 @@ endef

 $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))

-include $(SRC_PATH)/doc/Makefile
-
 define DOPROG
 OBJS-$(1) += $(1).o $(EXEOBJS) $(OBJS-$(1)-yes)
 $(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1))
--- a/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/config.mak
+++ b/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/config.mak
@@ -465,7 +465,7 @@ HAVE_ATTRIBUTE_PACKED=yes
 HAVE_EBP_AVAILABLE=yes
 HAVE_EBX_AVAILABLE=yes
 !HAVE_GNU_AS=yes
-HAVE_GNU_WINDRES=yes
+!HAVE_GNU_WINDRES=yes
 !HAVE_IBM_ASM=yes
 HAVE_INLINE_ASM_LABELS=yes
 HAVE_INLINE_ASM_NONLOCAL_LABELS=yes
--- a/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/libavcodec/hapdec.c
+++ b/contrib/sdk/sources/ffmpeg/ffmpeg-2.8/libavcodec/hapdec.c
@@ -37,7 +37,7 @@
 #include "bytestream.h"
 #include "hap.h"
 #include "internal.h"
-#include "memory.h"
+//#include "memory.h"
 #include "snappy.h"
 #include "texturedsp.h"
 #include "thread.h"