Update ffpyplayer and dependencies

germn · Oct 15, 2020 · d200d7f · d200d7f
1 parent 690dd18
commit d200d7f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 19 deletions.
diff --git a/pythonforandroid/recipes/ffmpeg/__init__.py b/pythonforandroid/recipes/ffmpeg/__init__.py
@@ -4,8 +4,7 @@
 
 
 class FFMpegRecipe(Recipe):
-    version = '007e03348dbd8d3de3eb09022d72c734a8608144'
-    # Moved to github.com instead of ffmpeg.org to improve download speed
+    version = '6bdfea8d4b3683605f47994e491770bc0bc6ce5d'
     url = 'https://github.com/FFmpeg/FFmpeg/archive/{version}.zip'
     depends = ['sdl2']  # Need this to build correct recipe order
     opts_depends = ['openssl', 'ffpyplayer_codecs']

diff --git a/pythonforandroid/recipes/ffmpeg/patches/configure.patch b/pythonforandroid/recipes/ffmpeg/patches/configure.patch
@@ -1,6 +1,6 @@
---- ./configure	2019-07-21 18:36:31.000000000 +0200
-+++ ./configure_new	2019-10-04 12:43:41.798448200 +0200
-@@ -6222,7 +6222,7 @@
+--- ./configure.orig	2020-10-15 13:54:04.668758400 +0300
++++ ./configure	2020-10-15 13:59:37.995982900 +0300
+@@ -6393,7 +6393,7 @@
  enabled librsvg           && require_pkg_config librsvg librsvg-2.0 librsvg-2.0/librsvg/rsvg.h rsvg_handle_render_cairo
  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++"
@@ -9,12 +9,3 @@
  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++
-@@ -6322,7 +6322,7 @@
-                                die "ERROR: OpenMAX IL headers not found"; } && enable omx
- enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
-                                check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
--                               check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
-+                               check_lib openssl openssl/ssl.h OPENSSL_init_ssl -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"; }
diff --git a/pythonforandroid/recipes/ffpyplayer/__init__.py b/pythonforandroid/recipes/ffpyplayer/__init__.py
@@ -4,7 +4,7 @@
 
 
 class FFPyPlayerRecipe(CythonRecipe):
-    version = 'c99913f2317bf3840eeacf1c1c3db3b3d1f78007'
+    version = '5e2333e410313da19e78eab08f17205d7d126628'
     url = 'https://github.com/matham/ffpyplayer/archive/{version}.zip'
     depends = ['python3', 'sdl2', 'ffmpeg']
     opt_depends = ['openssl', 'ffpyplayer_codecs']

diff --git a/pythonforandroid/recipes/libshine/__init__.py b/pythonforandroid/recipes/libshine/__init__.py
@@ -7,9 +7,8 @@
 
 
 class LibShineRecipe(Recipe):
-    version = 'c72aba9031bde18a0995e7c01c9b53f2e08a0e46'
+    version = '76ea4f072e03a3d76283c99412f698076a20a362'
     url = 'https://github.com/toots/shine/archive/{version}.zip'
-
     built_libraries = {'libshine.so': 'lib'}
 
     def get_recipe_env(self, arch=None, with_flags_in_cc=True):

diff --git a/pythonforandroid/recipes/libx264/__init__.py b/pythonforandroid/recipes/libx264/__init__.py
@@ -7,8 +7,8 @@
 
 
 class LibX264Recipe(Recipe):
-    version = 'x264-snapshot-20171218-2245-stable'  # using mirror url since can't use ftp
-    url = 'http://mirror.yandex.ru/mirrors/ftp.videolan.org/x264/snapshots/{version}.tar.bz2'
+    version = 'db0d417728460c647ed4a847222a535b00d3dbcb'
+    url = 'https://github.com/mirror/x264/archive/{version}.zip'
     built_libraries = {'libx264.a': 'lib'}
 
     def build_arch(self, arch):