Updated to latest revision. No ChangeLog. Slimmed down list of dependencies

in buildlink3.mk according to what is linked/included via libraries and
headers. Marked package as BROKEN if it's built with the opengl option.
This commit is contained in:
Blue Rats 2013-05-07 03:00:49 +00:00 committed by Thomas Klausner
parent 5dd17bf5e6
commit 1516fcdba7
4 changed files with 11 additions and 27 deletions

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.6 2013/04/10 01:38:38 othyro Exp $
# $NetBSD: Makefile,v 1.7 2013/05/07 03:00:49 othyro Exp $
#
REVISION= 7046
REVISION= 7140
DISTNAME= SDL-2.0.0-${REVISION}
PKGNAME= ${DISTNAME:S/SDL/SDL2/1:S/0-/0./1}
CATEGORIES= devel
@ -46,6 +46,7 @@ do-install:
.include "../../devel/libusb/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"

View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.2 2013/03/03 15:37:40 othyro Exp $
# $NetBSD: buildlink3.mk,v 1.3 2013/05/07 03:00:49 othyro Exp $
BUILDLINK_TREE+= SDL2
@ -11,19 +11,6 @@ BUILDLINK_PKGSRCDIR.SDL2?= ../../wip/SDL2
pkgbase := SDL2
.include "../../mk/pkg-build-options.mk"
.if !empty(PKG_BUILD_OPTIONS.SDL2:Malsa)
.include "../../audio/alsa-lib/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.SDL2:Marts)
.include "../../audio/arts/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.SDL2:Mesound)
.include "../../audio/esound/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.SDL2:Mnas)
.include "../../audio/nas/buildlink3.mk"
.endif
@ -36,10 +23,6 @@ pkgbase := SDL2
.include "../../mk/oss.buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.SDL2:Mpulseaudio)
.include "../../audio/pulseaudio/buildlink3.mk"
.endif
.if !empty(PKG_BUILD_OPTIONS.SDL2:Mx11)
.include "../../x11/libX11/buildlink3.mk"
.endif
@ -68,9 +51,8 @@ pkgbase := SDL2
.include "../../x11/libXScrnSaver/buildlink3.mk"
.endif
.include "../../devel/libusb/buildlink3.mk"
.include "../../mk/dlopen.buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.endif # SDL2_BUILDLINK3_MK

View file

@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.4 2013/04/10 01:38:39 othyro Exp $
$NetBSD: distinfo,v 1.5 2013/05/07 03:00:49 othyro Exp $
SHA1 (SDL-2.0.0-7046.tar.gz) = aa321792410c8b3c9ccbf90976fc842679ec8fc7
RMD160 (SDL-2.0.0-7046.tar.gz) = b5f2b4f896c225dfd4122675f87f378cdb96d197
Size (SDL-2.0.0-7046.tar.gz) = 4807255 bytes
SHA1 (SDL-2.0.0-7140.tar.gz) = f1952303fb3f6f88804990c1ba8656aea4aabf09
RMD160 (SDL-2.0.0-7140.tar.gz) = 6ba542006529b4d00e0a02f76d73413134f8c382
Size (SDL-2.0.0-7140.tar.gz) = 4814108 bytes

View file

@ -1,4 +1,4 @@
# $NetBSD: options.mk,v 1.2 2013/03/03 15:37:40 othyro Exp $
# $NetBSD: options.mk,v 1.3 2013/05/07 03:00:49 othyro Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.SDL2
PKG_SUPPORTED_OPTIONS= alsa arts esound nas opengl oss pulseaudio x11 xcursor
@ -38,6 +38,7 @@ CMAKE_ARGS+= -DNAS=OFF
.if !empty(PKG_OPTIONS:Mopengl)
.include "../../graphics/MesaLib/buildlink3.mk"
CMAKE_ARGS+= -DVIDEO_OPENGL=ON
BROKEN= opengl option doesn't work at the moment.
.else
CMAKE_ARGS+= -DVIDEO_OPENGL=OFF
.endif