Updated to version 1.3

3 files changed, 8 insertions, 292 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3ee88c5dfb8..1ffbc0ab76df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xavs2
 	pkgdesc = Open-Source encoder of AVS2-P2/IEEE1857.4 video coding standard
-	pkgver = 1.2
-	pkgrel = 4
+	pkgver = 1.3
+	pkgrel = 1
 	url = https://github.com/pkuvcl/xavs2/
 	arch = i686
 	arch = x86_64
@@ -13,10 +13,8 @@ pkgbase = xavs2
 	provides = libxavs2
 	conflicts = libxavs2
 	replaces = libxavs2
-	source = xavs2-1.2.tar.gz::https://github.com/pkuvcl/xavs2/archive/1.2.tar.gz
-	source = xavs2-1.2-gcc8-fix.patch
-	sha256sums = 8b985aeb4d5f60b5d8bc9a5e3897f2f4c5ed6546d48f06f87828ee12f6125a5f
-	sha256sums = 5de344631d212d2d256d9bcad05e4fd7a08701ed6e0017460fa86e6d23a1e25b
+	source = xavs2-1.3.tar.gz::https://github.com/pkuvcl/xavs2/archive/1.3.tar.gz
+	sha256sums = 28f9204dc9384336de7c6210cd3317d2d6b94ec23a4d1b6113fcbe7f00d7230b
 
 pkgname = xavs2
 
diff --git a/PKGBUILD b/PKGBUILD
index 63dcb44529eb..8572e75e7359 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 # https://github.com/pkuvcl/xavs2/issues/9
 
 pkgname=xavs2
-pkgver=1.2
-pkgrel=4
+pkgver=1.3
+pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Open-Source encoder of AVS2-P2/IEEE1857.4 video coding standard'
 url='https://github.com/pkuvcl/xavs2/'
