[libtheora] Update to version 1.1.1 and autogen.sh fix

- Update to release version 1.1.1
- Rewrite the autogen.sh script to prevent pulling
  in host libtoolize.

Signed-off-by: Erwin Rol <erwin@erwinrol.com>

5 files changed, 233 insertions, 0 deletions

diff --git a/patches/libtheora-1.1.1/autogen.sh b/patches/libtheora-1.1.1/autogen.sh
new file mode 100755
index 000000000..e0a6f14ab
--- /dev/null
+++ b/patches/libtheora-1.1.1/autogen.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+./autogen.sh --help
+
+
+echo "Generating configuration files for $package, please wait...."
+
+echo "  aclocal -I m4"
+aclocal -I m4 || exit 1
+echo "  libtoolize --automake --force"
+libtoolize --automake --force || exit 1
+echo "  autoheader"
+autoheader || exit 1
+echo "  automake --add-missing"
+automake --add-missing || exit 1
+echo "  autoconf"
+autoconf || exit 1
+
+
diff --git a/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-ogg.diff b/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-ogg.diff
new file mode 100644
index 000000000..ded272617
--- /dev/null
+++ b/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-ogg.diff
@@ -0,0 +1,81 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: libtheora: fix configure.ac to work with cross scenario for ogg
+
+This is https://trac.xiph.org/ticket/1467
+
+The current test in configure.ac mixes up two different methods (hand
+written plus pkg-config). This patch changes the mechanics towards
+proper pkg-config usage. In return, we get a cleaned up cross scenario
+with no build-system leakage.
+
+This patch fixes the libogg test.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ configure.ac |   50 ++++++++++++++++++++++++--------------------------
+ 1 file changed, 24 insertions(+), 26 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
+ dnl --------------------------------------------------
+ 
+-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)
+-if test "x$HAVE_PKG_CONFIG" = "xyes"
+-then
+-  PKG_CHECK_MODULES(OGG, ogg >= 1.1, 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
+-    obtain a copy.
+-  ]))
+-  cflags_save=$CFLAGS
+-  libs_save=$LIBS
+-  CFLAGS="$CFLAGS $OGG_CFLAGS"
+-  LIBS="$LIBS $OGG_LIBS"
+-  AC_CHECK_FUNC(oggpackB_read, , [
+-    AC_MSG_ERROR([newer libogg version (1.1 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@:>@]),
++        [case "$enableval" in
++        y | yes) HAVE_OGG=yes ;;
++        *) HAVE_OGG=no ;;
++        esac],
++    [HAVE_OGG=yes])
++AC_MSG_RESULT([${HAVE_OGG}])
++AM_CONDITIONAL(HAVE_OGG, [test "$HAVE_OGG" = "yes"])
++if test "${HAVE_OGG}" = "yes"; then
++    AC_DEFINE(HAVE_OGG, 1, [ogg])
++
++    REQUIRES_OGG="ogg >= 1.1"
++    AC_SUBST(REQUIRES_OGG)
++    PKG_CHECK_MODULES([OGG],
++          [${REQUIRES_OGG}],
++          [],
++          [AC_MSG_ERROR([*** ${REQUIRES_OGG} not found by pkg-config on your system])]
++    )
++    AC_SUBST(OGG_CFLAGS)
++    AC_SUBST(OGG_LIBS)
+ fi
+ 
+ 
diff --git a/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-sdl.diff b/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-sdl.diff
new file mode 100644
index 000000000..905e3306d
--- /dev/null
+++ b/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-sdl.diff
@@ -0,0 +1,60 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: libtheora: fix configure.ac to work with cross scenario for sdl
+
+This is https://trac.xiph.org/ticket/1466
+
+The current test in configure.ac mixes up two different methods (hand
+written plus pkg-config). This patch changes the mechanics towards
+proper pkg-config usage. In return, we get a cleaned up cross scenario
+with no build-system leakage.
+
+This patch fixes the SDL test.
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ configure.ac |   29 ++++++++++++++++++++++++-----
+ 1 file changed, 24 insertions(+), 5 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)
+ fi
+ 
++
+ dnl check for SDL
+-HAVE_SDL=no
++AC_MSG_CHECKING([for sdl])
++AC_ARG_ENABLE(sdl,
++    AS_HELP_STRING([--enable-sdl], [enable SDL @<:@default=yes@:>@]),
++        [case "$enableval" in
++        y | yes) HAVE_SDL=yes ;;
++        *) HAVE_SDL=no ;;
++        esac],
++    [HAVE_SDL=yes])
++AC_MSG_RESULT([${HAVE_SDL}])
++AM_CONDITIONAL(HAVE_SDL, [test "$HAVE_SDL" = "yes"])
++if test "${HAVE_SDL}" = "yes"; then
++    AC_DEFINE(HAVE_SDL, 1, [sdl])
++
++    REQUIRES_SDL="sdl >= 1.2.13"
++    AC_SUBST(REQUIRES_SDL)
++    PKG_CHECK_MODULES([SDL],
++          [${REQUIRES_SDL}],
++          [],
++          [AC_MSG_ERROR([*** ${REQUIRES_SDL} not found by pkg-config on your system])]
++    )
++    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 ***]))
+ 
+ dnl check for OSS
+ HAVE_OSS=no
diff --git a/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-vorbis.diff b/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-vorbis.diff
new file mode 100644
index 000000000..fcb875009
--- /dev/null
+++ b/patches/libtheora-1.1.1/libtheora-1.0beta3-configure-vorbis.diff
@@ -0,0 +1,69 @@
+From: Robert Schwebel <r.schwebel@pengutronix.de>
+Subject: libtheora: fix configure.ac to work with cross scenario for libvorbis
+
+This is https://trac.xiph.org/ticket/1465
+
+The current test in configure.ac mixes up two different methods (hand
+written plus pkg-config). This patch changes the mechanics towards
+proper pkg-config usage. In return, we get a cleaned up cross scenario
+with no build-system leakage.
+
+This patch fixes the vorbis test.
+
+
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+
+---
+ 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
+ 
+ 
+ dnl check for Vorbis
+-HAVE_VORBIS=no
+-
+-dnl first check through pkg-config since it's more flexible
+-
+-if test "x$HAVE_PKG_CONFIG" = "xyes"
+-then
+-  PKG_CHECK_MODULES(VORBIS, vorbis >= 1.0.1, HAVE_VORBIS=yes, HAVE_VORBIS=no)
+-  dnl also set VORBISENC_LIBS since an examples needs it
+-  dnl the old .m4 sets this to a value to use on top of VORBIS_LIBS,
+-  dnl so we do the same here.
+-  VORBISENC_LIBS="-lvorbisenc"
+-  AC_SUBST(VORBISENC_LIBS)
+-fi
+-if test "x$HAVE_VORBIS" = "xno"
+-then
+-  dnl fall back to the old school test
+-  XIPH_PATH_VORBIS(HAVE_VORBIS=yes, HAVE_VORBIS=no)
++AC_MSG_CHECKING([for vorbis])
++AC_ARG_ENABLE(vorbis,
++    AS_HELP_STRING([--enable-vorbis], [enable vorbis @<:@default=yes@:>@]),
++        [case "$enableval" in
++        y | yes) HAVE_VORBIS=yes ;;
++        *) HAVE_VORBIS=no ;;
++        esac],
++    [HAVE_VORBIS=yes])
++AC_MSG_RESULT([${HAVE_VORBIS}])
++AM_CONDITIONAL(HAVE_VORBIS, [test "$HAVE_VORBIS" = "yes"])
++if test "${HAVE_VORBIS}" = "yes"; then
++    AC_DEFINE(HAVE_VORBIS, 1, [vorbis])
++
++    REQUIRES_VORBIS="vorbis >= 1.0.1"
++    AC_SUBST(REQUIRES_VORBIS)
++    PKG_CHECK_MODULES([VORBIS],
++          [${REQUIRES_VORBIS}],
++          [],
++          [AC_MSG_ERROR([*** ${REQUIRES_VORBIS} not found by pkg-config on your system])]
++    )
++    AC_SUBST(VORBIS_CFLAGS)
++    AC_SUBST(VORBIS_LIBS)
+ fi
+ 
+ dnl check for SDL
diff --git a/patches/libtheora-1.1.1/series b/patches/libtheora-1.1.1/series
new file mode 100644
index 000000000..10f7ff3fc
--- /dev/null
+++ b/patches/libtheora-1.1.1/series
@@ -0,0 +1,4 @@
+libtheora-1.0beta3-configure-vorbis.diff
+libtheora-1.0beta3-configure-sdl.diff
+libtheora-1.0beta3-configure-ogg.diff
+