Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
51d3312c by Steve Lhomme at 2024-01-26T14:27:54+00:00
contrib: vorbis: update to 1.3.7
And build with CMake which doesn't force compiler flags that don't work.
And it avoids a RECONF call.
CMake patch submitted here https://github.com/xiph/vorbis/pull/105
- - - - -
5 changed files:
- +
contrib/src/vorbis/0001-CMake-add-missing-libm-in-.pc-file-when-it-s-used.patch
- contrib/src/vorbis/SHA512SUMS
- − contrib/src/vorbis/clang.patch
- contrib/src/vorbis/rules.mak
- − contrib/src/vorbis/vorbis-bitcode.patch
Changes:
=====================================
contrib/src/vorbis/0001-CMake-add-missing-libm-in-.pc-file-when-it-s-used.patch
=====================================
@@ -0,0 +1,26 @@
+From fac2505acea83d038bbe9e45c4504a6800c46726 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <slho...@matroska.org>
+Date: Tue, 9 Jan 2024 09:19:41 +0100
+Subject: [PATCH] CMake: add missing libm in .pc file when it's used
+
+---
+ CMakeLists.txt | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33f684f5..ea79c4aa 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,6 +52,9 @@ function(configure_pkg_config_file pkg_config_file_in)
+ set(libdir ${CMAKE_INSTALL_FULL_LIBDIR})
+ set(includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+ set(VERSION ${PROJECT_VERSION})
++ if(HAVE_LIBM)
++ set(VORBIS_LIBS "-lm")
++ endif()
+ string(REPLACE ".in" "" pkg_config_file ${pkg_config_file_in})
+ configure_file(${pkg_config_file_in} ${pkg_config_file} @ONLY)
+ endfunction()
+--
+2.39.3 (Apple Git-145)
+
=====================================
contrib/src/vorbis/SHA512SUMS
=====================================
@@ -1 +1 @@
-a5d990bb88db2501b16f8eaee9f2ecb599cefd7dab2134d16538d8905263a972157c7671867848c2a8a358bf5e5dbc7721205ece001032482f168be7bda4f132
libvorbis-1.3.6.tar.xz
+bbf5f11f623d959b3ba98d6b52806521b0b918b59b867f0658c153ea1013293364eead4987e9e71f8798021379310860a2e548fcf89d10caf23d45e41aba45cd
libvorbis-1.3.7.tar.xz
=====================================
contrib/src/vorbis/clang.patch deleted
=====================================
@@ -1,14 +0,0 @@
---- libvorbis/configure.ac.old 2018-03-16 23:22:48.275545229 +0100
-+++ libvorbis/configure.ac 2018-03-16 23:23:07.304870938 +0100
-@@ -133,9 +133,9 @@
- case $host in
- *86-*-linux*)
- DEBUG="-g -Wall -Wextra -D_REENTRANT -D__NO_MATH_INLINES
-fsigned-char"
-- CFLAGS="-O3 -Wall -Wextra -ffast-math -mno-ieee-fp -D_REENTRANT
-fsigned-char"
-+ CFLAGS="-O3 -Wall -Wextra -ffast-math -D_REENTRANT
-fsigned-char"
- # PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math
-D_REENTRANT -fsigned-char -fno-inline -static"
-- PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -mno-ieee-fp
-D_REENTRANT -fsigned-char -fno-inline"
-+ PROFILE="-Wall -Wextra -pg -g -O3 -ffast-math -D_REENTRANT
-fsigned-char -fno-inline"
-
- # glibc < 2.1.3 has a serious FP bug in the math inline header
- # that will cripple Vorbis. Look to see if the magic FP stack
=====================================
contrib/src/vorbis/rules.mak
=====================================
@@ -1,6 +1,6 @@
# libvorbis
-VORBIS_VERSION := 1.3.6
+VORBIS_VERSION := 1.3.7
VORBIS_URL := $(XIPH)/vorbis/libvorbis-$(VORBIS_VERSION).tar.xz
ifdef HAVE_FPU
@@ -27,22 +27,17 @@ $(TARBALLS)/libvorbis-$(VORBIS_VERSION).tar.xz:
libvorbis: libvorbis-$(VORBIS_VERSION).tar.xz .sum-vorbis
$(UNPACK)
-ifdef HAVE_CLANG
- $(APPLY) $(SRC)/vorbis/clang.patch
-endif
- $(UPDATE_AUTOCONFIG)
- $(APPLY) $(SRC)/vorbis/vorbis-bitcode.patch
+ $(APPLY)
$(SRC)/vorbis/0001-CMake-add-missing-libm-in-.pc-file-when-it-s-used.patch
$(call pkg_static,"vorbis.pc.in")
+ $(call pkg_static,"vorbisenc.pc.in")
+ $(call pkg_static,"vorbisfile.pc.in")
$(MOVE)
DEPS_vorbis = ogg $(DEPS_ogg)
-VORBIS_CONF := --disable-docs --disable-examples --disable-oggtest
-
-.vorbis: libvorbis
- $(RECONF) -Im4
- $(MAKEBUILDDIR)
- $(MAKECONFIGURE) $(VORBIS_CONF)
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
+.vorbis: libvorbis toolchain.cmake
+ $(CMAKECLEAN)
+ $(HOSTVARS) $(CMAKE)
+ +$(CMAKEBUILD)
+ $(CMAKEINSTALL)
touch $@
=====================================
contrib/src/vorbis/vorbis-bitcode.patch deleted
=====================================
@@ -1,16 +0,0 @@
-diff -ru libvorbis/configure.ac libvorbis-fixed/configure.ac
---- libvorbis/configure.ac 2015-01-12 21:00:37.000000000 +0100
-+++ libvorbis-fixed/configure.ac 2015-09-30 22:25:19.000000000 +0200
-@@ -197,9 +197,9 @@
- CFLAGS="-O3 -Wall -Wextra -ffast-math -D__NO_MATH_INLINES
-fsigned-char $sparc_cpu"
- PROFILE="-pg -g -O3 -D__NO_MATH_INLINES -fsigned-char
$sparc_cpu" ;;
- *-*-darwin*)
-- DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0
-fsigned-char"
-- CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O3
-ffast-math -fsigned-char"
-- PROFILE="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g
-pg -O3 -ffast-math -fsigned-char";;
-+ DEBUG="-DDARWIN -Wall -g -O0 -fsigned-char"
-+ CFLAGS="-DDARWIN -Wall -g -O3 -ffast-math -fsigned-char"
-+ PROFILE="-DDARWIN -Wall -g -pg -O3 -ffast-math -fsigned-char";;
- *-*-os2*)
- # Use -W instead of -Wextra because gcc on OS/2 is an old
version.
- DEBUG="-g -Wall -W -D_REENTRANT -D__NO_MATH_INLINES
-fsigned-char"
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/51d3312c958b08a2d2578b9dd00167244201189c
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/51d3312c958b08a2d2578b9dd00167244201189c
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
