The following reply was made to PR ports/183552; it has been noted by GNATS.
From: dfil...@freebsd.org (dfilter service) To: bug-follo...@freebsd.org Cc: Subject: Re: ports/183552: commit references a PR Date: Fri, 1 Nov 2013 23:12:09 +0000 (UTC) Author: flo Date: Fri Nov 1 23:12:00 2013 New Revision: 332421 URL: http://svnweb.freebsd.org/changeset/ports/332421 Log: Fix a mismerge that caused html5 audio to not work. PR: ports/183552 Reported by: Juanitou <lis...@club-internet.fr>, eadler Added: head/www/seamonkey/files/extra-bug780531 (contents, props changed) Modified: head/Mk/bsd.gecko.mk head/www/firefox-esr/Makefile head/www/firefox/Makefile head/www/seamonkey/Makefile Modified: head/Mk/bsd.gecko.mk ============================================================================== --- head/Mk/bsd.gecko.mk Fri Nov 1 23:05:48 2013 (r332420) +++ head/Mk/bsd.gecko.mk Fri Nov 1 23:12:00 2013 (r332421) @@ -758,6 +758,9 @@ ALL_TARGET= profiledbuild LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins MOZ_OPTIONS+= --enable-alsa +. if exists(${FILESDIR}/extra-bug780531) +EXTRA_PATCHES+= ${FILESDIR}/extra-bug780531 +. endif .endif .if ${PORT_OPTIONS:MPULSEAUDIO} Modified: head/www/firefox-esr/Makefile ============================================================================== --- head/www/firefox-esr/Makefile Fri Nov 1 23:05:48 2013 (r332420) +++ head/www/firefox-esr/Makefile Fri Nov 1 23:12:00 2013 (r332421) @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 24.1.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Fri Nov 1 23:05:48 2013 (r332420) +++ head/www/firefox/Makefile Fri Nov 1 23:12:00 2013 (r332421) @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 25.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ @@ -52,10 +53,6 @@ MOZ_OPTIONS= --program-transform-name='s WRKSRC:= ${WRKDIR}/mozilla-release -.if ${ARCH} == i386 && ${OSVERSION} < 1000000 -USE_GCC?= yes -.endif - post-extract: @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \ -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|' \ Modified: head/www/seamonkey/Makefile ============================================================================== --- head/www/seamonkey/Makefile Fri Nov 1 23:05:48 2013 (r332420) +++ head/www/seamonkey/Makefile Fri Nov 1 23:12:00 2013 (r332421) @@ -3,6 +3,7 @@ PORTNAME= seamonkey DISTVERSION= 2.22 +PORTREVISION= 1 CATEGORIES?= www ipv6 MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/ Added: head/www/seamonkey/files/extra-bug780531 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/seamonkey/files/extra-bug780531 Fri Nov 1 23:12:00 2013 (r332421) @@ -0,0 +1,24 @@ +--- mozilla/configure.in~ ++++ mozilla/configure.in +@@ -5364,15 +5364,18 @@ AC_SUBST(MOZ_SRTP) + + dnl Use integers over floats for audio on B2G and Android, because audio + dnl backends for those platforms don't support floats. +-if test "$OS_TARGET" = "Android"; then ++case "$target" in ++*-android*|*-linuxandroid*|*-dragonfly*|*-freebsd*|*-netbsd*|*-openbsd*) + MOZ_SAMPLE_TYPE_S16=1 + AC_DEFINE(MOZ_SAMPLE_TYPE_S16) + AC_SUBST(MOZ_SAMPLE_TYPE_S16) +-else ++;; ++*) + MOZ_SAMPLE_TYPE_FLOAT32=1 + AC_DEFINE(MOZ_SAMPLE_TYPE_FLOAT32) + AC_SUBST(MOZ_SAMPLE_TYPE_FLOAT32) +-fi ++;; ++esac + + dnl ======================================================== + dnl = Disable Speech API code _______________________________________________ svn-ports-...@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscr...@freebsd.org" _______________________________________________ freebsd-gecko@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "freebsd-gecko-unsubscr...@freebsd.org"
