[vlc-commits] [Git][videolan/vlc][master] 3 commits: package: raspberry: restrict neon flags to the arm target

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
53876fa4 by Alexandre Janniaux at 2026-08-26T17:21:40+00:00
package: raspberry: restrict neon flags to the arm target

-mfpu=neon was applied unconditionally, but it is an armv7 option.
Aarch64 has NEON and gcc rejects -mfpu=, so the aarch64 target could not
be built at all.

- - - - -
5015ebe5 by Alexandre Janniaux at 2026-08-26T17:21:40+00:00
package: raspberry: make the firmware prefix configurable

The VideoCore firmware headers and libraries live(d) in /opt/vc, outside
of the standard prefixes, and are only installed by default on the
32-bit images. Since mid-2025, they are not in aarch64 images anymore
since it has been superseeded by the v4l2 implementations (ref #30067).

Use VC_PREFIX instead, defaulting to /opt/vc on arm and unset on
aarch64. Setting it opts in for MMAL and OMX support, and setting it to
an empty value opts out on armv7.

When it is unset, MMAL is disabled explicitly so that configure does not
fail on the missing headers.

- - - - -
10a0aeca by Alexandre Janniaux at 2026-08-26T17:21:40+00:00
package: raspberry: remove the libdir from the include paths

It was confusing a library directory as an include directory. The
multiarch headers are actually in /usr/include/$TRIPLET, which the
compiler already searches.

- - - - -


1 changed file:

- extras/package/raspberry/build.sh


Changes:

=====================================
extras/package/raspberry/build.sh
=====================================
@@ -25,6 +25,11 @@ OPTIONS:
    -l            Enable translations (can be slow)
    -s            Interactive shell (get correct environment variables for build)
    -x            Add extra checks when compiling
+
+ENVIRONMENT:
+   VC_PREFIX     Path to the VideoCore firmware librares, providing MMAL and OMX
+                 (default: /opt/vc on arm, unset on aarch64). Set it to an empty
+                 value to build without mmal support.
 EOF
 }
 
@@ -74,6 +79,8 @@ case $ARCH in
     arm)
         SHORTARCH="linuxarm"
         EABI="gnueabihf"
+        ARCHFLAGS="-mfpu=neon"
+        : "${VC_PREFIX=/opt/vc}"
         ;;
     *)
         usage
@@ -114,11 +121,17 @@ CONTRIBFLAGS="$CONTRIBFLAGS --disable-x265 --disable-xcb --disable-libaribcaptio
 
 ${SCRIPT_PATH}/../../../contrib/bootstrap --host=$TRIPLET $CONTRIBFLAGS
 
-# use the system headers for the OS and firmware
-export CFLAGS="$CFLAGS -g -mfpu=neon -isystem=/usr/lib/$TRIPLET -isystem=/opt/vc/include"
-export CXXFLAGS="$CXXFLAGS -g -mfpu=neon -isystem=/usr/lib/$TRIPLET -isystem=/opt/vc/include"
-export CPPFLAGS="$CPPFLAGS -g -mfpu=neon -isystem=/usr/lib/$TRIPLET -isystem=/opt/vc/include"
-export LDFLAGS="$LDFLAGS -L/usr/$TRIPLET/lib -L/opt/vc/lib"
+if [ -n "$VC_PREFIX" ]; then
+    VC_CPPFLAGS="-isystem=$VC_PREFIX/include"
+    VC_LDFLAGS="-L$VC_PREFIX/lib"
+else
+    CONFIGFLAGS="$CONFIGFLAGS --disable-mmal"
+fi
+
+export CFLAGS="$CFLAGS -g $ARCHFLAGS $VC_CPPFLAGS"
+export CXXFLAGS="$CXXFLAGS -g $ARCHFLAGS $VC_CPPFLAGS"
+export CPPFLAGS="$CPPFLAGS -g $ARCHFLAGS $VC_CPPFLAGS"
+export LDFLAGS="$LDFLAGS -L/usr/$TRIPLET/lib $VC_LDFLAGS"
 
 # Rebuild the contribs or use the prebuilt ones
 if [ "$PREBUILT" = "yes" ]; then



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8384dd1c308987c4eb800aaada2bb0819e5d8bb8...10a0aecad02f54290a2e8307a8c5ed5e652156e1

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/8384dd1c308987c4eb800aaada2bb0819e5d8bb8...10a0aecad02f54290a2e8307a8c5ed5e652156e1
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help