Move more recipes to tarballs

25 files changed, 889 insertions, 5 deletions

diff --git a/recipes/icon-naming-utils.recipe b/recipes/icon-naming-utils.recipe
index df42c639..3f0db3b8 100644
--- a/recipes/icon-naming-utils.recipe
+++ b/recipes/icon-naming-utils.recipe
@@ -3,6 +3,8 @@
 class Recipe(recipe.Recipe):
     name = 'icon-naming-utils'
     version = '0.8.7'
+    stype = SourceType.TARBALL
+    url = 'http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz'
     licenses = [License.GPLv2]
     deps = ['XML-Simple']
 
diff --git a/recipes/iso-codes.recipe b/recipes/iso-codes.recipe
index 5ec624ad..92283065 100644
--- a/recipes/iso-codes.recipe
+++ b/recipes/iso-codes.recipe
@@ -3,5 +3,7 @@
 
 class Recipe(recipe.Recipe):
     name = 'iso-codes'
-    version = '3.37'
+    version = '3.57'
+    stype = SourceType.TARBALL
+    url = 'http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.57.tar.xz'
     licenses = [License.LGPLv2_1Plus]
diff --git a/recipes/libdca.recipe b/recipes/libdca.recipe
index 811b3ffd..69f50f69 100644
--- a/recipes/libdca.recipe
+++ b/recipes/libdca.recipe
@@ -3,7 +3,10 @@
 class Recipe(recipe.Recipe):
     name = 'libdca'
     version = '0.0.5'
+    stype = SourceType.TARBALL
+    url = 'http://download.videolan.org/pub/videolan/libdca/0.0.5/libdca-0.0.5.tar.bz2'
     licenses = [License.GPL]
+    patches = ['libdca/0001-Disable-AC_C_ALWAYS_INLINE.patch']
     autoreconf = True
 
     files_libs = ['libdca']
diff --git a/recipes/libdca/0001-Disable-AC_C_ALWAYS_INLINE.patch b/recipes/libdca/0001-Disable-AC_C_ALWAYS_INLINE.patch
new file mode 100644
index 00000000..bf5b38a7
--- /dev/null
+++ b/recipes/libdca/0001-Disable-AC_C_ALWAYS_INLINE.patch
@@ -0,0 +1,26 @@
+From e5c66f0aea6ad8ed7fb7915fe83050b0f937065e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
+Date: Mon, 23 Sep 2013 10:31:01 +0200
+Subject: [PATCH] Disable AC_C_ALWAYS_INLINE
+
+It causes errors with the new Xcode 5.0 toolchain and is not necessarily
+useful anyway
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 11e32f0..97fa5a0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -105,7 +105,6 @@ AC_CHECK_GENERATE_INTTYPES([include])
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+-AC_C_ALWAYS_INLINE
+ AC_C_RESTRICT
+ AC_C_BUILTIN_EXPECT
+ AC_TYPE_SIZE_T
+-- 
+2.1.4
+
diff --git a/recipes/libdv.recipe b/recipes/libdv.recipe
index 9aff79dd..35b5bd7d 100644
--- a/recipes/libdv.recipe
+++ b/recipes/libdv.recipe
@@ -4,8 +4,19 @@
 class Recipe(recipe.Recipe):
     name = 'libdv'
     version = '1.0.0'
+    stype = SourceType.TARBALL
+    url = 'http://sourceforge.net/projects/libdv/files/libdv/1.0.0/libdv-1.0.0.tar.gz'
     licenses = [License.LGPLv2_1Plus]
     autoreconf = True
+    patches = ['libdv/0001-Check-properly-for-sched_setscheduler.patch',
+               'libdv/0003-Don-t-build-test-programs.patch',
+               'libdv/0004-Fix-compilation-on-Android.patch',
+               'libdv/0005-Fix-compilation-on-Windows-some-more.patch',
+               'libdv/0006-Add-the-pthread-libs-to-pkg-config.patch',
+               'libdv/0007-Don-t-require-libsdl-to-be-installed-for-autoreconf.patch',
+               'libdv/0012-Build-a-DLL-on-Windows.patch',
+               'libdv/0013-Fix-endianess-detection-with-mingw-w64.patch',
+               'libdv/0014-libdv-fix-build-of-gasmoff-after-autoreconf.patch']
 
     files_libs = ['libdv']
     files_devel = ['include/libdv', 'lib/pkgconfig/libdv.pc']
