Fix patch files

introlab · Jul 10, 2024 · 9621d3f · 9621d3f
1 parent 4e92082
commit 9621d3f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 22 deletions.
diff --git a/patches/libvpx_linux_arm64-highbd_vp9_rtcd.h.patch b/patches/libvpx_linux_arm64-highbd_vp9_rtcd.h.patch
@@ -1,7 +1,3 @@
-diff --git a/libvpx/source/config/linux/arm64-highbd/vp9_rtcd.h b/libvpx/source/config/linux/arm64-highbd/vp9_rtcd.h
-index 53900f30360..a5c0c263753 100644
---- a/libvpx/source/config/linux/arm64-highbd/vp9_rtcd.h
-+++ b/libvpx/source/config/linux/arm64-highbd/vp9_rtcd.h
 @@ -41,10 +41,6 @@ int64_t vp9_block_error_neon(const tran_low_t* coeff,
                               const tran_low_t* dqcoeff,
                               intptr_t block_size,
@@ -25,7 +21,7 @@ index 53900f30360..a5c0c263753 100644
                                            int block_size);
 @@ -395,13 +388,7 @@ static void setup_rtcd_internal(void) {
    (void)flags;
- 
+
    vp9_block_error = vp9_block_error_neon;
 -  if (flags & HAS_SVE) {
 -    vp9_block_error = vp9_block_error_sve;
@@ -36,4 +32,4 @@ index 53900f30360..a5c0c263753 100644
 -  }
  }
  #endif
- 
+
diff --git a/patches/libvpx_linux_arm64-highbd_vpx_dsp_rtcd.h.patch b/patches/libvpx_linux_arm64-highbd_vpx_dsp_rtcd.h.patch
@@ -1,7 +1,3 @@
-diff --git a/libvpx/source/config/linux/arm64-highbd/vpx_dsp_rtcd.h b/libvpx/source/config/linux/arm64-highbd/vpx_dsp_rtcd.h
-index 9d8ba2f6a46..606905b9067 100644
---- a/libvpx/source/config/linux/arm64-highbd/vpx_dsp_rtcd.h
-+++ b/libvpx/source/config/linux/arm64-highbd/vpx_dsp_rtcd.h
 @@ -1032,12 +1032,6 @@ void vpx_highbd_10_get16x16var_neon(const uint8_t* src_ptr,
                                      int ref_stride,
                                      unsigned int* sse,
@@ -758,7 +754,7 @@ index 9d8ba2f6a46..606905b9067 100644
                                                ptrdiff_t src_stride,
                                                uint16_t* dst,
 @@ -8010,7 +7668,6 @@ void vpx_subtract_block_neon(int rows,
- 
+
  uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size);
  uint64_t vpx_sum_squares_2d_i16_neon(const int16_t* src, int stride, int size);
 -uint64_t vpx_sum_squares_2d_i16_sve(const int16_t* src, int stride, int size);

diff --git a/patches/libvpx_linux_arm64_vp9_rtcd.h.patch b/patches/libvpx_linux_arm64_vp9_rtcd.h.patch
@@ -1,7 +1,3 @@
-diff --git a/libvpx/source/config/linux/arm64/vp9_rtcd.h b/libvpx/source/config/linux/arm64/vp9_rtcd.h
-index d9c47bef7fd..32f641648bc 100644
---- a/libvpx/source/config/linux/arm64/vp9_rtcd.h
-+++ b/libvpx/source/config/linux/arm64/vp9_rtcd.h
 @@ -41,10 +41,6 @@ int64_t vp9_block_error_neon(const tran_low_t* coeff,
                               const tran_low_t* dqcoeff,
                               intptr_t block_size,
@@ -25,7 +21,7 @@ index d9c47bef7fd..32f641648bc 100644
                                            int block_size);
 @@ -240,13 +233,7 @@ static void setup_rtcd_internal(void) {
    (void)flags;
- 
+
    vp9_block_error = vp9_block_error_neon;
 -  if (flags & HAS_SVE) {
 -    vp9_block_error = vp9_block_error_sve;
@@ -36,4 +32,4 @@ index d9c47bef7fd..32f641648bc 100644
 -  }
  }
  #endif
- 
+
diff --git a/patches/libvpx_linux_arm64_vpx_dsp_rtcd.h.patch b/patches/libvpx_linux_arm64_vpx_dsp_rtcd.h.patch
@@ -1,9 +1,5 @@
-diff --git a/libvpx/source/config/linux/arm64/vpx_dsp_rtcd.h b/libvpx/source/config/linux/arm64/vpx_dsp_rtcd.h
-index 0e5bfd955c8..7bcc7b5f717 100644
---- a/libvpx/source/config/linux/arm64/vpx_dsp_rtcd.h
-+++ b/libvpx/source/config/linux/arm64/vpx_dsp_rtcd.h
 @@ -3106,7 +3106,6 @@ void vpx_subtract_block_neon(int rows,
- 
+
  uint64_t vpx_sum_squares_2d_i16_c(const int16_t* src, int stride, int size);
  uint64_t vpx_sum_squares_2d_i16_neon(const int16_t* src, int stride, int size);
 -uint64_t vpx_sum_squares_2d_i16_sve(const int16_t* src, int stride, int size);