[SVN-Commit] r786 - in branches/experimental: Mk www/firefox-nightly www/firefox-nightly/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Thu Jun 21 12:06:29 2012
New Revision: 786

Log:
add/enable gstreamer by default

Added:
   branches/experimental/www/firefox-nightly/files/patch-content-media-gstreamer-nsGStreamerReader.cpp
Modified:
   branches/experimental/Mk/bsd.gecko.mk
   branches/experimental/www/firefox-nightly/Makefile

Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk	Thu Jun 21 12:05:46 2012	(r785)
+++ branches/experimental/Mk/bsd.gecko.mk	Thu Jun 21 12:06:29 2012	(r786)
@@ -560,7 +560,7 @@
 LOGGING_DESC?=	Enable additional log messages
 SMB?=			Enable smb:// URI support using gnomevfs
 
-OPTIONS_DEFAULT+=DBUS
+OPTIONS_DEFAULT+=DBUS GSTREAMER
 
 .for use in ${USE_GECKO_OPTIONS}
 ${use:S/-/_WITHOUT_/}=	${TRUE}
@@ -683,6 +683,13 @@
 MOZ_OPTIONS+=	--disable-dbus --disable-libnotify
 .endif
 
+.if ${PORT_OPTIONS:MGSTREAMER}
+USE_GSTREAMER=	yes
+MOZ_OPTIONS+=	--enable-gstreamer
+.else
+MOZ_OPTIONS+=	--disable-gstreamer
+.endif
+
 .if ${PORT_OPTIONS:MSMB}
 USE_GNOME+=		gnomevfs2
 MOZ_OPTIONS+=	--enable-gnomevfs

Modified: branches/experimental/www/firefox-nightly/Makefile
==============================================================================
--- branches/experimental/www/firefox-nightly/Makefile	Thu Jun 21 12:05:46 2012	(r785)
+++ branches/experimental/www/firefox-nightly/Makefile	Thu Jun 21 12:06:29 2012	(r786)
@@ -30,6 +30,7 @@
 USE_GECKO=	gecko
 MOZ_PKGCONFIG_FILES=	# empty
 USE_MOZILLA=	-nspr -sqlite
+USE_GECKO_OPTIONS=+gstreamer
 MOZILLA_NAME=	Nightly
 MOZILLA_SUFX=	-nightly
 MOZILLA=	${PORTNAME}${MOZILLA_SUFX}

Added: branches/experimental/www/firefox-nightly/files/patch-content-media-gstreamer-nsGStreamerReader.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/experimental/www/firefox-nightly/files/patch-content-media-gstreamer-nsGStreamerReader.cpp	Thu Jun 21 12:06:29 2012	(r786)
@@ -0,0 +1,11 @@
+--- content/media/gstreamer/nsGStreamerReader.cpp~
++++ content/media/gstreamer/nsGStreamerReader.cpp
+@@ -191,7 +191,7 @@ nsresult nsGStreamerReader::ReadMetadata
+    * stream but that are otherwise decodeable.
+    */
+   guint flags[3] = {GST_PLAY_FLAG_VIDEO|GST_PLAY_FLAG_AUDIO,
+-    ~GST_PLAY_FLAG_AUDIO, ~GST_PLAY_FLAG_VIDEO};
++    static_cast<guint>(~GST_PLAY_FLAG_AUDIO), static_cast<guint>(~GST_PLAY_FLAG_VIDEO)};
+   guint default_flags, current_flags;
+   g_object_get(mPlayBin, "flags", &default_flags, NULL);
+