Skip to content

Commit c1ec69c

Browse files
misl6rambodbnicholsonAndreMirasinterlark
authored
Merge pull request #2666 from kivy/release-2022.09.04
* Add option for copying arbitratry xml files to src/main/res/xml without touching manifest * handle the case of getting list as res_xml * Remove stray - in output file name The final component in the package name is just the extension, so prefixing it with a - means the output file ends in -.<ext>. * Resolve absolute path to local recipes (#2640) This is necessary when using patches in a local recipe since `Recipe.apply_patch` assumes the recipe directory is absolute and uses `patch -d` to change directories. It could just be fixed there, but this ensures that recipe directories are always absolute. Closes: #2623 * Fix webview Back button behaviour (#2636) * Fixes TypeError: str.join() takes exactly one argument (2 given) in hostpython3/__init__.py", line 69 (#2642) * Update __init__.py .buildozer/android/platform/python-for-android/pythonforandroid/recipes/hostpython3/__init__.py", line 69, in get_recipe_env env["PKG_CONFIG_PATH"] = os.pathsep.join( TypeError: str.join() takes exactly one argument (2 given) * according of #2642 (review) * RTSP support for ffmpeg Added UDP and TCP protocols to "--enable-procol" to supporting RTSP streams over each. Added RTSP to "--enable-demuxer" to supporting RTSP with ffmpeg. * Fixes some E275 - assert is a keyword. (#2647) * Add icon-bg and icon-fg to fix_args + adds a missing folder in webview dir template (#2633) * Add icon-bg and icon-fg to fix_args Fix the icon-bg and icon-fg arguments and also create the folder mipmap-anydpi-v26 if it doesn't exists before trying to create a file inside. * Use existing ensure_dir function to create anydpi_dir * Add mipmap-anydpi-v26 to bootstrap template This makes available the directory in the final template so it's not needed to check the directory exists. * Updates matplotlib, fixes an issue related to shared libc++ (#2645) * Updates matplotlib, fixes an issue related to shared libc++ * Cleanup * Update supported Python versions (#2656) * Remove six and enum34 dependency (#2657) * Force --platform=linux/amd64 in Dockerfile (#2660) * Use p4a_install instead of install, as a file named INSTALL is already present. (#2663) * Update CHANGELOG.md & change version for release 2022.09.04 Co-authored-by: Eero af Heurlin <[email protected]> Co-authored-by: Dan Nicholson <[email protected]> Co-authored-by: Andre Miras <[email protected]> Co-authored-by: Andy Trofimov <[email protected]> Co-authored-by: Akshay Arora <[email protected]> Co-authored-by: --=FurtiF™=-- <[email protected]> Co-authored-by: alickc <[email protected]> Co-authored-by: danigm <[email protected]>
2 parents 17ec678 + 686c385 commit c1ec69c

File tree

26 files changed

+210
-343
lines changed

26 files changed

+210
-343
lines changed

‎.github/workflows/push.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Unit tests & build apps
33
on: ['push', 'pull_request']
44

55
env:
6-
APK_ARTIFACT_FILENAME: bdist_unit_tests_app-debug-1.1-.apk
7-
AAB_ARTIFACT_FILENAME: bdist_unit_tests_app-release-1.1-.aab
8-
AAR_ARTIFACT_FILENAME: bdist_unit_tests_app-release-1.1-.aar
6+
APK_ARTIFACT_FILENAME: bdist_unit_tests_app-debug-1.1.apk
7+
AAB_ARTIFACT_FILENAME: bdist_unit_tests_app-release-1.1.aab
8+
AAR_ARTIFACT_FILENAME: bdist_unit_tests_app-release-1.1.aar
99
PYTHONFORANDROID_PREREQUISITES_INSTALL_INTERACTIVE: 0
1010

1111
jobs:

‎CHANGELOG.md

+43
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,48 @@
11
# Changelog
22

3+
## [v2022.09.04](https://github.com/kivy/python-for-android/tree/v2022.09.04) (2022-09-04)
4+
5+
[Full Changelog](https://github.com/kivy/python-for-android/compare/v2022.07.20...v2022.09.04)
6+
7+
**Fixed bugs:**
8+
9+
- Matplotlib failed to import properly on an APK from Buildozer and Kivy [\#2643](https://github.com/kivy/python-for-android/issues/2643)
10+
11+
**Closed issues:**
12+
13+
- KeyError: Matplotlib with kivy android [\#2658](https://github.com/kivy/python-for-android/issues/2658)
14+
- KeyError: Matplotlib [\#2659](https://github.com/kivy/python-for-android/issues/2659)
15+
- Upgrade from NDK 19b to 23b causes problems with Pandas library [\#2654](https://github.com/kivy/python-for-android/issues/2654)
16+
- Update Dockerfile for ARM [\#2653](https://github.com/kivy/python-for-android/issues/2653)
17+
- Apple M2 chip doesn't generate apk: compiling error on liblzma [\#2652](https://github.com/kivy/python-for-android/issues/2652)
18+
- aiohttp/\_http\_parser.pyx:46:0: '\_headers.pxi' not found [\#2651](https://github.com/kivy/python-for-android/issues/2651)
19+
- \[Question\] Pip SSL ? [\#2649](https://github.com/kivy/python-for-android/issues/2649)
20+
- Colab gives me as error "No module named 'typing\_extensions' ", even if before with the same compilation it worked [\#2648](https://github.com/kivy/python-for-android/issues/2648)
21+
- \[Question\] Java Files [\#2646](https://github.com/kivy/python-for-android/issues/2646)
22+
- Using foreground services will cause wired behaviour on Android 8 [\#2641](https://github.com/kivy/python-for-android/issues/2641)
23+
- Can't apply patches with relative paths for local recipe [\#2623](https://github.com/kivy/python-for-android/issues/2623)
24+
- Compile for x86 on MacOS [\#2215](https://github.com/kivy/python-for-android/issues/2215)
25+
- splash always loading [\#1907](https://github.com/kivy/python-for-android/issues/1907)
26+
- python-for-android.readthedocs.io has problems updating, apparently [\#1709](https://github.com/kivy/python-for-android/issues/1709)
27+
- Webview apps not working on Android [\#1644](https://github.com/kivy/python-for-android/issues/1644)
28+
29+
**Merged pull requests:**
30+
31+
- `liblzma`: Use `p4a_install` instead of `install`, as a file named `INSTALL` is already present. [\#2663](https://github.com/kivy/python-for-android/pull/2663) ([misl6](https://github.com/misl6))
32+
- Force `--platform=linux/amd64` in Dockerfile [\#2660](https://github.com/kivy/python-for-android/pull/2660) ([misl6](https://github.com/misl6))
33+
- Remove six and enum34 dependency [\#2657](https://github.com/kivy/python-for-android/pull/2657) ([misl6](https://github.com/misl6))
34+
- Update supported Python versions [\#2656](https://github.com/kivy/python-for-android/pull/2656) ([misl6](https://github.com/misl6))
35+
- Fixes some E275 - assert is a keyword. [\#2647](https://github.com/kivy/python-for-android/pull/2647) ([misl6](https://github.com/misl6))
36+
- Updates matplotlib, fixes an issue related to shared libc++ [\#2645](https://github.com/kivy/python-for-android/pull/2645) ([misl6](https://github.com/misl6))
37+
- RTSP support for ffmpeg [\#2644](https://github.com/kivy/python-for-android/pull/2644) ([alicakici1234](https://github.com/alicakici1234))
38+
- Fixes TypeError: str.join\(\) takes exactly one argument \(2 given\) in hostpython3/\_\_init\_\_.py", line 69 [\#2642](https://github.com/kivy/python-for-android/pull/2642) ([Furtif](https://github.com/Furtif))
39+
- Resolve absolute path to local recipes [\#2640](https://github.com/kivy/python-for-android/pull/2640) ([dbnicholson](https://github.com/dbnicholson))
40+
- Merges master into develop after release 2022.07.20 [\#2639](https://github.com/kivy/python-for-android/pull/2639) ([misl6](https://github.com/misl6))
41+
- Fix webview Back button behaviour [\#2636](https://github.com/kivy/python-for-android/pull/2636) ([interlark](https://github.com/interlark))
42+
- Add icon-bg and icon-fg to fix\_args [\#2633](https://github.com/kivy/python-for-android/pull/2633) ([danigm](https://github.com/danigm))
43+
- Remove stray - in output file name [\#2581](https://github.com/kivy/python-for-android/pull/2581) ([dbnicholson](https://github.com/dbnicholson))
44+
- Add option for adding files to res/xml without touching manifest [\#2330](https://github.com/kivy/python-for-android/pull/2330) ([rambo](https://github.com/rambo))
45+
346
## [v2022.07.20](https://github.com/kivy/python-for-android/tree/v2022.07.20) (2022-07-20)
447

548
[Full Changelog](https://github.com/kivy/python-for-android/compare/v2022.03.13...v2022.07.20)

‎Dockerfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@
1515
# Use 'docker run' without '--rm' flag for keeping the container and use
1616
# 'docker commit <container hash> <new image>' to extend the original image
1717

18-
FROM ubuntu:20.04
18+
# If platform is not specified, by default the target platform of the build request is used.
19+
# This is not what we want, as Google doesn't provide a linux/arm64 compatible NDK.
20+
# See: https://docs.docker.com/engine/reference/builder/#from
21+
FROM --platform=linux/amd64 ubuntu:20.04
1922

2023
# configure locale
2124
RUN apt -y update -qq > /dev/null \

‎Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,17 @@ docker/run/command: docker/build
106106

107107
docker/run/make/with-artifact/apk/%: docker/build
108108
docker run --name p4a-latest --env-file=.env $(DOCKER_IMAGE) make $*
109-
docker cp p4a-latest:/home/user/app/testapps/on_device_unit_tests/bdist_unit_tests_app-debug-1.1-.apk ./apks
109+
docker cp p4a-latest:/home/user/app/testapps/on_device_unit_tests/bdist_unit_tests_app-debug-1.1.apk ./apks
110110
docker rm -fv p4a-latest
111111

112112
docker/run/make/with-artifact/aar/%: docker/build
113113
docker run --name p4a-latest --env-file=.env $(DOCKER_IMAGE) make $*
114-
docker cp p4a-latest:/home/user/app/testapps/on_device_unit_tests/bdist_unit_tests_app-release-1.1-.aar ./aars
114+
docker cp p4a-latest:/home/user/app/testapps/on_device_unit_tests/bdist_unit_tests_app-release-1.1.aar ./aars
115115
docker rm -fv p4a-latest
116116

117117
docker/run/make/with-artifact/aab/%: docker/build
118118
docker run --name p4a-latest --env-file=.env $(DOCKER_IMAGE) make $*
119-
docker cp p4a-latest:/home/user/app/testapps/on_device_unit_tests/bdist_unit_tests_app-release-1.1-.aab ./aabs
119+
docker cp p4a-latest:/home/user/app/testapps/on_device_unit_tests/bdist_unit_tests_app-release-1.1.aab ./aabs
120120
docker rm -fv p4a-latest
121121

122122
docker/run/make/rebuild_updated_recipes: docker/build

‎pythonforandroid/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '2022.07.20'
1+
__version__ = '2022.09.04'

‎pythonforandroid/bootstraps/common/build/build.py

+14-1
Original file line numberDiff line numberDiff line change
@@ -508,12 +508,20 @@ def make_package(args):
508508
url_scheme = 'kivy'
509509

510510
# Copy backup rules file if specified and update the argument
511+
res_xml_dir = join(res_dir, 'xml')
511512
if args.backup_rules:
512-
res_xml_dir = join(res_dir, 'xml')
513513
ensure_dir(res_xml_dir)
514514
shutil.copy(join(args.private, args.backup_rules), res_xml_dir)
515515
args.backup_rules = split(args.backup_rules)[1][:-4]
516516

517+
# Copy res_xml files to src/main/res/xml
518+
if args.res_xmls:
519+
ensure_dir(res_xml_dir)
520+
for xmlpath in args.res_xmls:
521+
if not os.path.exists(xmlpath):
522+
xmlpath = join(args.private, xmlpath)
523+
shutil.copy(xmlpath, res_xml_dir)
524+
517525
# Render out android manifest:
518526
manifest_path = "src/main/AndroidManifest.xml"
519527
render_args = {
@@ -803,6 +811,8 @@ def parse_args_and_make_package(args=None):
803811
'filename containing xml. The filename should be '
804812
'located relative to the python-for-android '
805813
'directory'))
814+
ap.add_argument('--res_xml', dest='res_xmls', action='append', default=[],
815+
help='Add files to res/xml directory (for example device-filters)', nargs='+')
806816
ap.add_argument('--with-billing', dest='billing_pubkey',
807817
help='If set, the billing service will be added (not implemented)')
808818
ap.add_argument('--add-source', dest='extra_source_dirs', action='append',
@@ -901,6 +911,9 @@ def _read_configuration():
901911
if args.permissions and isinstance(args.permissions[0], list):
902912
args.permissions = [p for perm in args.permissions for p in perm]
903913

914+
if args.res_xmls and isinstance(args.res_xmls[0], list):
915+
args.res_xmls = [x for res in args.res_xmls for x in res]
916+
904917
if args.try_system_python_compile:
905918
# Hardcoding python2.7 is okay for now, as python3 skips the
906919
# compilation anyway

‎pythonforandroid/bootstraps/service_only/build/src/main/java/org/kivy/android/PythonActivity.java

+11-8
Original file line numberDiff line numberDiff line change
@@ -177,19 +177,22 @@ public void loadLibraries() {
177177
new File(getApplicationInfo().nativeLibraryDir));
178178
}
179179

180-
long lastBackClick = SystemClock.elapsedRealtime();
180+
long lastBackClick = 0;
181181
@Override
182182
public boolean onKeyDown(int keyCode, KeyEvent event) {
183-
// If it wasn't the Back key or there's no web page history, bubble up to the default
184-
// system behavior (probably exit the activity)
185-
if (SystemClock.elapsedRealtime() - lastBackClick > 2000){
183+
// Check if the key event was the Back button
184+
if (keyCode == KeyEvent.KEYCODE_BACK) {
185+
// If there's no web page history, bubble up to the default
186+
// system behavior (probably exit the activity)
187+
if (SystemClock.elapsedRealtime() - lastBackClick > 2000){
188+
lastBackClick = SystemClock.elapsedRealtime();
189+
Toast.makeText(this, "Tap again to close the app", Toast.LENGTH_LONG).show();
190+
return true;
191+
}
192+
186193
lastBackClick = SystemClock.elapsedRealtime();
187-
Toast.makeText(this, "Click again to close the app",
188-
Toast.LENGTH_LONG).show();
189-
return true;
190194
}
191195

192-
lastBackClick = SystemClock.elapsedRealtime();
193196
return super.onKeyDown(keyCode, event);
194197
}
195198

‎pythonforandroid/bootstraps/webview/build/src/main/java/org/kivy/android/PythonActivity.java

+20-13
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import android.widget.AbsoluteLayout;
3333
import android.view.ViewGroup.LayoutParams;
3434

35+
import android.webkit.WebBackForwardList;
3536
import android.webkit.WebViewClient;
3637
import android.webkit.WebView;
3738
import android.webkit.CookieManager;
@@ -269,24 +270,30 @@ public static ViewGroup getLayout() {
269270
return mLayout;
270271
}
271272

272-
long lastBackClick = SystemClock.elapsedRealtime();
273+
long lastBackClick = 0;
273274
@Override
274275
public boolean onKeyDown(int keyCode, KeyEvent event) {
275-
// Check if the key event was the Back button and if there's history
276-
if ((keyCode == KeyEvent.KEYCODE_BACK) && mWebView.canGoBack()) {
277-
mWebView.goBack();
278-
return true;
279-
}
280-
// If it wasn't the Back key or there's no web page history, bubble up to the default
281-
// system behavior (probably exit the activity)
282-
if (SystemClock.elapsedRealtime() - lastBackClick > 2000){
276+
// Check if the key event was the Back button
277+
if (keyCode == KeyEvent.KEYCODE_BACK) {
278+
// Go back if there is web page history behind,
279+
// but not to the start preloader
280+
WebBackForwardList webViewBackForwardList = mWebView.copyBackForwardList();
281+
if (webViewBackForwardList.getCurrentIndex() > 1) {
282+
mWebView.goBack();
283+
return true;
284+
}
285+
286+
// If there's no web page history, bubble up to the default
287+
// system behavior (probably exit the activity)
288+
if (SystemClock.elapsedRealtime() - lastBackClick > 2000){
289+
lastBackClick = SystemClock.elapsedRealtime();
290+
Toast.makeText(this, "Tap again to close the app", Toast.LENGTH_LONG).show();
291+
return true;
292+
}
293+
283294
lastBackClick = SystemClock.elapsedRealtime();
284-
Toast.makeText(this, "Click again to close the app",
285-
Toast.LENGTH_LONG).show();
286-
return true;
287295
}
288296

289-
lastBackClick = SystemClock.elapsedRealtime();
290297
return super.onKeyDown(keyCode, event);
291298
}
292299

‎pythonforandroid/bootstraps/webview/build/src/main/res/mipmap-anydpi-v26/.gitkeep

Whitespace-only changes.

‎pythonforandroid/graph.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def get_dependency_tuple_list_for_recipe(recipe, blacklist=None):
4545
"""
4646
if blacklist is None:
4747
blacklist = set()
48-
assert(type(blacklist) == set)
48+
assert type(blacklist) == set
4949
if recipe.depends is None:
5050
dependencies = []
5151
else:

‎pythonforandroid/recipe.py

+3-18
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from os.path import basename, dirname, exists, isdir, isfile, join, realpath, split
22
import glob
33
from shutil import rmtree
4-
from six import with_metaclass
54

65
import hashlib
76
from re import match
@@ -40,7 +39,7 @@ def __new__(cls, name, bases, dct):
4039
return super().__new__(cls, name, bases, dct)
4140

4241

43-
class Recipe(with_metaclass(RecipeMeta)):
42+
class Recipe(metaclass=RecipeMeta):
4443
_url = None
4544
'''The address from which the recipe may be downloaded. This is not
4645
essential, it may be omitted if the source is available some other
@@ -123,8 +122,8 @@ class Recipe(with_metaclass(RecipeMeta)):
123122
"""
124123

125124
need_stl_shared = False
126-
'''Some libraries or python packages may need to be linked with android's
127-
stl. We can automatically do this for any recipe if we set this property to
125+
'''Some libraries or python packages may need the c++_shared in APK.
126+
We can automatically do this for any recipe if we set this property to
128127
`True`'''
129128

130129
stl_lib_name = 'c++_shared'
@@ -492,20 +491,6 @@ def get_recipe_env(self, arch=None, with_flags_in_cc=True):
492491
if arch is None:
493492
arch = self.filtered_archs[0]
494493
env = arch.get_env(with_flags_in_cc=with_flags_in_cc)
495-
496-
if self.need_stl_shared:
497-
env['CPPFLAGS'] = env.get('CPPFLAGS', '')
498-
env['CPPFLAGS'] += ' -I{}'.format(self.ctx.ndk.libcxx_include_dir)
499-
500-
env['CXXFLAGS'] = env['CFLAGS'] + ' -frtti -fexceptions'
501-
502-
if with_flags_in_cc:
503-
env['CXX'] += ' -frtti -fexceptions'
504-
505-
env['LDFLAGS'] += ' -L{}'.format(arch.ndk_lib_dir)
506-
env['LIBS'] = env.get('LIBS', '') + " -l{}".format(
507-
self.stl_lib_name
508-
)
509494
return env
510495

511496
def prebuild_arch(self, arch):

‎pythonforandroid/recipes/cppy/__init__.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33

44
class CppyRecipe(PythonRecipe):
55
site_packages_name = 'cppy'
6-
7-
# Pin to commit: `Nucleic migration and project documentation`,
8-
# because the official releases are too old, at time of writing
9-
version = '4e0b956'
6+
version = '1.1.0'
107
url = 'https://github.com/nucleic/cppy/archive/{version}.zip'
118
call_hostpython_via_targetpython = False
129
# to be detected by the matplotlib install script

‎pythonforandroid/recipes/ffmpeg/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def build_arch(self, arch):
8282
'--enable-parser=aac,ac3,h261,h264,mpegaudio,mpeg4video,mpegvideo,vc1',
8383
'--enable-decoder=aac,h264,mpeg4,mpegvideo',
8484
'--enable-muxer=h264,mov,mp4,mpeg2video',
85-
'--enable-demuxer=aac,h264,m4v,mov,mpegvideo,vc1',
85+
'--enable-demuxer=aac,h264,m4v,mov,mpegvideo,vc1,rtsp',
8686
]
8787

8888
# needed to prevent _ffmpeg.so: version node not found for symbol av_init_packet@LIBAVFORMAT_52
@@ -100,7 +100,7 @@ def build_arch(self, arch):
100100
# other flags:
101101
flags += [
102102
'--enable-filter=aresample,resample,crop,adelay,volume,scale',
103-
'--enable-protocol=file,http,hls',
103+
'--enable-protocol=file,http,hls,udp,tcp',
104104
'--enable-small',
105105
'--enable-hwaccels',
106106
'--enable-pic',

‎pythonforandroid/recipes/hostpython3/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def get_recipe_env(self, arch=None):
6767
openssl_prereq = OpenSSLPrerequisite()
6868
if env.get("PKG_CONFIG_PATH", ""):
6969
env["PKG_CONFIG_PATH"] = os.pathsep.join(
70-
openssl_prereq.pkg_config_location, env["PKG_CONFIG_PATH"]
70+
[openssl_prereq.pkg_config_location, env["PKG_CONFIG_PATH"]]
7171
)
7272
else:
7373
env["PKG_CONFIG_PATH"] = openssl_prereq.pkg_config_location

‎pythonforandroid/recipes/kiwisolver/__init__.py

+1-20
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,9 @@
33

44
class KiwiSolverRecipe(CppCompiledComponentsPythonRecipe):
55
site_packages_name = 'kiwisolver'
6-
# Pin to commit `docs: attempt to fix doc building`, the latest one
7-
# at the time of writing, just to be sure that we have te most up to date
8-
# version, but it should be pinned to an official release once the c++
9-
# changes that we want to include are merged to master branch
10-
# Note: the commit we want to include is
11-
# `Cppy use update and c++11 compatibility` (4858730)
12-
version = '0846189'
6+
version = '1.3.2'
137
url = 'https://github.com/nucleic/kiwi/archive/{version}.zip'
148
depends = ['cppy']
159

16-
def get_recipe_env(self, arch=None, with_flags_in_cc=True):
17-
env = super().get_recipe_env(arch, with_flags_in_cc)
18-
if self.need_stl_shared:
19-
# kiwisolver compile flags does not honor the standard flags:
20-
# `CPPFLAGS` and `LDLIBS`, so we put in `CFLAGS` and `LDFLAGS` to
21-
# correctly link with the `c++_shared` library
22-
env['CFLAGS'] += f' -I{self.ctx.ndk.libcxx_include_dir}'
23-
env['CFLAGS'] += ' -frtti -fexceptions'
24-
25-
env['LDFLAGS'] += f' -L{arch.ndk_lib_dir}'
26-
env['LDFLAGS'] += f' -l{self.stl_lib_name}'
27-
return env
28-
2910

3011
recipe = KiwiSolverRecipe()

‎pythonforandroid/recipes/liblzma/__init__.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@
66
from pythonforandroid.archs import Arch
77
from pythonforandroid.logger import shprint
88
from pythonforandroid.recipe import Recipe
9-
from pythonforandroid.util import current_directory, ensure_dir
9+
from pythonforandroid.util import current_directory
1010

1111

1212
class LibLzmaRecipe(Recipe):
1313

1414
version = '5.2.4'
1515
url = 'https://tukaani.org/xz/xz-{version}.tar.gz'
16-
built_libraries = {'liblzma.so': 'install/lib'}
16+
built_libraries = {'liblzma.so': 'p4a_install/lib'}
1717

1818
def build_arch(self, arch: Arch) -> None:
1919
env = self.get_recipe_env(arch)
20-
install_dir = join(self.get_build_dir(arch.arch), 'install')
20+
install_dir = join(self.get_build_dir(arch.arch), 'p4a_install')
2121
with current_directory(self.get_build_dir(arch.arch)):
2222
if not exists('configure'):
2323
shprint(sh.Command('./autogen.sh'), _env=env)
@@ -42,7 +42,6 @@ def build_arch(self, arch: Arch) -> None:
4242
_env=env
4343
)
4444

45-
ensure_dir('install')
4645
shprint(sh.make, 'install', _env=env)
4746

4847
def get_library_includes(self, arch: Arch) -> str:
@@ -52,7 +51,7 @@ def get_library_includes(self, arch: Arch) -> str:
5251
variable `CPPFLAGS`.
5352
"""
5453
return " -I" + join(
55-
self.get_build_dir(arch.arch), 'install', 'include',
54+
self.get_build_dir(arch.arch), 'p4a_install', 'include',
5655
)
5756

5857
def get_library_ldflags(self, arch: Arch) -> str:

0 commit comments

Comments
 (0)