[mupen64plus-core] 307/310: Use pkg-config to find GLESv2 library

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit d6da66c928c3c1dcb33b1434a468da218cd523d6
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun May 10 11:18:05 2015 +0200

    Use pkg-config to find GLESv2 library
---
 debian/changelog                                   |  2 ++
 .../Use-pkg-config-to-find-GLESv2-library.patch    | 32 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9b7d9cc..b88850e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ mupen64plus-core (2.5-2) UNRELEASED; urgency=medium
     - Change Vcs-Browser to new alioth CGit URL
   * debian/patches:
     - Move patches to alternative DEP-3 format and manage them with gbp pq
+    - Add Use-pkg-config-to-find-GLESv2-library.patch, Use pkg-config to
+      find GLESv2 library
 
  -- Sven Eckelmann <sven at narfation.org>  Fri, 01 May 2015 15:33:16 +0200
 
diff --git a/debian/patches/Use-pkg-config-to-find-GLESv2-library.patch b/debian/patches/Use-pkg-config-to-find-GLESv2-library.patch
new file mode 100644
index 0000000..2a26b47
--- /dev/null
+++ b/debian/patches/Use-pkg-config-to-find-GLESv2-library.patch
@@ -0,0 +1,32 @@
+From: Sven Eckelmann <sven at narfation.org>
+Date: Sun, 10 May 2015 11:18:05 +0200
+Subject: Use pkg-config to find GLESv2 library
+
+---
+ projects/unix/Makefile | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/projects/unix/Makefile b/projects/unix/Makefile
+index 7d5e848..0d33fb7 100755
+--- a/projects/unix/Makefile
++++ b/projects/unix/Makefile
+@@ -273,7 +273,18 @@ endif
+ 
+ ifeq ($(USE_GLES), 1)
+   CFLAGS += -DUSE_GLES
+-  LDLIBS += -lGLESv2
++
++  GLESV2_NAME ?= glesv2
++  ifeq ($(origin GLESV2_CFLAGS) $(origin GLESV2_LDLIBS), undefined undefined)
++    ifeq ($(shell $(PKG_CONFIG) --modversion $(GLESV2_NAME) 2>/dev/null),)
++      $(error No $(GLESV2_NAME) development libraries found!)
++    endif
++    GLESV2_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(GLESV2_NAME))
++    GLESV2_LDLIBS +=  $(shell $(PKG_CONFIG) --libs $(GLESV2_NAME))
++  endif
++  CFLAGS += $(GLESV2_CFLAGS)
++  LDLIBS += $(GLESV2_LDLIBS)
++
+   # OSD uses non-ES code and breaks attribs of video plugins
+   OSD=0
+ endif
diff --git a/debian/patches/series b/debian/patches/series
index 72383ff..a5365b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 Use-font-from-ttf-bitstream-vera.patch
 Add-printf-format-attribute.patch
 Disable-the-disassembler-of-the-recompiled-code.patch
+Use-pkg-config-to-find-GLESv2-library.patch

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