8000 Fix ffpyplayer under NDK 15+ · helllma/python-for-android@c103a70 · GitHub
[go: up one dir, main page]
Skip to content

Commit c103a70

Browse files
germngermn
committed
Fix ffpyplayer under NDK 15+
1 parent 1909741 commit c103a70

File tree

3 files changed

+22
-16
lines changed

3 files changed

+22
-16
lines changed

‎pythonforandroid/recipes/ffmpeg/__init__.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,13 @@
66
import os
77
import shutil
88

9-
# TODO
10-
# Recipe doesn't work with NDK r15c+ yet,
11-
# see: https://github.com/android-ndk/ndk/issues/477
12-
139

1410
class FFMpegRecipe(Recipe):
1511
version = '3.4.1'
1612
url = 'http://ffmpeg.org/releases/ffmpeg-{version}.tar.bz2'
1713
depends = ['sdl2'] # Need this to build correct recipe order
1814
opts_depends = ['openssl', 'ffpyplayer_codecs']
19-
patches = ['patches/fix-libshine-configure.patch']
15+
patches = ['patches/configure.patch']
2016

2117
def should_build(self, arch):
2218
build_dir = self.get_build_dir(arch.arch)

‎pythonforandroid/recipes/ffmpeg/patches/configure.patch

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
--- ./configure.orig 2017-12-11 00:35:18.000000000 +0300
2+
+++ ./configure 2017-12-19 09:47:54.104914600 +0300
3+
@@ -4841,9 +4841,6 @@
4+
add_cflags -std=c11 ||
5+
check_cflags -std=c99
6+
7+
-check_cppflags -D_FILE_OFFSET_BITS=64
8+
-check_cppflags -D_LARGEFILE_SOURCE
9+
-
10+
add_host_cppflags -D_ISOC99_SOURCE
11+
check_host_cflags -std=c99
12+
check_host_cflags -Wall
13+
@@ -5979,7 +5976,7 @@
14+
enabled librsvg && require_pkg_config librsvg librsvg-2.0 librsvg-2.0/librsvg/rsvg.h rsvg_handle_render_cairo
15+
enabled librtmp && require_pkg_config librtmp librtmp librtmp/rtmp.h RTMP_Socket
16+
enabled librubberband && require_pkg_config librubberband "rubberband >= 1.8.1" rubberband/rubberband-c.h rubberband_new
17+
-enabled libshine && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer
18+
+enabled libshine && require "shine" shine/layer3.h shine_encode_buffer -lshine
19+
enabled libsmbclient && { use_pkg_config libsmbclient smbclient libsmbclient.h smbc_init ||
20+
require smbclient libsmbclient.h smbc_init -lsmbclient; }
21+
enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy

‎pythonforandroid/recipes/ffmpeg/patches/fix-libshine-configure.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0