diff --git a/recipes/libdv/0001-Check-properly-for-sched_setscheduler.patch b/recipes/libdv/0001-Check-properly-for-sched_setscheduler.patch
new file mode 100644
index 00000000..39e614d6
--- /dev/null
+++ b/recipes/libdv/0001-Check-properly-for-sched_setscheduler.patch
@@ -0,0 +1,50 @@
+From 37e880e9d13e81f87362f62835b22ce38ae73fe1 Mon Sep 17 00:00:00 2001
+From: Andoni Morales Alastruey <ylatuya@gmail.com>
+Date: Wed, 7 Mar 2012 18:36:35 +0100
+Subject: [PATCH 01/14] Check properly for sched_setscheduler
+
+---
+ configure.ac         | 2 +-
+ encodedv/dvconnect.c | 6 +++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2b95735..8c3b2f6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -242,7 +242,7 @@ AC_HEADER_TIME
+ 
+ dnl Checks for library functions.
+ AC_FUNC_MMAP
+-AC_CHECK_FUNCS(gettimeofday)
++AC_CHECK_FUNCS(gettimeofday, sched_setscheduler)
+ 
+ AC_SUBST(ac_aux_dir)
+ AC_SUBST(RPM_RELEASE)
+diff --git a/encodedv/dvconnect.c b/encodedv/dvconnect.c
+index f276846..8492dfe 100644
+--- a/encodedv/dvconnect.c
++++ b/encodedv/dvconnect.c
+@@ -859,6 +859,7 @@ int rt_raisepri (int pri)
+ {
+ #ifdef _SC_PRIORITY_SCHEDULING
+ 	struct sched_param scp;
++        int ret = -1;
+ 
+ 	/*
+ 	 * Verify that scheduling is available
+@@ -870,7 +871,10 @@ int rt_raisepri (int pri)
+ 	} else {
+ 		memset (&scp, '\0', sizeof (scp));
+ 		scp.sched_priority = sched_get_priority_max (SCHED_RR) - pri;
+-		if (sched_setscheduler (0, SCHED_RR, &scp) < 0)	{
++#ifdef HAVE_SCHED_SETSCHEDULER
++		ret = sched_setscheduler (0, SCHED_RR, &scp)
++#endif
++		if (ret < 0)	{
+ 			fprintf (stderr, "WARNING: Cannot set RR-scheduler\n");
+ 			return (-1);
+ 		}
+-- 
+2.1.4
+
diff --git a/recipes/libdv/0003-Don-t-build-test-programs.patch b/recipes/libdv/0003-Don-t-build-test-programs.patch
new file mode 100644
index 00000000..38268e98
--- /dev/null
+++ b/recipes/libdv/0003-Don-t-build-test-programs.patch
@@ -0,0 +1,39 @@
+From a0d2365c7b70b5baefa2f6dd4822caac9037790e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
+Date: Tue, 13 Nov 2012 16:25:31 +0100
+Subject: [PATCH 03/14] Don't build test programs
+
+---
+ Makefile.am       | 2 +-
+ libdv/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 659a7b2..831bb9b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -4,7 +4,7 @@ else
+ gtk_subdirs =
+ endif
+ 
+-SUBDIRS                   = libdv encodedv $(gtk_subdirs)
++SUBDIRS                   = libdv #encodedv $(gtk_subdirs)
+ 
+ AUX_DIST                  = $(ac_aux_dir)/config.guess \
+                                    $(ac_aux_dir)/config.sub \
+diff --git a/libdv/Makefile.am b/libdv/Makefile.am
+index 2b010a3..a837bdf 100644
+--- a/libdv/Makefile.am
++++ b/libdv/Makefile.am
+@@ -16,7 +16,7 @@ GASMOFF=gasmoff
+ endif # HOST_X86_64
+ 
+ 
+-noinst_PROGRAMS= dovlc testvlc testbitstream $(GASMOFF) recode reppm enctest
++noinst_PROGRAMS= #dovlc testvlc testbitstream $(GASMOFF) recode reppm enctest
+ 
+ #
+ # If HOST_X86 is set, we build all the x86 asm stuff..
+-- 
+2.1.4
+
diff --git a/recipes/libdv/0004-Fix-compilation-on-Android.patch b/recipes/libdv/0004-Fix-compilation-on-Android.patch
new file mode 100644
index 00000000..1475ec3f
--- /dev/null
+++ b/recipes/libdv/0004-Fix-compilation-on-Android.patch
@@ -0,0 +1,40 @@
+From 9da7cd6b4e3b9c36dc335456efa3c6c7851887ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
+Date: Tue, 13 Nov 2012 16:38:07 +0100
+Subject: [PATCH 04/14] Fix compilation on Android
+
+---
+ libdv/encode.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/libdv/encode.c b/libdv/encode.c
+index b5aabbe..e672d22 100644
+--- a/libdv/encode.c
++++ b/libdv/encode.c
+@@ -1884,10 +1884,6 @@ int dv_encode_full_frame(dv_encoder_t *dv_enc, uint8_t **in,
+ 	return 0;
+ }
+ 
+-#ifdef __linux__
+-void swab(const void*, void*, ssize_t);
+-#endif
+-
+ /** @brief Encode signed 16-bit integer PCM audio data into a frame of DV video.
+  *
+  * @param dv_enc A pointer to a dv_encoder_t struct containing relevant options:
+@@ -1926,8 +1922,10 @@ int dv_encode_full_audio(dv_encoder_t *dv_enc, int16_t **pcm,
+ 	/* interleave channels */
+ 	if (channels > 1) {
+ 		for (i=0; i < DV_AUDIO_MAX_SAMPLES; i++)
+-			for (j=0; j < channels; j++)
+-				swab( pcm[j]+i, audio.data + (i*2+j)*channels, 2);
++			for (j=0; j < channels; j++) {
++                                uint16_t tmp = *(audio.data + (i*2+j)*channels);
++                                *(pcm[j]+i) = ((tmp<<8) & 0xff00) | ((tmp >> 8) & 0x00ff);
++                        }
+ 	}
+ 
+ 	return _dv_raw_insert_audio(frame_buf, &audio, dv_enc->isPAL);
+-- 
+2.1.4
+
diff --git a/recipes/libdv/0005-Fix-compilation-on-Windows-some-more.patch b/recipes/libdv/0005-Fix-compilation-on-Windows-some-more.patch
new file mode 100644
index 00000000..0674bff2
--- /dev/null
+++ b/recipes/libdv/0005-Fix-compilation-on-Windows-some-more.patch
@@ -0,0 +1,101 @@
+From bfdc87891d8eefe1e727e4a83530f8c81c63a13a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
+Date: Wed, 14 Nov 2012 12:02:02 +0100
+Subject: [PATCH 05/14] Fix compilation on Windows some more
+
+---
+ configure.ac      |  2 +-
+ libdv/Makefile.am |  1 +
+ libdv/enctest.c   |  4 ++--
+ libdv/headers.c   | 17 +++++++++++++----
+ 4 files changed, 17 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8c3b2f6..ba4c3f2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -242,7 +242,7 @@ AC_HEADER_TIME
+ 
+ dnl Checks for library functions.
+ AC_FUNC_MMAP
+-AC_CHECK_FUNCS(gettimeofday, sched_setscheduler)
++AC_CHECK_FUNCS(gettimeofday sched_setscheduler localtime_r)
+ 
+ AC_SUBST(ac_aux_dir)
+ AC_SUBST(RPM_RELEASE)
+diff --git a/libdv/Makefile.am b/libdv/Makefile.am
+index a837bdf..c5955ad 100644
+--- a/libdv/Makefile.am
++++ b/libdv/Makefile.am
+@@ -60,6 +60,7 @@ libdv_la_SOURCES= dv.c dct.c idct_248.c weighting.c quant.c vlc.c place.c \
+ 	$(libdv_la_ASMS)
+ 
+ libdv_la_LDFLAGS = -version-info 4:3:0
++libdv_la_LIBADD = $(PTHREAD_LIBS)
+ 
+ dovlc_SOURCES= dovlc.c 
+ dovlc_LDADD= libdv.la
+diff --git a/libdv/enctest.c b/libdv/enctest.c
+index 2528ff1..a36cfd3 100644
+--- a/libdv/enctest.c
++++ b/libdv/enctest.c
+@@ -28,7 +28,7 @@ static void* t(void* arg)
+ 	unsigned char* rgb;
+ 	dv_encoder_t* enc;
+ 
+-	fprintf(stderr, "thread %p: start frame %d\n", (void*) pthread_self(), i);
++	//fprintf(stderr, "thread %p: start frame %d\n", (void*) pthread_self(), i);
+ 	enc = dv_encoder_new(0, 0, 0);
+ 	enc->isPAL = 0;
+ 	enc->vlc_encode_passes = 3;
+@@ -40,7 +40,7 @@ static void* t(void* arg)
+ 	dv_encode_full_frame(enc, &rgb, e_dv_color_rgb, f->dv);
+ 
+ 	dv_encoder_free(enc);
+-	fprintf(stderr, "thread %p: done frame %d\n", (void*) pthread_self(), i);
++	//fprintf(stderr, "thread %p: done frame %d\n", (void*) pthread_self(), i);
+ 	return 0;
+ }
+ 
+diff --git a/libdv/headers.c b/libdv/headers.c
+index 444c463..9992b15 100644
+--- a/libdv/headers.c
++++ b/libdv/headers.c
+@@ -283,7 +283,12 @@ void dv_encode_metadata(uint8_t *target, int isPAL, int is16x9, time_t *datetime
+ {
+ 	int numDIFseq;
+ 	int ds;
+-	struct tm now_t;
++#ifdef HAVE_LOCALTIME_R
++	struct tm now_t_;
++	struct tm * now_t = &now_t_;
++#else
++	struct tm * now_t = NULL;
++#endif
+ 
+ 	numDIFseq = isPAL ? 12 : 10;
+ 
+@@ -291,13 +296,17 @@ void dv_encode_metadata(uint8_t *target, int isPAL, int is16x9, time_t *datetime
+ 		(*datetime)++;
+ 	}
+ 
+-	if (localtime_r(datetime, &now_t) != NULL )
++#ifdef HAVE_LOCALTIME_R
++	if (localtime_r(datetime, now_t) != NULL )
++#else
++	if ((now_t = localtime(datetime)) != NULL )
++#endif
+ 	{
+ 		for (ds = 0; ds < numDIFseq; ds++) { 
+ 			target +=   1 * 80;
+-			write_subcode_blocks(target, ds, frame, &now_t, isPAL);
++			write_subcode_blocks(target, ds, frame, now_t, isPAL);
+ 			target +=   2 * 80;
+-			write_vaux_blocks(target, ds, &now_t, isPAL, is16x9);
++			write_vaux_blocks(target, ds, now_t, isPAL, is16x9);
+ 			target +=   3 * 80;
+ 			target += 144 * 80;
+ 		}
+-- 
+2.1.4
+
diff --git a/recipes/libdv/0006-Add-the-pthread-libs-to-pkg-config.patch b/recipes/libdv/0006-Add-the-pthread-libs-to-pkg-config.patch
new file mode 100644
index 00000000..e4e5443d
--- /dev/null
+++ b/recipes/libdv/0006-Add-the-pthread-libs-to-pkg-config.patch
@@ -0,0 +1,23 @@
+From 0e925478a129657c449798e151b51fdee8b476ed Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
+Date: Wed, 14 Nov 2012 12:15:50 +0100
+Subject: [PATCH 06/14] Add the pthread libs to pkg-config
+
+---
+ libdv.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libdv.pc.in b/libdv.pc.in
+index 2f1ecb9..a98f6e8 100644
+--- a/libdv.pc.in
++++ b/libdv.pc.in
+@@ -7,5 +7,5 @@ Name: libdv
+ Description: DV software codec
+ Requires: 
+ Version: @VERSION@
+-Libs: -L${libdir} -ldv -lm @REQUIRES_NOPKGCONFIG@
++Libs: -L${libdir} -ldv -lm @PTHREAD_LIBS@ @REQUIRES_NOPKGCONFIG@
+ Cflags: -I${includedir}
+-- 
+2.1.4
+
diff --git a/recipes/libdv/0007-Don-t-require-libsdl-to-be-installed-for-autoreconf.patch b/recipes/libdv/0007-Don-t-require-libsdl-to-be-installed-for-autoreconf.patch
new file mode 100644
index 00000000..bc52dc4f
--- /dev/null
+++ b/recipes/libdv/0007-Don-t-require-libsdl-to-be-installed-for-autoreconf.patch
@@ -0,0 +1,215 @@
+From 6bc7b5fa3f4a4d120da985f79566713ddc9ca2d7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
+Date: Wed, 14 Nov 2012 17:44:00 +0100
+Subject: [PATCH 07/14] Don't require libsdl to be installed for autoreconf
+
+---
+ Makefile.am |   2 +
+ m4/sdl.m4   | 185 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 187 insertions(+)
+ create mode 100644 m4/sdl.m4
+
+diff --git a/Makefile.am b/Makefile.am
+index 831bb9b..0ecf95b 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,3 +1,5 @@
++ACLOCAL_AMFLAGS = -I m4
++
+ if HAVE_GTK
+ gtk_subdirs = playdv
+ else
+diff --git a/m4/sdl.m4 b/m4/sdl.m4
+new file mode 100644
+index 0000000..639eb85
+--- /dev/null
++++ b/m4/sdl.m4
+@@ -0,0 +1,185 @@
++# Configure paths for SDL
++# Sam Lantinga 9/21/99
++# stolen from Manish Singh
++# stolen back from Frank Belew
++# stolen from Manish Singh
++# Shamelessly stolen from Owen Taylor
++
++# serial 1
++
++dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
++dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
++dnl
++AC_DEFUN([AM_PATH_SDL],
++[dnl 
++dnl Get the cflags and libraries from the sdl-config script
++dnl
++AC_ARG_WITH(sdl-prefix,[  --with-sdl-prefix=PFX   Prefix where SDL is installed (optional)],
++            sdl_prefix="$withval", sdl_prefix="")
++AC_ARG_WITH(sdl-exec-prefix,[  --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
++            sdl_exec_prefix="$withval", sdl_exec_prefix="")
++AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run a test SDL program],
++		    , enable_sdltest=yes)
++
++  if test x$sdl_exec_prefix != x ; then
++    sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
++    if test x${SDL_CONFIG+set} != xset ; then
++      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
++    fi
++  fi
++  if test x$sdl_prefix != x ; then
++    sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
++    if test x${SDL_CONFIG+set} != xset ; then
++      SDL_CONFIG=$sdl_prefix/bin/sdl-config
++    fi
++  fi
++
++  as_save_PATH="$PATH"
++  if test "x$prefix" != xNONE; then
++    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
++  fi
++  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
++  PATH="$as_save_PATH"
++  min_sdl_version=ifelse([$1], ,0.11.0,$1)
++  AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
++  no_sdl=""
++  if test "$SDL_CONFIG" = "no" ; then
++    no_sdl=yes
++  else
++    SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
++    SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
++
++    sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
++    sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
++    sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
++           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
++    if test "x$enable_sdltest" = "xyes" ; then
++      ac_save_CFLAGS="$CFLAGS"
++      ac_save_CXXFLAGS="$CXXFLAGS"
++      ac_save_LIBS="$LIBS"
++      CFLAGS="$CFLAGS $SDL_CFLAGS"
++      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
++      LIBS="$LIBS $SDL_LIBS"
++dnl
++dnl Now check if the installed SDL is sufficiently new. (Also sanity
++dnl checks the results of sdl-config to some extent
++dnl
++      rm -f conf.sdltest
++      AC_TRY_RUN([
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include "SDL.h"
++
++char*
++my_strdup (char *str)
++{
++  char *new_str;
++  
++  if (str)
++    {
++      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
++      strcpy (new_str, str);
++    }
++  else
++    new_str = NULL;
++  
++  return new_str;
++}
++
++int main (int argc, char *argv[])
++{
++  int major, minor, micro;
++  char *tmp_version;
++
++  /* This hangs on some systems (?)
++  system ("touch conf.sdltest");
++  */
++  { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); }
++
++  /* HP/UX 9 (%@#!) writes to sscanf strings */
++  tmp_version = my_strdup("$min_sdl_version");
++  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
++     printf("%s, bad version string\n", "$min_sdl_version");
++     exit(1);
++   }
++
++   if (($sdl_major_version > major) ||
++      (($sdl_major_version == major) && ($sdl_minor_version > minor)) ||
++      (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro)))
++    {
++      return 0;
++    }
++  else
++    {
++      printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version);
++      printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro);
++      printf("*** best to upgrade to the required version.\n");
++      printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n");
++      printf("*** to point to the correct copy of sdl-config, and remove the file\n");
++      printf("*** config.cache before re-running configure\n");
++      return 1;
++    }
++}
++
++],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
++       CFLAGS="$ac_save_CFLAGS"
++       CXXFLAGS="$ac_save_CXXFLAGS"
++       LIBS="$ac_save_LIBS"
++     fi
++  fi
++  if test "x$no_sdl" = x ; then
++     AC_MSG_RESULT(yes)
++     ifelse([$2], , :, [$2])     
++  else
++     AC_MSG_RESULT(no)
++     if test "$SDL_CONFIG" = "no" ; then
++       echo "*** The sdl-config script installed by SDL could not be found"
++       echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
++       echo "*** your path, or set the SDL_CONFIG environment variable to the"
++       echo "*** full path to sdl-config."
++     else
++       if test -f conf.sdltest ; then
++        :
++       else
++          echo "*** Could not run SDL test program, checking why..."
++          CFLAGS="$CFLAGS $SDL_CFLAGS"
++          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
++          LIBS="$LIBS $SDL_LIBS"
++          AC_TRY_LINK([
++#include <stdio.h>
++#include "SDL.h"
++
++int main(int argc, char *argv[])
++{ return 0; }
++#undef  main
++#define main K_and_R_C_main
++],      [ return 0; ],
++        [ echo "*** The test program compiled, but did not run. This usually means"
++          echo "*** that the run-time linker is not finding SDL or finding the wrong"
++          echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
++          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
++          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
++          echo "*** is required on your system"
++	  echo "***"
++          echo "*** If you have an old version installed, it is best to remove it, although"
++          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
++        [ echo "*** The test program failed to compile or link. See the file config.log for the"
++          echo "*** exact error that occured. This usually means SDL was incorrectly installed"
++          echo "*** or that you have moved SDL since it was installed. In the latter case, you"
++          echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
++          CFLAGS="$ac_save_CFLAGS"
++          CXXFLAGS="$ac_save_CXXFLAGS"
++          LIBS="$ac_save_LIBS"
++       fi
++     fi
++     SDL_CFLAGS=""
++     SDL_LIBS=""
++     ifelse([$3], , :, [$3])
++  fi
++  AC_SUBST(SDL_CFLAGS)
++  AC_SUBST(SDL_LIBS)
++  rm -f conf.sdltest
++])
+-- 
+2.1.4
+
diff --git a/recipes/libdv/0012-Build-a-DLL-on-Windows.patch b/recipes/libdv/0012-Build-a-DLL-on-Windows.patch
new file mode 100644
index 00000000..fa8fee58
--- /dev/null
+++ b/recipes/libdv/0012-Build-a-DLL-on-Windows.patch
@@ -0,0 +1,25 @@
+From 041cc9e9a878f8357781154efe4ebe9e7b701e86 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
+Date: Wed, 28 Nov 2012 11:51:26 +0100
+Subject: [PATCH 12/14] Build a DLL on Windows
+
+---
+ libdv/Makefile.am | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libdv/Makefile.am b/libdv/Makefile.am
+index c5955ad..05f23da 100644
+--- a/libdv/Makefile.am
++++ b/libdv/Makefile.am
+@@ -59,7 +59,7 @@ libdv_la_SOURCES= dv.c dct.c idct_248.c weighting.c quant.c vlc.c place.c \
+         encode.c headers.c enc_input.c enc_audio_input.c enc_output.c \
+ 	$(libdv_la_ASMS)
+ 
+-libdv_la_LDFLAGS = -version-info 4:3:0
++libdv_la_LDFLAGS = -version-info 4:3:0 -no-undefined
+ libdv_la_LIBADD = $(PTHREAD_LIBS)
+ 
+ dovlc_SOURCES= dovlc.c 
+-- 
+2.1.4
+
diff --git a/recipes/libdv/0013-Fix-endianess-detection-with-mingw-w64.patch b/recipes/libdv/0013-Fix-endianess-detection-with-mingw-w64.patch
new file mode 100644
index 00000000..d86c17b8
--- /dev/null
+++ b/recipes/libdv/0013-Fix-endianess-detection-with-mingw-w64.patch
@@ -0,0 +1,67 @@
+From 8cfd142e093f8dc90827a22e98abb92ee061f604 Mon Sep 17 00:00:00 2001
+From: Andoni Morales Alastruey <ylatuya@gmail.com>
+Date: Mon, 8 Apr 2013 12:34:34 +0200
+Subject: [PATCH 13/14] Fix endianess detection with mingw-w64
+
+---
+ configure.ac      | 2 +-
+ libdv/YUY2.c      | 2 ++
+ libdv/bitstream.h | 2 ++
+ libdv/dv_types.h  | 2 ++
+ 4 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index ba4c3f2..4729b0a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -231,7 +231,7 @@ dnl Checks for header files.
+ AC_PATH_X
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h linux/videodev.h sys/soundcard.h \
+-endian.h machine/endian.h inttypes.h)
++endian.h machine/endian.h sys/param.h inttypes.h)
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+diff --git a/libdv/YUY2.c b/libdv/YUY2.c
+index 20b7513..d0d73b1 100644
+--- a/libdv/YUY2.c
++++ b/libdv/YUY2.c
+@@ -35,6 +35,8 @@
+ #include <endian.h>
+ #elif HAVE_MACHINE_ENDIAN_H
+ #include <machine/endian.h>
++#elif HAVE_SYS_PARAM_H
++#include <sys/param.h>
+ #endif
+ #include <stdlib.h>
+ 
+diff --git a/libdv/bitstream.h b/libdv/bitstream.h
+index 25f4ae9..478364a 100644
+--- a/libdv/bitstream.h
++++ b/libdv/bitstream.h
+@@ -36,6 +36,8 @@
+ #include <endian.h>
+ #elif HAVE_MACHINE_ENDIAN_H
+ #include <machine/endian.h>
++#elif HAVE_SYS_PARAM_H
++#include <sys/param.h>
+ #endif
+ 
+ #ifdef __cplusplus
+diff --git a/libdv/dv_types.h b/libdv/dv_types.h
+index 1f90561..efa8960 100644
+--- a/libdv/dv_types.h
++++ b/libdv/dv_types.h
+@@ -42,6 +42,8 @@
+ #include <endian.h>
+ #elif HAVE_MACHINE_ENDIAN_H
+ #include <machine/endian.h>
++#elif HAVE_SYS_PARAM_H
++#include <sys/param.h>
+ #endif
+ 
+ /* please tell me these are defined somewhere standard??? */
+-- 
+2.1.4
+
diff --git a/recipes/libdv/0014-libdv-fix-build-of-gasmoff-after-autoreconf.patch b/recipes/libdv/0014-libdv-fix-build-of-gasmoff-after-autoreconf.patch
new file mode 100644
index 00000000..3886a3be
--- /dev/null
+++ b/recipes/libdv/0014-libdv-fix-build-of-gasmoff-after-autoreconf.patch
@@ -0,0 +1,28 @@
+From 948a9618bb75ac3dede70567b8d2337dacb7d881 Mon Sep 17 00:00:00 2001
+From: Andoni Morales Alastruey <ylatuya@gmail.com>
+Date: Mon, 8 Apr 2013 15:28:41 +0200
+Subject: [PATCH 14/14] libdv: fix build of gasmoff after autoreconf
+
+This makes it build with -DHAVE_CONFIG_H and sets the correct
+endianess building after autoreconf
+---
+ libdv/Makefile.am | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/libdv/Makefile.am b/libdv/Makefile.am
+index 05f23da..9b9132c 100644
+--- a/libdv/Makefile.am
++++ b/libdv/Makefile.am
+@@ -15,8 +15,7 @@ if HOST_X86_64
+ GASMOFF=gasmoff
+ endif # HOST_X86_64
+ 
+-
+-noinst_PROGRAMS= #dovlc testvlc testbitstream $(GASMOFF) recode reppm enctest
++noinst_PROGRAMS= $(GASMOFF) #dovlc testvlc testbitstream $(GASMOFF) recode reppm enctest
+ 
+ #
+ # If HOST_X86 is set, we build all the x86 asm stuff..
+-- 
+2.1.4
+
diff --git a/recipes/libdvdnav.recipe b/recipes/libdvdnav.recipe
index 54ec6c28..b3f1de37 100644
--- a/recipes/libdvdnav.recipe
+++ b/recipes/libdvdnav.recipe
@@ -3,11 +3,14 @@
 
 class Recipe(recipe.Recipe):
     name = 'libdvdnav'
