On Wed, Sep 23, 2026 at 06:01:05PM +0200, Sven Püschel wrote: > https://gitlab.xiph.org/xiph/theora/-/releases/v1.2.0 > > Adjusted the patches to apply correctly and use git ptx-patches to > generate them. > > The LICENSE file checksum change is caused due to the removal of some > trailing whitespaces. > > The floating point option has been removed, the critical path doesn't > use floating points anymore and to get some simpler code. > > All other options have been reordered to match the output of the > configure_helper.py script and missing options have been added. > While most options are straight forward, asflags-probe seems to > dynamically adjust ASFLAGS to compile relevant asm instructions and then > decide at runtime (when they are supported) to use them. From the > configure.ac file of theora: > > > gas will not assemble instructions unless the architecture explicitly > > supports it (unlike on x86). > > Try to speculatively add ASFLAGS to enable usage of these instructions > > at assembly time (actual support is detected at runtime). > > If the user has already specified -march or -mcpu flags, this may give > > some spurious warnings (use --disable-asflag-probe to avoid this if > > you don't want run-time support for instructions not available on the > > architecture you specified).
Hmmmm, on ARMv7 building fails with: make[3]: Entering directory '.../build-target/libtheora-1.2.0/lib' Makefile:1357: warning: ignoring prerequisites on suffix rule definition [...] CPPAS armfrag-gnu.lo CPPAS armbits-gnu.lo CPPAS armidct-gnu.lo CPPAS armloop-gnu.lo cc1: fatal error: armloop-gnu.S: No such file or directory compilation terminated. make[3]: *** [Makefile:986: armloop-gnu.lo] Error 1 make[3]: *** Waiting for unfinished jobs.... Michael > Signed-off-by: Sven Püschel <[email protected]> > --- > patches/libtheora-1.1.1/series | 4 -- > ...figure.ac-to-work-with-cross-scenar.patch} | 18 ++++----- > ...figure.ac-to-work-with-cross-scenar.patch} | 34 ++++++++-------- > ...figure.ac-to-work-with-cross-scenar.patch} | 39 ++++++++++--------- > .../autogen.sh | 0 > patches/libtheora-1.2.0/series | 6 +++ > rules/libtheora.in | 7 ---- > rules/libtheora.make | 20 +++++----- > 8 files changed, 62 insertions(+), 66 deletions(-) > delete mode 100644 patches/libtheora-1.1.1/series > rename patches/{libtheora-1.1.1/libtheora-1.0beta3-configure-vorbis.diff => > libtheora-1.2.0/0001-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch} > (84%) > rename patches/{libtheora-1.1.1/libtheora-1.0beta3-configure-sdl.diff => > libtheora-1.2.0/0002-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch} > (66%) > rename patches/{libtheora-1.1.1/libtheora-1.0beta3-configure-ogg.diff => > libtheora-1.2.0/0003-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch} > (69%) > rename patches/{libtheora-1.1.1 => libtheora-1.2.0}/autogen.sh (100%) > create mode 100644 patches/libtheora-1.2.0/series > > diff --git a/patches/libtheora-1.1.1/series b/patches/libtheora-1.1.1/series > deleted file mode 100644 > index 10f7ff3fc..000000000 > --- a/patches/libtheora-1.1.1/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -libtheora-1.0beta3-configure-vorbis.diff > -libtheora-1.0beta3-configure-sdl.diff > -libtheora-1.0beta3-configure-ogg.diff > - > diff --git a/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-vorbis.diff > b/patches/libtheora-1.2.0/0001-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch > similarity index 84% > rename from patches/libtheora-1.1.1/libtheora-1.0beta3-configure-vorbis.diff > rename to > patches/libtheora-1.2.0/0001-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch > index fcb875009..f792f3ca4 100644 > --- a/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-vorbis.diff > +++ > b/patches/libtheora-1.2.0/0001-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch > @@ -1,5 +1,7 @@ > From: Robert Schwebel <[email protected]> > -Subject: libtheora: fix configure.ac to work with cross scenario for > libvorbis > +Date: Wed, 23 Sep 2026 15:39:17 +0200 > +Subject: [PATCH] libtheora: fix configure.ac to work with cross scenario for > + libvorbis > > This is https://trac.xiph.org/ticket/1465 > > @@ -10,18 +12,16 @@ with no build-system leakage. > > This patch fixes the vorbis test. > > - > Signed-off-by: Robert Schwebel <[email protected]> > - > --- > - configure.ac | 39 ++++++++++++++++++++++----------------- > + configure.ac | 39 ++++++++++++++++++++++----------------- > 1 file changed, 22 insertions(+), 17 deletions(-) > > -Index: libtheora-1.0/configure.ac > -=================================================================== > ---- libtheora-1.0.orig/configure.ac > -+++ libtheora-1.0/configure.ac > -@@ -288,23 +288,28 @@ fi > +diff --git a/configure.ac b/configure.ac > +index 3d2a413a1d18..234acd501685 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -442,23 +442,28 @@ fi > > > dnl check for Vorbis > diff --git a/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-sdl.diff > b/patches/libtheora-1.2.0/0002-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch > similarity index 66% > rename from patches/libtheora-1.1.1/libtheora-1.0beta3-configure-sdl.diff > rename to > patches/libtheora-1.2.0/0002-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch > index 905e3306d..cccd92dae 100644 > --- a/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-sdl.diff > +++ > b/patches/libtheora-1.2.0/0002-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch > @@ -1,5 +1,7 @@ > From: Robert Schwebel <[email protected]> > -Subject: libtheora: fix configure.ac to work with cross scenario for sdl > +Date: Wed, 23 Sep 2026 16:36:40 +0200 > +Subject: [PATCH] libtheora: fix configure.ac to work with cross scenario for > + sdl > > This is https://trac.xiph.org/ticket/1466 > > @@ -11,22 +13,24 @@ with no build-system leakage. > This patch fixes the SDL test. > > Signed-off-by: Robert Schwebel <[email protected]> > - > --- > - configure.ac | 29 ++++++++++++++++++++++++----- > - 1 file changed, 24 insertions(+), 5 deletions(-) > + configure.ac | 28 ++++++++++++++++++++++------ > + 1 file changed, 22 insertions(+), 6 deletions(-) > > -Index: libtheora-1.0/configure.ac > -=================================================================== > ---- libtheora-1.0.orig/configure.ac > -+++ libtheora-1.0/configure.ac > -@@ -312,13 +312,32 @@ if test "${HAVE_VORBIS}" = "yes"; then > - AC_SUBST(VORBIS_LIBS) > +diff --git a/configure.ac b/configure.ac > +index 234acd501685..8a4faa7d344f 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -467,12 +467,28 @@ if test "${HAVE_VORBIS}" = "yes"; then > fi > > -+ > dnl check for SDL > -HAVE_SDL=no > +-if test "x$HAVE_PKG_CONFIG" = "xyes" > +-then > +- PKG_CHECK_MODULES(SDL, sdl, HAVE_SDL=yes, [ > +- HAVE_SDL=no > +- AC_MSG_WARN([*** Unable to find SDL -- Not compiling example players > ***])]) > +AC_MSG_CHECKING([for sdl]) > +AC_ARG_ENABLE(sdl, > + AS_HELP_STRING([--enable-sdl], [enable SDL @<:@default=yes@:>@]), > @@ -49,12 +53,6 @@ Index: libtheora-1.0/configure.ac > + ) > + AC_SUBST(SDL_CFLAGS) > + AC_SUBST(SDL_LIBS) > -+fi > - > --AM_PATH_SDL(,[ > -- HAVE_SDL=yes > -- SDL_LIBS=`$SDL_CONFIG --libs` > --],AC_MSG_WARN([*** Unable to find SDL -- Not compiling example players > ***])) > + fi > > dnl check for OSS > - HAVE_OSS=no > diff --git a/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-ogg.diff > b/patches/libtheora-1.2.0/0003-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch > similarity index 69% > rename from patches/libtheora-1.1.1/libtheora-1.0beta3-configure-ogg.diff > rename to > patches/libtheora-1.2.0/0003-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch > index ded272617..709702491 100644 > --- a/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-ogg.diff > +++ > b/patches/libtheora-1.2.0/0003-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch > @@ -1,5 +1,7 @@ > From: Robert Schwebel <[email protected]> > -Subject: libtheora: fix configure.ac to work with cross scenario for ogg > +Date: Wed, 23 Sep 2026 17:03:33 +0200 > +Subject: [PATCH] libtheora: fix configure.ac to work with cross scenario for > + ogg > > This is https://trac.xiph.org/ticket/1467 > > @@ -11,36 +13,37 @@ with no build-system leakage. > This patch fixes the libogg test. > > Signed-off-by: Robert Schwebel <[email protected]> > - > --- > - configure.ac | 50 ++++++++++++++++++++++++-------------------------- > - 1 file changed, 24 insertions(+), 26 deletions(-) > + configure.ac | 52 ++++++++++++++++++++++------------------------------ > + 1 file changed, 22 insertions(+), 30 deletions(-) > > -Index: libtheora-1.0/configure.ac > -=================================================================== > ---- libtheora-1.0.orig/configure.ac > -+++ libtheora-1.0/configure.ac > -@@ -256,34 +256,32 @@ dnl ------------------------------------ > - dnl Checks for support libraries and headers > +diff --git a/configure.ac b/configure.ac > +index 8a4faa7d344f..b17cafe75b92 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -408,36 +408,28 @@ dnl Checks for support libraries and headers > dnl -------------------------------------------------- > > --dnl check for Ogg > + dnl check for Ogg > -HAVE_OGG=no > - > +- > -dnl first check through pkg-config since it's more flexible > - > +- > -dnl check for pkg-config itself so we don't try the m4 macro without > pkg-config > -AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes) > +- > +-THEORA_LIBOGG_REQ_VERSION=1.3.4 > +-AC_SUBST(THEORA_LIBOGG_REQ_VERSION) > -if test "x$HAVE_PKG_CONFIG" = "xyes" > -then > -- PKG_CHECK_MODULES(OGG, ogg >= 1.1, HAVE_OGG=yes, HAVE_OGG=no) > +- PKG_CHECK_MODULES(OGG, ogg >= $THEORA_LIBOGG_REQ_VERSION, HAVE_OGG=yes, > HAVE_OGG=no) > -fi > -if test "x$HAVE_OGG" = "xno" > -then > - dnl fall back to the old school test > - XIPH_PATH_OGG(, AC_MSG_ERROR([ > - libogg is required to build this package! > -- please see http://www.xiph.org/ for how to > +- please see https://www.xiph.org/ for how to > - obtain a copy. > - ])) > - cflags_save=$CFLAGS > @@ -48,12 +51,10 @@ Index: libtheora-1.0/configure.ac > - CFLAGS="$CFLAGS $OGG_CFLAGS" > - LIBS="$LIBS $OGG_LIBS" > - AC_CHECK_FUNC(oggpackB_read, , [ > -- AC_MSG_ERROR([newer libogg version (1.1 or later) required]) > +- AC_MSG_ERROR([newer libogg version ($THEORA_LIBOGG_REQ_VERSION or > later) required]) > - ]) > - CFLAGS=$cflags_save > - LIBS=$libs_save > -+ > -+dnl check for Ogg > +AC_MSG_CHECKING([for ogg]) > +AC_ARG_ENABLE(ogg, > + AS_HELP_STRING([--enable-ogg], [enable ogg @<:@default=yes@:>@]), > @@ -67,7 +68,7 @@ Index: libtheora-1.0/configure.ac > +if test "${HAVE_OGG}" = "yes"; then > + AC_DEFINE(HAVE_OGG, 1, [ogg]) > + > -+ REQUIRES_OGG="ogg >= 1.1" > ++ REQUIRES_OGG="ogg >= 1.3.4" > + AC_SUBST(REQUIRES_OGG) > + PKG_CHECK_MODULES([OGG], > + [${REQUIRES_OGG}], > diff --git a/patches/libtheora-1.1.1/autogen.sh > b/patches/libtheora-1.2.0/autogen.sh > similarity index 100% > rename from patches/libtheora-1.1.1/autogen.sh > rename to patches/libtheora-1.2.0/autogen.sh > diff --git a/patches/libtheora-1.2.0/series b/patches/libtheora-1.2.0/series > new file mode 100644 > index 000000000..840aa1657 > --- /dev/null > +++ b/patches/libtheora-1.2.0/series > @@ -0,0 +1,6 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch > +0002-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch > +0003-libtheora-fix-configure.ac-to-work-with-cross-scenar.patch > +# 7fb07d85860ed38f6a476812ef9e9b2a - git-ptx-patches magic > diff --git a/rules/libtheora.in b/rules/libtheora.in > index c29889a51..01631a442 100644 > --- a/rules/libtheora.in > +++ b/rules/libtheora.in > @@ -15,13 +15,6 @@ config LIBTHEORA_VORBIS > bool > prompt "vorbis support" > > -config LIBTHEORA_FLOAT > - bool > - prompt "floating point support" > - help > - Disable use of floating point code. This might be a good idea on > - architectures which don't have an FPU. > - > config LIBTHEORA_ENCODING > bool > prompt "encoding support" > diff --git a/rules/libtheora.make b/rules/libtheora.make > index c0e341500..a7031dafa 100644 > --- a/rules/libtheora.make > +++ b/rules/libtheora.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBTHEORA) += libtheora > # > # Paths and names > # > -LIBTHEORA_VERSION := 1.1.1 > -LIBTHEORA_SHA256 := > 40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b > +LIBTHEORA_VERSION := 1.2.0 > +LIBTHEORA_SHA256 := > 279327339903b544c28a92aeada7d0dcfd0397b59c2f368cc698ac56f515906e > LIBTHEORA := libtheora-$(LIBTHEORA_VERSION) > LIBTHEORA_SUFFIX := tar.gz > LIBTHEORA_URL := > http://downloads.xiph.org/releases/theora/$(LIBTHEORA).$(LIBTHEORA_SUFFIX) > @@ -25,7 +25,7 @@ LIBTHEORA_DIR := $(BUILDDIR)/$(LIBTHEORA) > LIBTHEORA_LICENSE := BSD-3-Clause > LIBTHEORA_LICENSE_FILES := \ > file://COPYING;md5=cf91718f59eb6a83d06dc7bcaf411132 \ > - file://LICENSE;md5=82ccf023e3ce1aa18043edc61f948e2c > + file://LICENSE;md5=85dce169acaaabe0f13caf35a513098e > > # > ---------------------------------------------------------------------------- > # Prepare > @@ -44,17 +44,19 @@ LIBTHEORA_CONF_ENV := \ > LIBTHEORA_CONF_TOOL := autoconf > LIBTHEORA_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > - --enable-asm \ > - --disable-examples \ > + --disable-doc \ > --disable-spec \ > --disable-valgrind-testing \ > - --disable-telemetry \ > - --disable-examples \ > + --disable-gcc-sanitizers \ > + --enable-asm \ > + --enable-asflag-probe \ > --enable-ogg \ > --$(call ptx/endis, PTXCONF_LIBTHEORA_VORBIS)-vorbis \ > --disable-sdl \ > - --$(call ptx/endis, PTXCONF_LIBTHEORA_FLOAT)-float \ > - --$(call ptx/endis, PTXCONF_LIBTHEORA_ENCODING)-encode > + --disable-telemetry \ > + --disable-mem-constraint \ > + --$(call ptx/endis, PTXCONF_LIBTHEORA_ENCODING)-encode \ > + --disable-examples > > # > ---------------------------------------------------------------------------- > # Target-Install > -- > 2.47.3 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
