[vlc-commits] Contribs: libmpeg2, do not use AC_C_ALWAYS_INLINE

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Jan 20 15:32:42 2016 +0100| [84cbf4326f20f52711b20a7b4495d4f8979ccc8b] | committer: Hugo Beauzée-Luyssen

Contribs: libmpeg2, do not use AC_C_ALWAYS_INLINE

(cherry picked from commit 179f76d0b3f02a5b6e29c7d36799129afc6f1e37)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

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

 contrib/src/libmpeg2/libmpeg2-inline.patch |   10 ++++++++++
 contrib/src/libmpeg2/rules.mak             |    1 +
 2 files changed, 11 insertions(+)

diff --git a/contrib/src/libmpeg2/libmpeg2-inline.patch b/contrib/src/libmpeg2/libmpeg2-inline.patch
new file mode 100644
index 0000000..c80ced7
--- /dev/null
+++ b/contrib/src/libmpeg2/libmpeg2-inline.patch
@@ -0,0 +1,10 @@
+--- libmpeg2/configure.ac	2016-01-20 15:31:37.933547037 +0100
++++ libmpeg2.new/configure.ac	2016-01-20 15:05:40.931231465 +0100
+@@ -149,7 +149,6 @@
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+-AC_C_ALWAYS_INLINE
+ AC_C_RESTRICT
+ AC_C_BUILTIN_EXPECT
+ AC_C_BIGENDIAN
diff --git a/contrib/src/libmpeg2/rules.mak b/contrib/src/libmpeg2/rules.mak
index 650814a..fcaf421 100644
--- a/contrib/src/libmpeg2/rules.mak
+++ b/contrib/src/libmpeg2/rules.mak
@@ -18,6 +18,7 @@ $(TARBALLS)/libmpeg2-$(LIBMPEG2_VERSION).tar.gz:
 libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz .sum-libmpeg2
 	$(UNPACK)
 	$(APPLY) $(SRC)/libmpeg2/libmpeg2-arm-pld.patch
+	$(APPLY) $(SRC)/libmpeg2/libmpeg2-inline.patch
 	$(APPLY) $(SRC)/libmpeg2/libmpeg2-mc-neon.patch
 	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub .auto
 	$(MOVE)