[vlc-commits] Contribs: openjpeg, check for restrict keyword in configure

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at gmail.com> | Sat Jan 30 09:26:45 2016 +0100| [a51d53e863963c1d9785fe6a8f7d482837af5ab7] | committer: Jean-Baptiste Kempf

Contribs: openjpeg, check for restrict keyword in configure

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/openjpeg/restrict.patch |   50 +++++++++++++++++++++++++++++++++++
 contrib/src/openjpeg/rules.mak      |    1 +
 2 files changed, 51 insertions(+)

diff --git a/contrib/src/openjpeg/restrict.patch b/contrib/src/openjpeg/restrict.patch
new file mode 100644
index 0000000..1e80c6a
--- /dev/null
+++ b/contrib/src/openjpeg/restrict.patch
@@ -0,0 +1,50 @@
+diff --git a/configure.ac b/configure.ac
+index 71098e5..8843546 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -486,6 +486,8 @@ else
+    OPJ_COMPILER_FLAG([-O3])
+ fi
+ 
++AC_C_RESTRICT
++
+ 
+ ### Checks for linker characteristics
+ 
+diff --git a/libopenjpeg/dwt.c b/libopenjpeg/dwt.c
+index 0fbfc20..26ee0f4 100644
+--- a/libopenjpeg/dwt.c
++++ b/libopenjpeg/dwt.c
+@@ -35,6 +35,7 @@
+ #include <xmmintrin.h>
+ #endif
+ 
++#include "opj_config.h"
+ #include "opj_includes.h"
+ 
+ /** @defgroup DWT DWT - Implementation of a discrete wavelet transform */
+diff --git a/libopenjpeg/mct.c b/libopenjpeg/mct.c
+index 870993b..66c91d8 100644
+--- a/libopenjpeg/mct.c
++++ b/libopenjpeg/mct.c
+@@ -33,6 +33,7 @@
+ #include <xmmintrin.h>
+ #endif
+ 
++#include "opj_config.h"
+ #include "opj_includes.h"
+ 
+ /* <summary> */
+diff --git a/libopenjpeg/t1.c b/libopenjpeg/t1.c
+index ed9cdc3..78f6940 100644
+--- a/libopenjpeg/t1.c
++++ b/libopenjpeg/t1.c
+@@ -30,6 +30,7 @@
+  * POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
++#include "opj_config.h"
+ #include "opj_includes.h"
+ #include "t1_luts.h"
+ 
+
diff --git a/contrib/src/openjpeg/rules.mak b/contrib/src/openjpeg/rules.mak
index eeafcc9..d756ab2 100644
--- a/contrib/src/openjpeg/rules.mak
+++ b/contrib/src/openjpeg/rules.mak
@@ -14,6 +14,7 @@ openjpeg: openjpeg-$(OPENJPEG_VERSION).tar.gz .sum-openjpeg
 ifdef HAVE_VISUALSTUDIO
 	$(APPLY) $(SRC)/openjpeg/msvc.patch
 endif
+	$(APPLY) $(SRC)/openjpeg/restrict.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)