[Android] Add Message-Id header to VLC4 patches

Romain Vimont git at videolan.org
Wed Oct 30 20:31:58 CET 2019


vlc-android | branch: master | Romain Vimont <rom1v at videolabs.io> | Wed Oct 16 16:43:04 2019 +0200| [c08dbb934a34a9a9e2de14e159c7733c6ecae3b5] | committer: Romain Vimont

Add Message-Id header to VLC4 patches

The compile.sh script uses this id to check whether a patch is already
applied.

Ref commit d948cb1a4e838030a7dfa47560bc85295586175e.

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

 .../0001-compat-Workaround-sendmsg-bug-on-android.patch     | 13 +++++++------
 .../0002-network-tls-Handle-errors-from-older-kernels.patch |  9 ++++++---
 ...access_output-file-Add-error-dialog-for-write-open.patch |  9 ++++++---
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/libvlc/patches/vlc4/0001-compat-Workaround-sendmsg-bug-on-android.patch b/libvlc/patches/vlc4/0001-compat-Workaround-sendmsg-bug-on-android.patch
index b9eead88f..ca86c5fcb 100644
--- a/libvlc/patches/vlc4/0001-compat-Workaround-sendmsg-bug-on-android.patch
+++ b/libvlc/patches/vlc4/0001-compat-Workaround-sendmsg-bug-on-android.patch
@@ -1,7 +1,8 @@
-From 5b79f2cf244f0c144ed5b00ebd96db71e3b2efef Mon Sep 17 00:00:00 2001
+From dfab4e10f396671cfa1c48a9ab0b9f4443946321 Mon Sep 17 00:00:00 2001
+Message-Id: <dfab4e10f396671cfa1c48a9ab0b9f4443946321.1571236616.git.rom at rom1v.com>
 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
 Date: Thu, 28 Mar 2019 15:23:48 +0100
-Subject: [PATCH 1/5] compat: Workaround sendmsg bug on android
+Subject: [PATCH 1/3] compat: Workaround sendmsg bug on android
 
 This only happens on 64bits builds, see compat/sendmsg.c comments
 ---
@@ -46,10 +47,10 @@ index 0b08ce0942..2ef542eb7b 100644
  #else
  #error sendmsg not implemented on your platform!
 diff --git a/configure.ac b/configure.ac
-index a86a9f8897..fa0375d1ae 100644
+index 210b4ca537..3d72781883 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -401,6 +401,9 @@ AS_IF([test "$SYS" = linux],[
+@@ -415,6 +415,9 @@ AS_IF([test "$SYS" = linux],[
      ],[
        HAVE_ANDROID="1"
        AC_MSG_RESULT([yes])
@@ -60,7 +61,7 @@ index a86a9f8897..fa0375d1ae 100644
        AC_MSG_RESULT([no])
      ])
 diff --git a/include/vlc_network.h b/include/vlc_network.h
-index b4d5fabdd6..7b05183ab7 100644
+index 88dcfefbca..17cdca6198 100644
 --- a/include/vlc_network.h
 +++ b/include/vlc_network.h
 @@ -296,6 +296,12 @@ static inline int net_GetPeerAddress( int fd, char *address, int *port )
@@ -77,5 +78,5 @@ index b4d5fabdd6..7b05183ab7 100644
  }
  # endif
 -- 
-2.20.1
+2.23.0
 
diff --git a/libvlc/patches/vlc4/0002-network-tls-Handle-errors-from-older-kernels.patch b/libvlc/patches/vlc4/0002-network-tls-Handle-errors-from-older-kernels.patch
index fe00615ae..112cc7ef0 100644
--- a/libvlc/patches/vlc4/0002-network-tls-Handle-errors-from-older-kernels.patch
+++ b/libvlc/patches/vlc4/0002-network-tls-Handle-errors-from-older-kernels.patch
@@ -1,7 +1,10 @@
-From 57d2653f9c5dc92b6ca6bbf40523479833ebfd76 Mon Sep 17 00:00:00 2001
+From 1ac1a72efed635e5d6c59db61e056cef08756ed1 Mon Sep 17 00:00:00 2001
+Message-Id: <1ac1a72efed635e5d6c59db61e056cef08756ed1.1571236616.git.rom at rom1v.com>
+In-Reply-To: <dfab4e10f396671cfa1c48a9ab0b9f4443946321.1571236616.git.rom at rom1v.com>
+References: <dfab4e10f396671cfa1c48a9ab0b9f4443946321.1571236616.git.rom at rom1v.com>
 From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
 Date: Fri, 29 Mar 2019 10:56:26 +0100
-Subject: [PATCH 2/5] network: tls: Handle errors from older kernels
+Subject: [PATCH 2/3] network: tls: Handle errors from older kernels
 
 If MSG_FASTOPEN is defined, but turns out to be unimplemented by the
 underlying kernel (as is the case on android where the NDK claims to
@@ -35,5 +38,5 @@ index 5a24bd7134..0b9b1573d7 100644
  #endif
  
 -- 
-2.20.1
+2.23.0
 
diff --git a/libvlc/patches/vlc4/0003-access_output-file-Add-error-dialog-for-write-open.patch b/libvlc/patches/vlc4/0003-access_output-file-Add-error-dialog-for-write-open.patch
index 7cf4db26e..f1f2c3e03 100644
--- a/libvlc/patches/vlc4/0003-access_output-file-Add-error-dialog-for-write-open.patch
+++ b/libvlc/patches/vlc4/0003-access_output-file-Add-error-dialog-for-write-open.patch
@@ -1,7 +1,10 @@
-From 6a8b6462c17a9268df7976c55749268203b63431 Mon Sep 17 00:00:00 2001
+From cba62e75c2be117abfdeea091f030ff7e252bfec Mon Sep 17 00:00:00 2001
+Message-Id: <cba62e75c2be117abfdeea091f030ff7e252bfec.1571236616.git.rom at rom1v.com>
+In-Reply-To: <dfab4e10f396671cfa1c48a9ab0b9f4443946321.1571236616.git.rom at rom1v.com>
+References: <dfab4e10f396671cfa1c48a9ab0b9f4443946321.1571236616.git.rom at rom1v.com>
 From: Soomin Lee <bubu at mikan.io>
 Date: Mon, 1 Oct 2018 15:37:57 +0200
-Subject: [PATCH 3/5] access_output: file: Add error dialog for write/open
+Subject: [PATCH 3/3] access_output: file: Add error dialog for write/open
 
 ---
  modules/access_output/file.c | 8 ++++++++
@@ -36,5 +39,5 @@ index c983e3a8f0..8a690fc41f 100644
                  break;
              flags &= ~O_EXCL;
 -- 
-2.20.1
+2.23.0
 



More information about the Android mailing list