diff --git a/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch b/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch index e0e85710..37cc62f0 100644 --- a/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch +++ b/package/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch @@ -6,7 +6,7 @@ Subject: [PATCH 1/1] Add 'Libs.private' field to pkg-config file In order to support static linking, SDL_mixer.pc should include a 'Libs.private' field listing all the libraries that SDL_mixer requires. -This patch adds such a field and also modifies configure.in so that +This patch adds such a field and also modifies configure.ac so that EXTRA_LDFLAGS (which is now also used as the value of 'Libs.private') no longer includes SDL_LIBS. This is done so as to prevent libraries required by SDL from being listed twice when 'pkg-config --libs --static @@ -20,7 +20,7 @@ Signed-off-by: Rodrigo Rebello --- Makefile.in | 2 +- SDL_mixer.pc.in | 1 + - configure.in | 1 - + configure.ac | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in @@ -47,10 +47,10 @@ index 1c4965d..d793521 100644 +Libs.private: @EXTRA_LDFLAGS@ Cflags: -I${includedir}/SDL -diff --git a/configure.in b/configure.in +diff --git a/configure.ac b/configure.ac index 2272b29..442eca6 100644 ---- a/configure.in -+++ b/configure.in +--- a/configure.ac ++++ b/configure.ac @@ -202,7 +202,6 @@ AM_PATH_SDL($SDL_VERSION, AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) ) diff --git a/package/sdl_mixer/0004-modpluginclude.patch b/package/sdl_mixer/0004-modpluginclude.patch index 8ab86d4c..ea6c3bf7 100644 --- a/package/sdl_mixer/0004-modpluginclude.patch +++ b/package/sdl_mixer/0004-modpluginclude.patch @@ -1,6 +1,6 @@ -diff -ru SDL_mixer-1.2.13.org/configure.in SDL_mixer-1.2.13/configure.in ---- SDL_mixer-1.2.13.org/configure.in 2012-01-15 23:01:05.000000000 +0100 -+++ SDL_mixer-1.2.13/configure.in 2014-07-03 05:25:44.761854572 +0200 +diff -ru SDL_mixer-1.2.13.org/configure.ac SDL_mixer-1.2.13/configure.ac +--- SDL_mixer-1.2.13.org/configure.ac 2012-01-15 23:01:05.000000000 +0100 ++++ SDL_mixer-1.2.13/configure.ac 2014-07-03 05:25:44.761854572 +0200 @@ -301,7 +301,7 @@ have_libmikmod=yes AC_MSG_CHECKING([for libmikmod - version >= $libmikmod_ver]) diff --git a/package/sdl_mixer/0005-Fixwontbuildontremor.patch b/package/sdl_mixer/0005-Fixwontbuildontremor.patch index d057301a..aef830cc 100644 --- a/package/sdl_mixer/0005-Fixwontbuildontremor.patch +++ b/package/sdl_mixer/0005-Fixwontbuildontremor.patch @@ -1,5 +1,5 @@ ---- a/configure.in -+++ a/configure.in +--- a/configure.ac ++++ a/configure.ac @@ -449,7 +449,7 @@ echo "-- dynamic libvorbisidec -> $ogg_lib" EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\"" diff --git a/retrofw/board/rootfs_overlay/usr/share/fonts/truetype/droid/DroidSansFallback.ttf b/retrofw/board/rootfs_overlay/usr/share/fonts/truetype/droid/DroidSansFallback.ttf new file mode 100644 index 00000000..1099b177 Binary files /dev/null and b/retrofw/board/rootfs_overlay/usr/share/fonts/truetype/droid/DroidSansFallback.ttf differ