[vlc-commits] contribs: updated libdca to 0.0.6.

[Konstantin Pavlov]

vlc/vlc-3.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Tue May 15 17:40:18 2018 +0300| [cbe63d07ef3db8fb58f8cf2a9c5c5c664700ca55] | committer: Jean-Baptiste Kempf

contribs: updated libdca to 0.0.6.

(cherry picked from commit 2efb93cd7c3087e9bd24edd36756ed0d3f59f8b0)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=cbe63d07ef3db8fb58f8cf2a9c5c5c664700ca55
---

 contrib/src/dca/SHA512SUMS            |  2 +-
 contrib/src/dca/libdca-inline.patch   | 10 ----------
 contrib/src/dca/libdca-llvm-gcc.patch | 22 ----------------------
 contrib/src/dca/rules.mak             |  7 +++----
 4 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/contrib/src/dca/SHA512SUMS b/contrib/src/dca/SHA512SUMS
index 440f970ce1..54dd1fc334 100644
--- a/contrib/src/dca/SHA512SUMS
+++ b/contrib/src/dca/SHA512SUMS
@@ -1 +1 @@
-d9f0ed34efeb3f27af8424fcb3e6df56744c6735854a65b5709c02b42b4513b9c4618dcc19eb44293afa051bd95616651bda5fc3b49dfabe975d0babfb1bc287  libdca-0.0.5.tar.bz2
+d264128019e7fd295a35691636311f81960c17802dbbc67764c4e00b2fdf12ebc69b057a4947b57551a130e5cfd1fef3fe3558c7067216ea04a0b6bbb881b4f1  libdca-0.0.6.tar.bz2
diff --git a/contrib/src/dca/libdca-inline.patch b/contrib/src/dca/libdca-inline.patch
deleted file mode 100644
index 8f5d979171..0000000000
--- a/contrib/src/dca/libdca-inline.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libdca/configure.ac	2007-04-10 14:28:07.000000000 +0200
-+++ libdca.new/configure.ac	2016-01-20 15:05:33.835304760 +0100
-@@ -105,7 +105,6 @@
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
--AC_C_ALWAYS_INLINE
- AC_C_RESTRICT
- AC_C_BUILTIN_EXPECT
- AC_TYPE_SIZE_T
diff --git a/contrib/src/dca/libdca-llvm-gcc.patch b/contrib/src/dca/libdca-llvm-gcc.patch
deleted file mode 100644
index 61862d4c5a..0000000000
--- a/contrib/src/dca/libdca-llvm-gcc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: libdca/parse.c
-===================================================================
---- libdca/parse.c	(revision 90)
-+++ libdca/parse.c	(working copy)
-@@ -1193,11 +1193,14 @@
-         for (k=0;k<16;k++)
-         {
-             B[k] = 0.0;
--            for (i=0;i<16;i++)
-+
-+            B[k]+=(raXin[0])*state->cos_mod[j++];
-+
-+            for (i=1;i<16;i++)
-             {
--                if(i>0) B[k]+=(raXin[2*i]+raXin[2*i-1])*state->cos_mod[j++];
--                else B[k]+=(raXin[2*i])*state->cos_mod[j++];
-+                B[k]+=(raXin[2*i]+raXin[2*i-1])*state->cos_mod[j++];
-             }
-+
-             SUM[k]=A[k]+B[k];
-             DIFF[k]=A[k]-B[k];
-         }
diff --git a/contrib/src/dca/rules.mak b/contrib/src/dca/rules.mak
index e1f2874667..d469819f72 100644
--- a/contrib/src/dca/rules.mak
+++ b/contrib/src/dca/rules.mak
@@ -1,6 +1,6 @@
 # libdca
 
-DCA_VERSION := 0.0.5
+DCA_VERSION := 0.0.6
 DCA_URL := $(VIDEOLAN)/libdca/$(DCA_VERSION)/libdca-$(DCA_VERSION).tar.bz2
 
 ifdef HAVE_FPU
@@ -19,9 +19,8 @@ $(TARBALLS)/libdca-$(DCA_VERSION).tar.bz2:
 
 libdca: libdca-$(DCA_VERSION).tar.bz2 .sum-dca
 	$(UNPACK)
-	#$(APPLY) $(SRC)/dca/libdca-llvm-gcc.patch
-	$(APPLY) $(SRC)/dca/libdca-inline.patch
-	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub autotools
+	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR)
+	$(call pkg_static,"./libdca/libdca.pc.in")
 	$(MOVE)
 
 .dca: libdca