Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
46aaa284 by Felix Paul Kühne at 2021-06-29T13:07:39+00:00
contrib/zvbi: remove no-longer needed hack
- - - - -
1c883595 by Felix Paul Kühne at 2021-06-29T13:07:39+00:00
contrib/lame: fix cross-compilation for i386 on AArch64
- - - - -
3 changed files:
- + contrib/src/lame/lame-fix-i386-on-aarch64.patch
- contrib/src/lame/rules.mak
- contrib/src/zvbi/rules.mak
Changes:
=====================================
contrib/src/lame/lame-fix-i386-on-aarch64.patch
=====================================
@@ -0,0 +1,21 @@
+diff -ru lame/configure.in lame/configure.in
+--- lame/configure.in 2021-05-07 10:51:04.000000000 +0200
++++ lame-fixed/configure.in 2021-05-07 10:51:26.000000000 +0200
+@@ -935,7 +935,7 @@
+ -mtune=native"
+ ;;
+ *86)
+- OPTIMIZATION="${OPTIMIZATION}
-march=native \
++ OPTIMIZATION="${OPTIMIZATION}
-march=i386 \
+ -mtune=native"
+ ;;
+ arm*-gnueabi)
+@@ -986,7 +986,7 @@
+ -mtune=native"
+ ;;
+ *86)
+- OPTIMIZATION="${OPTIMIZATION} -march=native \
++ OPTIMIZATION="${OPTIMIZATION} -march=i386 \
+ -mtune=native"
+ ;;
+ esac
=====================================
contrib/src/lame/rules.mak
=====================================
@@ -19,6 +19,9 @@ lame: lame-$(LAME_VERSION).tar.gz .sum-lame
$(APPLY) $(SRC)/lame/sse.patch
ifdef HAVE_VISUALSTUDIO
$(APPLY) $(SRC)/lame/struct-float-copy.patch
+endif
+ifdef HAVE_DARWIN_OS
+ $(APPLY) $(SRC)/lame/lame-fix-i386-on-aarch64.patch
endif
# Avoid relying on iconv.m4 from gettext, when reconfiguring.
# This is only used by the frontend which we disable.
=====================================
contrib/src/zvbi/rules.mak
=====================================
@@ -43,9 +43,6 @@ ZVBICONF := \
ifdef HAVE_WIN32
DEPS_upnp += pthreads $(DEPS_pthreads)
endif
-ifdef HAVE_MACOSX
-ZVBI_CFLAGS += -fnested-functions
-endif
.zvbi: zvbi
$(UPDATE_AUTOCONFIG)
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/c78f7ac90f35779a97f4ce8372ac9126433e7674...1c883595888e99d042770608b1c7a229ae9dac50
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/c78f7ac90f35779a97f4ce8372ac9126433e7674...1c883595888e99d042770608b1c7a229ae9dac50
You're receiving this email because of your account on code.videolan.org.
_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
