re-add patch; fix linking with static libx264

Author: DexerBR

pythonforandroid/recipes/ffmpeg/__init__.py

@@ -8,7 +8,8 @@ class FFMpegRecipe(Recipe):
     # Moved to github.com instead of ffmpeg.org to improve download speed
     url = 'https://github.com/FFmpeg/FFmpeg/archive/{version}.zip'
     depends = ['sdl2']  # Need this to build correct recipe order
-    opts_depends = ['openssl', 'ffpyplayer_codecs']
+    opts_depends = ['openssl', 'ffpyplayer_codecs', 'av_codecs']
+    patches = ['patches/configure.patch']
 
     def should_build(self, arch):
         build_dir = self.get_build_dir(arch.arch)
@@ -39,7 +40,9 @@ def build_arch(self, arch):
                            '-DOPENSSL_API_COMPAT=0x10002000L']
                 ldflags += ['-L' + build_dir]
 
-            if 'ffpyplayer_codecs' in self.ctx.recipe_build_order:
+            codecs_opts = {"ffpyplayer_codecs", "av_codecs"}
+            if codecs_opts.intersection(self.ctx.recipe_build_order):
+
                 # Enable GPL
                 flags += ['--enable-gpl']
 
@@ -48,7 +51,7 @@ def build_arch(self, arch):
                 build_dir = Recipe.get_recipe(
                     'libx264', self.ctx).get_build_dir(arch.arch)
                 cflags += ['-I' + build_dir + '/include/']
-                ldflags += ['-lx264', '-L' + build_dir + '/lib/']
+                ldflags += [build_dir + '/lib/' + 'libx264.a']
 
                 # libshine
                 flags += ['--enable-libshine']

pythonforandroid/recipes/ffmpeg/patches/configure.patch

@@ -0,0 +1,22 @@
+diff --git a/configure b/configure
+index 5af693c954..d1d0a4f0a2 100755
+--- a/configure
++++ b/configure
+@@ -6800,7 +6800,7 @@ enabled librsvg           && require_pkg_config librsvg librsvg-2.0 librsvg-2.0/
+ enabled librtmp           && require_pkg_config librtmp librtmp librtmp/rtmp.h RTMP_Socket
+ enabled librubberband     && require_pkg_config librubberband "rubberband >= 1.8.1" rubberband/rubberband-c.h rubberband_new -lstdc++ && append librubberband_extralibs "-lstdc++"
+ enabled libshaderc        && require_pkg_config spirv_compiler "shaderc >= 2019.1" shaderc/shaderc.h shaderc_compiler_initialize
+-enabled libshine          && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer
++enabled libshine          && require "shine" shine/layer3.h shine_encode_buffer -lshine -lm
+ enabled libsmbclient      && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init ||
+                                require libsmbclient libsmbclient.h smbc_init -lsmbclient; }
+ enabled libsnappy         && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
+@@ -6850,7 +6850,7 @@ enabled libvpx            && {
+ enabled libwebp           && {
+     enabled libwebp_encoder      && require_pkg_config libwebp "libwebp >= 0.2.0" webp/encode.h WebPGetEncoderVersion
+     enabled libwebp_anim_encoder && check_pkg_config libwebp_anim_encoder "libwebpmux >= 0.4.0" webp/mux.h WebPAnimEncoderOptionsInit; }
+-enabled libx264           && require_pkg_config libx264 x264 "stdint.h x264.h" x264_encoder_encode &&
++enabled libx264           && require "x264" "stdint.h x264.h" x264_encoder_encode &&
+                              require_cpp_condition libx264 x264.h "X264_BUILD >= 122" && {
+                              [ "$toolchain" != "msvc" ] ||
+                              require_cpp_condition libx264 x264.h "X264_BUILD >= 158"; } &&