Fixes ffmpeg compilation w/ openssl 1.1.1

misl6 · AndreMiras · commit 95d41f793fa4 · 2019-01-12T14:40:43.000+01:00
Fixes ffmpeg compilation with openssl 1.1.1 + added scale filter + ffpyplayer now supports python3
diff --git a/pythonforandroid/recipes/ffmpeg/__init__.py b/pythonforandroid/recipes/ffmpeg/__init__.py
@@ -87,7 +87,7 @@ def build_arch(self, arch):
 
             # other flags:
             flags += [
-                '--enable-filter=aresample,resample,crop,adelay,volume',
+                '--enable-filter=aresample,resample,crop,adelay,volume,scale',
                 '--enable-protocol=file,http',
                 '--enable-small',
                 '--enable-hwaccels',
diff --git a/pythonforandroid/recipes/ffmpeg/patches/configure.patch b/pythonforandroid/recipes/ffmpeg/patches/configure.patch
@@ -3,7 +3,7 @@
 @@ -4841,9 +4841,6 @@
      add_cflags -std=c11 ||
      check_cflags -std=c99
- 
+
 -check_cppflags -D_FILE_OFFSET_BITS=64
 -check_cppflags -D_LARGEFILE_SOURCE
 -
@@ -19,3 +19,22 @@
  enabled libsmbclient      && { use_pkg_config libsmbclient smbclient libsmbclient.h smbc_init ||
                                 require smbclient libsmbclient.h smbc_init -lsmbclient; }
  enabled libsnappy         && require libsnappy snappy-c.h snappy_compress -lsnappy
+
+diff -Naur ffmpeg/configure ffmpeg-1/configure
+--- ffmpeg/configure	2019-01-11 09:30:02.824961600 +0100
++++ ffmpeg-1/configure	2019-01-11 09:29:54.976149600 +0100
+@@ -6068,11 +6068,11 @@
+                                { ! enabled cross_compile && add_cflags -isystem/opt/vc/include/IL && check_header OMX_Core.h ; } ||
+                                die "ERROR: OpenMAX IL headers not found"; }
+ enabled omx               && require_header OMX_Core.h
+-enabled openssl           && { use_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
++enabled openssl           && { use_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
+                                use_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
+-                               check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
+-                               check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl32 -leay32 ||
+-                               check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto -lws2_32 -lgdi32 ||
++                               check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
++                               check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
++                               check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
+                                die "ERROR: openssl not found"; }
+ enabled rkmpp             && { { require_pkg_config rockchip_mpp rockchip_mpp rockchip/rk_mpi.h mpp_create ||
diff --git a/pythonforandroid/recipes/ffpyplayer/__init__.py b/pythonforandroid/recipes/ffpyplayer/__init__.py
@@ -6,7 +6,7 @@
 class FFPyPlayerRecipe(CythonRecipe):
     version = '6f7568b498715c2da88f061ebad082a042514923'
     url = 'https://github.com/matham/ffpyplayer/archive/{version}.zip'
-    depends = [('python2', 'python3crystax'), 'sdl2', 'ffmpeg']
+    depends = [('python2', 'python3'), 'sdl2', 'ffmpeg']
     opt_depends = ['openssl', 'ffpyplayer_codecs']
 
     def get_recipe_env(self, arch, with_flags_in_cc=True):
