[Buildroot] [PATCH 1/3] package/vlc: renumber patch 0008 -> 0009

[Buildroot] [PATCH 1/3] package/vlc: renumber patch 0008 -> 0009

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/vlc/{0008-ffmpeg-3.0.patch => 0009-ffmpeg-3.0.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/vlc/{0008-ffmpeg-3.0.patch => 0009-ffmpeg-3.0.patch} (100%)

diff --git a/package/vlc/0008-ffmpeg-3.0.patch b/package/vlc/0009-ffmpeg-3.0.patch
similarity index 100%
rename from package/vlc/0008-ffmpeg-3.0.patch
rename to package/vlc/0009-ffmpeg-3.0.patch
-- 
2.9.3

[Buildroot] [PATCH v2 2/3] package/vlc: backport upstream patches to fix compat function for static_assert

[Bernd Kuhls]

Fixes
http://autobuild.buildroot.net/results/3b9/3b9d15f226057706c185270788050dace7b7b535/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: added an additional upstream commit to fix compilation with gcc6
    (Johan Oudinet)

 package/vlc/0010-static-assert.patch | 25 +++++++++++++++++++++++++
 package/vlc/0011-static-assert.patch | 28 ++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 package/vlc/0010-static-assert.patch
 create mode 100644 package/vlc/0011-static-assert.patch

diff --git a/package/vlc/0010-static-assert.patch b/package/vlc/0010-static-assert.patch
new file mode 100644
index 0000000..87fd56b
--- /dev/null
+++ b/package/vlc/0010-static-assert.patch
@@ -0,0 +1,25 @@
+From: Thomas Guillem <thomas@gllm.fr>
+Date: Thu, 30 Apr 2015 13:29:50 +0000 (+0200)
+Subject: Fix build when using C99 and C++11
+X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=51ce6cdaf598754e617900994c1943c6cba6d604
+
+Fix build when using C99 and C++11
+
+Indeed, C99 doesn't have static_assert and C++11 has it.
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+
+diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
+index b949d24..ee168d7 100644
+--- a/include/vlc_fixups.h
++++ b/include/vlc_fixups.h
+@@ -239,7 +239,7 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
+ }
+ #endif
+ 
+-#if !defined (HAVE_STATIC_ASSERT)
++#if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert)
+ # define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
+ # define static_assert _Static_assert
+ #endif
diff --git a/package/vlc/0011-static-assert.patch b/package/vlc/0011-static-assert.patch
new file mode 100644
index 0000000..3ce23e1
--- /dev/null
+++ b/package/vlc/0011-static-assert.patch
@@ -0,0 +1,28 @@
+From: Thomas Guillem <thomas@gllm.fr>
+Date: Mon, 14 Dec 2015 09:08:25 +0000 (+0100)
+Subject: compat: fix static_assert
+X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=6faf9066670db6e0d241ead6a3926b2d9cc6a041
+
+compat: fix static_assert
+
+It was not possible to use it outside of functions.
+
+Signed-off-by: R?mi Denis-Courmont <remi@remlab.net>
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+
+diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
+index 213d3f3..bd798d0 100644
+--- a/include/vlc_fixups.h
++++ b/include/vlc_fixups.h
+@@ -273,7 +273,9 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base)
+ #endif
+ 
+ #if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert)
+-# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); }))
++# define STATIC_ASSERT_CONCAT_(a, b) a##b
++# define STATIC_ASSERT_CONCAT(a, b) STATIC_ASSERT_CONCAT_(a, b)
++# define _Static_assert(x, s) extern char STATIC_ASSERT_CONCAT(static_assert_, __LINE__)[sizeof(struct { unsigned:-!(x); })]
+ # define static_assert _Static_assert
+ #endif
+ 
-- 
2.9.3

[Buildroot] [PATCH v2 3/3] package/vlc: use BR2_TOOLCHAIN_HAS_LIBATOMIC

[Bernd Kuhls]

While fixing
http://autobuild.buildroot.net/results/d95/d9572bcafc1776eebe88bbcaf031a05cd6ee4b23/
by using http://patchwork.ozlabs.org/patch/674337/ the build stopped at
a later stage with

/home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_fetch_add_4'
/home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_fetch_sub_4'
/home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_fetch_or_1'
/home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_compare_exchange_4'
/home/buildroot/br4/output/build/vlc-2.2.4/src/.libs/libvlccore.so: undefined reference to `__atomic_exchange_1'
collect2: error: ld returned 1 exit status

so libatomic must be pulled in if necessary.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: no changes

 package/vlc/vlc.mk | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index 8efbecb..cf0b557 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -56,6 +56,11 @@ VLC_CONF_OPTS += \
 	--disable-addonmanagermodules \
 	--enable-run-as-root \
 
+# Uses __atomic_fetch_add_4
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+VLC_CONF_ENV += LIBS="-latomic"
+endif
+
 # Building static and shared doesn't work, so force static off.
 ifeq ($(BR2_STATIC_LIBS),)
 VLC_CONF_OPTS += --disable-static
-- 
2.9.3

[Buildroot] [PATCH 1/3] package/vlc: renumber patch 0008 -> 0009

[Thomas Petazzoni]

Hello,

On Sun, 16 Oct 2016 23:01:25 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  package/vlc/{0008-ffmpeg-3.0.patch => 0009-ffmpeg-3.0.patch} | 0
>  1 file changed, 0 insertions(+), 0 deletions(-)
>  rename package/vlc/{0008-ffmpeg-3.0.patch => 0009-ffmpeg-3.0.patch} (100%)

All three patches applied. Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com