summaryrefslogtreecommitdiffstats
path: root/package/wine/0001-sane-config-fix.patch
diff options
context:
space:
mode:
authorAndré Hentschel <nerv@dawncrow.de>2015-12-20 03:24:12 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-12-20 13:34:43 +0100
commitac8b5ffef1ce93b13ac6fb2ba37c8ce7ec42afcb (patch)
treec8196147e532cc9b468d97f6ca91cd6e6ed644ad /package/wine/0001-sane-config-fix.patch
parent1b5352e7942990ff65037889e2e35d67d7b2671a (diff)
downloadbuildroot-ac8b5ffef1ce93b13ac6fb2ba37c8ce7ec42afcb.tar.gz
buildroot-ac8b5ffef1ce93b13ac6fb2ba37c8ce7ec42afcb.zip
wine: Bump to version 1.8
Bumping to brand new stable version 1.8 Upstreamed patches are dropped, sane patch is rebased. Adding libpcap, pulseaudio and samba4 as soft dependencies. sfnt2fon moved to its own subfolder and needs to be built in host-wine. Signed-off-by: André Hentschel <nerv@dawncrow.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/wine/0001-sane-config-fix.patch')
-rw-r--r--package/wine/0001-sane-config-fix.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/package/wine/0001-sane-config-fix.patch b/package/wine/0001-sane-config-fix.patch
new file mode 100644
index 0000000000..bccde7dc01
--- /dev/null
+++ b/package/wine/0001-sane-config-fix.patch
@@ -0,0 +1,21 @@
+Add support for SANE_CONFIG variable
+
+Instead of using directly the sane-config command, allow to pass a
+SANE_CONFIG environment variable to override where to find the
+sane-config tool.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -1291,7 +1291,7 @@
+ dnl **** Check for SANE ****
+ if test "x$with_sane" != "xno"
+ then
+- WINE_PACKAGE_FLAGS(SANE,[libsane],,[`sane-config --cflags 2>/dev/null`],[`sane-config --ldflags 2>/dev/null`],
++ WINE_PACKAGE_FLAGS(SANE,[libsane],,[`${SANE_CONFIG:-sane-config} --cflags 2>/dev/null`],[`${SANE_CONFIG:-sane-config} --ldflags 2>/dev/null`],
+ [AC_CHECK_HEADER(sane/sane.h,
+ [WINE_CHECK_SONAME(sane,sane_init,,[SANE_CFLAGS=""],[$SANE_LIBS])],
+ [SANE_CFLAGS=""])])
OpenPOWER on IntegriCloud