[zoom-player] 03/05: Enable xft.

[Stephen Kitt]

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository zoom-player.

commit baeed2b9d3a356f61dbb1b6579857f8b9d1b1ef4
Author: Stephen Kitt <steve at sk2.org>
Date:   Sun Jan 17 16:53:42 2016 +0100

    Enable xft.
---
 debian/control                      |  3 +--
 debian/patches/series               |  1 +
 debian/patches/xft-pkg-config.patch | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 6e8ae78..d31e094 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,7 @@ Build-Depends:
  libsm-dev,
  libx11-dev,
  libxext-dev,
-# To use libxft-dev, zoom needs adapted to use pkg-config instead of xft-config
-# libxft-dev,
+ libxft-dev,
  libxrender-dev,
  zlib1g-dev
 Standards-Version: 3.9.6
diff --git a/debian/patches/series b/debian/patches/series
index ec00dad..660ca19 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 acinclude.patch
 restore-return.patch
+xft-pkg-config.patch
diff --git a/debian/patches/xft-pkg-config.patch b/debian/patches/xft-pkg-config.patch
new file mode 100644
index 0000000..e22609e
--- /dev/null
+++ b/debian/patches/xft-pkg-config.patch
@@ -0,0 +1,29 @@
+Description: Use pkg-config to find xft
+Author: Stephen Kitt <skitt at debian.org>
+
+This is rather hacky, we should use PKG_CHECK_MODULES.
+
+--- a/configure.in
++++ b/configure.in
+@@ -356,13 +356,17 @@
+       
+     # If Xft is installed, then there will be a xft-config file on the current path
+     AC_MSG_CHECKING([for xft-config])
+-    XFTCONFIG=`which xft-config`
++    XFTCONFIG=`which pkg-config`
+     XFT_CFLAGS=""
+     XFT_LIBS=""
+     if test -x ${XFTCONFIG}; then
+-    	AC_MSG_RESULT([$XFTCONFIG])
+-    	XFT_CFLAGS=`${XFTCONFIG} --cflags`
+-    	XFT_LIBS=`${XFTCONFIG} --libs`
++        if ${XFTCONFIG} xft; then
++            AC_MSG_RESULT([$XFTCONFIG])
++            XFT_CFLAGS=`${XFTCONFIG} --cflags xft`
++            XFT_LIBS=`${XFTCONFIG} --libs xft`
++        else
++            AC_MSG_RESULT(no)
++        fi
+     else
+     	AC_MSG_RESULT(no)
+     fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/zoom-player.git