kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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.
This commit is contained in:
nia 2019-05-27 17:21:01 +00:00
parent 68d4f22e29
commit c5660cd669
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
devel/SDL2/Makefile
View file

@ -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

3
devel/SDL2/options.mk
View file

@ -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)