diff --git a/README.md b/README.md index 8f558d7df127bb023800f784abffc83a196af695..db9bf56b1ef198aaddc9e84ca7dfce2614090d82 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Requirements summary: For libtheora: -* libogg 1.1 or newer. +* libogg 1.3.4 or newer. For example encoder: @@ -116,7 +116,7 @@ Jan Gerber's ffmpeg2theora is an excellent encoding front end. encoder_internal.h:664: parse error before `ogg_uint16_t` -This means you have version of libogg prior to 1.1. A *complete* new Ogg +This means you have version of libogg prior to 1.3.4. A *complete* new Ogg install, libs and headers is needed. Also be sure that there aren't multiple copies of Ogg installed in @@ -127,7 +127,7 @@ for libs and headers. undefined reference to `oggpackB_stream` -See above; you need libogg 1.1 or later. +See above; you need libogg 1.3.4 or later. ### Link error, such as: diff --git a/configure.ac b/configure.ac index 33f43be328da169a9e9fa5c5da9dfb94d0b3c780..47fa9c80cd2870b56f67760382f2245cea0ad41e 100644 --- a/configure.ac +++ b/configure.ac @@ -402,9 +402,12 @@ 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.3.4, 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 @@ -419,7 +422,7 @@ then CFLAGS="$CFLAGS $OGG_CFLAGS" LIBS="$LIBS $OGG_LIBS" AC_CHECK_FUNC(oggpackB_read, , [ - AC_MSG_ERROR([newer libogg version (1.3.4 or later) required]) + AC_MSG_ERROR([newer libogg version ($THEORA_LIBOGG_REQ_VERSION or later) required]) ]) CFLAGS=$cflags_save LIBS=$libs_save diff --git a/libtheora.spec.in b/libtheora.spec.in index ce9345ed047cd75e3c8b329910715ed00d6a5247..ac3591085de1e8ded7f2c3cc8897feb1874dcc78 100644 --- a/libtheora.spec.in +++ b/libtheora.spec.in @@ -1,6 +1,6 @@ Name: libtheora Version: @VERSION@ -Release: 0.xiph.0.4.alpha5 +Release: 0.xiph.0 Summary: The Theora Video Compression Codec. Group: System Environment/Libraries @@ -10,7 +10,7 @@ Vendor: Xiph.org Foundation <team@xiph.org> Source: http://downloads.xiph.org/releases/theora/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: libogg-devel >= 2:1.1 +BuildRequires: libogg-devel >= 2:@THEORA_LIBOGG_REQ_VERSION@ BuildRequires: libvorbis-devel >= 1:1.0.1 BuildRequires: SDL-devel @@ -30,7 +30,7 @@ in the future to improve over what is possible with VP3. Summary: Development tools for Theora applications. Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libogg-devel >= 2:1.1 +Requires: libogg-devel >= 2:@THEORA_LIBOGG_REQ_VERSION@ %description devel The libtheora-devel package contains the header files and documentation @@ -76,6 +76,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/theora.pc %changelog +* Sat Mar 16 2025 Petter Reinholdtsen <pere at hungry.com> +- updated version for 1.2beta1 release * Sat Aug 20 2005 Ralph Giles <giles at xiph.org> - updated version for 1.0alpha5 release * Thu Jun 10 2004 Thomas Vander Stichele <thomas at apestaart dot org> diff --git a/theora-uninstalled.pc.in b/theora-uninstalled.pc.in index 6446850523da915b8d82bc0416ab01fd0c11422b..b676eb2550dafc9ac4d6bd4964615f231afe1233 100644 --- a/theora-uninstalled.pc.in +++ b/theora-uninstalled.pc.in @@ -8,7 +8,7 @@ includedir=${pcfiledir}/include Name: theora uninstalled Description: Theora video codec (not installed) Version: @VERSION@ -Requires: ogg >= 1.1 +Requires: ogg >= @THEORA_LIBOGG_REQ_VERSION@ Conflicts: Libs: ${libdir}/libtheora.la Cflags: -I${includedir} diff --git a/theora.pc.in b/theora.pc.in index 96efec94db53744027c711194ebee973b91298dd..b5470afc9b20336a90f61dd4c13a442d82c0f8a3 100644 --- a/theora.pc.in +++ b/theora.pc.in @@ -8,7 +8,7 @@ includedir=@includedir@ Name: theora Description: Theora video codec Version: @VERSION@ -Requires: ogg >= 1.1 +Requires: ogg >= @THEORA_LIBOGG_REQ_VERSION@ Conflicts: Libs: -L${libdir} -ltheora Cflags: -I${includedir} diff --git a/theoradec-uninstalled.pc.in b/theoradec-uninstalled.pc.in index 8bf9df1325711e281ebd72100544b078e9ec2186..6b8b6c70707ffb98b67f0090adf28f74d00c4e36 100644 --- a/theoradec-uninstalled.pc.in +++ b/theoradec-uninstalled.pc.in @@ -8,7 +8,7 @@ includedir=${pcfiledir}/include Name: theora uninstalled Description: Theora video codec(decoder) (not installed) Version: @VERSION@ -Requires: ogg >= 1.1 +Requires: ogg >= @THEORA_LIBOGG_REQ_VERSION@ Conflicts: Libs: ${libdir}/libtheoradec.la Cflags: -I${includedir} diff --git a/theoradec.pc.in b/theoradec.pc.in index 615718df84ea93b4d5d43b2b539f54fc3b078b86..73de6a8e21f089832e09c8680fd53c11f406e0cd 100644 --- a/theoradec.pc.in +++ b/theoradec.pc.in @@ -8,7 +8,7 @@ includedir=@includedir@ Name: theora Description: Theora video codec (decoder) Version: @VERSION@ -Requires: ogg >= 1.1 +Requires: ogg >= @THEORA_LIBOGG_REQ_VERSION@ Conflicts: Libs: -L${libdir} -ltheoradec Cflags: -I${includedir} diff --git a/theoraenc.pc.in b/theoraenc.pc.in index 007ac8f82019a4ecbad20d97ec6da50c486cdd9a..96bc51435236a88e119ae6217f498210dcd4cdf7 100644 --- a/theoraenc.pc.in +++ b/theoraenc.pc.in @@ -8,7 +8,7 @@ includedir=@includedir@ Name: theora Description: Theora video codec (encoder) Version: @VERSION@ -Requires: theoradec, ogg >= 1.1 +Requires: theoradec, ogg >= @THEORA_LIBOGG_REQ_VERSION@ Conflicts: Libs: -L${libdir} -ltheoraenc Cflags: -I${includedir}