Skip to content

Commit 3ab7df8

Browse files
committed
use PATCH_DIR specify patch dir
1 parent dc051f1 commit 3ab7df8

File tree

6 files changed

+8
-2
lines changed

6 files changed

+8
-2
lines changed

configs/libs/bluray.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export GIT_COMMIT=1.3.4
3030
export GIT_WITH_SUBMODULE=1
3131
export REPO_DIR=bluray
3232
export GIT_REPO_VERSION=1.3.4
33+
export PATCH_DIR=bluray
3334

3435
# you can export GIT_BLURAY_UPSTREAM=git@xx:yy/libbluray.git use your mirror
3536
if [[ "$GIT_BLURAY_UPSTREAM" != "" ]] ;then

configs/libs/smb2.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export GIT_LOCAL_REPO=extra/smb2
3030
export GIT_COMMIT=libsmb2-6.2
3131
export REPO_DIR=smb2
3232
export GIT_REPO_VERSION=6.2
33+
export PATCH_DIR=smb2-6.2
3334

3435
# you can export GIT_SMB2_UPSTREAM=git@xx:yy/libsmb2.git use your mirror
3536
if [[ "$GIT_SMB2_UPSTREAM" != "" ]] ;then

configs/libs/soundtouch.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export GIT_LOCAL_REPO=extra/soundtouch
3030
export REPO_DIR=soundtouch
3131
export GIT_COMMIT=2.3.3
3232
export GIT_REPO_VERSION=2.3.3
33+
export PATCH_DIR=soundtouch
3334

3435
# you can export GIT_SOUNDTOUCH_UPSTREAM=git@xx:yy/soundtouch.git use your mirror
3536
if [[ "$GIT_SOUNDTOUCH_UPSTREAM" != "" ]] ;then

configs/libs/uavs3d.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export GIT_LOCAL_REPO=extra/uavs3d
2828
export GIT_COMMIT=1fd0491
2929
export REPO_DIR=uavs3d
3030
export GIT_REPO_VERSION=1.2.1
31+
export PATCH_DIR=uavs3d
3132

3233
# you can export GIT_UAVS3D_UPSTREAM=git@xx:yy/UAVS3D.git use your mirror
3334
if [[ "$GIT_UAVS3D_UPSTREAM" != "" ]] ;then

configs/libs/yuv.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ export GIT_LOCAL_REPO=extra/yuv
2525
export GIT_COMMIT=eb6e7bb
2626
export REPO_DIR=yuv
2727
export GIT_REPO_VERSION=stable-eb6e7bb
28+
export PATCH_DIR=yuv
2829

2930
# you can export GIT_YUV_UPSTREAM=git@xx:yy/yuv.git use your mirror
3031
if [[ "$GIT_YUV_UPSTREAM" != "" ]] ;then

do-init/init-repo.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,18 @@ function pull_common() {
6666
}
6767

6868
function apply_patches() {
69-
if [[ "$SKIP_FFMPEG_PATHCHES" && $REPO_DIR == 'ffmpeg' ]]; then
69+
if [[ "$SKIP_FFMPEG_PATHCHES" && $LIB_NAME == ffmpeg* ]]; then
7070
echo "⚠️ skip apply $REPO_DIR patches,because you set SKIP_FFMPEG_PATHCHES env."
7171
return
7272
fi
7373

7474
local plat="$MR_PLAT"
75-
local patch_dir="${THIS_DIR}/../patches/$REPO_DIR"
75+
local patch_dir="${THIS_DIR}/../patches/$PATCH_DIR"
7676

7777
if [[ -d "${patch_dir}_${plat}" ]]; then
7878
patch_dir="${patch_dir}_${plat}"
7979
fi
80+
8081
if [[ -d "$patch_dir" ]]; then
8182
echo
8283
echo "== Applying patches: $(basename $patch_dir)$(basename $PWD) =="

0 commit comments

Comments
 (0)