diff -Naur xulrunner-1.9.2.ebuild.old xulrunner-1.9.2.ebuild --- xulrunner-1.9.2.ebuild.old 2010-01-22 15:06:37.000000000 +0100 +++ xulrunner-1.9.2.ebuild 2010-01-27 13:13:58.000000000 +0100 @@ -20,7 +20,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" SLOT="1.9" LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" -IUSE="+alsa debug libnotify +networkmanager" +IUSE="+alsa oss debug libnotify +networkmanager" RDEPEND="java? ( >=virtual/jre-1.4 ) >=dev-lang/python-2.3[threads] @@ -67,6 +67,19 @@ sed -i -e "s:@PV@:${MAJ_PV}:" "${S}"/config/autoconf.mk.in \ || die "${MAJ_PV} sed failed!" + # Disable ALSA and enable OSS (Arch) + if use oss ; then + sed -i -e "s/sydney_audio_alsa/sydney_audio_oss/" \ + "${S}"/media/libsydneyaudio/src/Makefile.in || die "sed OSS failed" + #Remove the ALSA bits form the build system + sed -i -e "/alsa\//d" "${S}"/config/system-headers || die "ALSA clean failed" + sed -i -e "/alsa\//d" "${S}"/js/src/config/system-headers || die "ALSA clean failed" + sed -i -e "/LIB(asound/d" "${S}"/configure.in || die "ALSA clean failed" + if use alsa ; then + die "ALSA support is removed with the oss use flag" + fi + fi + # Enable gnomebreakpad if use debug ; then sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \ @@ -131,11 +144,22 @@ mozconfig_annotate '' --enable-system-lcms mozconfig_annotate '' --with-system-bz2 + + # Enable audio if ALSA or OSS is enabled + if use alsa ; then + mozconfig_annotate 'ALSA' --enable-wave + mozconfig_annotate 'ALSA' --enable-ogg + elif use oss ; then + mozconfig_annotate 'OSS' --enable-wave + mozconfig_annotate 'OSS' --enable-ogg + else + mozconfig_annotate 'nosound' --disable-wave + mozconfig_annotate 'nosound' --disable-ogg + fi + mozconfig_use_enable libnotify mozconfig_use_enable java javaxpcom mozconfig_use_enable networkmanager necko-wifi - mozconfig_use_enable alsa ogg - mozconfig_use_enable alsa wave # Debug if use debug ; then