Skip to content

Commit d200d7f

Browse files
committed
Update ffpyplayer and dependencies
1 parent 690dd18 commit d200d7f

File tree

5 files changed

+8
-19
lines changed

5 files changed

+8
-19
lines changed

pythonforandroid/recipes/ffmpeg/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55

66
class FFMpegRecipe(Recipe):
7-
version = '007e03348dbd8d3de3eb09022d72c734a8608144'
8-
# Moved to github.com instead of ffmpeg.org to improve download speed
7+
version = '6bdfea8d4b3683605f47994e491770bc0bc6ce5d'
98
url = 'https://github.com/FFmpeg/FFmpeg/archive/{version}.zip'
109
depends = ['sdl2'] # Need this to build correct recipe order
1110
opts_depends = ['openssl', 'ffpyplayer_codecs']
Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- ./configure 2019-07-21 18:36:31.000000000 +0200
2-
+++ ./configure_new 2019-10-04 12:43:41.798448200 +0200
3-
@@ -6222,7 +6222,7 @@
1+
--- ./configure.orig 2020-10-15 13:54:04.668758400 +0300
2+
+++ ./configure 2020-10-15 13:59:37.995982900 +0300
3+
@@ -6393,7 +6393,7 @@
44
enabled librsvg && require_pkg_config librsvg librsvg-2.0 librsvg-2.0/librsvg/rsvg.h rsvg_handle_render_cairo
55
enabled librtmp && require_pkg_config librtmp librtmp librtmp/rtmp.h RTMP_Socket
66
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 @@
99
enabled libsmbclient && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init ||
1010
require libsmbclient libsmbclient.h smbc_init -lsmbclient; }
1111
enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
12-
@@ -6322,7 +6322,7 @@
13-
die "ERROR: OpenMAX IL headers not found"; } && enable omx
14-
enabled openssl && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
15-
check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
16-
- check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
17-
+ check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
18-
check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
19-
check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
20-
die "ERROR: openssl not found"; }

pythonforandroid/recipes/ffpyplayer/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55

66
class FFPyPlayerRecipe(CythonRecipe):
7-
version = 'c99913f2317bf3840eeacf1c1c3db3b3d1f78007'
7+
version = '5e2333e410313da19e78eab08f17205d7d126628'
88
url = 'https://github.com/matham/ffpyplayer/archive/{version}.zip'
99
depends = ['python3', 'sdl2', 'ffmpeg']
1010
opt_depends = ['openssl', 'ffpyplayer_codecs']

pythonforandroid/recipes/libshine/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@
77

88

99
class LibShineRecipe(Recipe):
10-
version = 'c72aba9031bde18a0995e7c01c9b53f2e08a0e46'
10+
version = '76ea4f072e03a3d76283c99412f698076a20a362'
1111
url = 'https://github.com/toots/shine/archive/{version}.zip'
12-
1312
built_libraries = {'libshine.so': 'lib'}
1413

1514
def get_recipe_env(self, arch=None, with_flags_in_cc=True):

pythonforandroid/recipes/libx264/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77

88

99
class LibX264Recipe(Recipe):
10-
version = 'x264-snapshot-20171218-2245-stable' # using mirror url since can't use ftp
11-
url = 'http://mirror.yandex.ru/mirrors/ftp.videolan.org/x264/snapshots/{version}.tar.bz2'
10+
version = 'db0d417728460c647ed4a847222a535b00d3dbcb'
11+
url = 'https://github.com/mirror/x264/archive/{version}.zip'
1212
built_libraries = {'libx264.a': 'lib'}
1313

1414
def build_arch(self, arch):

0 commit comments

Comments
 (0)