Skip to contentSkip to conversation

package/gst1-libav: fix syntax error

PATCH New Fabrice Fontaine 2 participants 3 messages Mar 29, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/gst1-libav: fix syntax error

---
 package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/gstreamer1/gst1-libav/gst1-libav.mk +1 -1
index 8450c34a07..97e069a35f 100644
@@ -83,7 +83,7 @@ else
 GST1_LIBAV_CONF_EXTRA_OPTS += --disable-vfp
 endif
 
-ifeq ($(BR2_POWERPC_CPU_HASH_ALTIVEC),y)
+ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y)
 GST1_LIBAV_CONF_EXTRA_OPTS += --enable-altivec
 else
 GST1_LIBAV_CONF_EXTRA_OPTS += --disable-altivec
Signature · 1 line
2.14.1
#1 lore raw

PATCH 2/2 package/gst1-libav: fix powerpc build

AS "hack" is also needed for powerpc builds otherwise build fails on:
AS libavcodec/ppc/fft_altivec.o
/home/buildroot/autobuild/run/instance-2/output/host/bin/powerpc64-linux-as: invalid option -- '_'

This error is raised because CPPFLAGS are (wrongly) passed to AS

Fixes:
- http://autobuild.buildroot.org/results/6710e72452fe70788d75191b8b735f90beff9361
- http://autobuild.buildroot.org/results/a1f22975d4a4a6cfc553a450da464a431702800f
- http://autobuild.buildroot.org/results/be2d161443c5ab24979e6b9389eb21a53d4b4066

---
 package/gstreamer1/gst1-libav/gst1-libav.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/gstreamer1/gst1-libav/gst1-libav.mk +2 -2
index 97e069a35f..254ab719ae 100644
@@ -15,8 +15,8 @@ GST1_LIBAV_LICENSE = GPL-2.0+
 GST1_LIBAV_LICENSE_FILES = COPYING
 GST1_LIBAV_CONF_EXTRA_OPTS = --cross-prefix=$(TARGET_CROSS) --target-os=linux
 
-# fixes arm build: https://bugzilla.gnome.org/show_bug.cgi?id=694416
-ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be),y)
+# fixes arm/powerpc build: https://bugzilla.gnome.org/show_bug.cgi?id=694416
+ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y)
 GST1_LIBAV_CONF_ENV = AS="$(TARGET_CROSS)gcc"
 endif
 
Signature · 1 line
2.14.1
#2 lore raw

PATCH 1/2 package/gst1-libav: fix syntax error

In reply to Fabrice Fontaine
Quoted 4 lines · On Fri, 29 Mar 2019 15:55:46 +0100 Fabrice Fontaine…
---
 package/gstreamer1/gst1-libav/gst1-libav.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Both applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com