Skip to content
Snippets Groups Projects
Commit 10b3ce94 authored by Petter Reinholdtsen's avatar Petter Reinholdtsen
Browse files

Updated requirement information in README, .pc and spec files.

Document the need for ogg 1.3.4 and use the 1.2.0 version number
more places.  Move required ogg version to configure.ac substitution
variable.

Fixes #2328
parent 61ab2119
No related branches found
No related tags found
1 merge request!39Updated requirement information in README, .pc and spec files.
Pipeline #6291 passed
......@@ -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:
......
......@@ -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
......
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>
......
......@@ -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}
......@@ -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}
......@@ -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}
......@@ -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}
......@@ -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}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment