Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit c3897f4

Browse filesBrowse files
committed
Fix soxr on arm64
1 parent 3ac5fad commit c3897f4
Copy full SHA for c3897f4

File tree

Expand file treeCollapse file tree

2 files changed

+12
-6
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+12
-6
lines changed

‎build-ffmpeg

Copy file name to clipboardExpand all lines: build-ffmpeg
+5-1Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
PROGNAME=$(basename "$0")
77
FFMPEG_VERSION=4.4
8-
SCRIPT_VERSION=1.33rc2
8+
SCRIPT_VERSION=1.33rc3
99
CWD=$(pwd)
1010
PACKAGES="$CWD/packages"
1111
WORKSPACE="$CWD/workspace"
@@ -1083,6 +1083,10 @@ if $SHARED_LIBRARIES; then
10831083
download "http://ftp.debian.org/debian/pool/main/libs/libsoxr/libsoxr_0.1.3.orig.tar.xz" "soxr-0.1.3.tar.xz"
10841084
make_dir build
10851085
cd build || exit
1086+
if [[ "$OSTYPE" == "darwin"* ]]; then
1087+
download "https://raw.githubusercontent.com/macports/macports-ports/master/audio/soxr/files/patch-pffft.c.diff" "patch-pffft.c.diff"
1088+
execute patch "${PACKAGES}/soxr-0.1.3/src/pffft.c" ${PACKAGES}/patch-pffft.c.diff""
1089+
fi
10861090
execute cmake .. -DWITH_OPENMP:BOOL=OFF -Wno-dev -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS:BOOL=ON
10871091
execute make -j $MJOBS
10881092
execute make install

‎descript/build-ffmpeg-descript.py

Copy file name to clipboardExpand all lines: descript/build-ffmpeg-descript.py
+7-5Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -447,13 +447,15 @@ def main():
447447
log('=======================')
448448

449449
# bundle up the third-party source
450-
# grab each .tar.* from the packages folder
450+
# grab each .tar.* and any downloaded patches from the packages folder
451451
packages_zip_name = base_artifact_name + '-packages.zip'
452452
with zipfile.ZipFile(os.path.join(output_dir, packages_zip_name), 'w', zipfile.ZIP_DEFLATED) as myzip:
453-
archives = pathlib.Path(packages_dir + '/').glob('*.tar.*')
454-
for archive in sorted(archives, key=lambda s: str(s).lower()):
455-
log(os.path.join('packages', archive.name))
456-
myzip.write(str(archive.absolute()), archive.name)
453+
types = ['*.tar.*', '*.patch', '*.diff']
454+
for file_type in types:
455+
archives = pathlib.Path(packages_dir + '/').glob(file_type)
456+
for archive in sorted(archives, key=lambda s: str(s).lower()):
457+
log(os.path.join('packages', archive.name))
458+
myzip.write(str(archive.absolute()), archive.name)
457459

458460
log('\nArchiving libraries')
459461
log('=======================')

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.