CVS commit: pkgsrc/devel/SDL2

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon May 27 17:21:01 UTC 2019

Modified Files:
        pkgsrc/devel/SDL2: Makefile options.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/devel/SDL2/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/SDL2/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/SDL2/Makefile
diff -u pkgsrc/devel/SDL2/Makefile:1.35 pkgsrc/devel/SDL2/Makefile:1.36
--- pkgsrc/devel/SDL2/Makefile:1.35     Fri May 24 18:13:36 2019
+++ pkgsrc/devel/SDL2/Makefile  Mon May 27 17:21:01 2019
@@ -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 @@ PKGCONFIG_OVERRIDE+=  sdl2.pc.in
 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
 

Index: pkgsrc/devel/SDL2/options.mk
diff -u pkgsrc/devel/SDL2/options.mk:1.11 pkgsrc/devel/SDL2/options.mk:1.12
--- pkgsrc/devel/SDL2/options.mk:1.11   Fri May 24 18:13:36 2019
+++ pkgsrc/devel/SDL2/options.mk        Mon May 27 17:21:01 2019
@@ -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 @@ CONFIGURE_ARGS+=      --disable-pulseaudio
 .include "../../x11/libXrandr/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-video-x11
-CONFIGURE_ARGS+=       --disable-x11-shared
 .endif
 
 .if !empty(PKG_OPTIONS:Mrpi)