[Android] Move VLC patches to a vlc3/ subfolder

Romain Vimont git at videolan.org
Thu May 16 18:20:29 CEST 2019


vlc-android | branch: master | Romain Vimont <rom1v at videolabs.io> | Thu May  9 13:41:55 2019 +0200| [f23764ef87976572f66fb6405e0d1a1dd01ac87f] | committer: Geoffrey Métais

Move VLC patches to a vlc3/ subfolder

We will add patches for vlc4, so we need an additional level of
directories.

> https://code.videolan.org/videolan/vlc-android/commit/f23764ef87976572f66fb6405e0d1a1dd01ac87f
---

 compile.sh                                                              | 2 +-
 libvlc/patches/{ => vlc3}/0001-access-add-smb2-module.patch             | 0
 .../{ => vlc3}/0002-compat-Workaround-sendmsg-bug-on-android.patch      | 0
 .../{ => vlc3}/0003-libvlc-events-Add-callbacks-for-record.patch        | 0
 .../{ => vlc3}/0003-network-tls-Handle-errors-from-older-kernels.patch  | 0
 .../0004-access_output-file-Add-error-dialog-for-write-open.patch       | 0
 .../patches/{ => vlc3}/0005-libvlc-media_player-Add-record-method.patch | 0
 7 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/compile.sh b/compile.sh
index f756d3de1..300ba96e0 100755
--- a/compile.sh
+++ b/compile.sh
@@ -243,7 +243,7 @@ if [ ! -d "vlc" ]; then
     diagnostic "VLC source not found, cloning"
     git clone https://git.videolan.org/git/vlc/vlc-3.0.git vlc
     checkfail "vlc source: git clone failed"
-    cd vlc && git am ../libvlc/patches/*.patch && cd ..
+    cd vlc && git am ../libvlc/patches/vlc3/*.patch && cd ..
 fi
 diagnostic "VLC source found"
 cd vlc
diff --git a/libvlc/patches/0001-access-add-smb2-module.patch b/libvlc/patches/vlc3/0001-access-add-smb2-module.patch
similarity index 100%
rename from libvlc/patches/0001-access-add-smb2-module.patch
rename to libvlc/patches/vlc3/0001-access-add-smb2-module.patch
diff --git a/libvlc/patches/0002-compat-Workaround-sendmsg-bug-on-android.patch b/libvlc/patches/vlc3/0002-compat-Workaround-sendmsg-bug-on-android.patch
similarity index 100%
rename from libvlc/patches/0002-compat-Workaround-sendmsg-bug-on-android.patch
rename to libvlc/patches/vlc3/0002-compat-Workaround-sendmsg-bug-on-android.patch
diff --git a/libvlc/patches/0003-libvlc-events-Add-callbacks-for-record.patch b/libvlc/patches/vlc3/0003-libvlc-events-Add-callbacks-for-record.patch
similarity index 100%
rename from libvlc/patches/0003-libvlc-events-Add-callbacks-for-record.patch
rename to libvlc/patches/vlc3/0003-libvlc-events-Add-callbacks-for-record.patch
diff --git a/libvlc/patches/0003-network-tls-Handle-errors-from-older-kernels.patch b/libvlc/patches/vlc3/0003-network-tls-Handle-errors-from-older-kernels.patch
similarity index 100%
rename from libvlc/patches/0003-network-tls-Handle-errors-from-older-kernels.patch
rename to libvlc/patches/vlc3/0003-network-tls-Handle-errors-from-older-kernels.patch
diff --git a/libvlc/patches/0004-access_output-file-Add-error-dialog-for-write-open.patch b/libvlc/patches/vlc3/0004-access_output-file-Add-error-dialog-for-write-open.patch
similarity index 100%
rename from libvlc/patches/0004-access_output-file-Add-error-dialog-for-write-open.patch
rename to libvlc/patches/vlc3/0004-access_output-file-Add-error-dialog-for-write-open.patch
diff --git a/libvlc/patches/0005-libvlc-media_player-Add-record-method.patch b/libvlc/patches/vlc3/0005-libvlc-media_player-Add-record-method.patch
similarity index 100%
rename from libvlc/patches/0005-libvlc-media_player-Add-record-method.patch
rename to libvlc/patches/vlc3/0005-libvlc-media_player-Add-record-method.patch



More information about the Android mailing list