[SVN-Commit] r91 - in branches/experimental/www/libxul: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: beat
Date: Fri Aug 21 07:19:57 2009
New Revision: 91

Log:
- Fix build on FreeBSD 6.x

Added:
   branches/experimental/www/libxul/files/libsydney_oss
      - copied unchanged from r86, branches/experimental/www/libxul/files/patch-media-libsydneyaudio-src-Makefile.in
   branches/experimental/www/libxul/files/releng6_pulseaudio
Deleted:
   branches/experimental/www/libxul/files/patch-media-libsydneyaudio-src-Makefile.in
Modified:
   branches/experimental/www/libxul/Makefile

Modified: branches/experimental/www/libxul/Makefile
==============================================================================
--- branches/experimental/www/libxul/Makefile	Thu Aug 20 15:44:22 2009	(r90)
+++ branches/experimental/www/libxul/Makefile	Fri Aug 21 07:19:57 2009	(r91)
@@ -50,6 +50,13 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${OSVERSION} < 700000
+LIB_DEPENDS+=	pulse.0:${PORTSDIR}/audio/pulseaudio
+EXTRA_PATCHES=	${FILESDIR}/releng6_pulseaudio
+.else
+EXTRA_PATCHES=	${FILESDIR}/libsydney_oss
+.endif
+
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif

Copied: branches/experimental/www/libxul/files/libsydney_oss (from r86, branches/experimental/www/libxul/files/patch-media-libsydneyaudio-src-Makefile.in)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/libxul/files/libsydney_oss	Fri Aug 21 07:19:57 2009	(r91, copy of r86, branches/experimental/www/libxul/files/patch-media-libsydneyaudio-src-Makefile.in)
@@ -0,0 +1,15 @@
+--- media/libsydneyaudio/src/Makefile.in.orig	2009-08-17 14:21:06.000000000 +0200
++++ media/libsydneyaudio/src/Makefile.in	2009-08-17 14:21:53.000000000 +0200
+@@ -45,6 +45,12 @@
+ LIBRARY_NAME	= sydneyaudio
+ FORCE_STATIC_LIB= 1
+ 
++ifeq ($(OS_ARCH),FreeBSD)
++CSRCS		= \
++		sydney_audio_oss.c \
++		$(NULL)
++endif
++
+ ifeq ($(OS_ARCH),Linux)
+ CSRCS		= \
+ 		sydney_audio_alsa.c \

Deleted: branches/experimental/www/libxul/files/patch-media-libsydneyaudio-src-Makefile.in
==============================================================================
--- branches/experimental/www/libxul/files/patch-media-libsydneyaudio-src-Makefile.in	Fri Aug 21 07:19:57 2009	(r90)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,15 +0,0 @@
---- media/libsydneyaudio/src/Makefile.in.orig	2009-08-17 14:21:06.000000000 +0200
-+++ media/libsydneyaudio/src/Makefile.in	2009-08-17 14:21:53.000000000 +0200
-@@ -45,6 +45,12 @@
- LIBRARY_NAME	= sydneyaudio
- FORCE_STATIC_LIB= 1
- 
-+ifeq ($(OS_ARCH),FreeBSD)
-+CSRCS		= \
-+		sydney_audio_oss.c \
-+		$(NULL)
-+endif
-+
- ifeq ($(OS_ARCH),Linux)
- CSRCS		= \
- 		sydney_audio_alsa.c \

Added: branches/experimental/www/libxul/files/releng6_pulseaudio
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/libxul/files/releng6_pulseaudio	Fri Aug 21 07:19:57 2009	(r91)
@@ -0,0 +1,43 @@
+--- media/libsydneyaudio/src/Makefile.in.orig	2009-08-20 21:43:41.000000000 +0200
++++ media/libsydneyaudio/src/Makefile.in	2009-08-20 21:44:17.000000000 +0200
+@@ -45,6 +45,12 @@
+ LIBRARY_NAME	= sydneyaudio
+ FORCE_STATIC_LIB= 1
+ 
++ifeq ($(OS_ARCH),FreeBSD)
++CSRCS		= \
++		sydney_audio_pulseaudio.c \
++		$(NULL)
++endif
++
+ ifeq ($(OS_ARCH),Linux)
+ CSRCS		= \
+ 		sydney_audio_alsa.c \
+--- toolkit/library/Makefile.in.orig	2009-08-20 21:45:20.000000000 +0200
++++ toolkit/library/Makefile.in	2009-08-20 21:46:25.000000000 +0200
+@@ -228,12 +228,12 @@
+ endif
+ 
+ ifeq (gtk2,$(MOZ_WIDGET_TOOLKIT))
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) $(XT_LIBS) -lgthread-2.0 -lpulse -lpthread
+ EXTRA_DSO_LDOPTS += $(FT2_LIBS)
+ endif
+ 
+ ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
+-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0 -lpulse -lpthread
+ EXTRA_DSO_LDOPTS += $(FT2_LIBS)
+ endif
+ 
+--- js/src/Makefile.in.orig	2009-08-21 00:34:43.000000000 +0200
++++ js/src/Makefile.in	2009-08-21 00:36:59.000000000 +0200
+@@ -427,7 +427,7 @@
+ endif # WINNT
+ 
+ ifeq ($(OS_ARCH),FreeBSD)
+-EXTRA_LIBS	+= -pthread
++EXTRA_LIBS	+= -pthread -lpulse -lc
+ endif
+ ifeq ($(OS_ARCH),IRIX)
+ ifdef USE_N32