diff options
author | Florian Smeets <flo@FreeBSD.org> | 2012-07-26 21:49:58 +0000 |
---|---|---|
committer | Florian Smeets <flo@FreeBSD.org> | 2012-07-26 21:49:58 +0000 |
commit | 30c1a0a7927d6992cbf7baf9e8e1f637b2e4f6d4 (patch) | |
tree | 89c0045d73cc71a8a86842d8aa10f24e71cb5f26 /www/firefox-esr/files/patch-alsapulse | |
parent | - Update to 0.07 (diff) |
- update firefox/thunderbird ESR versions to 10.0.6
- update firefox 14.0.1
- update thunderbird to 14.0
- update seamonkey to 2.11
- switch to new options framework
- add experimental rendering via cairo-qt (QT4 option)
- add audio backend options (ALSA and PulseAudio)
- rename SMB option to GNOMEVFS2
- turn on LOGGING by default (like upstream linux builds)
- improve about:memory output
- unbreak PGO
- use system libs [1]
- switch to libevent2 [2]
- fix conflict with devel/libunwind and base gcc [3]
- unbreak clang/libc++ build [4]
- unbreak build with base gcc on >= 9.x [5]
- use common IPC code with other BSDs[6]
- and *miscellaneous improvements*
PR: ports/146231 [1], ports/161421 [2]
ports/150631, ports/168369, ports/168637, ports/168793, ports/168978 [3]
ports/163454, ports/164905, ports/169231 [4]
ports/169389, ports/169479 [5]
Obtained from: pkgsrc via bugzilla #753046 [6]
In collaboration with: Jan Beich (who did the major part of this work and
deserves a special thank you!)
Notes
Notes:
svn path=/head/; revision=301582
Diffstat (limited to 'www/firefox-esr/files/patch-alsapulse')
-rw-r--r-- | www/firefox-esr/files/patch-alsapulse | 119 |
1 files changed, 119 insertions, 0 deletions
diff --git a/www/firefox-esr/files/patch-alsapulse b/www/firefox-esr/files/patch-alsapulse new file mode 100644 index 000000000000..175b41680977 --- /dev/null +++ b/www/firefox-esr/files/patch-alsapulse @@ -0,0 +1,119 @@ +--- config/autoconf.mk.in~ ++++ config/autoconf.mk.in +@@ -568,7 +568,13 @@ MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CF + MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ + MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ + ++MOZ_ALSA = @MOZ_ALSA@ + MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ ++MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ ++ ++MOZ_PULSEAUDIO = @MOZ_PULSEAUDIO@ ++MOZ_PULSEAUDIO_LIBS = @MOZ_PULSEAUDIO_LIBS@ ++MOZ_PULSEAUDIO_CFLAGS = @MOZ_PULSEAUDIO_CFLAGS@ + + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ +--- configure.in~ ++++ configure.in +@@ -5758,17 +5775,48 @@ dnl ==================================== + dnl = Check alsa availability on Linux if using sydneyaudio + dnl ======================================================== + ++MOZ_ARG_ENABLE_BOOL(alsa, ++[ --enable-alsa Enable Alsa support], ++MOZ_ALSA=1, ++MOZ_ALSA= MOZ_ALSA_FORCE=$enableval) ++ + dnl If using sydneyaudio with Linux, ensure that the alsa library is available +-if test -n "$MOZ_SYDNEYAUDIO"; then ++if test -n "$MOZ_SYDNEYAUDIO" -a "$MOZ_ALSA_FORCE" != "no"; then + case "$target_os" in + linux*) ++ MOZ_ALSA=1 ++ ;; ++ esac ++fi ++ ++if test -n "$MOZ_ALSA"; then + PKG_CHECK_MODULES(MOZ_ALSA, alsa, , + [echo "$MOZ_ALSA_PKG_ERRORS" + AC_MSG_ERROR([Need alsa for Ogg, Wave or WebM decoding on Linux. Disable with --disable-ogg --disable-wave --disable-webm. (On Ubuntu, you might try installing the package libasound2-dev.)])]) +- ;; +- esac + fi + ++AC_SUBST(MOZ_ALSA_CFLAGS) ++AC_SUBST(MOZ_ALSA) ++ ++dnl ======================================================== ++dnl = Enable PulseAudio ++dnl ======================================================== ++ ++MOZ_ARG_ENABLE_BOOL(pulseaudio, ++[ --enable-pulseaudio Enable PulseAudio support], ++MOZ_PULSEAUDIO=1, ++MOZ_PULSEAUDIO=) ++ ++if test -n "$MOZ_PULSEAUDIO"; then ++ PKG_CHECK_MODULES(MOZ_PULSEAUDIO, libpulse, , ++ [echo "$MOZ_PULSEAUDIO_PKG_ERRORS" ++ AC_MSG_ERROR([pulseaudio audio backend requires libpulse package])]) ++fi ++ ++AC_SUBST(MOZ_PULSEAUDIO_CFLAGS) ++AC_SUBST(MOZ_PULSEAUDIO_LIBS) ++AC_SUBST(MOZ_PULSEAUDIO) ++ + dnl ======================================================== + dnl Permissions System + dnl ======================================================== +--- media/libsydneyaudio/src/Makefile.in~ ++++ media/libsydneyaudio/src/Makefile.in +@@ -30,10 +30,6 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),android) + CSRCS = \ + sydney_audio_android.c \ + $(NULL) +-else ifeq ($(OS_ARCH),Linux) +-CSRCS = \ +- sydney_audio_alsa.c \ +- $(NULL) + endif + + ifeq ($(OS_ARCH),WINNT) +@@ -68,6 +64,18 @@ CSRCS = \ + $(NULL) + endif + ++ifdef MOZ_ALSA ++CSRCS = \ ++ sydney_audio_alsa.c \ ++ $(NULL) ++endif ++ ++ifdef MOZ_PULSEAUDIO ++CSRCS = \ ++ sydney_audio_pulseaudio.c \ ++ $(NULL) ++endif ++ + ifeq ($(OS_ARCH),WINNT) + OS_LIBS += winmm.lib + endif +--- toolkit/library/libxul-config.mk~ ++++ toolkit/library/libxul-config.mk +@@ -348,10 +348,12 @@ ifdef MOZ_NATIVE_LIBVPX + EXTRA_DSO_LDOPTS += $(MOZ_LIBVPX_LIBS) + endif + +-ifdef MOZ_SYDNEYAUDIO +-ifeq ($(OS_ARCH),Linux) ++ifdef MOZ_ALSA + EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS) + endif ++ ++ifdef MOZ_PULSEAUDIO ++EXTRA_DSO_LDOPTS += $(MOZ_PULSEAUDIO_LIBS) + endif + + ifdef HAVE_CLOCK_MONOTONIC |