File tree Expand file tree Collapse file tree 2 files changed +12
-6
lines changed
Filter options
Expand file tree Collapse file tree 2 files changed +12
-6
lines changed
Original file line number Diff line number Diff line change 5
5
6
6
PROGNAME=$( basename " $0 " )
7
7
FFMPEG_VERSION=4.4
8
- SCRIPT_VERSION=1.33rc2
8
+ SCRIPT_VERSION=1.33rc3
9
9
CWD=$( pwd)
10
10
PACKAGES=" $CWD /packages"
11
11
WORKSPACE=" $CWD /workspace"
@@ -1083,6 +1083,10 @@ if $SHARED_LIBRARIES; then
1083
1083
download " http://ftp.debian.org/debian/pool/main/libs/libsoxr/libsoxr_0.1.3.orig.tar.xz" " soxr-0.1.3.tar.xz"
1084
1084
make_dir build
1085
1085
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
1086
1090
execute cmake .. -DWITH_OPENMP:BOOL=OFF -Wno-dev -DCMAKE_INSTALL_PREFIX=" ${WORKSPACE} " -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS:BOOL=ON
1087
1091
execute make -j $MJOBS
1088
1092
execute make install
Original file line number Diff line number Diff line change @@ -447,13 +447,15 @@ def main():
447
447
log ('=======================' )
448
448
449
449
# 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
451
451
packages_zip_name = base_artifact_name + '-packages.zip'
452
452
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 )
457
459
458
460
log ('\n Archiving libraries' )
459
461
log ('=======================' )
You can’t perform that action at this time.
0 commit comments