Merge pull request kivy#3302 from kivy/pyav

`pyav`: update to `17.0.0`

Author: AndreMiras

pythonforandroid/recipes/av/__init__.py

@@ -1,25 +1,21 @@
 from pythonforandroid.toolchain import Recipe
-from pythonforandroid.recipe import CythonRecipe
+from pythonforandroid.recipe import PyProjectRecipe
 
 
-class PyAVRecipe(CythonRecipe):
+class PyAVRecipe(PyProjectRecipe):
 
     name = "av"
-    version = "13.1.0"
+    version = "17.0.0"
     url = "https://github.com/PyAV-Org/PyAV/archive/v{version}.zip"
-
-    depends = ["python3", "cython", "ffmpeg", "av_codecs"]
-    opt_depends = ["openssl"]
-    patches = ['patches/compilation_syntax_errors.patch']
+    patches = ["libs.patch"]
+    depends = ["python3", "ffmpeg", "av_codecs", "openssl"]
+    hostpython_prerequisites = ["cython>=3.1.0"]
 
     def get_recipe_env(self, arch, with_flags_in_cc=True):
         env = super().get_recipe_env(arch)
-
-        build_dir = Recipe.get_recipe("ffmpeg", self.ctx).get_build_dir(
-            arch.arch
-        )
-        self.setup_extra_args = ["--ffmpeg-dir={}".format(build_dir)]
-
+        build_dir = Recipe.get_recipe("ffmpeg", self.ctx).get_build_dir(arch.arch)
+        env["CFLAGS"] += f" -I{build_dir}"
+        self.extra_build_args += ["--config-setting=--ffmpeg-dir={}".format(build_dir)]
         return env
 
 

pythonforandroid/recipes/av/libs.patch

@@ -0,0 +1,38 @@
+diff '--color=auto' -uNr PyAV-17.0.0/setup.py PyAV-17.0.0.mod/setup.py
+--- PyAV-17.0.0/setup.py	2026-03-14 19:42:41.000000000 +0530
++++ PyAV-17.0.0.mod/setup.py	2026-05-22 08:21:47.438004827 +0530
+@@ -79,20 +79,21 @@
+     """
+     Get distutils-compatible extension arguments using pkg-config.
+     """
+-    pkg_config = os.environ.get("PKG_CONFIG", "pkg-config")
+-    try:
+-        raw_cflags = subprocess.check_output(
+-            [pkg_config, "--cflags", "--libs"]
+-            + ["lib" + name for name in FFMPEG_LIBRARIES]
+-        )
+-    except FileNotFoundError:
+-        print(f"{pkg_config} is required for building PyAV")
+-        exit(1)
+-    except subprocess.CalledProcessError:
+-        print(f"{pkg_config} could not find libraries {FFMPEG_LIBRARIES}")
+-        exit(1)
++    # pkg_config = os.environ.get("PKG_CONFIG", "pkg-config")
++    # try:
++    #     raw_cflags = subprocess.check_output(
++    #         [pkg_config, "--cflags", "--libs"]
++    #         + ["lib" + name for name in FFMPEG_LIBRARIES]
++    #     )
++    # except FileNotFoundError:
++    #     print(f"{pkg_config} is required for building PyAV")
++    #     exit(1)
++    # except subprocess.CalledProcessError:
++    #     print(f"{pkg_config} could not find libraries {FFMPEG_LIBRARIES}")
++    #     exit(1)
+ 
+-    known, unknown = parse_cflags(raw_cflags.decode("utf-8"))
++    raw_cflags = "-lavdevice -lavfilter -lavformat -lavcodec -lswscale -lswresample -lavutil"
++    known, unknown = parse_cflags(raw_cflags)
+     if unknown:
+         print("pkg-config returned flags we don't understand: {}".format(unknown))
+         if "-pthread" in unknown:

pythonforandroid/recipes/av/patches/compilation_syntax_errors.patch

@@ -9,7 +9,7 @@
 class LibShineRecipe(Recipe):
     version = 'c72aba9031bde18a0995e7c01c9b53f2e08a0e46'
     url = 'https://github.com/toots/shine/archive/{version}.zip'
-
+    patches = ["fixbuild.patch"]
     built_libraries = {'libshine.so': 'lib'}
 
     def get_recipe_env(self, arch=None, with_flags_in_cc=True):

pythonforandroid/recipes/libshine/__init__.py

@@ -0,0 +1,12 @@
+diff '--color=auto' -uNr shine-c72aba9031bde18a0995e7c01c9b53f2e08a0e46/src/lib/l3mdct.h shine-c72aba9031bde18a0995e7c01c9b53f2e08a0e46.mod/src/lib/l3mdct.h
+--- shine-c72aba9031bde18a0995e7c01c9b53f2e08a0e46/src/lib/l3mdct.h	2017-08-01 19:14:17.000000000 +0530
++++ shine-c72aba9031bde18a0995e7c01c9b53f2e08a0e46.mod/src/lib/l3mdct.h	2026-05-22 08:30:59.625697302 +0530
+@@ -1,7 +1,7 @@
+ #ifndef shine_MDCT_H
+ #define shine_MDCT_H
+ 
+-void shine_mdct_initialise();
++void shine_mdct_initialise(shine_global_config *config);
+ void shine_mdct_sub(shine_global_config *config, int stride);
+ 
+ #endif