debian/changelog | 6 ++++++ debian/control | 2 +- debian/patches/glapi-link.patch | 13 +++++++++++++ debian/patches/series | 1 + 4 files changed, 21 insertions(+), 1 deletion(-)
New commits: commit 4e5a18e19955208822d7eb198b975c1fbe986624 Author: Maarten Lankhorst <[email protected]> Date: Tue Oct 1 14:41:31 2013 +0200 Link against libglapi to fix a symbol error. (LP: #1232658) diff --git a/debian/changelog b/debian/changelog index f9b316c..c43bb95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +glamor-egl (0.5.1-0ubuntu4) saucy; urgency=low + + * Link against libglapi to fix a symbol error. (LP: #1232658) + + -- Maarten Lankhorst <[email protected]> Tue, 01 Oct 2013 13:51:50 +0200 + glamor-egl (0.5.1-0ubuntu3) saucy; urgency=low * temporarily add libatomic-ops-dev to build-depends. diff --git a/debian/control b/debian/control index 85213f7..80f6759 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: x11proto-dri2-dev, libdrm-dev (>= 2.4.23), xserver-xorg-dev (>= 2:1.10), - libgl1-mesa-dev, + libgl1-mesa-dev (>= 9.2-1ubuntu3), libpixman-1-dev, libegl1-mesa-dev, libgbm-dev, diff --git a/debian/patches/glapi-link.patch b/debian/patches/glapi-link.patch new file mode 100644 index 0000000..4c9efbc --- /dev/null +++ b/debian/patches/glapi-link.patch @@ -0,0 +1,13 @@ +diff --git a/configure.ac b/configure.ac +index acde38f..76d09c6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -175,7 +175,7 @@ AC_SUBST(GLX_TLS, ${GLX_USE_TLS}) + + if test "x$GLX_USE_TLS" = xyes ; then + GLX_DEFINES="-DGLX_USE_TLS -DPTHREADS" +- GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread" ++ GLX_SYS_LIBS="$GLX_SYS_LIBS -lpthread -lglapi" + fi + AC_SUBST([GLX_DEFINES]) + AC_SUBST([GLX_SYS_LIBS]) diff --git a/debian/patches/series b/debian/patches/series index d92f925..05d1c8f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ fix-fdo65964.diff +glapi-link.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
