aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-12-30 09:25:55 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-12-30 09:25:55 +0000
commit72cf2fcde755730edca403990c913867e082268b (patch)
tree0f8f86b4227d9a83fb3eddfea6148fe9479735a6
parenta935b9d7eb1b9450c15560cb18b5d789b7414f25 (diff)
downloadaports-72cf2fcde755730edca403990c913867e082268b.tar.gz
aports-72cf2fcde755730edca403990c913867e082268b.tar.bz2
aports-72cf2fcde755730edca403990c913867e082268b.tar.xz
main/mesa-demos: fix linking to libx11
-rw-r--r--main/mesa-demos/APKBUILD9
-rw-r--r--main/mesa-demos/link.patch15
2 files changed, 21 insertions, 3 deletions
diff --git a/main/mesa-demos/APKBUILD b/main/mesa-demos/APKBUILD
index 571bbe47df..f522392e6c 100644
--- a/main/mesa-demos/APKBUILD
+++ b/main/mesa-demos/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mesa-demos
pkgver=8.0.1
-pkgrel=2
+pkgrel=3
pkgdesc="Mesa demos and utils"
url="http://mesa3d.sourceforge.net"
arch="all"
@@ -14,7 +14,9 @@ install=""
subpackages=
source="ftp://ftp.freedesktop.org/pub/mesa/demos/$pkgver/$pkgname-$pkgver.tar.bz2
sincos.patch
- mesa-demos-gles.patch"
+ mesa-demos-gles.patch
+ link.patch
+ "
_builddir="$srcdir/$pkgname-$pkgver"
@@ -41,4 +43,5 @@ package() {
md5sums="320c2a4b6edc6faba35d9cb1e2a30bf4 mesa-demos-8.0.1.tar.bz2
75be22556a657f0a157028233832d167 sincos.patch
-dc89e44fed4a6c9d0ac3d8b88ddead91 mesa-demos-gles.patch"
+dc89e44fed4a6c9d0ac3d8b88ddead91 mesa-demos-gles.patch
+502885b11980be71712f6a33bfd1508d link.patch"
diff --git a/main/mesa-demos/link.patch b/main/mesa-demos/link.patch
new file mode 100644
index 0000000000..f19b6bbc95
--- /dev/null
+++ b/main/mesa-demos/link.patch
@@ -0,0 +1,15 @@
+--- ./src/egl/opengl/Makefile.in.orig
++++ ./src/egl/opengl/Makefile.in
+@@ -111,10 +111,10 @@
+ peglgears_LDADD = $(LDADD)
+ xeglgears_SOURCES = xeglgears.c
+ xeglgears_OBJECTS = xeglgears.$(OBJEXT)
+-xeglgears_LDADD = $(LDADD)
++xeglgears_LDADD = $(LDADD) $(X11_LIBS)
+ xeglthreads_SOURCES = xeglthreads.c
+ xeglthreads_OBJECTS = xeglthreads.$(OBJEXT)
+-xeglthreads_LDADD = $(LDADD)
++xeglthreads_LDADD = $(LDADD) $(X11_LIBS) -lpthread
+ DEFAULT_INCLUDES = -I.@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles