diff --git a/scripts/build-ffmpeg.py b/scripts/build-ffmpeg.py index 8d8c6afd..0ffae428 100644 --- a/scripts/build-ffmpeg.py +++ b/scripts/build-ffmpeg.py @@ -71,7 +71,6 @@ def calculate_sha256(filename: str) -> str: source_url="https://storage.googleapis.com/aom-releases/libaom-3.11.0.tar.gz", sha256="cf7d103d2798e512aca9c6e7353d7ebf8967ee96fffe9946e015bb9947903e3e", requires=["cmake"], - source_strip_components=1, build_system="cmake", build_arguments=[ "-DENABLE_DOCS=0", @@ -90,8 +89,8 @@ def calculate_sha256(filename: str) -> str: ), Package( name="libsvtav1", - source_url="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v3.0.1/SVT-AV1-v3.0.1.tar.bz2", - sha256="f1d1ad8db551cd84ab52ae579b0e5086d8a0b7e47aea440e75907242a51b4cb9", + source_url="https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v3.1.0/SVT-AV1-v3.1.0.tar.bz2", + sha256="8231b63ea6c50bae46a019908786ebfa2696e5743487270538f3c25fddfa215a", build_system="cmake", ), Package( diff --git a/scripts/cibuildpkg.py b/scripts/cibuildpkg.py index dbaf4a80..6750dafa 100644 --- a/scripts/cibuildpkg.py +++ b/scripts/cibuildpkg.py @@ -134,7 +134,6 @@ class Package: requires: list[str] = field(default_factory=list) source_dir: str = "" source_filename: str = "" - source_strip_components: int = 1 when: When = When.always def __lt__(self, other): @@ -424,10 +423,6 @@ def _build_x265(self, package: Package, for_builder: bool) -> None: self._build_with_cmake(package=package, for_builder=for_builder) def _extract(self, package: Package) -> None: - assert package.source_strip_components in ( - 0, - 1, - ), "source_strip_components must be 0 or 1" path = os.path.join(self.build_dir, package.name) patch = os.path.join(self.patch_dir, package.name + ".patch") tarball = os.path.join( @@ -440,16 +435,13 @@ def _extract(self, package: Package) -> None: with tarfile.open(tarball) as tar: # determine common prefix to strip - if package.source_strip_components: - prefixes = set() - for name in tar.getnames(): - prefixes.add(name.split("/")[0]) - assert len(prefixes) == 1, ( - "cannot strip path components, multiple prefixes found" - ) - prefix = list(prefixes)[0] - else: - prefix = "" + prefixes = set() + for name in tar.getnames(): + prefixes.add(name.split("/")[0]) + assert len(prefixes) == 1, ( + "cannot strip path components, multiple prefixes found" + ) + prefix = list(prefixes)[0] # extract archive with tempfile.TemporaryDirectory(dir=self.build_dir) as temp_dir: