[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: theora: update to 1.2.0
Steve Lhomme (@robUx4)
gitlab at videolan.org
Fri May 1 09:04:24 UTC 2026
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
b49d17a0 by Steve Lhomme at 2026-05-01T08:29:20+00:00
contrib: theora: update to 1.2.0
Ref #29814 as this version doesn't contain the usage of _ogg_offsetof().
- - - - -
e9908a48 by Steve Lhomme at 2026-05-01T08:29:20+00:00
extras: tools: bump the minimum autoconf version to 2.71
The libtheora git version requires it.
- - - - -
b3fea20f by Steve Lhomme at 2026-05-01T08:29:20+00:00
contrib: theora: use latest git hash
It should fix arm build and fixes CVE-2026-5673
- - - - -
5 changed files:
- contrib/src/theora/SHA512SUMS
- − contrib/src/theora/libtheora-compiler-differentiation.patch
- − contrib/src/theora/libtheora-no-forceaddr.patch
- contrib/src/theora/rules.mak
- extras/tools/bootstrap
Changes:
=====================================
contrib/src/theora/SHA512SUMS
=====================================
@@ -1 +1 @@
-032fb60f10ac0074ec87d5f8c586702309edc50dc0d2842d2f9b9c46ebd1500acc399e9309f858f318fff5b8fbe953234db3afb54ed74a03d0f2c6ee8c3ed481 libtheora-1.1.1.tar.xz
+849db0c916f0f0b1237a4893594ff4b9e72d4ad1dca42f3f2979af5971f42c3fe77a75b181dfdd1c1353bbca4c832d6ab43f6d509c0650901c692e96ceab5f26 libtheora-1.2.0.tar.xz
=====================================
contrib/src/theora/libtheora-compiler-differentiation.patch deleted
=====================================
@@ -1,25 +0,0 @@
-diff -ru libtheora/configure.ac libtheora-fixed/configure.ac
---- libtheora/configure.ac 2009-10-01 20:00:33.000000000 +0200
-+++ libtheora-fixed/configure.ac 2014-06-13 20:21:16.000000000 +0200
-@@ -155,8 +155,20 @@
-
- dnl Set some target options
-
-+cc_compiler=unknown
-+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#if ! __clang__
-+ #error
-+ #endif
-+ ]])],
-+ cc_compiler=clang,
-+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#if ! __GNUC__
-+ #error
-+ #endif
-+ ]])],
-+ cc_compiler=gcc, [])])
-+
- cflags_save="$CFLAGS"
--if test -z "$GCC"; then
-+if test $cc_compiler != "gcc" ; then
- case $host in
- *)
- DEBUG="-g -DDEBUG"
=====================================
contrib/src/theora/libtheora-no-forceaddr.patch deleted
=====================================
@@ -1,22 +0,0 @@
---- a/configure.ac.orig 2014-06-27 16:45:06.000000000 -0400
-+++ b/configure.ac 2014-06-27 16:45:23.000000000 -0400
-@@ -180,7 +180,7 @@
- case $host in
- *)
- DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
-- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
-+ CFLAGS="-Wall -Wno-parentheses -O3 -fomit-frame-pointer -finline-functions -funroll-loops"
- PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
- esac
- fi
---- a/configure.orig 2014-06-27 16:57:16.000000000 -0400
-+++ b/configure 2014-06-27 16:57:21.000000000 -0400
-@@ -11863,7 +11863,7 @@
- case $host in
- *)
- DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
-- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
-+ CFLAGS="-Wall -Wno-parentheses -O3 -fomit-frame-pointer -finline-functions -funroll-loops"
- PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
- esac
- fi
=====================================
contrib/src/theora/rules.mak
=====================================
@@ -1,7 +1,10 @@
# Theora
-THEORA_VERSION := 1.1.1
+THEORA_VERSION := 1.2.0
THEORA_URL := $(XIPH)/theora/libtheora-$(THEORA_VERSION).tar.xz
+THEORA_GITURL := https://gitlab.xiph.org/xiph/theora.git
+THEORA_GITBRANCH := main
+THEORA_GITVERSION := fb92ede9ba5162d0b8134cd1ff57751df6f3dbe6
PKGS += theora
ifeq ($(call need_pkg,"theora >= 1.0"),)
@@ -13,14 +16,17 @@ $(TARBALLS)/libtheora-$(THEORA_VERSION).tar.xz:
.sum-theora: libtheora-$(THEORA_VERSION).tar.xz
-libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
+$(TARBALLS)/libtheora-$(THEORA_GITVERSION).tar.xz:
+ $(call download_git,$(THEORA_GITURL),$(THEORA_GITBRANCH),$(THEORA_GITVERSION))
+
+.sum-theora: libtheora-$(THEORA_GITVERSION).tar.xz
+ $(call check_githash,$(THEORA_GITVERSION))
+ touch $@
+
+# libtheora: libtheora-$(THEORA_VERSION).tar.xz .sum-theora
+libtheora: libtheora-$(THEORA_GITVERSION).tar.xz
$(UNPACK)
- $(call update_autoconfig,.)
- $(APPLY) $(SRC)/theora/libtheora-compiler-differentiation.patch
- $(APPLY) $(SRC)/theora/libtheora-no-forceaddr.patch
- # Disable the generation of documentation. In 1.2.x it can be replaced by
- # a --disable-doc parameter.
- sed -i.orig "/^SUBDIRS =/s/doc//g" "$(UNPACK_DIR)/Makefile.am" "$(UNPACK_DIR)/Makefile.in"
+ # $(call update_autoconfig,.)
$(MOVE)
THEORACONF := \
@@ -28,7 +34,8 @@ THEORACONF := \
--disable-sdltest \
--disable-oggtest \
--disable-vorbistest \
- --disable-examples
+ --disable-examples \
+ --disable-doc
ifndef BUILD_ENCODERS
THEORACONF += --disable-encode
@@ -36,21 +43,14 @@ endif
ifndef HAVE_FPU
THEORACONF += --disable-float
endif
-ifdef HAVE_MACOSX64
-THEORACONF += --disable-asm
-endif
ifdef HAVE_IOS
THEORACONF += --disable-asm
endif
-ifdef HAVE_WIN32
-ifeq ($(ARCH),x86_64)
-THEORACONF += --disable-asm
-endif
-endif
DEPS_theora = ogg $(DEPS_ogg)
.theora: libtheora
+ $(RECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(THEORACONF)
+$(MAKEBUILD)
=====================================
extras/tools/bootstrap
=====================================
@@ -15,7 +15,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
-MIN_AUTOCONF=2.69
+MIN_AUTOCONF=2.71
MIN_AUTOMAKE=1.15
MIN_BISON=3.0.0
MIN_CMAKE=3.21.0
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9c6dbd31ca4430507b4f7faa233b02eea054a7dd...b3fea20f91a756161d160d6fc480e3b5ac99eb46
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/9c6dbd31ca4430507b4f7faa233b02eea054a7dd...b3fea20f91a756161d160d6fc480e3b5ac99eb46
You're receiving this email because of your account on code.videolan.org.
More information about the vlc-commits
mailing list