@@ -16,16 +16,8 @@ makedepends=('yasm' 'l-smash')
 provides=('libxavs2')
 conflicts=('libxavs2')
 replaces=('libxavs2')
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/pkuvcl/${pkgname}/archive/${pkgver}.tar.gz"
-        'xavs2-1.2-gcc8-fix.patch')
-sha256sums=('8b985aeb4d5f60b5d8bc9a5e3897f2f4c5ed6546d48f06f87828ee12f6125a5f'
-            '5de344631d212d2d256d9bcad05e4fd7a08701ed6e0017460fa86e6d23a1e25b')
-
-prepare() {
-    cd "${pkgname}-${pkgver}"
-    
-    patch --binary -Np1 -i "${srcdir}/xavs2-1.2-gcc8-fix.patch"
-}
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/pkuvcl/${pkgname}/archive/${pkgver}.tar.gz")
+sha256sums=('28f9204dc9384336de7c6210cd3317d2d6b94ec23a4d1b6113fcbe7f00d7230b')
 
 build() {
     cd "${pkgname}-${pkgver}/build/linux"
diff --git a/xavs2-1.2-gcc8-fix.patch b/xavs2-1.2-gcc8-fix.patch
deleted file mode 100644
index 3ef26ceeefc0..000000000000
--- a/xavs2-1.2-gcc8-fix.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-[PATCH] Make AVX symbols to be strictly visible (fix build with gcc8)

-

-Backport of upstream commit f018e1da10196c1f03ed8834d5db64ef67f3cc71

-

-https://github.com/pkuvcl/xavs2/issues/17

-https://github.com/pkuvcl/xavs2/commit/f018e1da10196c1f03ed8834d5db64ef67f3cc71

-

-diff --git a/source/common/vec/intrinsic_cg_scan_avx.c b/source/common/vec/intrinsic_cg_scan_avx.c

-index ec9a109..c8425a8 100644

---- a/source/common/vec/intrinsic_cg_scan_avx.c

-+++ b/source/common/vec/intrinsic_cg_scan_avx.c

-@@ -35,15 +35,15 @@

-  *    For more information, contact us at sswang @ pku.edu.cn.

-  */

- 

--#include "../common.h"

--#include "intrinsic.h"

--

- #include <mmintrin.h>

- #include <emmintrin.h>

- #include <tmmintrin.h>

- #include <smmintrin.h>

- #include <immintrin.h>

- 

-+#include "../common.h"

-+#include "intrinsic.h"

-+

- #if ARCH_X86_64

- /* ---------------------------------------------------------------------------

-  */

-diff --git a/source/common/vec/intrinsic_dct.c b/source/common/vec/intrinsic_dct.c

-index 2251593..15cc90b 100644

---- a/source/common/vec/intrinsic_dct.c

-+++ b/source/common/vec/intrinsic_dct.c

-@@ -34,16 +34,15 @@

-  *    For more information, contact us at sswang @ pku.edu.cn.

-  */

- 

--#include "../basic_types.h"

--#include "../avs2_defs.h"

--#include "intrinsic.h"

--

- #include <mmintrin.h>

- #include <emmintrin.h>

- #include <tmmintrin.h>

- #include <smmintrin.h>

- #include <immintrin.h>

- 

-+#include "../basic_types.h"

-+#include "../avs2_defs.h"

-+#include "intrinsic.h"

- 

- void *xavs2_fast_memzero_mmx(void *dst, size_t n);

- 

-diff --git a/source/common/vec/intrinsic_dct_avx.c b/source/common/vec/intrinsic_dct_avx.c

-index 7332097..77381d9 100644

---- a/source/common/vec/intrinsic_dct_avx.c

-+++ b/source/common/vec/intrinsic_dct_avx.c

-@@ -36,15 +36,15 @@

-  *    For more information, contact us at sswang @ pku.edu.cn.

-  */

- 

--#include "../basic_types.h"

--#include "intrinsic.h"

--#include "../avs2_defs.h"

--

- #include <xmmintrin.h>  // SSE

- #include <pmmintrin.h>  // SSE3

- #include <tmmintrin.h>  // SSSE3

- #include <immintrin.h>  // AVX and AVX2

- 

-+#include "../basic_types.h"

-+#include "intrinsic.h"

-+#include "../avs2_defs.h"

-+

- /* disable warnings */

- #ifdef _MSC_VER

- #pragma warning(disable:4127)  // warning C4127: 条件表达式是常量

-diff --git a/source/common/vec/intrinsic_deblock_avx2.c b/source/common/vec/intrinsic_deblock_avx2.c

-index fd39f98..6d29f75 100644

---- a/source/common/vec/intrinsic_deblock_avx2.c

-+++ b/source/common/vec/intrinsic_deblock_avx2.c

-@@ -34,16 +34,15 @@

-  *    For more information, contact us at sswang @ pku.edu.cn.

-  */

- 

--

--#include "../basic_types.h"

--#include "intrinsic.h"

--

- #include <mmintrin.h>

- #include <emmintrin.h>

- #include <tmmintrin.h>

- #include <smmintrin.h>

- #include <immintrin.h>

- 

-+#include "../basic_types.h"

-+#include "intrinsic.h"

-+

- void deblock_edge_ver_avx2(pel_t *SrcPtr, int stride, int Alpha, int Beta, uint8_t *flt_flag)

- {

-     pel_t *pTmp = SrcPtr - 4;

-diff --git a/source/common/vec/intrinsic_idct_avx2.c b/source/common/vec/intrinsic_idct_avx2.c

-index 3b769d9..5e1473d 100644

---- a/source/common/vec/intrinsic_idct_avx2.c

-+++ b/source/common/vec/intrinsic_idct_avx2.c

-@@ -36,16 +36,16 @@

-  *    For more information, contact us at sswang @ pku.edu.cn.

-  */

- 

--#include "../basic_types.h"

--#include "../avs2_defs.h"

--#include "intrinsic.h"

--

- #include <mmintrin.h>

- #include <emmintrin.h>

- #include <tmmintrin.h>

- #include <smmintrin.h>

- #include <immintrin.h>

- 

-+#include "../basic_types.h"

-+#include "../avs2_defs.h"

-+#include "intrinsic.h"

-+

- /* disable warnings */

- #pragma warning(disable:4127)  // warning C4127: 条件表达式是常量

- 

-diff --git a/source/common/vec/intrinsic_inter_pred.c b/source/common/vec/intrinsic_inter_pred.c

-index 422f6a3..f786aad 100644

---- a/source/common/vec/intrinsic_inter_pred.c

-+++ b/source/common/vec/intrinsic_inter_pred.c

-@@ -34,16 +34,16 @@

-  *    For more information, contact us at sswang @ pku.edu.cn.

-  */

- 

--#include "../basic_types.h"

--#include "intrinsic.h"

--#include "avs2_defs.h"

--

- #include <mmintrin.h>

- #include <emmintrin.h>

- #include <tmmintrin.h>

- #include <smmintrin.h>

- #include <immintrin.h>

- 

-+#include "../basic_types.h"

-+#include "intrinsic.h"

-+#include "avs2_defs.h"

-+

- /* ---------------------------------------------------------------------------

-  */

- void intpl_chroma_block_hor_sse128(pel_t *dst, int i_dst, pel_t *src, int i_src, int width, int height, const int8_t *coeff)

-diff --git a/source/common/vec/intrinsic_inter_pred_avx2.c b/source/common/vec/intrinsic_inter_pred_avx2.c

-index eb159ef..7e62ad1 100644

---- a/source/common/vec/intrinsic_inter_pred_avx2.c

-+++ b/source/common/vec/intrinsic_inter_pred_avx2.c

-@@ -34,14 +34,15 @@

-  *    For more information, contact us at sswang @ pku.edu.cn.

-  */

- 

--#include "../basic_types.h"

--#include "intrinsic.h"

--

- #include <mmintrin.h>

- #include <emmintrin.h>

- #include <tmmintrin.h>

- #include <smmintrin.h>

- #include <immintrin.h>

-+

-+#include "../basic_types.h"

-+#include "intrinsic.h"

-+

- #pragma warning(disable:4127)  // warning C4127: 条件表达式是常量

- 

- /* ---------------------------------------------------------------------------

-diff --git a/source/common/vec/intrinsic_intra-pred_avx2.c b/source/common/vec/intrinsic_intra-pred_avx2.c

-index 3542511..d1c9b24 100644

---- a/source/common/vec/intrinsic_intra-pred_avx2.c

-+++ b/source/common/vec/intrinsic_intra-pred_avx2.c

-@@ -34,16 +34,15 @@

-  *    For more information, contact us at sswang @ pku.edu.cn.

-  */

- 

--#include "../basic_types.h"

--#include "avs2_defs.h"

--#include "intrinsic.h"

--

- #include <mmintrin.h>

- #include <emmintrin.h>

- #include <tmmintrin.h>

- #include <smmintrin.h>

- #include <immintrin.h>

- 

-+#include "../basic_types.h"

-+#include "avs2_defs.h"

-+#include "intrinsic.h"

- 

- #ifndef _MSC_VER

- #define __int64 int64_t

-diff --git a/source/common/vec/intrinsic_pixel_avx.c b/source/common/vec/intrinsic_pixel_avx.c

-index ab9ddb7..a88f6d6 100644

---- a/source/common/vec/intrinsic_pixel_avx.c

-+++ b/source/common/vec/intrinsic_pixel_avx.c

-@@ -34,10 +34,6 @@

-  *    For more information, contact us at sswang @ pku.edu.cn.

-  */

- 

--#include "../basic_types.h"

--#include "../avs2_defs.h"

--#include "intrinsic.h"

--

- #include <mmintrin.h>

- #include <emmintrin.h>

- #include <tmmintrin.h>

-@@ -45,6 +41,10 @@

- #include <immintrin.h>

- #include <string.h>

- 

-+#include "../basic_types.h"

-+#include "../avs2_defs.h"

-+#include "intrinsic.h"

-+

- /* ---------------------------------------------------------------------------

-  */

- void *xavs2_memzero_aligned_c_avx(void *dst, size_t n)

-diff --git a/source/common/vec/intrinsic_quant_avx2.c b/source/common/vec/intrinsic_quant_avx2.c

-index 263ead9..562b4e2 100644

---- a/source/common/vec/intrinsic_quant_avx2.c

-+++ b/source/common/vec/intrinsic_quant_avx2.c

-@@ -35,16 +35,15 @@

-  *    For more information, contact us at sswang @ pku.edu.cn.

-  */

- 

--

--#include "../basic_types.h"

--#include "intrinsic.h"

--

- #include <mmintrin.h>

- #include <emmintrin.h>

- #include <tmmintrin.h>

- #include <smmintrin.h>

- #include <immintrin.h>

- 

-+#include "../basic_types.h"

-+#include "intrinsic.h"

-+

- int quant_avx2(coeff_t *coef, const int i_coef, const int scale, const int shift, const int add)

- {

-     __m256i mScale, mAdd;

-diff --git a/source/common/vec/intrinsic_sao_avx2.c b/source/common/vec/intrinsic_sao_avx2.c

-index 9b7f428..cab0b1a 100644

---- a/source/common/vec/intrinsic_sao_avx2.c

-+++ b/source/common/vec/intrinsic_sao_avx2.c

-@@ -34,16 +34,16 @@

-  *    For more information, contact us at sswang @ pku.edu.cn.

-  */

- 

--#include "../common.h"

--#include "intrinsic.h"

--#include "../filter.h"

--

- #include <mmintrin.h>

- #include <emmintrin.h>

- #include <tmmintrin.h>

- #include <smmintrin.h>

- #include <immintrin.h>

- 

-+#include "../common.h"

-+#include "intrinsic.h"

-+#include "../filter.h"

-+

- /* ---------------------------------------------------------------------------

-  */

- void SAO_on_block_sse256(pel_t *p_dst, int i_dst, pel_t *p_src, int i_src, int i_block_w, int i_block_h,