From 9cfe908f158c1a6dae667e5b761c0c3635dcedc2 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sun, 12 Sep 2004 13:28:40 +0000 Subject: [PATCH] Clifford Wolf: Fixed openal build (dmalloc and efence are not for production systems anyways) [2004090620483011608] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@4168 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/kasc/openal/openal.conf | 12 ++++------ package/kasc/openal/subconfig-libs.in | 34 +++++++++++---------------- 2 files changed, 18 insertions(+), 28 deletions(-) diff --git a/package/kasc/openal/openal.conf b/package/kasc/openal/openal.conf index e53f2abd0..971b8b1e7 100644 --- a/package/kasc/openal/openal.conf +++ b/package/kasc/openal/openal.conf @@ -21,9 +21,11 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -preconf="cd linux; touch configure; chmod +x configure " autogen=1 +preconf="cd linux; touch configure; chmod +x configure " + var_append extraconfopt " " "--enable-optimization --enable-arch-asm" + if [ "$ROCKCFG_PKG_OPENAL_ALSA" == "1" ] ; then var_append extraconfopt " " "--enable-alsa" fi @@ -42,18 +44,12 @@ fi if [ "$ROCKCFG_PKG_OPENAL_SMPEG" == "1" ] ; then var_append extraconfopt " " "--enable-smpeg" fi -if [ "$ROCKCFG_PKG_OPENAL_EFENCE" == "1" ] ; then - var_append extraconfopt " " "--enable-efence" -fi -if [ "$ROCKCFG_PKG_OPENAL_DMALLOC" == "1" ] ; then - var_append extraconfopt " " "--enable-dmalloc" -fi if [ "$ROCKCFG_PKG_OPENAL_CAPTURE" == "1" ] ; then var_append extraconfopt " " "--enable-capture" fi # known bugs: -# --enable-smpeg, and --enable-dmalloc could be useful but are untested yet. +# --enable-smpeg could be useful but are untested yet. # ALSA 1.0 API change workaround ... :-( var_append GCC_WRAPPER_APPEND " " \ diff --git a/package/kasc/openal/subconfig-libs.in b/package/kasc/openal/subconfig-libs.in index 9f8508630..d4d996c73 100644 --- a/package/kasc/openal/subconfig-libs.in +++ b/package/kasc/openal/subconfig-libs.in @@ -24,37 +24,31 @@ if pkgcheck openal X ; then menu_begin MENU_PKG_OPENAL 'OpenAL Library Options' block_begin 4 if pkgcheck alsa X ; then - bool 'alsa support (broken)' ROCKCFG_PKG_OPENAL_ALSA 1 " - Compile with alsa output support" + bool 'alsa support (broken)' ROCKCFG_PKG_OPENAL_ALSA 1 \ + "Compile with alsa output support" fi if pkgcheck arts31 X ; then - bool 'arts support' ROCKCFG_PKG_OPENAL_ARTS 0 " - Compile with arts output support" + bool 'arts support' ROCKCFG_PKG_OPENAL_ARTS 0 \ + "Compile with arts output support" fi if pkgcheck esound X ; then - bool 'esd support' ROCKCFG_PKG_OPENAL_ESD 1 " - Compile with esd output support" + bool 'esd support' ROCKCFG_PKG_OPENAL_ESD 1 \ + "Compile with esd output support" fi if pkgcheck libsdl X ; then - bool 'sdl support' ROCKCFG_PKG_OPENAL_SDL 1 " - Compile with sdl output support" + bool 'sdl support' ROCKCFG_PKG_OPENAL_SDL 1 \ + "Compile with sdl output support" fi if pkgcheck ogg-vorbis X ; then - bool 'vorbis support' ROCKCFG_PKG_OPENAL_VORBIS 1 " - Compile with ogg-vorbis output support" + bool 'vorbis support' ROCKCFG_PKG_OPENAL_VORBIS 1 \ + "Compile with ogg-vorbis output support" fi if pkgcheck smpeg X ; then - bool 'smpeg support' ROCKCFG_PKG_OPENAL_SMPEG 1 " - Compile with smpeg support" + bool 'smpeg support' ROCKCFG_PKG_OPENAL_SMPEG 1 \ + "Compile with smpeg support" fi - if pkgcheck electricfence X ; then - bool 'efence support' ROCKCFG_PKG_OPENAL_EFENCE 1 " - Compile with efence support" - fi - bool 'dmalloc support' ROCKCFG_PKG_OPENAL_DMALLOC 0 " - Compile with dmalloc support" - bool 'capture support' ROCKCFG_PKG_OPENAL_CAPTURE 1 " - Compile with capture support" + bool 'capture support' ROCKCFG_PKG_OPENAL_CAPTURE 1 \ + "Compile with capture support" block_end menu_end fi