libav: update to version 11.6

Enables also the use of the avresample library.

Fixes #1910

repos/libports/lib/import/import-avresample.mk

@@ -0,0 +1,4 @@
+include $(call select_from_repositories,lib/import/import-av.inc)
+
+REP_INC_DIR += include/libavresample
+INC_DIR     += $(call select_from_ports,libav)/include/libav/libavresample

repos/libports/lib/import/import-avutil.mk

@@ -1,4 +1,3 @@
 include $(call select_from_repositories,lib/import/import-av.inc)
 
 REP_INC_DIR += include/libavutil
-INC_DIR     += $(call select_from_ports,libav)/include/libav/libavutil

repos/libports/lib/import/import-resample.mk

@@ -0,0 +1,4 @@
+include $(call select_from_repositories,lib/import/import-av.inc)
+
+REP_INC_DIR += include/libavresample
+INC_DIR     += $(call select_from_ports,libav)/include/libav/libavresample

repos/libports/lib/mk/avresample.mk

@@ -0,0 +1,9 @@
+include $(REP_DIR)/lib/mk/av.inc
+
+include $(REP_DIR)/lib/import/import-avresample.mk
+
+LIBAVRESAMPLE_DIR = $(call select_from_ports,libav)/src/lib/libav/libavresample
+
+include $(LIBAVRESAMPLE_DIR)/Makefile
+
+vpath % $(LIBAVRESAMPLE_DIR)

repos/libports/lib/mk/spec/arm/avutil.mk

@@ -4,3 +4,5 @@ ARCH_ARM=yes
 CC_C_OPT += -DARCH_ARM=1
 
 include $(REP_DIR)/lib/mk/avutil.inc
+
+include $(LIBAVUTIL_DIR)/arm/Makefile

repos/libports/lib/mk/spec/x86/avutil.inc

@@ -4,3 +4,5 @@ ARCH_X86=yes
 CC_C_OPT += -DARCH_X86=1
 
 include $(REP_DIR)/lib/mk/avutil.inc
+
+include $(LIBAVUTIL_DIR)/x86/Makefile

repos/libports/ports/libav.hash

@@ -1 +1 @@
-e49246d41b3e0b75eecf767df995ad27f0e8723e
+f0631cd5c85fe9c08ea236de0d062384798a0955

repos/libports/ports/libav.port

@@ -1,18 +1,22 @@
 LICENSE   := GPLv3
-VERSION   := 0.8.2
+VERSION   := 11.6
 DOWNLOADS := libav.archive
 
-URL(libav) := http://www.libav.org/releases/libav-$(VERSION).tar.gz
-SHA(libav) := e5231f8f995fae53c99e0bd30a455b3e5a906b71
+URL(libav) := https://www.libav.org/releases/libav-$(VERSION).tar.gz
+SHA(libav) := 4f65d7474a45330ec2d51ad80ab00159515229eb
 DIR(libav) := src/lib/libav
 SIG(libav) := ${URL(libav)}.asc
 
-PATCHES := src/app/avplay/avplay.patch
+PATCHES := src/app/avplay/avplay.patch \
+           src/lib/libav/avcodec.patch
 
 include_subdirs := . libavcodec libavfilter libavutil libavformat libswscale \
-                   libavutil/x86 libavutil/arm libavcodec/x86 libavcodec/arm
+                   libavutil/x86 libavutil/arm libavutil/ppc libavcodec/x86 \
+                   libavcodec/arm libavresample
 
 DIRS := $(addprefix include/libav/,$(include_subdirs))
 
 $(foreach dir,$(include_subdirs),\
           $(eval DIR_CONTENT(include/libav/$(dir)) := src/lib/libav/$(dir)/*.h))
+
+DIR_CONTENT(include/libav/libavutil) += src/lib/libav/libavutil/log2_tab.c

repos/libports/run/avplay.run

@@ -120,6 +120,7 @@ set boot_modules {
 	core init timer audio_drv avplay
 	ld.lib.so libc.lib.so libm.lib.so pthread.lib.so zlib.lib.so sdl.lib.so
 	avfilter.lib.so avutil.lib.so avcodec.lib.so avformat.lib.so swscale.lib.so
+	avresample.lib.so
 	mediafile
 }
 

repos/libports/run/qt5_avplay.run

@@ -95,6 +95,7 @@ append boot_modules {
 	avformat.lib.so
 	avutil.lib.so
 	avfilter.lib.so
+	avresample.lib.so
 	swscale.lib.so
 	sdl.lib.so
 	pthread.lib.so

repos/libports/src/app/avplay/target.mk

@@ -2,7 +2,7 @@ include $(REP_DIR)/lib/import/import-av.inc
 
 TARGET = avplay
 SRC_C  = avplay.c cmdutils.c libc_dummies.c
-LIBS  += avfilter avformat avcodec avutil swscale
+LIBS  += avfilter avformat avcodec avutil avresample swscale
 LIBS  += sdl libc libm config_args
 
 CC_WARN += -Wno-parentheses -Wno-switch -Wno-uninitialized \

repos/libports/src/lib/libav/avcodec.patch

@@ -0,0 +1,23 @@
+- avoid relocation errors by hiding symbols
+
++++ src/lib/libav/libavcodec/cabac.c
+@@ -31,7 +31,7 @@
+ #include "cabac.h"
+ #include "cabac_functions.h"
+ 
+-uint8_t ff_h264_cabac_tables[512 + 4*2*64 + 4*64 + 63] = {
++uint8_t __attribute__((visibility("hidden"))) ff_h264_cabac_tables[512 + 4*2*64 + 4*64 + 63]= {
+  9,8,7,7,6,6,6,6,5,5,5,5,5,5,5,5,
+  4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
+  3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
++++ src/lib/libav/libavcodec/x86/constants.c
+@@ -37,7 +37,7 @@ DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_17)   = { 0x0011001100110011ULL, 0x001
+ DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_18)   = { 0x0012001200120012ULL, 0x0012001200120012ULL };
+ DECLARE_ALIGNED(8,  const uint64_t, ff_pw_20)   =   0x0014001400140014ULL;
+ DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_32)   = { 0x0020002000200020ULL, 0x0020002000200020ULL };
+-DECLARE_ALIGNED(8,  const uint64_t, ff_pw_42)   =   0x002A002A002A002AULL;
++DECLARE_ALIGNED(8,  const uint64_t __attribute__((visibility("hidden"))), ff_pw_42)   =   0x002A002A002A002AULL;
+ DECLARE_ALIGNED(8,  const uint64_t, ff_pw_53)   =   0x0035003500350035ULL;
+ DECLARE_ALIGNED(16, const xmm_reg,  ff_pw_64)   = { 0x0040004000400040ULL, 0x0040004000400040ULL };
+ DECLARE_ALIGNED(8,  const uint64_t, ff_pw_96)   =   0x0060006000600060ULL;
+--