head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2012.09.10.19.19.32;	author beat;	state Exp;
branches;
next	1.1;

1.1
date	2012.07.26.21.49.58;	author flo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@SVN rev 304053 on 2012-09-10 19:19:32Z by beat

- Move libxul 1.9.2 to www/libxul19
- Update www/libxul to 10.0.7
- Update all dependent ports to use www/libxul19 (no functional changes)
- Bump PORTREVISION on ports where libxul is a run dependency as the
  resulting package will change.

Submitted by:	Jan Beich <jbeich@@tormail.org>
With hat:	gecko
@
text
@--- 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
@


1.1
log
@SVN rev 301582 on 2012-07-26 21:49:58Z by flo

- 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!)
@
text
@d3 1
a3 1
@@@@ -555,6 +555,14 @@@@ MOZ_LIBNOTIFY_CFLAGS	= @@MOZ_LIBNOTIFY_CF
d8 1
a8 1
+MOZ_ALSA_LIBS           = @@MOZ_ALSA_LIBS@@
d14 1
a14 1
+
a16 1
 GLIB_GMODULE_LIBS	= @@GLIB_GMODULE_LIBS@@
d19 3
a21 1
@@@@ -5660,15 +5660,49 @@@@ dnl ====================================
a22 3
 dnl If using sydneyaudio with Linux, ensure that the alsa library is available
 if test "$COMPILE_ENVIRONMENT"; then
-if test -n "$MOZ_SYDNEYAUDIO"; then
d28 2
a32 1
-      AC_CHECK_LIB(asound, snd_pcm_open,,AC_MSG_ERROR([Ogg support on Linux requires the alsa library]))
d34 3
a36 3
       ;;
    esac
 fi
d39 5
a43 4
+      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.)])])
+fi
a46 1
+AC_SUBST(MOZ_ALSA_LIBS)
d69 1
a69 1
 dnl Splashscreen
d73 5
a77 5
@@@@ -45,12 +45,6 @@@@ MODULE		= sydneyaudio
 LIBRARY_NAME	= sydneyaudio
 FORCE_STATIC_LIB= 1
 
-ifeq ($(OS_ARCH),Linux)
d81 5
a85 7
-endif
-
 ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
 CSRCS		= \
 		sydney_audio_waveapi.c \
@@@@ -83,6 +83,18 @@@@ CSRCS         = \
               $(NULL)
d105 2
a106 2
@@@@ -90,6 +90,14 @@@@ endif
 LOCAL_INCLUDES += -I$(topsrcdir)/widget/src/os2
d109 2
d112 2
a113 2
+EXTRA_DSO_LDOPTS += $(MOZ_ALSA_LIBS)
+endif
d117 3
a119 5
+endif
+
 # dependent libraries
 ifdef MOZ_IPC
 STATIC_LIBS += \
@

