glamor-egl: Changes to 'debian-unstable'
configure.ac | 2 +-
debian/changelog | 2 +-
src/Makefile.am | 10 ++++++++--
3 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 10c589483f603934d0e16336dcbca3a5e54ce9a5
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Thu Aug 29 08:03:04 2013 +0300
clarify the version
diff --git a/debian/changelog b/debian/changelog
index bd00331..5cf97a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
glamor-egl (0.5.0-1) UNRELEASED; urgency=low
* Initial release. (Closes: #XXXXXX)
- * Pull from upstream 81aadb8ae.
+ * Merged from tagged 0.5.1.
-- Timo Aaltonen <tjaalton@ubuntu.com> Wed, 03 Apr 2013 10:35:26 +0300
commit d3d166779e1a1698e017de9c4f4496bf3c5bbc0e
Author: Zhigang Gong <zhigang.gong@linux.intel.com>
Date: Mon Aug 26 15:03:51 2013 +0800
Bump to 0.5.1.
The change in this version is only about bug fix and package build fix.
Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com>
diff --git a/configure.ac b/configure.ac
index 5ff6ae1..acde38f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@
# Initialize Autoconf
AC_PREREQ([2.63])
AC_INIT([glamor-egl],
- [0.5.0],
+ [0.5.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=glamor],
[glamor-egl])
commit 0777a81fb3551b8d06c40c81bcd0ccd69dfcd836
Author: Christian König <christian.koenig at amd.com>
Date: Mon Aug 26 14:57:47 2013 +0800
Use GBM_LIBS and GBM_CFLAGS
Signed-off-by: Christian König <christian.koenig at amd.com>
Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index 4beb559..c1759c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,9 +64,15 @@ LIBGLAMOREGL = libglamoregl.la
module_LTLIBRARIES = $(LIBGLAMOREGL)
libglamoregl_la_DEPENDENCIES = libglamor.la
libglamoregl_la_LDFLAGS = -avoid-version -module
-libglamoregl_la_LIBADD = $(EGL_LIBS) $(GLX_SYS_LIBS) libglamor.la
+libglamoregl_la_LIBADD = $(EGL_LIBS) $(GLX_SYS_LIBS) $(GBM_LIBS) libglamor.la
libglamoregl_la_SOURCES = glamor_eglmodule.c $(top_srcdir)/src/glamor_egl.c
-libglamoregl_la_CFLAGS = $(AM_CFLAGS) $(GLX_DEFINES) -I$(top_srcdir)/src $(LIBDRM_CFLAGS) $(EGL_CFLAGS)
+libglamoregl_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(GLX_DEFINES) \
+ -I$(top_srcdir)/src \
+ $(LIBDRM_CFLAGS) \
+ $(EGL_CFLAGS) \
+ $(GBM_CFLAGS)
endif
Reply to: