updated static/portable build scripts;

musepack c99 compile fix

195 files changed, 14 insertions, 10 deletions

diff --git a/PORTABLE_BUILD b/PORTABLE_BUILD
index d00491fd..0cfbf088 100644
--- a/PORTABLE_BUILD
+++ b/PORTABLE_BUILD
@@ -1 +1 @@
-1
+2
diff --git a/PORTABLE_VERSION b/PORTABLE_VERSION
index 6f2743d6..d64531f1 100644
--- a/PORTABLE_VERSION
+++ b/PORTABLE_VERSION
@@ -1 +1 @@
-0.4.4
+devel
diff --git a/configure.ac b/configure.ac
index e8fc61a6..51a1c790 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,10 @@ case "$host" in
     AC_DEFINE(ARCH_X86_32, 1, [architecture is x86])
     LIB="lib-x86-32"
     ;;
+  x86_64-apple-*)
+    AC_DEFINE(ARCH_X86_64_OSX, 1, [architecture is x86_64 for OSX])
+    LIB="lib-x86-64-osx"
+    ;;
   x86_64-*-* | amd64-*-*)
     AC_DEFINE(ARCH_X86_64, 1, [architecture is x86_64])
     LIB="lib-x86-64"
@@ -113,7 +117,7 @@ if test "x$enable_portable" != "xno" && test "x$enable_staticlink" != "xno" ; th
         PORTABLE_FULL=yes
     fi
 
-    PREFIXFLAGS="-DPREFIX=donotuse -DLIBDIR=donotuse -DDOCDIR=donotuse -I./include -I../../include"
+    PREFIXFLAGS="-DPREFIX=donotuse -DLIBDIR=donotuse -DDOCDIR=donotuse -I./$LIB/include -I../../$LIB/include"
 else
     PREFIXFLAGS=" -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\" -DDOCDIR=\\\"$docdir\\\""
 fi
@@ -162,7 +166,7 @@ AC_CHECK_HEADER([iconv.h],[],[iconv.h not found.])
 
 AC_CHECK_LIB([iconv], [main], [have_iconv=yes], [have_iconv=no])
 if test "x${have_iconv}" = "xyes" ; then
-ICONV_LIB="-liconv"
+    ICONV_LIB="-liconv"
     AC_SUBST(ICONV_LIB)
     AC_DEFINE(HAVE_LIBICONV,1,[Use libiconv instead of glibc iconv])
 fi
@@ -186,7 +190,7 @@ fi
 if test "x$enable_staticlink" != "xno" ; then
     HAVE_DBUS=yes
     DBUS_DEPS_LIBS="../../$LIB/libdbus-1.a ../../$LIB/libexpat.a -lrt"
-    DBUS_DEPS_CFLAGS="-I../../include/dbus-1"
+    DBUS_DEPS_CFLAGS="-I../../$LIB/include/dbus-1"
     AC_SUBST(DBUS_DEPS_LIBS)
 else
     PKG_CHECK_MODULES(DBUS_DEPS, dbus-1, HAVE_DBUS=yes, HAVE_DBUS=no)
@@ -414,7 +418,7 @@ fi
 
 if test "x$enable_src" != "xno" ; then
 if test "x$enable_staticlink" != "xno" ; then
-    LIBSAMPLERATE_DEPS_LIBS="$LIB/libsamplerate.a -lpthread -ldl"
+    LIBSAMPLERATE_DEPS_LIBS="../../$LIB/libsamplerate.a -lpthread -ldl"
     AC_SUBST(LIBSAMPLERATE_DEPS_LIBS)
     HAVE_DSP_SRC=yes
 else
