From 62a5e413cc8c52f2a4cff371164fb771e8fdeb09 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Tue, 30 Jul 2024 21:18:34 -0400 Subject: [PATCH 01/19] Create test.txt creating aubio folder --- pythonforandroid/recipes/aubio/test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 pythonforandroid/recipes/aubio/test.txt diff --git a/pythonforandroid/recipes/aubio/test.txt b/pythonforandroid/recipes/aubio/test.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/pythonforandroid/recipes/aubio/test.txt @@ -0,0 +1 @@ + From 6069f27c24700fc4971b75f62dd2cda47aa9f8ee Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Tue, 30 Jul 2024 21:19:20 -0400 Subject: [PATCH 02/19] uploading aubio recipe --- pythonforandroid/recipes/aubio/__init__.py | 50 +++++++++++++++++++ .../recipes/aubio/patches/build_ext.patch | 13 +++++ 2 files changed, 63 insertions(+) create mode 100644 pythonforandroid/recipes/aubio/__init__.py create mode 100644 pythonforandroid/recipes/aubio/patches/build_ext.patch diff --git a/pythonforandroid/recipes/aubio/__init__.py b/pythonforandroid/recipes/aubio/__init__.py new file mode 100644 index 0000000000..f1cbfd946e --- /dev/null +++ b/pythonforandroid/recipes/aubio/__init__.py @@ -0,0 +1,50 @@ +# recipe for aubio package +from pythonforandroid.recipe import CompiledComponentsPythonRecipe, CythonRecipe +from os.path import join + + +class AubioRecipe(CythonRecipe): + version = '0.4.7' + #source_dir = '/home/jk/Downloads/aubio-0.4.7/' + url = 'https://aubio.org/pub/aubio-{version}.tar.bz2' + #url = source_dir + depends = ['numpy'] # Make sure 'samplerate' is included as a dependency + patches =[join('patches', 'build_ext.patch')] + #install_in_hostpython = True + #call_hostpython_via_targetpython = False + + +# def get_recipe_env(self, arch=None, with_flags_in_cc=True): +# env = super().get_recipe_env(arch, with_flags_in_cc=True) +# # Add the WAFOPTS variable to disable specific features +# env['WAFOPTS'] = '--disable-avcodec --disable-samplerate --disable-jack --disable-sndfile' +# env['PKG_CONFIG_PATH'] = '/home/jk/Downloads/aubio-0.4.7/build/' + env.get('PKG_CONFIG_PATH', '') +# env['LD_LIBRARY_PATH'] = '/home/jk/Downloads/aubio-0.4.7/build/src/' +# +## env['CFLAGS'] += ' -I/usr/lib/x86_64-linux-gnu/' +# #env['CFLAGS'] += ' -DHAVE_SAMPLERATE=0' +## env['CC'] += '/home/jk/Downloads/aubio-0.4.7/contrib/toolchain-android-19-arm/bin/arm-linux-androideabi-gcc-4.9' +# return env +## +## def build_arch(self, arch): +## super().build_arch(arch) +## # You may need to perform additional build steps specific to aubio +## # For example: +## # self.run_python('-m pip install --no-deps --force-reinstall --target={} .'.format(self.get_build_dir(arch.arch))) +## +## def install(self): +## super().install() +## # You may need to perform additional installation steps specific to aubio +## # For example: +## # self.run_python('-m pip install --no-deps --force-reinstall --target={} .'.format(self.get_install_dir())) +## +## def get_recipe_depends(self, arch): +## depends = super().get_recipe_depends(arch) +## # You may need to include additional dependencies specific to aubio +## # For example: +## # depends['python3'] = self.ctx.python_recipe +## return depends + + +recipe = AubioRecipe() + diff --git a/pythonforandroid/recipes/aubio/patches/build_ext.patch b/pythonforandroid/recipes/aubio/patches/build_ext.patch new file mode 100644 index 0000000000..fcadb11979 --- /dev/null +++ b/pythonforandroid/recipes/aubio/patches/build_ext.patch @@ -0,0 +1,13 @@ +diff -Naur a/python/lib/moresetuptools.py b/python/lib/moresetuptools.py + +--- a/python/lib/moresetuptools.py 2024-02-01 22:35:52.713443658 -0500 ++++ b/python/lib/moresetuptools.py.bkup 2024-02-02 00:54:22.274822119 -0500 +@@ -179,7 +179,7 @@ + add_local_aubio_lib(extension) + else: + # check for external dependencies +- add_external_deps(extension, usedouble=enable_double) ++ #add_external_deps(extension, usedouble=enable_double) + # force adding libav on windows + if os.name == 'nt' and ('WITH_LIBAV' in os.environ \ + or 'CONDA_PREFIX' in os.environ): From 916af9faf65735db9089fc0317f84b29dfb72a90 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Tue, 30 Jul 2024 21:20:07 -0400 Subject: [PATCH 03/19] Delete pythonforandroid/recipes/aubio/test.txt --- pythonforandroid/recipes/aubio/test.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 pythonforandroid/recipes/aubio/test.txt diff --git a/pythonforandroid/recipes/aubio/test.txt b/pythonforandroid/recipes/aubio/test.txt deleted file mode 100644 index 8b13789179..0000000000 --- a/pythonforandroid/recipes/aubio/test.txt +++ /dev/null @@ -1 +0,0 @@ - From 7721052414fcfe31c71dbc9b026d25653eb728f9 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Tue, 30 Jul 2024 21:23:43 -0400 Subject: [PATCH 04/19] Update __init__.py cleaned up - removed unwanted comments --- pythonforandroid/recipes/aubio/__init__.py | 36 ---------------------- 1 file changed, 36 deletions(-) diff --git a/pythonforandroid/recipes/aubio/__init__.py b/pythonforandroid/recipes/aubio/__init__.py index f1cbfd946e..e1693bf865 100644 --- a/pythonforandroid/recipes/aubio/__init__.py +++ b/pythonforandroid/recipes/aubio/__init__.py @@ -5,45 +5,9 @@ class AubioRecipe(CythonRecipe): version = '0.4.7' - #source_dir = '/home/jk/Downloads/aubio-0.4.7/' url = 'https://aubio.org/pub/aubio-{version}.tar.bz2' - #url = source_dir depends = ['numpy'] # Make sure 'samplerate' is included as a dependency patches =[join('patches', 'build_ext.patch')] - #install_in_hostpython = True - #call_hostpython_via_targetpython = False - - -# def get_recipe_env(self, arch=None, with_flags_in_cc=True): -# env = super().get_recipe_env(arch, with_flags_in_cc=True) -# # Add the WAFOPTS variable to disable specific features -# env['WAFOPTS'] = '--disable-avcodec --disable-samplerate --disable-jack --disable-sndfile' -# env['PKG_CONFIG_PATH'] = '/home/jk/Downloads/aubio-0.4.7/build/' + env.get('PKG_CONFIG_PATH', '') -# env['LD_LIBRARY_PATH'] = '/home/jk/Downloads/aubio-0.4.7/build/src/' -# -## env['CFLAGS'] += ' -I/usr/lib/x86_64-linux-gnu/' -# #env['CFLAGS'] += ' -DHAVE_SAMPLERATE=0' -## env['CC'] += '/home/jk/Downloads/aubio-0.4.7/contrib/toolchain-android-19-arm/bin/arm-linux-androideabi-gcc-4.9' -# return env -## -## def build_arch(self, arch): -## super().build_arch(arch) -## # You may need to perform additional build steps specific to aubio -## # For example: -## # self.run_python('-m pip install --no-deps --force-reinstall --target={} .'.format(self.get_build_dir(arch.arch))) -## -## def install(self): -## super().install() -## # You may need to perform additional installation steps specific to aubio -## # For example: -## # self.run_python('-m pip install --no-deps --force-reinstall --target={} .'.format(self.get_install_dir())) -## -## def get_recipe_depends(self, arch): -## depends = super().get_recipe_depends(arch) -## # You may need to include additional dependencies specific to aubio -## # For example: -## # depends['python3'] = self.ctx.python_recipe -## return depends recipe = AubioRecipe() From 14d8d1b24b8dc2bf99733be528b9e9344a5d80a8 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Wed, 31 Jul 2024 09:02:51 -0400 Subject: [PATCH 05/19] Update __init__.py removed lines at the end of the file. removed os import - unused --- pythonforandroid/recipes/aubio/__init__.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pythonforandroid/recipes/aubio/__init__.py b/pythonforandroid/recipes/aubio/__init__.py index e1693bf865..9296e33181 100644 --- a/pythonforandroid/recipes/aubio/__init__.py +++ b/pythonforandroid/recipes/aubio/__init__.py @@ -1,7 +1,5 @@ # recipe for aubio package from pythonforandroid.recipe import CompiledComponentsPythonRecipe, CythonRecipe -from os.path import join - class AubioRecipe(CythonRecipe): version = '0.4.7' @@ -9,6 +7,4 @@ class AubioRecipe(CythonRecipe): depends = ['numpy'] # Make sure 'samplerate' is included as a dependency patches =[join('patches', 'build_ext.patch')] - recipe = AubioRecipe() - From 42e97044e46127bbc2293c84b0427f29e10d2f5d Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Wed, 31 Jul 2024 09:43:19 -0400 Subject: [PATCH 06/19] Create temp.txt test --- pythonforandroid/recipes/aubio/temp.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 pythonforandroid/recipes/aubio/temp.txt diff --git a/pythonforandroid/recipes/aubio/temp.txt b/pythonforandroid/recipes/aubio/temp.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/pythonforandroid/recipes/aubio/temp.txt @@ -0,0 +1 @@ + From dae206f8cab49d395ec8d061111b84408d5992e7 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Wed, 31 Jul 2024 09:43:36 -0400 Subject: [PATCH 07/19] Delete pythonforandroid/recipes/aubio/__init__.py --- pythonforandroid/recipes/aubio/__init__.py | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 pythonforandroid/recipes/aubio/__init__.py diff --git a/pythonforandroid/recipes/aubio/__init__.py b/pythonforandroid/recipes/aubio/__init__.py deleted file mode 100644 index 9296e33181..0000000000 --- a/pythonforandroid/recipes/aubio/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -# recipe for aubio package -from pythonforandroid.recipe import CompiledComponentsPythonRecipe, CythonRecipe - -class AubioRecipe(CythonRecipe): - version = '0.4.7' - url = 'https://aubio.org/pub/aubio-{version}.tar.bz2' - depends = ['numpy'] # Make sure 'samplerate' is included as a dependency - patches =[join('patches', 'build_ext.patch')] - -recipe = AubioRecipe() From 28fb66919b5f51474ac918047d2af5855b4b721c Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Wed, 31 Jul 2024 09:44:50 -0400 Subject: [PATCH 08/19] Add files via upload reformatted for linting --- pythonforandroid/recipes/aubio/__init__.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 pythonforandroid/recipes/aubio/__init__.py diff --git a/pythonforandroid/recipes/aubio/__init__.py b/pythonforandroid/recipes/aubio/__init__.py new file mode 100644 index 0000000000..4c5543288d --- /dev/null +++ b/pythonforandroid/recipes/aubio/__init__.py @@ -0,0 +1,12 @@ +from pythonforandroid.recipe import CompiledComponentsPythonRecipe, CythonRecipe +from os.path import join + + +class AubioRecipe(CythonRecipe): + version = "0.4.7" + url = "https://aubio.org/pub/aubio-{version}.tar.bz2" + depends = ["numpy"] # Make sure 'samplerate' is included as a dependency + patches = [join("patches", "build_ext.patch")] + + +recipe = AubioRecipe() From e600047797c5b5cbb02582c8595584be5f755751 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Wed, 31 Jul 2024 09:45:25 -0400 Subject: [PATCH 09/19] Delete pythonforandroid/recipes/aubio/temp.txt --- pythonforandroid/recipes/aubio/temp.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 pythonforandroid/recipes/aubio/temp.txt diff --git a/pythonforandroid/recipes/aubio/temp.txt b/pythonforandroid/recipes/aubio/temp.txt deleted file mode 100644 index 8b13789179..0000000000 --- a/pythonforandroid/recipes/aubio/temp.txt +++ /dev/null @@ -1 +0,0 @@ - From f7d37e681c0fdc7272b106c34bd9e0047a97d1bb Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Wed, 31 Jul 2024 11:56:36 -0400 Subject: [PATCH 10/19] Create test.txt --- pythonforandroid/recipes/aubio/test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 pythonforandroid/recipes/aubio/test.txt diff --git a/pythonforandroid/recipes/aubio/test.txt b/pythonforandroid/recipes/aubio/test.txt new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/pythonforandroid/recipes/aubio/test.txt @@ -0,0 +1 @@ + From 9b5f89996b829a78fccf19b23e96b432f8f58fec Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Wed, 31 Jul 2024 11:56:56 -0400 Subject: [PATCH 11/19] Delete pythonforandroid/recipes/aubio/__init__.py --- pythonforandroid/recipes/aubio/__init__.py | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 pythonforandroid/recipes/aubio/__init__.py diff --git a/pythonforandroid/recipes/aubio/__init__.py b/pythonforandroid/recipes/aubio/__init__.py deleted file mode 100644 index 4c5543288d..0000000000 --- a/pythonforandroid/recipes/aubio/__init__.py +++ /dev/null @@ -1,12 +0,0 @@ -from pythonforandroid.recipe import CompiledComponentsPythonRecipe, CythonRecipe -from os.path import join - - -class AubioRecipe(CythonRecipe): - version = "0.4.7" - url = "https://aubio.org/pub/aubio-{version}.tar.bz2" - depends = ["numpy"] # Make sure 'samplerate' is included as a dependency - patches = [join("patches", "build_ext.patch")] - - -recipe = AubioRecipe() From b15feefaa73c8449a2a392fd446bc103c79a7c48 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Wed, 31 Jul 2024 11:57:39 -0400 Subject: [PATCH 12/19] Add files via upload updated the import line as directed by flake8 --- pythonforandroid/recipes/aubio/__init__.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 pythonforandroid/recipes/aubio/__init__.py diff --git a/pythonforandroid/recipes/aubio/__init__.py b/pythonforandroid/recipes/aubio/__init__.py new file mode 100644 index 0000000000..e6cc630d29 --- /dev/null +++ b/pythonforandroid/recipes/aubio/__init__.py @@ -0,0 +1,12 @@ +from pythonforandroid.recipe import CythonRecipe +from os.path import join + + +class AubioRecipe(CythonRecipe): + version = "0.4.7" + url = "https://aubio.org/pub/aubio-{version}.tar.bz2" + depends = ["numpy"] # Make sure 'samplerate' is included as a dependency + patches = [join("patches", "build_ext.patch")] + + +recipe = AubioRecipe() From 2e795466bd5c040645d655f44d76008f271212c0 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Wed, 31 Jul 2024 11:58:08 -0400 Subject: [PATCH 13/19] Delete pythonforandroid/recipes/aubio/test.txt --- pythonforandroid/recipes/aubio/test.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 pythonforandroid/recipes/aubio/test.txt diff --git a/pythonforandroid/recipes/aubio/test.txt b/pythonforandroid/recipes/aubio/test.txt deleted file mode 100644 index 8b13789179..0000000000 --- a/pythonforandroid/recipes/aubio/test.txt +++ /dev/null @@ -1 +0,0 @@ - From dbe6cd36a94b6eac009274c792cec8828be9f922 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Wed, 21 Aug 2024 23:13:51 -0400 Subject: [PATCH 14/19] Update __init__.py --- pythonforandroid/recipes/aubio/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pythonforandroid/recipes/aubio/__init__.py b/pythonforandroid/recipes/aubio/__init__.py index e6cc630d29..aac6ee659e 100644 --- a/pythonforandroid/recipes/aubio/__init__.py +++ b/pythonforandroid/recipes/aubio/__init__.py @@ -1,11 +1,11 @@ -from pythonforandroid.recipe import CythonRecipe +from pythonforandroid.recipe import PyProjectRecipe from os.path import join -class AubioRecipe(CythonRecipe): +class AubioRecipe(PyProjectRecipe): version = "0.4.7" url = "https://aubio.org/pub/aubio-{version}.tar.bz2" - depends = ["numpy"] # Make sure 'samplerate' is included as a dependency + depends = ["numpy", "setuptools"] # Make sure 'samplerate' is included as a dependency patches = [join("patches", "build_ext.patch")] From 8bfc4b300c359ec5cf6110967ef19272a0a5b5e3 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Thu, 22 Aug 2024 21:02:13 -0400 Subject: [PATCH 15/19] Update __init__.py commented out patches, commented out os import, updated version to 0.4.9 --- pythonforandroid/recipes/aubio/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pythonforandroid/recipes/aubio/__init__.py b/pythonforandroid/recipes/aubio/__init__.py index aac6ee659e..d2fb3fd3f2 100644 --- a/pythonforandroid/recipes/aubio/__init__.py +++ b/pythonforandroid/recipes/aubio/__init__.py @@ -1,12 +1,12 @@ from pythonforandroid.recipe import PyProjectRecipe -from os.path import join +#from os.path import join class AubioRecipe(PyProjectRecipe): - version = "0.4.7" + version = "0.4.9" url = "https://aubio.org/pub/aubio-{version}.tar.bz2" depends = ["numpy", "setuptools"] # Make sure 'samplerate' is included as a dependency - patches = [join("patches", "build_ext.patch")] + #patches = [join("patches", "build_ext.patch")] recipe = AubioRecipe() From eebcd7427561619fcbd2d8ae3dc7d65064945a59 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Thu, 22 Aug 2024 21:05:15 -0400 Subject: [PATCH 16/19] Update __init__.py --- pythonforandroid/recipes/aubio/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pythonforandroid/recipes/aubio/__init__.py b/pythonforandroid/recipes/aubio/__init__.py index d2fb3fd3f2..4961ff50f2 100644 --- a/pythonforandroid/recipes/aubio/__init__.py +++ b/pythonforandroid/recipes/aubio/__init__.py @@ -1,12 +1,10 @@ from pythonforandroid.recipe import PyProjectRecipe -#from os.path import join class AubioRecipe(PyProjectRecipe): version = "0.4.9" url = "https://aubio.org/pub/aubio-{version}.tar.bz2" - depends = ["numpy", "setuptools"] # Make sure 'samplerate' is included as a dependency - #patches = [join("patches", "build_ext.patch")] - + depends = ["numpy", "setuptools"] + recipe = AubioRecipe() From b2bcc6670433385f20e5e548b36a34d4599b6683 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Thu, 22 Aug 2024 21:10:37 -0400 Subject: [PATCH 17/19] Update __init__.py flaked --- pythonforandroid/recipes/aubio/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pythonforandroid/recipes/aubio/__init__.py b/pythonforandroid/recipes/aubio/__init__.py index 4961ff50f2..7df0aeae1b 100644 --- a/pythonforandroid/recipes/aubio/__init__.py +++ b/pythonforandroid/recipes/aubio/__init__.py @@ -4,7 +4,7 @@ class AubioRecipe(PyProjectRecipe): version = "0.4.9" url = "https://aubio.org/pub/aubio-{version}.tar.bz2" - depends = ["numpy", "setuptools"] - + depends = ["numpy", "setuptools"] + recipe = AubioRecipe() From 400041e789156e4edda111fc52a7c51b8a4e4941 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Sat, 24 Aug 2024 20:48:10 -0400 Subject: [PATCH 18/19] Update __init__.py added a doc string to indicate the errors on macos --- pythonforandroid/recipes/aubio/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pythonforandroid/recipes/aubio/__init__.py b/pythonforandroid/recipes/aubio/__init__.py index 7df0aeae1b..241a92a23b 100644 --- a/pythonforandroid/recipes/aubio/__init__.py +++ b/pythonforandroid/recipes/aubio/__init__.py @@ -1,3 +1,11 @@ +""" +Aubio recipe. +Note that this hasn't been ported to cross compile from macOS yet, +the error on 0.4.9 was: src/aubio_priv.h:95:10: +fatal error: 'Accelerate/Accelerate.h' file not found +#include +""" + from pythonforandroid.recipe import PyProjectRecipe From 1c92f23b13c7a3ced831d1fcfcdd1eff25fc43d8 Mon Sep 17 00:00:00 2001 From: Jithesh Kuyyalil Date: Sat, 24 Aug 2024 20:48:53 -0400 Subject: [PATCH 19/19] Delete pythonforandroid/recipes/aubio/patches directory --- .../recipes/aubio/patches/build_ext.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 pythonforandroid/recipes/aubio/patches/build_ext.patch diff --git a/pythonforandroid/recipes/aubio/patches/build_ext.patch b/pythonforandroid/recipes/aubio/patches/build_ext.patch deleted file mode 100644 index fcadb11979..0000000000 --- a/pythonforandroid/recipes/aubio/patches/build_ext.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur a/python/lib/moresetuptools.py b/python/lib/moresetuptools.py - ---- a/python/lib/moresetuptools.py 2024-02-01 22:35:52.713443658 -0500 -+++ b/python/lib/moresetuptools.py.bkup 2024-02-02 00:54:22.274822119 -0500 -@@ -179,7 +179,7 @@ - add_local_aubio_lib(extension) - else: - # check for external dependencies -- add_external_deps(extension, usedouble=enable_double) -+ #add_external_deps(extension, usedouble=enable_double) - # force adding libav on windows - if os.name == 'nt' and ('WITH_LIBAV' in os.environ \ - or 'CONDA_PREFIX' in os.environ):