contrib: fix building static liboil

Signed-off-by: David Flynn <davidf@rd.bbc.co.uk>
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 893df543776aa93dd67f18743a312413f09520a7..7915aabb6cb9d3f41b472b71102060b26ba4ef6e 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2488,6 +2488,7 @@ liboil-$(OIL_VERSION).tar.gz:
 
 liboil: liboil-$(OIL_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -d liboil -p1 < Patches/liboil-noshared.patch
 
 .liboil: liboil
 ifdef HAVE_DARWIN_OS

diff --git a/extras/contrib/src/Patches/liboil-noshared.patch b/extras/contrib/src/Patches/liboil-noshared.patch
new file mode 100644 (file)
index 0000000..b5d7b97
--- /dev/null
+++ b/extras/contrib/src/Patches/liboil-noshared.patch
@@ -0,0 +1,100 @@
+diff -ur liboil-0.3.16/liboil/Makefile.am liboil/liboil/Makefile.am
+--- liboil-0.3.16/liboil/Makefile.am   2009-02-26 19:35:39.000000000 +0000
++++ liboil/liboil/Makefile.am  2009-04-10 12:52:54.000000000 +0100
+@@ -207,25 +207,38 @@
+ build_trampolines_LDADD = $(LIBOIL_LIBS)
+ 
+ liboilarray.c: liboiltmp1.la Makefile
++      ../libtool --config > .libs/libtoolcfg
+       echo '/* This file is autogenerated.  Do not edit */' >liboilarray.c.tmp
+       echo >>liboilarray.c.tmp
+       echo '#include <liboil/liboilfunction.h>' >>liboilarray.c.tmp
+       echo >>liboilarray.c.tmp
+-      grep '^_oil_function_class_' .libs/liboiltmp1.exp | \
+-        sed -e 's/ DATA$$//' -e 's/ .*//' -e 's/.*/extern OilFunctionClass &;/' >>liboilarray.c.tmp
++      . .libs/libtoolcfg; eval "$$NM .libs/liboiltmp1.a | $$global_symbol_pipe " \
++       | sed -e /^[^D]/D -e 's/^. [^ ]* \([^ ]*\)/\1/' \
++       | grep ^_oil_function_class_ \
++       | sed -e 's/.*/extern OilFunctionClass &;/' \
++       >>liboilarray.c.tmp
+       echo >>liboilarray.c.tmp
+       echo 'OilFunctionClass *_oil_function_class_array[] = {' >>liboilarray.c.tmp
+-      grep '^_oil_function_class_' .libs/liboiltmp1.exp | \
+-        sed -e 's/ .*//' -e 's/.*/  \&&,/' >>liboilarray.c.tmp
++      . .libs/libtoolcfg; eval "$$NM .libs/liboiltmp1.a | $$global_symbol_pipe " \
++       | sed -e /^[^D]/D -e 's/^. [^ ]* \([^ ]*\)/\1/' \
++       | grep ^_oil_function_class_ \
++       | sed -e 's/.*/  \&&,/' \
++       >>liboilarray.c.tmp
+       echo '  NULL' >>liboilarray.c.tmp
+       echo '};' >>liboilarray.c.tmp
+       echo >>liboilarray.c.tmp
+-      grep '^_oil_function_impl_' .libs/liboiltmp1.exp | \
+-        sed -e 's/ .*//' -e 's/.*/extern OilFunctionImpl &;/' >>liboilarray.c.tmp
++      . .libs/libtoolcfg; eval "$$NM .libs/liboiltmp1.a | $$global_symbol_pipe " \
++       | sed -e /^[^D]/D -e 's/^. [^ ]* \([^ ]*\)/\1/' \
++       | grep ^_oil_function_impl_ \
++       | sed -e 's/.*/extern OilFunctionImpl &;/' \
++       >>liboilarray.c.tmp
+       echo >>liboilarray.c.tmp
+       echo 'OilFunctionImpl *_oil_function_impl_array[] = {' >>liboilarray.c.tmp
+-      grep '^_oil_function_impl_' .libs/liboiltmp1.exp | \
+-        sed -e 's/ .*//' -e 's/.*/  \&&,/' >>liboilarray.c.tmp
++      . .libs/libtoolcfg; eval "$$NM .libs/liboiltmp1.a | $$global_symbol_pipe " \
++       | sed -e /^[^D]/D -e 's/^. [^ ]* \([^ ]*\)/\1/' \
++       | grep ^_oil_function_impl_ \
++       | sed -e 's/.*/  \&&,/' \
++       >>liboilarray.c.tmp
+       echo '  NULL' >>liboilarray.c.tmp
+       echo '};' >>liboilarray.c.tmp
+       echo >>liboilarray.c.tmp
+diff -ur liboil-0.3.16/liboil/Makefile.in liboil/liboil/Makefile.in
+--- liboil-0.3.16/liboil/Makefile.in   2009-03-19 05:41:32.000000000 +0000
++++ liboil/liboil/Makefile.in  2009-04-10 12:51:19.000000000 +0100
+@@ -1218,25 +1218,38 @@
+ 
+ 
+ liboilarray.c: liboiltmp1.la Makefile
++      ../libtool --config > .libs/libtoolcfg
+       echo '/* This file is autogenerated.  Do not edit */' >liboilarray.c.tmp
+       echo >>liboilarray.c.tmp
+       echo '#include <liboil/liboilfunction.h>' >>liboilarray.c.tmp
+       echo >>liboilarray.c.tmp
+-      grep '^_oil_function_class_' .libs/liboiltmp1.exp | \
+-        sed -e 's/ DATA$$//' -e 's/ .*//' -e 's/.*/extern OilFunctionClass &;/' >>liboilarray.c.tmp
++      . .libs/libtoolcfg; eval "$$NM .libs/liboiltmp1.a | $$global_symbol_pipe " \
++       | sed -e /^[^D]/D -e 's/^. [^ ]* \([^ ]*\)/\1/' \
++       | grep ^_oil_function_class_ \
++       | sed -e 's/.*/extern OilFunctionClass &;/' \
++       >>liboilarray.c.tmp
+       echo >>liboilarray.c.tmp
+       echo 'OilFunctionClass *_oil_function_class_array[] = {' >>liboilarray.c.tmp
+-      grep '^_oil_function_class_' .libs/liboiltmp1.exp | \
+-        sed -e 's/ .*//' -e 's/.*/  \&&,/' >>liboilarray.c.tmp
++      . .libs/libtoolcfg; eval "$$NM .libs/liboiltmp1.a | $$global_symbol_pipe " \
++       | sed -e /^[^D]/D -e 's/^. [^ ]* \([^ ]*\)/\1/' \
++       | grep ^_oil_function_class_ \
++       | sed -e 's/.*/  \&&,/' \
++       >>liboilarray.c.tmp
+       echo '  NULL' >>liboilarray.c.tmp
+       echo '};' >>liboilarray.c.tmp
+       echo >>liboilarray.c.tmp
+-      grep '^_oil_function_impl_' .libs/liboiltmp1.exp | \
+-        sed -e 's/ .*//' -e 's/.*/extern OilFunctionImpl &;/' >>liboilarray.c.tmp
++      . .libs/libtoolcfg; eval "$$NM .libs/liboiltmp1.a | $$global_symbol_pipe " \
++       | sed -e /^[^D]/D -e 's/^. [^ ]* \([^ ]*\)/\1/' \
++       | grep ^_oil_function_impl_ \
++       | sed -e 's/.*/extern OilFunctionImpl &;/' \
++       >>liboilarray.c.tmp
+       echo >>liboilarray.c.tmp
+       echo 'OilFunctionImpl *_oil_function_impl_array[] = {' >>liboilarray.c.tmp
+-      grep '^_oil_function_impl_' .libs/liboiltmp1.exp | \
+-        sed -e 's/ .*//' -e 's/.*/  \&&,/' >>liboilarray.c.tmp
++      . .libs/libtoolcfg; eval "$$NM .libs/liboiltmp1.a | $$global_symbol_pipe " \
++       | sed -e /^[^D]/D -e 's/^. [^ ]* \([^ ]*\)/\1/' \
++       | grep ^_oil_function_impl_ \
++       | sed -e 's/.*/  \&&,/' \
++       >>liboilarray.c.tmp
+       echo '  NULL' >>liboilarray.c.tmp
+       echo '};' >>liboilarray.c.tmp
+       echo >>liboilarray.c.tmp