diff --git a/include/FLAC/Makefile.am b/lib-x86-32/include/FLAC/Makefile.am
index 19f49b1f..19f49b1f 100644
--- a/include/FLAC/Makefile.am
+++ b/lib-x86-32/include/FLAC/Makefile.am
diff --git a/include/FLAC/all.h b/lib-x86-32/include/FLAC/all.h
index c542c0d5..c542c0d5 100644
--- a/include/FLAC/all.h
+++ b/lib-x86-32/include/FLAC/all.h
diff --git a/include/FLAC/assert.h b/lib-x86-32/include/FLAC/assert.h
index 3fc03f31..3fc03f31 100644
--- a/include/FLAC/assert.h
+++ b/lib-x86-32/include/FLAC/assert.h
diff --git a/include/FLAC/callback.h b/lib-x86-32/include/FLAC/callback.h
index c9541210..c9541210 100644
--- a/include/FLAC/callback.h
+++ b/lib-x86-32/include/FLAC/callback.h
diff --git a/include/FLAC/export.h b/lib-x86-32/include/FLAC/export.h
index a525f29c..a525f29c 100644
--- a/include/FLAC/export.h
+++ b/lib-x86-32/include/FLAC/export.h
diff --git a/include/FLAC/format.h b/lib-x86-32/include/FLAC/format.h
index 77e2d013..77e2d013 100644
--- a/include/FLAC/format.h
+++ b/lib-x86-32/include/FLAC/format.h
diff --git a/include/FLAC/metadata.h b/lib-x86-32/include/FLAC/metadata.h
index fff90b0b..fff90b0b 100644
--- a/include/FLAC/metadata.h
+++ b/lib-x86-32/include/FLAC/metadata.h
diff --git a/include/FLAC/ordinals.h b/lib-x86-32/include/FLAC/ordinals.h
index a7a5cd96..a7a5cd96 100644
--- a/include/FLAC/ordinals.h
+++ b/lib-x86-32/include/FLAC/ordinals.h
diff --git a/include/FLAC/stream_decoder.h b/lib-x86-32/include/FLAC/stream_decoder.h
index 9ac15947..9ac15947 100644
--- a/include/FLAC/stream_decoder.h
+++ b/lib-x86-32/include/FLAC/stream_decoder.h
diff --git a/include/FLAC/stream_encoder.h b/lib-x86-32/include/FLAC/stream_encoder.h
index dbbbb23e..dbbbb23e 100644
--- a/include/FLAC/stream_encoder.h
+++ b/lib-x86-32/include/FLAC/stream_encoder.h
diff --git a/include/cddb/Makefile.am b/lib-x86-32/include/cddb/Makefile.am
index f6c2f70f..f6c2f70f 100644
--- a/include/cddb/Makefile.am
+++ b/lib-x86-32/include/cddb/Makefile.am
diff --git a/include/cddb/cddb.h b/lib-x86-32/include/cddb/cddb.h
index c46700a6..c46700a6 100644
--- a/include/cddb/cddb.h
+++ b/lib-x86-32/include/cddb/cddb.h
diff --git a/include/cddb/cddb_cmd.h b/lib-x86-32/include/cddb/cddb_cmd.h
index c5a01fef..c5a01fef 100644
--- a/include/cddb/cddb_cmd.h
+++ b/lib-x86-32/include/cddb/cddb_cmd.h
diff --git a/include/cddb/cddb_cmd_ni.h b/lib-x86-32/include/cddb/cddb_cmd_ni.h
index 4b02190a..4b02190a 100644
--- a/include/cddb/cddb_cmd_ni.h
+++ b/lib-x86-32/include/cddb/cddb_cmd_ni.h
diff --git a/include/cddb/cddb_config.h b/lib-x86-32/include/cddb/cddb_config.h
index fd0d3769..fd0d3769 100644
--- a/include/cddb/cddb_config.h
+++ b/lib-x86-32/include/cddb/cddb_config.h
diff --git a/include/cddb/cddb_config.h.in b/lib-x86-32/include/cddb/cddb_config.h.in
index fd0d3769..fd0d3769 100644
--- a/include/cddb/cddb_config.h.in
+++ b/lib-x86-32/include/cddb/cddb_config.h.in
diff --git a/include/cddb/cddb_conn.h b/lib-x86-32/include/cddb/cddb_conn.h
index ada3cdda..ada3cdda 100644
--- a/include/cddb/cddb_conn.h
+++ b/lib-x86-32/include/cddb/cddb_conn.h
diff --git a/include/cddb/cddb_conn_ni.h b/lib-x86-32/include/cddb/cddb_conn_ni.h
index 6eddbdcf..6eddbdcf 100644
--- a/include/cddb/cddb_conn_ni.h
+++ b/lib-x86-32/include/cddb/cddb_conn_ni.h
diff --git a/include/cddb/cddb_disc.h b/lib-x86-32/include/cddb/cddb_disc.h
index 7951ae96..7951ae96 100644
--- a/include/cddb/cddb_disc.h
+++ b/lib-x86-32/include/cddb/cddb_disc.h
diff --git a/include/cddb/cddb_error.h b/lib-x86-32/include/cddb/cddb_error.h
index 6e779900..6e779900 100644
--- a/include/cddb/cddb_error.h
+++ b/lib-x86-32/include/cddb/cddb_error.h
diff --git a/include/cddb/cddb_log.h b/lib-x86-32/include/cddb/cddb_log.h
index 30fe7899..30fe7899 100644
--- a/include/cddb/cddb_log.h
+++ b/lib-x86-32/include/cddb/cddb_log.h
diff --git a/include/cddb/cddb_log_ni.h b/lib-x86-32/include/cddb/cddb_log_ni.h
index ea7727fc..ea7727fc 100644
--- a/include/cddb/cddb_log_ni.h
+++ b/lib-x86-32/include/cddb/cddb_log_ni.h
diff --git a/include/cddb/cddb_net.h b/lib-x86-32/include/cddb/cddb_net.h
index 60c5464b..60c5464b 100644
--- a/include/cddb/cddb_net.h
+++ b/lib-x86-32/include/cddb/cddb_net.h
diff --git a/include/cddb/cddb_ni.h b/lib-x86-32/include/cddb/cddb_ni.h
index d32fdc13..d32fdc13 100644
--- a/include/cddb/cddb_ni.h
+++ b/lib-x86-32/include/cddb/cddb_ni.h
diff --git a/include/cddb/cddb_regex.h b/lib-x86-32/include/cddb/cddb_regex.h
index 9b50e097..9b50e097 100644
--- a/include/cddb/cddb_regex.h
+++ b/lib-x86-32/include/cddb/cddb_regex.h
diff --git a/include/cddb/cddb_site.h b/lib-x86-32/include/cddb/cddb_site.h
index 9c48ac6c..9c48ac6c 100644
--- a/include/cddb/cddb_site.h
+++ b/lib-x86-32/include/cddb/cddb_site.h
diff --git a/include/cddb/cddb_track.h b/lib-x86-32/include/cddb/cddb_track.h
index 0f6ee0f9..0f6ee0f9 100644
--- a/include/cddb/cddb_track.h
+++ b/lib-x86-32/include/cddb/cddb_track.h
diff --git a/include/cddb/ll.h b/lib-x86-32/include/cddb/ll.h
index 9486e59f..9486e59f 100644
--- a/include/cddb/ll.h
+++ b/lib-x86-32/include/cddb/ll.h
diff --git a/include/cddb/version.h b/lib-x86-32/include/cddb/version.h
index f72839b2..f72839b2 100644
--- a/include/cddb/version.h
+++ b/lib-x86-32/include/cddb/version.h
diff --git a/include/cddb/version.h.in b/lib-x86-32/include/cddb/version.h.in
index 48d4c3fc..48d4c3fc 100644
--- a/include/cddb/version.h.in
+++ b/lib-x86-32/include/cddb/version.h.in
diff --git a/include/cdio/Makefile.am b/lib-x86-32/include/cdio/Makefile.am
index ea695618..ea695618 100644
--- a/include/cdio/Makefile.am
+++ b/lib-x86-32/include/cdio/Makefile.am
diff --git a/include/cdio/audio.h b/lib-x86-32/include/cdio/audio.h
index 880cd541..880cd541 100644
--- a/include/cdio/audio.h
+++ b/lib-x86-32/include/cdio/audio.h
diff --git a/include/cdio/bytesex.h b/lib-x86-32/include/cdio/bytesex.h
index e1be483e..e1be483e 100644
--- a/include/cdio/bytesex.h
+++ b/lib-x86-32/include/cdio/bytesex.h
diff --git a/include/cdio/bytesex_asm.h b/lib-x86-32/include/cdio/bytesex_asm.h
index 7f1f131a..7f1f131a 100644
--- a/include/cdio/bytesex_asm.h
+++ b/lib-x86-32/include/cdio/bytesex_asm.h
diff --git a/include/cdio/cd_types.h b/lib-x86-32/include/cdio/cd_types.h
index bc1f16c0..bc1f16c0 100644
--- a/include/cdio/cd_types.h
+++ b/lib-x86-32/include/cdio/cd_types.h
diff --git a/include/cdio/cdda.h b/lib-x86-32/include/cdio/cdda.h
index c30e129d..c30e129d 100644
--- a/include/cdio/cdda.h
+++ b/lib-x86-32/include/cdio/cdda.h
diff --git a/include/cdio/cdio.h b/lib-x86-32/include/cdio/cdio.h
index 84e54b10..84e54b10 100644
--- a/include/cdio/cdio.h
+++ b/lib-x86-32/include/cdio/cdio.h
diff --git a/include/cdio/cdio_config.h b/lib-x86-32/include/cdio/cdio_config.h
index 2005b888..2005b888 100644
--- a/include/cdio/cdio_config.h
+++ b/lib-x86-32/include/cdio/cdio_config.h
diff --git a/include/cdio/cdtext.h b/lib-x86-32/include/cdio/cdtext.h
index daac733f..daac733f 100644
--- a/include/cdio/cdtext.h
+++ b/lib-x86-32/include/cdio/cdtext.h
diff --git a/include/cdio/device.h b/lib-x86-32/include/cdio/device.h
index cc84e79a..cc84e79a 100644
--- a/include/cdio/device.h
+++ b/lib-x86-32/include/cdio/device.h
diff --git a/include/cdio/disc.h b/lib-x86-32/include/cdio/disc.h
index b5ae3c49..b5ae3c49 100644
--- a/include/cdio/disc.h
+++ b/lib-x86-32/include/cdio/disc.h
diff --git a/include/cdio/ds.h b/lib-x86-32/include/cdio/ds.h
index 447e30df..447e30df 100644
--- a/include/cdio/ds.h
+++ b/lib-x86-32/include/cdio/ds.h
diff --git a/include/cdio/dvd.h b/lib-x86-32/include/cdio/dvd.h
index 8be8317b..8be8317b 100644
--- a/include/cdio/dvd.h
+++ b/lib-x86-32/include/cdio/dvd.h
diff --git a/include/cdio/ecma_167.h b/lib-x86-32/include/cdio/ecma_167.h
index 78da7ae0..78da7ae0 100644
--- a/include/cdio/ecma_167.h
+++ b/lib-x86-32/include/cdio/ecma_167.h
diff --git a/include/cdio/iso9660.h b/lib-x86-32/include/cdio/iso9660.h
index a5311c8f..a5311c8f 100644
--- a/include/cdio/iso9660.h
+++ b/lib-x86-32/include/cdio/iso9660.h
diff --git a/include/cdio/logging.h b/lib-x86-32/include/cdio/logging.h
index 988d11c5..988d11c5 100644
--- a/include/cdio/logging.h
+++ b/lib-x86-32/include/cdio/logging.h
diff --git a/include/cdio/mmc.h b/lib-x86-32/include/cdio/mmc.h
index c7a4eeaf..c7a4eeaf 100644
--- a/include/cdio/mmc.h
+++ b/lib-x86-32/include/cdio/mmc.h
diff --git a/include/cdio/paranoia.h b/lib-x86-32/include/cdio/paranoia.h
index 02b50002..02b50002 100644
--- a/include/cdio/paranoia.h
+++ b/lib-x86-32/include/cdio/paranoia.h
diff --git a/include/cdio/posix.h b/lib-x86-32/include/cdio/posix.h
index 89e0ad37..89e0ad37 100644
--- a/include/cdio/posix.h
+++ b/lib-x86-32/include/cdio/posix.h
diff --git a/include/cdio/read.h b/lib-x86-32/include/cdio/read.h
index 81e5148a..81e5148a 100644
--- a/include/cdio/read.h
+++ b/lib-x86-32/include/cdio/read.h
diff --git a/include/cdio/rock.h b/lib-x86-32/include/cdio/rock.h
index 57003276..57003276 100644
--- a/include/cdio/rock.h
+++ b/lib-x86-32/include/cdio/rock.h
diff --git a/include/cdio/sector.h b/lib-x86-32/include/cdio/sector.h
index 6e308338..6e308338 100644
--- a/include/cdio/sector.h
+++ b/lib-x86-32/include/cdio/sector.h
diff --git a/include/cdio/track.h b/lib-x86-32/include/cdio/track.h
index 9deb942b..9deb942b 100644
--- a/include/cdio/track.h
+++ b/lib-x86-32/include/cdio/track.h
diff --git a/include/cdio/types.h b/lib-x86-32/include/cdio/types.h
index 347bf5a7..347bf5a7 100644
--- a/include/cdio/types.h
+++ b/lib-x86-32/include/cdio/types.h
diff --git a/include/cdio/udf.h b/lib-x86-32/include/cdio/udf.h
index e35d74d1..e35d74d1 100644
--- a/include/cdio/udf.h
+++ b/lib-x86-32/include/cdio/udf.h
diff --git a/include/cdio/udf_file.h b/lib-x86-32/include/cdio/udf_file.h
index 0b8fe99e..0b8fe99e 100644
--- a/include/cdio/udf_file.h
+++ b/lib-x86-32/include/cdio/udf_file.h
diff --git a/include/cdio/udf_time.h b/lib-x86-32/include/cdio/udf_time.h
index 791fcdd9..791fcdd9 100644
--- a/include/cdio/udf_time.h
+++ b/lib-x86-32/include/cdio/udf_time.h
diff --git a/include/cdio/utf8.h b/lib-x86-32/include/cdio/utf8.h
index 236105e9..236105e9 100644
--- a/include/cdio/utf8.h
+++ b/lib-x86-32/include/cdio/utf8.h
diff --git a/include/cdio/util.h b/lib-x86-32/include/cdio/util.h
index 81557dc7..81557dc7 100644
--- a/include/cdio/util.h
+++ b/lib-x86-32/include/cdio/util.h
diff --git a/include/cdio/version.h b/lib-x86-32/include/cdio/version.h
index 8eb564dc..8eb564dc 100644
--- a/include/cdio/version.h
+++ b/lib-x86-32/include/cdio/version.h
diff --git a/include/cdio/version.h.in b/lib-x86-32/include/cdio/version.h.in
index 17d199e7..17d199e7 100644
--- a/include/cdio/version.h.in
+++ b/lib-x86-32/include/cdio/version.h.in
diff --git a/include/cdio/xa.h b/lib-x86-32/include/cdio/xa.h
index 13b21c8f..13b21c8f 100644
--- a/include/cdio/xa.h
+++ b/lib-x86-32/include/cdio/xa.h
diff --git a/include/curl/Makefile.am b/lib-x86-32/include/curl/Makefile.am
index a3b44438..a3b44438 100644
--- a/include/curl/Makefile.am
+++ b/lib-x86-32/include/curl/Makefile.am
diff --git a/include/curl/curl.h b/lib-x86-32/include/curl/curl.h
index cb9d0fbf..cb9d0fbf 100644
--- a/include/curl/curl.h
+++ b/lib-x86-32/include/curl/curl.h
diff --git a/include/curl/curlbuild.h b/lib-x86-32/include/curl/curlbuild.h
index 81f4a285..81f4a285 100644
--- a/include/curl/curlbuild.h
+++ b/lib-x86-32/include/curl/curlbuild.h
diff --git a/include/curl/curlbuild.h.cmake b/lib-x86-32/include/curl/curlbuild.h.cmake
index 3aa772fc..3aa772fc 100644
--- a/include/curl/curlbuild.h.cmake
+++ b/lib-x86-32/include/curl/curlbuild.h.cmake
diff --git a/include/curl/curlbuild.h.in b/lib-x86-32/include/curl/curlbuild.h.in
index cb1de80a..cb1de80a 100644
--- a/include/curl/curlbuild.h.in
+++ b/lib-x86-32/include/curl/curlbuild.h.in
diff --git a/include/curl/curlrules.h b/lib-x86-32/include/curl/curlrules.h
index 8aad1df6..8aad1df6 100644
--- a/include/curl/curlrules.h
+++ b/lib-x86-32/include/curl/curlrules.h
diff --git a/include/curl/curlver.h b/lib-x86-32/include/curl/curlver.h
index e345f56d..e345f56d 100644
--- a/include/curl/curlver.h
+++ b/lib-x86-32/include/curl/curlver.h
diff --git a/include/curl/easy.h b/lib-x86-32/include/curl/easy.h
index 1ddb4fe5..1ddb4fe5 100644
--- a/include/curl/easy.h
+++ b/lib-x86-32/include/curl/easy.h
diff --git a/include/curl/mprintf.h b/lib-x86-32/include/curl/mprintf.h
index de7dd2f3..de7dd2f3 100644
--- a/include/curl/mprintf.h
+++ b/lib-x86-32/include/curl/mprintf.h
diff --git a/include/curl/multi.h b/lib-x86-32/include/curl/multi.h
index f9656666..f9656666 100644
--- a/include/curl/multi.h
+++ b/lib-x86-32/include/curl/multi.h
diff --git a/include/curl/stdcheaders.h b/lib-x86-32/include/curl/stdcheaders.h
index ad82ef63..ad82ef63 100644
--- a/include/curl/stdcheaders.h
+++ b/lib-x86-32/include/curl/stdcheaders.h
diff --git a/include/curl/typecheck-gcc.h b/lib-x86-32/include/curl/typecheck-gcc.h
index e6f74a95..e6f74a95 100644
--- a/include/curl/typecheck-gcc.h
+++ b/lib-x86-32/include/curl/typecheck-gcc.h
diff --git a/include/curl/types.h b/lib-x86-32/include/curl/types.h
index d37d6ae9..d37d6ae9 100644
--- a/include/curl/types.h
+++ b/lib-x86-32/include/curl/types.h
diff --git a/include/dbus-1/dbus/dbus-address.h b/lib-x86-32/include/dbus-1/dbus/dbus-address.h
index e51ef0ae..e51ef0ae 100644
--- a/include/dbus-1/dbus/dbus-address.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-address.h
diff --git a/include/dbus-1/dbus/dbus-arch-deps.h b/lib-x86-32/include/dbus-1/dbus/dbus-arch-deps.h
index c8359c8c..c8359c8c 100644
--- a/include/dbus-1/dbus/dbus-arch-deps.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-arch-deps.h
diff --git a/include/dbus-1/dbus/dbus-auth-script.h b/lib-x86-32/include/dbus-1/dbus/dbus-auth-script.h
index 39e6c7c4..39e6c7c4 100644
--- a/include/dbus-1/dbus/dbus-auth-script.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-auth-script.h
diff --git a/include/dbus-1/dbus/dbus-auth.h b/lib-x86-32/include/dbus-1/dbus/dbus-auth.h
index ae3f3647..ae3f3647 100644
--- a/include/dbus-1/dbus/dbus-auth.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-auth.h
diff --git a/include/dbus-1/dbus/dbus-bus.h b/lib-x86-32/include/dbus-1/dbus/dbus-bus.h
index 02a95711..02a95711 100644
--- a/include/dbus-1/dbus/dbus-bus.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-bus.h
diff --git a/include/dbus-1/dbus/dbus-connection-internal.h b/lib-x86-32/include/dbus-1/dbus/dbus-connection-internal.h
index cdf3f59d..cdf3f59d 100644
--- a/include/dbus-1/dbus/dbus-connection-internal.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-connection-internal.h
diff --git a/include/dbus-1/dbus/dbus-connection.h b/lib-x86-32/include/dbus-1/dbus/dbus-connection.h
index 3e2a7d8d..3e2a7d8d 100644
--- a/include/dbus-1/dbus/dbus-connection.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-connection.h
diff --git a/include/dbus-1/dbus/dbus-credentials.h b/lib-x86-32/include/dbus-1/dbus/dbus-credentials.h
index ef6124fd..ef6124fd 100644
--- a/include/dbus-1/dbus/dbus-credentials.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-credentials.h
diff --git a/include/dbus-1/dbus/dbus-dataslot.h b/lib-x86-32/include/dbus-1/dbus/dbus-dataslot.h
index 2e706f72..2e706f72 100644
--- a/include/dbus-1/dbus/dbus-dataslot.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-dataslot.h
diff --git a/include/dbus-1/dbus/dbus-errors.h b/lib-x86-32/include/dbus-1/dbus/dbus-errors.h
index e63139a0..e63139a0 100644
--- a/include/dbus-1/dbus/dbus-errors.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-errors.h
diff --git a/include/dbus-1/dbus/dbus-file.h b/lib-x86-32/include/dbus-1/dbus/dbus-file.h
index 24837f47..24837f47 100644
--- a/include/dbus-1/dbus/dbus-file.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-file.h
diff --git a/include/dbus-1/dbus/dbus-hash.h b/lib-x86-32/include/dbus-1/dbus/dbus-hash.h
index d1ca246c..d1ca246c 100644
--- a/include/dbus-1/dbus/dbus-hash.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-hash.h
diff --git a/include/dbus-1/dbus/dbus-internals.h b/lib-x86-32/include/dbus-1/dbus/dbus-internals.h
index dcef7d7f..dcef7d7f 100644
--- a/include/dbus-1/dbus/dbus-internals.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-internals.h
diff --git a/include/dbus-1/dbus/dbus-keyring.h b/lib-x86-32/include/dbus-1/dbus/dbus-keyring.h
index 200e31bc..200e31bc 100644
--- a/include/dbus-1/dbus/dbus-keyring.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-keyring.h
diff --git a/include/dbus-1/dbus/dbus-list.h b/lib-x86-32/include/dbus-1/dbus/dbus-list.h
index 663ad257..663ad257 100644
--- a/include/dbus-1/dbus/dbus-list.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-list.h
diff --git a/include/dbus-1/dbus/dbus-macros.h b/lib-x86-32/include/dbus-1/dbus/dbus-macros.h
index d1e40ecb..d1e40ecb 100644
--- a/include/dbus-1/dbus/dbus-macros.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-macros.h
diff --git a/include/dbus-1/dbus/dbus-mainloop.h b/lib-x86-32/include/dbus-1/dbus/dbus-mainloop.h
index 656f8231..656f8231 100644
--- a/include/dbus-1/dbus/dbus-mainloop.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-mainloop.h
diff --git a/include/dbus-1/dbus/dbus-marshal-basic.h b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-basic.h
index 0c27fc9e..0c27fc9e 100644
--- a/include/dbus-1/dbus/dbus-marshal-basic.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-basic.h
diff --git a/include/dbus-1/dbus/dbus-marshal-byteswap.h b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-byteswap.h
index be2dd758..be2dd758 100644
--- a/include/dbus-1/dbus/dbus-marshal-byteswap.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-byteswap.h
diff --git a/include/dbus-1/dbus/dbus-marshal-header.h b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-header.h
index fd16c5f0..fd16c5f0 100644
--- a/include/dbus-1/dbus/dbus-marshal-header.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-header.h
diff --git a/include/dbus-1/dbus/dbus-marshal-recursive.h b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-recursive.h
index 97e5466b..97e5466b 100644
--- a/include/dbus-1/dbus/dbus-marshal-recursive.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-recursive.h
diff --git a/include/dbus-1/dbus/dbus-marshal-validate.h b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-validate.h
index 5817de32..5817de32 100644
--- a/include/dbus-1/dbus/dbus-marshal-validate.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-marshal-validate.h
diff --git a/include/dbus-1/dbus/dbus-memory.h b/lib-x86-32/include/dbus-1/dbus/dbus-memory.h
index ea28423c..ea28423c 100644
--- a/include/dbus-1/dbus/dbus-memory.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-memory.h
diff --git a/include/dbus-1/dbus/dbus-mempool.h b/lib-x86-32/include/dbus-1/dbus/dbus-mempool.h
index afe52472..afe52472 100644
--- a/include/dbus-1/dbus/dbus-mempool.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-mempool.h
diff --git a/include/dbus-1/dbus/dbus-message-factory.h b/lib-x86-32/include/dbus-1/dbus/dbus-message-factory.h
index b0747504..b0747504 100644
--- a/include/dbus-1/dbus/dbus-message-factory.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-message-factory.h
diff --git a/include/dbus-1/dbus/dbus-message-internal.h b/lib-x86-32/include/dbus-1/dbus/dbus-message-internal.h
index 870934b9..870934b9 100644
--- a/include/dbus-1/dbus/dbus-message-internal.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-message-internal.h
diff --git a/include/dbus-1/dbus/dbus-message-private.h b/lib-x86-32/include/dbus-1/dbus/dbus-message-private.h
index 57888fa5..57888fa5 100644
--- a/include/dbus-1/dbus/dbus-message-private.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-message-private.h
diff --git a/include/dbus-1/dbus/dbus-message.h b/lib-x86-32/include/dbus-1/dbus/dbus-message.h
index 5500492d..5500492d 100644
--- a/include/dbus-1/dbus/dbus-message.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-message.h
diff --git a/include/dbus-1/dbus/dbus-misc.h b/lib-x86-32/include/dbus-1/dbus/dbus-misc.h
index 3504bcaa..3504bcaa 100644
--- a/include/dbus-1/dbus/dbus-misc.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-misc.h
diff --git a/include/dbus-1/dbus/dbus-nonce.h b/lib-x86-32/include/dbus-1/dbus/dbus-nonce.h
index 474ea728..474ea728 100644
--- a/include/dbus-1/dbus/dbus-nonce.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-nonce.h
diff --git a/include/dbus-1/dbus/dbus-object-tree.h b/lib-x86-32/include/dbus-1/dbus/dbus-object-tree.h
index 022dd93f..022dd93f 100644
--- a/include/dbus-1/dbus/dbus-object-tree.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-object-tree.h
diff --git a/include/dbus-1/dbus/dbus-pending-call-internal.h b/lib-x86-32/include/dbus-1/dbus/dbus-pending-call-internal.h
index 1875eea8..1875eea8 100644
--- a/include/dbus-1/dbus/dbus-pending-call-internal.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-pending-call-internal.h
diff --git a/include/dbus-1/dbus/dbus-pending-call.h b/lib-x86-32/include/dbus-1/dbus/dbus-pending-call.h
index 8f64b8be..8f64b8be 100644
--- a/include/dbus-1/dbus/dbus-pending-call.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-pending-call.h
diff --git a/include/dbus-1/dbus/dbus-pipe.h b/lib-x86-32/include/dbus-1/dbus/dbus-pipe.h
index f6eac5f9..f6eac5f9 100644
--- a/include/dbus-1/dbus/dbus-pipe.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-pipe.h
diff --git a/include/dbus-1/dbus/dbus-protocol.h b/lib-x86-32/include/dbus-1/dbus/dbus-protocol.h
index 17798e94..17798e94 100644
--- a/include/dbus-1/dbus/dbus-protocol.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-protocol.h
diff --git a/include/dbus-1/dbus/dbus-resources.h b/lib-x86-32/include/dbus-1/dbus/dbus-resources.h
index 4763a97f..4763a97f 100644
--- a/include/dbus-1/dbus/dbus-resources.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-resources.h
diff --git a/include/dbus-1/dbus/dbus-server-debug-pipe.h b/lib-x86-32/include/dbus-1/dbus/dbus-server-debug-pipe.h
index 4574311d..4574311d 100644
--- a/include/dbus-1/dbus/dbus-server-debug-pipe.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-server-debug-pipe.h
diff --git a/include/dbus-1/dbus/dbus-server-protected.h b/lib-x86-32/include/dbus-1/dbus/dbus-server-protected.h
index cc2de8dd..cc2de8dd 100644
--- a/include/dbus-1/dbus/dbus-server-protected.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-server-protected.h
diff --git a/include/dbus-1/dbus/dbus-server-socket.h b/lib-x86-32/include/dbus-1/dbus/dbus-server-socket.h
index 0a7c7891..0a7c7891 100644
--- a/include/dbus-1/dbus/dbus-server-socket.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-server-socket.h
diff --git a/include/dbus-1/dbus/dbus-server-unix.h b/lib-x86-32/include/dbus-1/dbus/dbus-server-unix.h
index 92b996ca..92b996ca 100644
--- a/include/dbus-1/dbus/dbus-server-unix.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-server-unix.h
diff --git a/include/dbus-1/dbus/dbus-server-win.h b/lib-x86-32/include/dbus-1/dbus/dbus-server-win.h
index 65c27568..65c27568 100644
--- a/include/dbus-1/dbus/dbus-server-win.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-server-win.h
diff --git a/include/dbus-1/dbus/dbus-server.h b/lib-x86-32/include/dbus-1/dbus/dbus-server.h
index bdbefa0f..bdbefa0f 100644
--- a/include/dbus-1/dbus/dbus-server.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-server.h
diff --git a/include/dbus-1/dbus/dbus-sha.h b/lib-x86-32/include/dbus-1/dbus/dbus-sha.h
index c48035b9..c48035b9 100644
--- a/include/dbus-1/dbus/dbus-sha.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-sha.h
diff --git a/include/dbus-1/dbus/dbus-shared.h b/lib-x86-32/include/dbus-1/dbus/dbus-shared.h
index 6a576704..6a576704 100644
--- a/include/dbus-1/dbus/dbus-shared.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-shared.h
diff --git a/include/dbus-1/dbus/dbus-shell.h b/lib-x86-32/include/dbus-1/dbus/dbus-shell.h
index 06da274e..06da274e 100644
--- a/include/dbus-1/dbus/dbus-shell.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-shell.h
diff --git a/include/dbus-1/dbus/dbus-signature.h b/lib-x86-32/include/dbus-1/dbus/dbus-signature.h
index ebf00c1e..ebf00c1e 100644
--- a/include/dbus-1/dbus/dbus-signature.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-signature.h
diff --git a/include/dbus-1/dbus/dbus-sockets-win.h b/lib-x86-32/include/dbus-1/dbus/dbus-sockets-win.h
index 5dead058..5dead058 100644
--- a/include/dbus-1/dbus/dbus-sockets-win.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-sockets-win.h
diff --git a/include/dbus-1/dbus/dbus-spawn.h b/lib-x86-32/include/dbus-1/dbus/dbus-spawn.h
index 5af54b72..5af54b72 100644
--- a/include/dbus-1/dbus/dbus-spawn.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-spawn.h
diff --git a/include/dbus-1/dbus/dbus-string-private.h b/lib-x86-32/include/dbus-1/dbus/dbus-string-private.h
index 365d89a3..365d89a3 100644
--- a/include/dbus-1/dbus/dbus-string-private.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-string-private.h
diff --git a/include/dbus-1/dbus/dbus-string.h b/lib-x86-32/include/dbus-1/dbus/dbus-string.h
index 2f1ed31c..2f1ed31c 100644
--- a/include/dbus-1/dbus/dbus-string.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-string.h
diff --git a/include/dbus-1/dbus/dbus-sysdeps-unix.h b/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-unix.h
index 807d2cf5..807d2cf5 100644
--- a/include/dbus-1/dbus/dbus-sysdeps-unix.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-unix.h
diff --git a/include/dbus-1/dbus/dbus-sysdeps-win.h b/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-win.h
index a8ff9433..a8ff9433 100644
--- a/include/dbus-1/dbus/dbus-sysdeps-win.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-win.h
diff --git a/include/dbus-1/dbus/dbus-sysdeps-wince-glue.h b/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-wince-glue.h
index f5ac6c8a..f5ac6c8a 100644
--- a/include/dbus-1/dbus/dbus-sysdeps-wince-glue.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps-wince-glue.h
diff --git a/include/dbus-1/dbus/dbus-sysdeps.h b/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps.h
index c98db36d..c98db36d 100644
--- a/include/dbus-1/dbus/dbus-sysdeps.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-sysdeps.h
diff --git a/include/dbus-1/dbus/dbus-test.h b/lib-x86-32/include/dbus-1/dbus/dbus-test.h
index 0238b0ce..0238b0ce 100644
--- a/include/dbus-1/dbus/dbus-test.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-test.h
diff --git a/include/dbus-1/dbus/dbus-threads-internal.h b/lib-x86-32/include/dbus-1/dbus/dbus-threads-internal.h
index 11f9ce20..11f9ce20 100644
--- a/include/dbus-1/dbus/dbus-threads-internal.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-threads-internal.h
diff --git a/include/dbus-1/dbus/dbus-threads.h b/lib-x86-32/include/dbus-1/dbus/dbus-threads.h
index ba07ca57..ba07ca57 100644
--- a/include/dbus-1/dbus/dbus-threads.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-threads.h
diff --git a/include/dbus-1/dbus/dbus-timeout.h b/lib-x86-32/include/dbus-1/dbus/dbus-timeout.h
index d0a8af4a..d0a8af4a 100644
--- a/include/dbus-1/dbus/dbus-timeout.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-timeout.h
diff --git a/include/dbus-1/dbus/dbus-transport-protected.h b/lib-x86-32/include/dbus-1/dbus/dbus-transport-protected.h
index 44b9d785..44b9d785 100644
--- a/include/dbus-1/dbus/dbus-transport-protected.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-transport-protected.h
diff --git a/include/dbus-1/dbus/dbus-transport-socket.h b/lib-x86-32/include/dbus-1/dbus/dbus-transport-socket.h
index 8aefae37..8aefae37 100644
--- a/include/dbus-1/dbus/dbus-transport-socket.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-transport-socket.h
diff --git a/include/dbus-1/dbus/dbus-transport-unix.h b/lib-x86-32/include/dbus-1/dbus/dbus-transport-unix.h
index 783a8313..783a8313 100644
--- a/include/dbus-1/dbus/dbus-transport-unix.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-transport-unix.h
diff --git a/include/dbus-1/dbus/dbus-transport-win.h b/lib-x86-32/include/dbus-1/dbus/dbus-transport-win.h
index af997a27..af997a27 100644
--- a/include/dbus-1/dbus/dbus-transport-win.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-transport-win.h
diff --git a/include/dbus-1/dbus/dbus-transport.h b/lib-x86-32/include/dbus-1/dbus/dbus-transport.h
index 0db048a2..0db048a2 100644
--- a/include/dbus-1/dbus/dbus-transport.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-transport.h
diff --git a/include/dbus-1/dbus/dbus-types.h b/lib-x86-32/include/dbus-1/dbus/dbus-types.h
index 54f348f3..54f348f3 100644
--- a/include/dbus-1/dbus/dbus-types.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-types.h
diff --git a/include/dbus-1/dbus/dbus-userdb.h b/lib-x86-32/include/dbus-1/dbus/dbus-userdb.h
index cb49d9e7..cb49d9e7 100644
--- a/include/dbus-1/dbus/dbus-userdb.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-userdb.h
diff --git a/include/dbus-1/dbus/dbus-uuidgen.h b/lib-x86-32/include/dbus-1/dbus/dbus-uuidgen.h
index 9c1b8595..9c1b8595 100644
--- a/include/dbus-1/dbus/dbus-uuidgen.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-uuidgen.h
diff --git a/include/dbus-1/dbus/dbus-watch.h b/lib-x86-32/include/dbus-1/dbus/dbus-watch.h
index fa953ec1..fa953ec1 100644
--- a/include/dbus-1/dbus/dbus-watch.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus-watch.h
diff --git a/include/dbus-1/dbus/dbus.h b/lib-x86-32/include/dbus-1/dbus/dbus.h
index 1f099508..1f099508 100644
--- a/include/dbus-1/dbus/dbus.h
+++ b/lib-x86-32/include/dbus-1/dbus/dbus.h
diff --git a/include/dbus-1/dbus/sd-daemon.h b/lib-x86-32/include/dbus-1/dbus/sd-daemon.h
index c68c96d2..c68c96d2 100644
--- a/include/dbus-1/dbus/sd-daemon.h
+++ b/lib-x86-32/include/dbus-1/dbus/sd-daemon.h
diff --git a/include/faad.h b/lib-x86-32/include/faad.h
index 72f40728..72f40728 100644
--- a/include/faad.h
+++ b/lib-x86-32/include/faad.h
diff --git a/include/libavcodec/avcodec.h b/lib-x86-32/include/libavcodec/avcodec.h
index 974e87cc..974e87cc 100644
--- a/include/libavcodec/avcodec.h
+++ b/lib-x86-32/include/libavcodec/avcodec.h
diff --git a/include/libavcodec/avfft.h b/lib-x86-32/include/libavcodec/avfft.h
index 623f0a33..623f0a33 100644
--- a/include/libavcodec/avfft.h
+++ b/lib-x86-32/include/libavcodec/avfft.h
diff --git a/include/libavcodec/dxva2.h b/lib-x86-32/include/libavcodec/dxva2.h
index 5c5fe21e..5c5fe21e 100644
--- a/include/libavcodec/dxva2.h
+++ b/lib-x86-32/include/libavcodec/dxva2.h
diff --git a/include/libavcodec/opt.h b/lib-x86-32/include/libavcodec/opt.h
index 55ca4ea6..55ca4ea6 100644
--- a/include/libavcodec/opt.h
+++ b/lib-x86-32/include/libavcodec/opt.h
diff --git a/include/libavcodec/vaapi.h b/lib-x86-32/include/libavcodec/vaapi.h
index 07568a47..07568a47 100644
--- a/include/libavcodec/vaapi.h
+++ b/lib-x86-32/include/libavcodec/vaapi.h
diff --git a/include/libavcodec/vdpau.h b/lib-x86-32/include/libavcodec/vdpau.h
index a8fa4d38..a8fa4d38 100644
--- a/include/libavcodec/vdpau.h
+++ b/lib-x86-32/include/libavcodec/vdpau.h
diff --git a/include/libavcodec/xvmc.h b/lib-x86-32/include/libavcodec/xvmc.h
index 01f84b28..01f84b28 100644
--- a/include/libavcodec/xvmc.h
+++ b/lib-x86-32/include/libavcodec/xvmc.h
diff --git a/include/libavformat/avformat.h b/lib-x86-32/include/libavformat/avformat.h
index dbd22bb8..dbd22bb8 100644
--- a/include/libavformat/avformat.h
+++ b/lib-x86-32/include/libavformat/avformat.h
diff --git a/include/libavformat/avio.h b/lib-x86-32/include/libavformat/avio.h
index 9ffe9356..9ffe9356 100644
--- a/include/libavformat/avio.h
+++ b/lib-x86-32/include/libavformat/avio.h
diff --git a/include/libavutil/adler32.h b/lib-x86-32/include/libavutil/adler32.h
index 9626c805..9626c805 100644
--- a/include/libavutil/adler32.h
+++ b/lib-x86-32/include/libavutil/adler32.h
diff --git a/include/libavutil/attributes.h b/lib-x86-32/include/libavutil/attributes.h
index da45234c..da45234c 100644
--- a/include/libavutil/attributes.h
+++ b/lib-x86-32/include/libavutil/attributes.h
diff --git a/include/libavutil/avconfig.h b/lib-x86-32/include/libavutil/avconfig.h
index b028bb4f..b028bb4f 100644
--- a/include/libavutil/avconfig.h
+++ b/lib-x86-32/include/libavutil/avconfig.h
diff --git a/include/libavutil/avstring.h b/lib-x86-32/include/libavutil/avstring.h
index 01c2391b..01c2391b 100644
--- a/include/libavutil/avstring.h
+++ b/lib-x86-32/include/libavutil/avstring.h
diff --git a/include/libavutil/avutil.h b/lib-x86-32/include/libavutil/avutil.h
index e9e07b92..e9e07b92 100644
--- a/include/libavutil/avutil.h
+++ b/lib-x86-32/include/libavutil/avutil.h
diff --git a/include/libavutil/base64.h b/lib-x86-32/include/libavutil/base64.h
index 103860ef..103860ef 100644
--- a/include/libavutil/base64.h
+++ b/lib-x86-32/include/libavutil/base64.h
diff --git a/include/libavutil/common.h b/lib-x86-32/include/libavutil/common.h
index 4aa00a99..4aa00a99 100644
--- a/include/libavutil/common.h
+++ b/lib-x86-32/include/libavutil/common.h
diff --git a/include/libavutil/crc.h b/lib-x86-32/include/libavutil/crc.h
index 6c0baab5..6c0baab5 100644
--- a/include/libavutil/crc.h
+++ b/lib-x86-32/include/libavutil/crc.h
diff --git a/include/libavutil/error.h b/lib-x86-32/include/libavutil/error.h
index 13a9a359..13a9a359 100644
--- a/include/libavutil/error.h
+++ b/lib-x86-32/include/libavutil/error.h
diff --git a/include/libavutil/fifo.h b/lib-x86-32/include/libavutil/fifo.h
index fb1ed47f..fb1ed47f 100644
--- a/include/libavutil/fifo.h
+++ b/lib-x86-32/include/libavutil/fifo.h
diff --git a/include/libavutil/intfloat_readwrite.h b/lib-x86-32/include/libavutil/intfloat_readwrite.h
index 1b80fc6e..1b80fc6e 100644
--- a/include/libavutil/intfloat_readwrite.h
+++ b/lib-x86-32/include/libavutil/intfloat_readwrite.h
diff --git a/include/libavutil/log.h b/lib-x86-32/include/libavutil/log.h
index 1c3e4901..1c3e4901 100644
--- a/include/libavutil/log.h
+++ b/lib-x86-32/include/libavutil/log.h
diff --git a/include/libavutil/lzo.h b/lib-x86-32/include/libavutil/lzo.h
index 6788054b..6788054b 100644
--- a/include/libavutil/lzo.h
+++ b/lib-x86-32/include/libavutil/lzo.h
diff --git a/include/libavutil/mathematics.h b/lib-x86-32/include/libavutil/mathematics.h
index e198aef8..e198aef8 100644
--- a/include/libavutil/mathematics.h
+++ b/lib-x86-32/include/libavutil/mathematics.h
diff --git a/include/libavutil/md5.h b/lib-x86-32/include/libavutil/md5.h
index 969202a8..969202a8 100644
--- a/include/libavutil/md5.h
+++ b/lib-x86-32/include/libavutil/md5.h
diff --git a/include/libavutil/mem.h b/lib-x86-32/include/libavutil/mem.h
index 14887927..14887927 100644
--- a/include/libavutil/mem.h
+++ b/lib-x86-32/include/libavutil/mem.h
diff --git a/include/libavutil/pixdesc.h b/lib-x86-32/include/libavutil/pixdesc.h
index 8e4c85d7..8e4c85d7 100644
--- a/include/libavutil/pixdesc.h
+++ b/lib-x86-32/include/libavutil/pixdesc.h
diff --git a/include/libavutil/pixfmt.h b/lib-x86-32/include/libavutil/pixfmt.h
index d976f343..d976f343 100644
--- a/include/libavutil/pixfmt.h
+++ b/lib-x86-32/include/libavutil/pixfmt.h
diff --git a/include/libavutil/rational.h b/lib-x86-32/include/libavutil/rational.h
index 4d91f7ba..4d91f7ba 100644
--- a/include/libavutil/rational.h
+++ b/lib-x86-32/include/libavutil/rational.h
diff --git a/include/libavutil/sha1.h b/lib-x86-32/include/libavutil/sha1.h
index cf7c4a65..cf7c4a65 100644
--- a/include/libavutil/sha1.h
+++ b/lib-x86-32/include/libavutil/sha1.h
diff --git a/include/mad.h b/lib-x86-32/include/mad.h
index 9ef6cc8f..9ef6cc8f 100644
--- a/include/mad.h
+++ b/lib-x86-32/include/mad.h
diff --git a/include/neaacdec.h b/lib-x86-32/include/neaacdec.h
index a45f1d09..a45f1d09 100644
--- a/include/neaacdec.h
+++ b/lib-x86-32/include/neaacdec.h
diff --git a/include/ogg/Makefile.am b/lib-x86-32/include/ogg/Makefile.am
index 142699d3..142699d3 100644
--- a/include/ogg/Makefile.am
+++ b/lib-x86-32/include/ogg/Makefile.am
diff --git a/include/ogg/config_types.h b/lib-x86-32/include/ogg/config_types.h
index 496e900f..496e900f 100644
--- a/include/ogg/config_types.h
+++ b/lib-x86-32/include/ogg/config_types.h
diff --git a/include/ogg/config_types.h.in b/lib-x86-32/include/ogg/config_types.h.in
index 568a001f..568a001f 100644
--- a/include/ogg/config_types.h.in
+++ b/lib-x86-32/include/ogg/config_types.h.in
diff --git a/include/ogg/ogg.h b/lib-x86-32/include/ogg/ogg.h
index ae0cfd53..ae0cfd53 100644
--- a/include/ogg/ogg.h
+++ b/lib-x86-32/include/ogg/ogg.h
diff --git a/include/ogg/os_types.h b/lib-x86-32/include/ogg/os_types.h
index f6f8b381..f6f8b381 100644
--- a/include/ogg/os_types.h
+++ b/lib-x86-32/include/ogg/os_types.h
diff --git a/include/samplerate.h b/lib-x86-32/include/samplerate.h
index 9651e635..9651e635 100644
--- a/include/samplerate.h
+++ b/lib-x86-32/include/samplerate.h
diff --git a/include/sndfile.h b/lib-x86-32/include/sndfile.h
index 1b7e1f99..1b7e1f99 100644
--- a/include/sndfile.h
+++ b/lib-x86-32/include/sndfile.h
diff --git a/include/vorbis/Makefile.am b/lib-x86-32/include/vorbis/Makefile.am
index dbba34e5..dbba34e5 100644
--- a/include/vorbis/Makefile.am
+++ b/lib-x86-32/include/vorbis/Makefile.am
diff --git a/include/vorbis/codec.h b/lib-x86-32/include/vorbis/codec.h
index 999aa335..999aa335 100644
--- a/include/vorbis/codec.h
+++ b/lib-x86-32/include/vorbis/codec.h
diff --git a/include/vorbis/vorbisenc.h b/lib-x86-32/include/vorbis/vorbisenc.h
index 02332b50..02332b50 100644
--- a/include/vorbis/vorbisenc.h
+++ b/lib-x86-32/include/vorbis/vorbisenc.h
diff --git a/include/vorbis/vorbisfile.h b/lib-x86-32/include/vorbis/vorbisfile.h
index a865cd09..a865cd09 100644
--- a/include/vorbis/vorbisfile.h
+++ b/lib-x86-32/include/vorbis/vorbisfile.h
diff --git a/include/wavpack.h b/lib-x86-32/include/wavpack.h
index fe66dcbc..fe66dcbc 100644
--- a/include/wavpack.h
+++ b/lib-x86-32/include/wavpack.h
diff --git a/include/zconf.h b/lib-x86-32/include/zconf.h
index b2343874..b2343874 100644
--- a/include/zconf.h
+++ b/lib-x86-32/include/zconf.h
diff --git a/include/zlib.h b/lib-x86-32/include/zlib.h
index bfbba83e..bfbba83e 100644
--- a/include/zlib.h
+++ b/lib-x86-32/include/zlib.h
diff --git a/plugins/musepack/mpc_decoder.c b/plugins/musepack/mpc_decoder.c
index a7732bf2..952789fd 100644
--- a/plugins/musepack/mpc_decoder.c
+++ b/plugins/musepack/mpc_decoder.c
@@ -650,11 +650,11 @@ void mpc_decoder_read_bitstream_sv8(mpc_decoder * d, mpc_bits_reader * r, mpc_bo
 					for ( ; k < 36; k += 2 ) {
 						union {
 							mpc_int8_t sym;
-							struct { mpc_int8_t s1:4, s2:4; };
+							struct { mpc_int8_t s1:4, s2:4; } symf;
 						} tmp;
 						tmp.sym = mpc_bits_can_dec(r, Table);
-						q[k] = tmp.s1;
-						q[k + 1] = tmp.s2;
+						q[k] = tmp.symf.s1;
+						q[k + 1] = tmp.symf.s2;
 					}
 				} else if (Res <= 8) {
 					Tables[0] = & mpc_can_Q [Res - 3][0];
diff --git a/scripts/portable_build.sh b/scripts/portable_build.sh
index 4259c845..35ee48a1 100755
--- a/scripts/portable_build.sh
+++ b/scripts/portable_build.sh
@@ -3,7 +3,7 @@ VERSION=`cat PORTABLE_VERSION | perl -ne 'chomp and print'`
 ORIGIN=`pwd | perl -ne 'chomp and print'`
 export APBUILD_STATIC_LIBGCC=1
 
-CC=$ORIGIN/tools/apbuild/apgcc CXX=$ORIGIN/tools/apbuild/apgcc ./configure --enable-staticlink --enable-portable=yes --disable-pulse --disable-mpris --enable-maintainer-mode --disable-nls
+CC=$ORIGIN/tools/apbuild/apgcc CXX=$ORIGIN/tools/apbuild/apgcc ./configure --enable-staticlink --enable-portable=yes --disable-pulse --disable-mpris --disable-nls
 sed -i 's/-lstdc++ -lm -lgcc_s -lc -lgcc_s/-lm -lc/g' libtool
 make clean
 make -j9