Merge branch 'evelikov/remove-libgbm-libgl-libdeps-v2'

* cooking/evelikov/remove-libgbm-libgl-libdeps-v2:
  glx: drop explicit linking against libGL.so
  glx: fetch the libGL function pointers at glx_platform_create
  pkg/archlinux: demote libgbm to (make|opt)depend
  gbm: drop explicit linking against libgbm.so (v2)
  gbm: fetch the libgbm function pointers at wgbm_platform_init
  pkg/archlinux: waffle does not link against libegl
  pkg/archlinux: use configure autodetection

Conflicts:
  src/waffle/gbm/wgbm_display.c
    Minor conflict due to 9a4f7c0, the libglapi workaround.

2 files changed, 7 insertions, 11 deletions

diff --git a/pkg/archlinux/waffle-1.4.1/PKGBUILD b/pkg/archlinux/waffle-1.4.1/PKGBUILD
index e877ddc..5426e4b 100644
--- a/pkg/archlinux/waffle-1.4.1/PKGBUILD
+++ b/pkg/archlinux/waffle-1.4.1/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname='waffle'
 pkgver='1.4.1'
-pkgrel=1
+pkgrel=2
 pkgdesc='a library for choosing window system and OpenGL API at runtime'
 arch=('i686' 'x86_64')
 url='http://www.waffle-gl.org'
@@ -34,10 +34,6 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
     -DCMAKE_BUILD_TYPE=Release \
-    -Dwaffle_has_gbm=1 \
-    -Dwaffle_has_glx=1 \
-    -Dwaffle_has_x11_egl=1 \
-    -Dwaffle_has_wayland=1 \
     -Dwaffle_build_manpages=1 \
     -Dwaffle_build_htmldocs=1 \
     -Dwaffle_build_examples=0
diff --git a/pkg/archlinux/waffle-git/PKGBUILD b/pkg/archlinux/waffle-git/PKGBUILD
index b5a6d96..932595c 100644
--- a/pkg/archlinux/waffle-git/PKGBUILD
+++ b/pkg/archlinux/waffle-git/PKGBUILD
@@ -12,8 +12,6 @@ provides=(waffle)
 conflicts=(waffle)
 depends=(
   'libgl' # for glx
-  'libegl'
-  'libgbm'
   'libx11'
   'libxcb'
   'wayland'
@@ -22,6 +20,9 @@ makedepends=(
   'cmake'
   'xcb-proto'
 
+  'libegl'
+  'libgbm'
+
   # for building the docs.
   'libxslt'
   'docbook-xsl'
@@ -43,10 +44,6 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib \
     -DCMAKE_BUILD_TYPE=Release \
-    -Dwaffle_has_glx=1 \
-    -Dwaffle_has_x11_egl=1 \
-    -Dwaffle_has_wayland=1 \
-    -Dwaffle_has_gbm=1 \
     -Dwaffle_build_manpages=1 \
     -Dwaffle_build_htmldocs=1 \
     -Dwaffle_build_examples=0
@@ -54,6 +51,9 @@ build() {
 }
 
 package() {
+  optdepends=('libegl: for x11_egl, gbm or wayland support')
+  optdepends=('libgbm: for gbm support')
+
   cd "$srcdir/${_unpackdir}"
   make DESTDIR="$pkgdir/" install
   install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"