This is an automated email from the git hooks/post-receive script. ecsv-guest pushed a commit to branch armhf_test in repository mupen64plus-video-rice.
commit 72a5a281cf3cb4802f60b26b076d913a38721ae0 Author: Sven Eckelmann <[email protected]> Date: Sun May 10 15:20:02 2015 +0200 Use pkg-config to find GLESv2 library --- debian/changelog | 3 ++ .../Use-pkg-config-to-find-GLESv2-library.patch | 39 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 43 insertions(+) diff --git a/debian/changelog b/debian/changelog index f4c7030..f4a4e89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,9 @@ mupen64plus-video-rice (2.5-2) UNRELEASED; urgency=medium * debian/copyright: - Use a common license section for the BMG library + * debian/patches: + - Add Use-pkg-config-to-find-GLESv2-library.patch, Use pkg-config to + find GLESv2 library -- Sven Eckelmann <[email protected]> Sun, 10 May 2015 22:33:59 +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..0567ca8 --- /dev/null +++ b/debian/patches/Use-pkg-config-to-find-GLESv2-library.patch @@ -0,0 +1,39 @@ +From: Sven Eckelmann <[email protected]> +Date: Sun, 10 May 2015 15:20:02 +0200 +Subject: Use pkg-config to find GLESv2 library + +--- + projects/unix/Makefile | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/projects/unix/Makefile b/projects/unix/Makefile +index d827a25..7d2b2b8 100755 +--- a/projects/unix/Makefile ++++ b/projects/unix/Makefile +@@ -200,7 +200,7 @@ ifeq ($(VC), 1) + endif + ifeq ($(USE_GLES), 1) + CFLAGS += -DUSE_GLES +- GL_LDLIBS += -lGLESv2 ++ GL_NAME = glesv2 + endif + ifeq ($(OS), OSX) + GL_LDLIBS = -framework OpenGL +@@ -208,12 +208,13 @@ endif + ifeq ($(OS), MINGW) + GL_LDLIBS = -lopengl32 + endif ++GL_NAME ?= gl + ifeq ($(origin GL_CFLAGS) $(origin GL_LDLIBS), undefined undefined) +- ifeq ($(shell $(PKG_CONFIG) --modversion gl 2>/dev/null),) +- $(error No OpenGL development libraries found!) ++ ifeq ($(shell $(PKG_CONFIG) --modversion $(GL_NAME) 2>/dev/null),) ++ $(error No $(GL_NAME) development libraries found!) + endif +- GL_CFLAGS += $(shell $(PKG_CONFIG) --cflags gl) +- GL_LDLIBS += $(shell $(PKG_CONFIG) --libs gl) ++ GL_CFLAGS += $(shell $(PKG_CONFIG) --cflags $(GL_NAME)) ++ GL_LDLIBS += $(shell $(PKG_CONFIG) --libs $(GL_NAME)) + endif + CFLAGS += $(GL_CFLAGS) + LDLIBS += $(GL_LDLIBS) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..49bf471 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +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-video-rice.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