-    version = '4.2.0'
+    version = '4.2.1'
+    stype = SourceType.TARBALL
+    url = 'http://download.videolan.org/pub/videolan/libdvdnav/libdvdnav-4.2.1.tar.xz'
     licenses = [License.GPLv2Plus]
     config_sh = 'sh autogen.sh'
     deps = ['libdvdread']
     configure_options = '--with-dvdread-config=$CERBERO_PREFIX/bin/dvdread-config'
+    patches = ['libdvdnav/0001-Fix-linking-in-windows-compilation.patch']
 
     files_libs = ['libdvdnav', 'libdvdnavmini']
     files_devel = ['include/dvdnav', 'lib/pkgconfig/dvdnav.pc',
diff --git a/recipes/libdvdnav/0001-Fix-linking-in-windows-compilation.patch b/recipes/libdvdnav/0001-Fix-linking-in-windows-compilation.patch
new file mode 100644
index 00000000..7e05396c
--- /dev/null
+++ b/recipes/libdvdnav/0001-Fix-linking-in-windows-compilation.patch
@@ -0,0 +1,25 @@
+From 1e31e8a955dbe800413d6c475b91f9e77e5f65d8 Mon Sep 17 00:00:00 2001
+From: Andoni Morales Alastruey <ylatuya@gmail.com>
+Date: Wed, 29 Feb 2012 18:12:14 +0100
+Subject: [PATCH] Fix linking in windows compilation
+
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index c7502a3..9ecfacb 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -21,7 +21,7 @@ libdvdnav_la_LIBADD = $(THREAD_LIBS) $(DVDREAD_LIBS) \
+ 
+ libdvdnav_la_LDFLAGS = \
+ 	-version-info $(DVDNAV_LT_CURRENT):$(DVDNAV_LT_REVISION):$(DVDNAV_LT_AGE) \
+-	-export-symbols-regex "(^dvdnav.*|^nav.*|^ifo.*|^DVD.*)"
++	-export-symbols-regex "(^dvdnav.*|^nav.*|^ifo.*|^DVD.*)" $(DVDREAD_LIBS)
+ #	-release $(DVDNAV_MAJOR).$(DVDNAV_MINOR).$(DVDNAV_SUB)
+ 
+ libdvdnavmini_la_SOURCES = $(libdvdnav_la_SOURCES)
+-- 
+2.1.4
+
diff --git a/recipes/libdvdread.recipe b/recipes/libdvdread.recipe
index ed60f7ff..208550cb 100644
--- a/recipes/libdvdread.recipe
+++ b/recipes/libdvdread.recipe
@@ -3,7 +3,9 @@
 
 class Recipe(recipe.Recipe):
     name = 'libdvdread'
-    version = '4.2.0'
+    version = '4.2.1'
+    stype = SourceType.TARBALL
+    url = 'http://download.videolan.org/pub/videolan/libdvdread/libdvdread-4.2.1.tar.xz'
     licenses = [License.GPLv2Plus]
     config_sh = 'sh autogen.sh'
 
diff --git a/recipes/libexif.recipe b/recipes/libexif.recipe
index 0a9808a5..8801dc47 100644
--- a/recipes/libexif.recipe
+++ b/recipes/libexif.recipe
@@ -4,6 +4,8 @@
 class Recipe(recipe.Recipe):
     name = 'libexif'
     version = '0.6.21'
+    stype = SourceType.TARBALL
+    url = 'http://sourceforge.net/projects/libexif/files/libexif/0.6.21/libexif-0.6.21.tar.bz2'
     # TODO: check license - some source files are LGPLv2+, others LGPLv2.1+
     #       and COPYING is LGPLv2.1
     licenses = [License.LGPLv2_1Plus]
diff --git a/recipes/libkate.recipe b/recipes/libkate.recipe
index 3d78327c..1d5817db 100644
--- a/recipes/libkate.recipe
+++ b/recipes/libkate.recipe
@@ -4,8 +4,11 @@
 class Recipe(recipe.Recipe):
     name = 'libkate'
     version = '0.4.1'
+    stype = SourceType.TARBALL
+    url = 'https://libkate.googlecode.com/files/libkate-0.4.1.tar.gz'
     licenses = [License.BSD_like]
     deps = ['libogg', 'libpng']
+    patches = ['libkate/0001-be-more-permissive-with-automake-errors-now-that-we-.patch']
 
     files_libs = ['libkate', 'liboggkate']
     files_devel = ['include/kate', 'lib/pkgconfig/kate.pc', 'lib/pkgconfig/oggkate.pc']
diff --git a/recipes/libkate/0001-be-more-permissive-with-automake-errors-now-that-we-.patch b/recipes/libkate/0001-be-more-permissive-with-automake-errors-now-that-we-.patch
new file mode 100644
index 00000000..a543ee08
--- /dev/null
+++ b/recipes/libkate/0001-be-more-permissive-with-automake-errors-now-that-we-.patch
@@ -0,0 +1,26 @@
+From 7da1af870dad6a6f2f781f8cddbc061755492b06 Mon Sep 17 00:00:00 2001
+From: Andoni Morales Alastruey <ylatuya@gmail.com>
+Date: Fri, 26 Oct 2012 03:01:13 +0200
+Subject: [PATCH] be more permissive with automake errors now that we use
+ automake 1.12
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 58ff478..2bbf6dd 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@ AC_PREREQ(2.53)
+ 
+ AC_CANONICAL_TARGET
+ 
+-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
+ AC_CONFIG_HEADERS([include/config.h])
+ 
+ ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
+-- 
+2.1.4
+
diff --git a/recipes/libmms.recipe b/recipes/libmms.recipe
index c183e15b..6bd757e7 100644
--- a/recipes/libmms.recipe
+++ b/recipes/libmms.recipe
@@ -2,7 +2,9 @@
 
 class Recipe(recipe.Recipe):
     name = 'libmms'
-    version = '0.6.2'
+    version = '0.6.4'
+    stype = SourceType.TARBALL
+    url = 'http://sourceforge.net/projects/libmms/files/libmms/0.6.4/libmms-0.6.4.tar.gz'
     licenses = [License.LGPLv2_1Plus]
     deps = [ 'glib' ]
 
diff --git a/recipes/libmpeg2.recipe b/recipes/libmpeg2.recipe
index 03002ee4..32a3a937 100644
--- a/recipes/libmpeg2.recipe
+++ b/recipes/libmpeg2.recipe
@@ -4,8 +4,12 @@ from cerbero.utils import shell
 class Recipe(recipe.Recipe):
     name = 'libmpeg2'
     version = '0.5.1'
+    stype = SourceType.TARBALL
+    url = 'http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz'
     licenses = [License.GPLv2Plus]
     autoreconf = True
+    patches = ['libmpeg2/0001-Disable-AC_C_ALWAYS_INLINE.patch',
+               'libmpeg2/0002-Import-revision-1206-from-upstream-to-fix-PIE-build.patch']
 
     files_libs = ['libmpeg2', 'libmpeg2convert']
     files_bins = ['mpeg2dec', 'extract_mpeg2', 'corrupt_mpeg2']
diff --git a/recipes/libmpeg2/0001-Disable-AC_C_ALWAYS_INLINE.patch b/recipes/libmpeg2/0001-Disable-AC_C_ALWAYS_INLINE.patch
new file mode 100644
index 00000000..0027f1e8
--- /dev/null
+++ b/recipes/libmpeg2/0001-Disable-AC_C_ALWAYS_INLINE.patch
@@ -0,0 +1,26 @@
+From d2e07e1324684e0f40be42c64870bf3b59489253 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <slomo@circular-chaos.org>
+Date: Mon, 23 Sep 2013 12:40:22 +0200
+Subject: [PATCH 1/2] Disable AC_C_ALWAYS_INLINE
+
+It causes errors with the new Xcode 5.0 toolchain and is not necessarily
+useful anyway
+---
+ configure.ac | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9f4831e..fd4196f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -142,7 +142,6 @@ AC_CHECK_GENERATE_INTTYPES([include])
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+-AC_C_ALWAYS_INLINE
+ AC_C_RESTRICT
+ AC_C_BUILTIN_EXPECT
+ AC_C_BIGENDIAN
+-- 
+2.1.4
+
diff --git a/recipes/libmpeg2/0002-Import-revision-1206-from-upstream-to-fix-PIE-build.patch b/recipes/libmpeg2/0002-Import-revision-1206-from-upstream-to-fix-PIE-build.patch
new file mode 100644
index 00000000..da4c098a
--- /dev/null
+++ b/recipes/libmpeg2/0002-Import-revision-1206-from-upstream-to-fix-PIE-build.patch
@@ -0,0 +1,157 @@
+From 7e531b2454a3474f4f2ab342d3834c75f9945079 Mon Sep 17 00:00:00 2001
+From: Jan Schmidt <thaytan@noraisin.net>
+Date: Sun, 10 Nov 2013 00:49:52 +1100
+Subject: [PATCH 2/2] Import revision 1206 from upstream to fix PIE build.
+
+Functions MC_put_o_16_arm, MC_put_o_8_arm, MC_put_x_16_arm, MC_put_x_8_arm
+in libmpeg2/motion_comp_arm_s.S have addresses in .text, which is bad
+for shared libraries.  Some environments demand that .text actually be
+read-only all the time, yet MC_put_o_16_arm etc require that the addresses
+be modified by the dynamic linking mechanism (dlopen, LoadLibrary, etc.)
+Even in those environments which permit the dynamic linker to modify the
+.text segment, the runtime cost of doing the relocation can be noticeable.
+
+This commit rewrites the linkage, discarding the tables of addresses
+in favor of tables of offsets.  All transfers are local within each individual
+function, so there can be no interference by processing that occurs
+after assembly, such as link-time re-ordering (even of individual functions.)
+
+Patch by John Reiser <jreiser@bitwagon.com>
+---
+ libmpeg2/motion_comp_arm_s.S | 70 +++++++++++++++++++++-----------------------
+ 1 file changed, 33 insertions(+), 37 deletions(-)
+
+diff --git a/libmpeg2/motion_comp_arm_s.S b/libmpeg2/motion_comp_arm_s.S
+index f6c3d7d..d011ea2 100644
+--- a/libmpeg2/motion_comp_arm_s.S
++++ b/libmpeg2/motion_comp_arm_s.S
+@@ -29,9 +29,13 @@ MC_put_o_16_arm:
+ 	pld [r1]
+         stmfd sp!, {r4-r11, lr} @ R14 is also called LR
+ 	and r4, r1, #3
+-	adr r5, MC_put_o_16_arm_align_jt
+-	add r5, r5, r4, lsl #2
+-	ldr pc, [r5]
++	ldrb r4, [pc, r4]
++	add pc, pc, r4, lsl #2
++	.byte (MC_put_o_16_arm_align0 - 0f)>>2
++	.byte (MC_put_o_16_arm_align1 - 0f)>>2
++	.byte (MC_put_o_16_arm_align2 - 0f)>>2
++	.byte (MC_put_o_16_arm_align3 - 0f)>>2
++0:
+ 
+ MC_put_o_16_arm_align0:
+ 	ldmia r1, {r4-r7}
+@@ -75,11 +79,6 @@ MC_put_o_16_arm_align3:
+ 1:	PROC(24)
+ 	bne 1b
+         ldmfd sp!, {r4-r11, pc} @@ update PC with LR content.
+-MC_put_o_16_arm_align_jt:
+-	.word MC_put_o_16_arm_align0
+-	.word MC_put_o_16_arm_align1
+-	.word MC_put_o_16_arm_align2
+-	.word MC_put_o_16_arm_align3
+ 
+ @ ----------------------------------------------------------------
+ 	.align
+@@ -89,9 +88,14 @@ MC_put_o_8_arm:
+ 	pld [r1]
+         stmfd sp!, {r4-r10, lr} @ R14 is also called LR
+ 	and r4, r1, #3
+-	adr r5, MC_put_o_8_arm_align_jt
+-	add r5, r5, r4, lsl #2
+-	ldr pc, [r5]
++	ldrb r4, [pc, r4]
++	add pc, pc, r4, lsl #2
++	.byte (MC_put_o_8_arm_align0 - 0f)>>2
++	.byte (MC_put_o_8_arm_align1 - 0f)>>2
++	.byte (MC_put_o_8_arm_align2 - 0f)>>2
++	.byte (MC_put_o_8_arm_align3 - 0f)>>2
++0:
++
+ MC_put_o_8_arm_align0:
+ 	ldmia r1, {r4-r5}
+ 	add r1, r1, r2
+@@ -133,12 +137,6 @@ MC_put_o_8_arm_align3:
+ 	bne 1b
+         ldmfd sp!, {r4-r10, pc} @@ update PC with LR content.
+ 
+-MC_put_o_8_arm_align_jt:
+-	.word MC_put_o_8_arm_align0
+-	.word MC_put_o_8_arm_align1
+-	.word MC_put_o_8_arm_align2
+-	.word MC_put_o_8_arm_align3
+-
+ @ ----------------------------------------------------------------
+ .macro	AVG_PW rW1, rW2
+ 	mov \rW2, \rW2, lsl #24
+@@ -157,12 +155,17 @@ MC_put_x_16_arm:
+ 	@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
+ 	pld [r1]
+         stmfd sp!, {r4-r11,lr} @ R14 is also called LR
++	ldr r11, 0f
+ 	and r4, r1, #3
+-	adr r5, MC_put_x_16_arm_align_jt
+-	ldr r11, [r5]
+ 	mvn r12, r11
+-	add r5, r5, r4, lsl #2
+-	ldr pc, [r5, #4]
++	ldrb r4, [pc, r4]
++	add pc, pc, r4, lsl #2
++	.byte (MC_put_x_16_arm_align0 - 0f)>>2
++	.byte (MC_put_x_16_arm_align1 - 0f)>>2
++	.byte (MC_put_x_16_arm_align2 - 0f)>>2
++	.byte (MC_put_x_16_arm_align3 - 0f)>>2
++0:
++	  .word 0x01010101
+ 
+ .macro	ADJ_ALIGN_QW shift, R0, R1, R2, R3, R4
+ 	mov \R0, \R0, lsr #(\shift)
+@@ -235,12 +238,6 @@ MC_put_x_16_arm_align3:
+ 	add r0, r0, r2
+ 	bne 1b
+         ldmfd sp!, {r4-r11,pc} @@ update PC with LR content.
+-MC_put_x_16_arm_align_jt:
+-	.word 0x01010101
+-	.word MC_put_x_16_arm_align0
+-	.word MC_put_x_16_arm_align1
+-	.word MC_put_x_16_arm_align2
+-	.word MC_put_x_16_arm_align3
+ 
+ @ ----------------------------------------------------------------
+ 	.align
+@@ -249,12 +246,17 @@ MC_put_x_8_arm:
+ 	@@ void func(uint8_t * dest, const uint8_t * ref, int stride, int height)
+ 	pld [r1]
+         stmfd sp!, {r4-r11,lr} @ R14 is also called LR
++	ldr r11, 0f
+ 	and r4, r1, #3
+-	adr r5, MC_put_x_8_arm_align_jt
+-	ldr r11, [r5]
+ 	mvn r12, r11
+-	add r5, r5, r4, lsl #2
+-	ldr pc, [r5, #4]
++	ldrb r4, [pc, r4]
++	add pc, pc, r4, lsl #2
++	.byte (MC_put_x_8_arm_align0 - 0f)>>2
++	.byte (MC_put_x_8_arm_align1 - 0f)>>2
++	.byte (MC_put_x_8_arm_align2 - 0f)>>2
++	.byte (MC_put_x_8_arm_align3 - 0f)>>2
++0:
++	  .word 0x01010101
+ 
+ .macro	ADJ_ALIGN_DW shift, R0, R1, R2
+ 	mov \R0, \R0, lsr #(\shift)
+@@ -315,9 +317,3 @@ MC_put_x_8_arm_align3:
+ 	add r0, r0, r2
+ 	bne 1b
+         ldmfd sp!, {r4-r11,pc} @@ update PC with LR content.
+-MC_put_x_8_arm_align_jt:
+-	.word 0x01010101
+-	.word MC_put_x_8_arm_align0
+-	.word MC_put_x_8_arm_align1
+-	.word MC_put_x_8_arm_align2
+-	.word MC_put_x_8_arm_align3
+-- 
+2.1.4
+
diff --git a/recipes/libshout.recipe b/recipes/libshout.recipe
index bd4408c5..1743d2ed 100644
--- a/recipes/libshout.recipe
+++ b/recipes/libshout.recipe
@@ -3,7 +3,9 @@
 
 class Recipe(recipe.Recipe):
     name = 'libshout'
-    version = '2.2.2'
+    version = '2.3.1'
+    stype = SourceType.TARBALL
+    url = 'http://downloads.xiph.org/releases/libshout/libshout-2.3.1.tar.gz'
     licenses = [License.LGPLv2Plus]
     deps = ['libtheora', 'libogg', 'libvorbis', 'speex']