[pkgsrc/trunk]: pkgsrc/devel/SDL2 SDL2: Always --disable-x11-shared so X11 is...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae345f90935b
branches:  trunk
changeset: 396312:ae345f90935b
user:      nia <nia%pkgsrc.org@localhost>
date:      Mon May 27 17:21:01 2019 +0000

description:
SDL2: Always --disable-x11-shared so X11 is linked the normal way.

This fixes creating a GL context with r600_dri (and probably other drivers)
on NetBSD with native X, where otherwise missing libxcb symbol errors
happen.

Programs this unbreaks include fasttracker2, mednafen. Programs this
doesn't unbreak include nestopia (uses libepoxy).

This is a workaround, but we're already doing the same in the SDL1
package...

Bump PKGREVISION.

diffstat:

 devel/SDL2/Makefile   |  6 ++++--
 devel/SDL2/options.mk |  3 +--
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (39 lines):

diff -r 86f331eef4e1 -r ae345f90935b devel/SDL2/Makefile
--- a/devel/SDL2/Makefile       Mon May 27 17:04:04 2019 +0000
+++ b/devel/SDL2/Makefile       Mon May 27 17:21:01 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2019/05/24 18:13:36 nia Exp $
+# $NetBSD: Makefile,v 1.36 2019/05/27 17:21:01 nia Exp $
 
 DISTNAME=      SDL2-2.0.9
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  http://www.libsdl.org/release/
 
@@ -19,6 +19,8 @@
 CONFIGURE_ENV+=        SDL_RLD_FLAGS="${COMPILER_RPATH_FLAG}${PREFIX}/lib \
                ${COMPILER_RPATH_FLAG}${X11BASE}/lib"
 
+CONFIGURE_ARGS+=       --disable-x11-shared
+
 CHECK_PORTABILITY_SKIP+=build-scripts/androidbuildlibs.sh
 CHECK_PORTABILITY_SKIP+=build-scripts/iosbuild.sh
 
diff -r 86f331eef4e1 -r ae345f90935b devel/SDL2/options.mk
--- a/devel/SDL2/options.mk     Mon May 27 17:04:04 2019 +0000
+++ b/devel/SDL2/options.mk     Mon May 27 17:21:01 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2019/05/24 18:13:36 nia Exp $
+# $NetBSD: options.mk,v 1.12 2019/05/27 17:21:01 nia Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.SDL2
 PKG_OPTIONS_REQUIRED_GROUPS=   gl
@@ -80,7 +80,6 @@
 .include "../../x11/libXrandr/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-video-x11
-CONFIGURE_ARGS+=       --disable-x11-shared
 .endif
 
 .if !empty(PKG_OPTIONS:Mrpi)