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

Added smpeg2 PKG_OPTION, enabled by default. Removed hard disabling of this

Browse source 
option from Makefile, as upstream split it into a separate package.
This commit is contained in:
Blue Rats 2013-06-30 23:06:41 +00:00 committed by Thomas Klausner
parent df52065100
commit 29d8883e43
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
SDL2_mixer/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2013/06/12 12:12:09 othyro Exp $
# $NetBSD: Makefile,v 1.2 2013/06/30 23:06:41 othyro Exp $
DISTNAME= SDL2_mixer-2.0.0
CATEGORIES= audio
@ -27,9 +27,5 @@ PKGCONFIG_OVERRIDE+= external/libvorbisidec-1.2.1/vorbisidec.pc.in
.include "options.mk"
CONFIGURE_ARGS+= --enable-music-mp3-smpeg=no --disable-smpegtest
# XXX http://forums.libsdl.org/viewtopic.php?p=37449&sid=cb779c24fba69bff5ba36046daf82d78#37449
.include "../../wip/SDL2/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

13
SDL2_mixer/options.mk
View file

@ -1,8 +1,8 @@
# $NetBSD: options.mk,v 1.1 2013/06/12 12:12:09 othyro Exp $
# $NetBSD: options.mk,v 1.2 2013/06/30 23:06:41 othyro Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.SDL2_mixer
PKG_SUPPORTED_OPTIONS= flac fluidsynth modplug static vorbis
PKG_SUGGESTED_OPTIONS+= flac fluidsynth modplug static vorbis
PKG_SUPPORTED_OPTIONS= flac fluidsynth modplug smpeg2 static vorbis
PKG_SUGGESTED_OPTIONS+= flac fluidsynth modplug smpeg2 static vorbis
.include "../../mk/bsd.options.mk"
@ -27,6 +27,13 @@ CONFIGURE_ARGS+= --enable-music-mod-modplug=yes
CONFIGURE_ARGS+= --enable-music-mod-modplug=no
.endif
.if !empty(PKG_OPTIONS:Msmpeg2)
.include "../../wip/smpeg2/buildlink3.mk"
CONFIGURE_ARGS+= --enable-music-mp3-smpeg=yes
.else
CONFIGURE_ARGS+= --enable-music-mp3-smpeg=no
.endif
.if !empty(PKG_OPTIONS:Mstatic)
CONFIGURE_ARGS+= --enable-static=yes
.else