pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
chromium-new: Add missing python dependencies and implement pulseaudio/alsa option
Module Name: pkgsrc-wip
Committed By: Ryo ONODERA <ryoon%NetBSD.org@localhost>
Pushed By: ryoon
Date: Thu Dec 1 23:06:06 2016 +0900
Changeset: 7b04852a399097978cfa424290eae076114641ad
Modified Files:
chromium-new/Makefile
chromium-new/options.mk
Log Message:
chromium-new: Add missing python dependencies and implement pulseaudio/alsa option
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7b04852a399097978cfa424290eae076114641ad
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
chromium-new/Makefile | 6 ++----
chromium-new/options.mk | 17 +++++++++++++++--
2 files changed, 17 insertions(+), 6 deletions(-)
diffs:
diff --git a/chromium-new/Makefile b/chromium-new/Makefile
index e126173..52ab98d 100644
--- a/chromium-new/Makefile
+++ b/chromium-new/Makefile
@@ -18,6 +18,8 @@ BUILD_DEPENDS+= gperf>=3.0.1:../../devel/gperf
BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm
BUILD_DEPENDS+= ninja-build-[0-9]*:../../devel/ninja-build
BUILD_DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
+BUILD_DEPENDS+= ${PYPKGPREFIX}-beautifulsoup4-[0-9]*:../../www/py-beautifulsoup4
+BUILD_DEPENDS+= ${PYPKGPREFIX}-ply-[0-9]*:../../devel/py-ply
DEPENDS+= xdg-utils-[0-9]*:../../misc/xdg-utils
@@ -165,7 +167,6 @@ GN_ARGS+= proprietary_codecs=true \
ffmpeg_branding="Chrome"
GN_ARGS+= use_gconf=false \
- use_pulseaudio=true \
use_kerberos=false \
use_cups=false \
use_aura=true \
@@ -314,9 +315,6 @@ do-install:
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../audio/speech-dispatcher/buildlink3.mk"
-.include "../../audio/pulseaudio/buildlink3.mk"
-# Not tested
-#.include "../../audio/alsa-lib/buildlink3.mk"
.include "../../graphics/cairo/buildlink3.mk"
# This introduces OpenSSL dependency and it conflicts with bundled BoringSSL.
#.include "../../print/cups/buildlink3.mk"
diff --git a/chromium-new/options.mk b/chromium-new/options.mk
index 1c76eee..514d2b7 100644
--- a/chromium-new/options.mk
+++ b/chromium-new/options.mk
@@ -1,10 +1,23 @@
# $NetBSD: options.mk,v 1.32 2016/08/20 11:17:32 ryoon Exp $
-PKG_OPTIONS_VAR= PKG_OPTIONS.chromium
-PKG_SUPPORTED_OPTIONS+= debug
+PKG_OPTIONS_VAR= PKG_OPTIONS.chromium
+PKG_OPTIONS_REQUIRED_GROUPS= audio
+PKG_OPTIONS_GROUP.audio= alsa pulseaudio
+PKG_SUPPORTED_OPTIONS+= debug
+PKG_SUGGESTED_OPTIONS= alsa
.include "../../mk/bsd.options.mk"
+.if !empty(PKG_OPTIONS:Malsa)
+GN_ARGS+= use_alsa=true
+GN_ARGS+= use_pulseaudio=false
+.include "../../audio/alsa-lib/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mpulseaudio)
+GN_ARGS+= use_alsa=false
+GN_ARGS+= use_pulseaudio=true
+.include "../../audio/pulseaudio/buildlink3.mk"
+.endif
+
.if !empty(PKG_OPTIONS:Mdebug)
BUILDTYPE= Debug
GN_ARGS+= is_debug=true
Home |
Main Index |
Thread Index |
Old Index