Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 19 Sep 2013 04:06:32 GMT
From:      svn-freebsd-gecko@chruetertee.ch
To:        freebsd-gecko@freebsd.org
Subject:   [SVN-Commit] r1364 - in trunk/www: firefox firefox-nightly firefox/files
Message-ID:  <201309190406.r8J46Wjl071278@trillian.chruetertee.ch>

next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Thu Sep 19 04:06:32 2013
New Revision: 1364

Log:
update

Added:
   trunk/www/firefox/files/patch-bug853301
Deleted:
   trunk/www/firefox/files/patch-bug803480
   trunk/www/firefox/files/patch-bug889699
Modified:
   trunk/www/firefox-nightly/Makefile
   trunk/www/firefox-nightly/Makefile.hgrev
   trunk/www/firefox-nightly/distinfo
   trunk/www/firefox/Makefile
   trunk/www/firefox/distinfo
   trunk/www/firefox/files/patch-bug783463
   trunk/www/firefox/files/patch-bug807492
   trunk/www/firefox/files/patch-bug851992
   trunk/www/firefox/files/patch-bug878791

Modified: trunk/www/firefox-nightly/Makefile
==============================================================================
--- trunk/www/firefox-nightly/Makefile	Thu Sep 19 04:02:10 2013	(r1363)
+++ trunk/www/firefox-nightly/Makefile	Thu Sep 19 04:06:32 2013	(r1364)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	firefox
-PORTVERSION=	26.0.${HGREV:C/:.*//}
+PORTVERSION=	27.0.${HGREV:C/:.*//}
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	https://hg.mozilla.org/integration/mozilla-inbound/archive/

Modified: trunk/www/firefox-nightly/Makefile.hgrev
==============================================================================
--- trunk/www/firefox-nightly/Makefile.hgrev	Thu Sep 19 04:02:10 2013	(r1363)
+++ trunk/www/firefox-nightly/Makefile.hgrev	Thu Sep 19 04:06:32 2013	(r1364)
@@ -1 +1 @@
-HGREV=		147328:1713de744990
+HGREV=		147767:99002d48464e

Modified: trunk/www/firefox-nightly/distinfo
==============================================================================
--- trunk/www/firefox-nightly/distinfo	Thu Sep 19 04:02:10 2013	(r1363)
+++ trunk/www/firefox-nightly/distinfo	Thu Sep 19 04:06:32 2013	(r1364)
@@ -1,2 +1,2 @@
-SHA256 (firefox-nightly/1713de744990.tar.bz2) = 5e8372423c6c59ae0c58d5bd357b8a7ea5cb99d4957febdf3d9974b7abfed96c
-SIZE (firefox-nightly/1713de744990.tar.bz2) = 125684665
+SHA256 (firefox-nightly/99002d48464e.tar.bz2) = 0bb9483d8bccad72ce3ca5cae3d86ef6f757249cd396cec61f6ebcbfa9aa227c
+SIZE (firefox-nightly/99002d48464e.tar.bz2) = 125743500

Modified: trunk/www/firefox/Makefile
==============================================================================
--- trunk/www/firefox/Makefile	Thu Sep 19 04:02:10 2013	(r1363)
+++ trunk/www/firefox/Makefile	Thu Sep 19 04:06:32 2013	(r1364)
@@ -2,23 +2,24 @@
 # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $
 
 PORTNAME=	firefox
-DISTVERSION=	24.0
+DISTVERSION=	25.0b1
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
-MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
-		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}esr-candidates/build1/source/
-DISTNAME=	${PORTNAME}-${DISTVERSION}esr.source
+MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
+		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
+DISTNAME=	${PORTNAME}-${DISTVERSION}.source
 
 MAINTAINER=	gecko@FreeBSD.org
 COMMENT=	Web browser based on the browser portion of Mozilla
 
 BUILD_DEPENDS=	nspr>=4.10:${PORTSDIR}/devel/nspr \
-		nss>=3.15:${PORTSDIR}/security/nss \
 		sqlite3>=3.7.17:${PORTSDIR}/databases/sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		cairo>=1.10.2_1,1:${PORTSDIR}/graphics/cairo \
 		v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat \
 		unzip:${PORTSDIR}/archivers/unzip
+#		nss>=3.15:${PORTSDIR}/security/nss \
+
 LIB_DEPENDS=	libv4l2.so:${PORTSDIR}/multimedia/libv4l
 
 USE_AUTOTOOLS=	autoconf213:env
@@ -27,7 +28,7 @@
 USE_GECKO=	gecko
 CONFLICTS=	firefox-esr-24.* firefox-esr-17.* firefox-1[07].*
 MOZ_PKGCONFIG_FILES=	# empty
-USE_MOZILLA=	# empty
+USE_MOZILLA=	-nss # bug713933
 MOZILLA_NAME=	Firefox
 
 WANT_GNOME=	yes
@@ -55,7 +56,7 @@
 
 .include <bsd.port.pre.mk>
 
-WRKSRC:=	${WRKDIR}/mozilla-esr24
+WRKSRC:=	${WRKDIR}/mozilla-beta
 
 post-extract:
 	@${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' -e 's|@MOZILLA@|${MOZILLA}|' \

Modified: trunk/www/firefox/distinfo
==============================================================================
--- trunk/www/firefox/distinfo	Thu Sep 19 04:02:10 2013	(r1363)
+++ trunk/www/firefox/distinfo	Thu Sep 19 04:06:32 2013	(r1364)
@@ -1,2 +1,2 @@
-SHA256 (firefox-24.0esr.source.tar.bz2) = 3872f7c4c7b3f1f3f06dd3e4f7cc97b59a6857085af8f2df56820185e3d5cadb
-SIZE (firefox-24.0esr.source.tar.bz2) = 119722621
+SHA256 (firefox-25.0b1.source.tar.bz2) = 4b77adf21432e7c9050fb97f1e46ed6b5184f90d0625241a007bb87924d3449a
+SIZE (firefox-25.0b1.source.tar.bz2) = 127809261

Modified: trunk/www/firefox/files/patch-bug783463
==============================================================================
--- trunk/www/firefox/files/patch-bug783463	Thu Sep 19 04:02:10 2013	(r1363)
+++ trunk/www/firefox/files/patch-bug783463	Thu Sep 19 04:06:32 2013	(r1364)
@@ -1,14 +1,11 @@
 --- gfx/skia/moz.build~
 +++ gfx/skia/moz.build
-@@ -188,10 +188,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
-         'SkMMapStream.cpp',
+@@ -190,7 +190,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
+         'SkFontHost_FreeType_common.cpp',
          'SkOSFile.cpp',
      ]
 -    if CONFIG['OS_TARGET'] == 'Linux':
 +    if CONFIG['MOZ_X11'] == 1 or CONFIG['OS_TARGET'] == 'Linux':
-         CPP_SOURCES += [
-             'SkFontHost_linux.cpp',
--            'SkFontHost_tables.cpp',
-             'SkThread_pthread.cpp',
-             'SkTime_Unix.cpp',
+         EXPORTS.skia += [
+             'include/ports/SkTypeface_cairo.h',
          ]

Deleted: trunk/www/firefox/files/patch-bug803480
==============================================================================
--- trunk/www/firefox/files/patch-bug803480	Thu Sep 19 04:06:32 2013	(r1363)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,102 +0,0 @@
-diff --git configure.in configure.in
-index a0575dc..be327fd 100644
---- configure.in
-+++ configure.in
-@@ -4306,7 +4306,6 @@ NS_PRINTING=1
- MOZ_PDF_PRINTING=
- MOZ_DISABLE_CRYPTOLEGACY=
- NSS_DISABLE_DBM=
--NECKO_WIFI=1
- NECKO_COOKIES=1
- NECKO_PROTOCOLS_DEFAULT="about data file ftp http res viewsource websocket wyciwyg device"
- USE_ARM_KUSER=
-@@ -4336,11 +4335,6 @@ case "${target}" in
-         fi
- 
-         NSS_DISABLE_DBM=1
--        if test -z "$gonkdir"; then
--          NECKO_WIFI=
--        else
--          NECKO_WIFI=1
--        fi
-         MOZ_THEME_FASTSTRIPE=1
-         MOZ_TREE_FREETYPE=1
-         MOZ_MEMORY=1
-@@ -8485,28 +8479,39 @@ done
- dnl
- dnl option to disable necko's wifi scanner
- dnl
-+
-+case "$OS_TARGET" in
-+  OS2)
-+    dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
-+    ;;
-+  Android)
-+    if test -n "$gonkdir"; then
-+      NECKO_WIFI=1
-+    fi
-+    ;;
-+  Darwin|SunOS|WINNT)
-+    NECKO_WIFI=1
-+    ;;
-+  Linux)
-+    if test -z "$MOZ_ENABLE_DBUS"; then
-+      AC_MSG_ERROR([Necko WiFi scanning needs DBus on your platform, remove --disable-dbus or use --disable-necko-wifi])
-+    fi
-+    NECKO_WIFI=1
-+    NECKO_WIFI_DBUS=1
-+    ;;
-+esac
-+
- MOZ_ARG_DISABLE_BOOL(necko-wifi,
- [  --disable-necko-wifi    Disable necko wifi scanner],
-     NECKO_WIFI=,
-     NECKO_WIFI=1)
- 
--if test "$OS_ARCH" = "OS2"; then
--  dnl OS/2 implementation of Necko-WiFi support will be added in bug 506566
--  NECKO_WIFI=
--fi
--if test "$NECKO_WIFI" -a \
--        "$OS_ARCH" != "Linux" -a \
--        "$OS_ARCH" != "Darwin" -a \
--        "$OS_ARCH" != "SunOS" -a \
--        "$OS_ARCH" != "WINNT"; then
--  AC_MSG_ERROR([Necko WiFi scanning not supported on your platform, use --disable-necko-wifi])
--fi
--
- if test "$NECKO_WIFI"; then
-   AC_DEFINE(NECKO_WIFI)
-   _NON_GLOBAL_ACDEFINES="$_NON_GLOBAL_ACDEFINES NECKO_WIFI"
- fi
- AC_SUBST(NECKO_WIFI)
-+AC_SUBST(NECKO_WIFI_DBUS)
- 
- dnl
- dnl option to disable cookies
-diff --git netwerk/wifi/Makefile.in netwerk/wifi/Makefile.in
-index 26dbd79..4cbf912 100644
---- netwerk/wifi/Makefile.in
-+++ netwerk/wifi/Makefile.in
-@@ -20,7 +20,7 @@ ifeq ($(OS_ARCH),SunOS)
- OS_INCLUDES += $(GLIB_CFLAGS)
- endif
- 
--ifdef MOZ_ENABLE_DBUS
-+ifdef NECKO_WIFI_DBUS
- OS_INCLUDES += $(MOZ_DBUS_GLIB_CFLAGS)
- endif
- 
-diff --git netwerk/wifi/moz.build netwerk/wifi/moz.build
-index 5e70211..07b01de 100644
---- netwerk/wifi/moz.build
-+++ netwerk/wifi/moz.build
-@@ -43,7 +43,7 @@ elif CONFIG['OS_ARCH'] == 'SunOS':
-         'nsWifiScannerSolaris.cpp',
-     ]
- 
--if CONFIG['MOZ_ENABLE_DBUS']:
-+if CONFIG['NECKO_WIFI_DBUS']:
-     CPP_SOURCES += [
-         'nsWifiScannerDBus.cpp',
-     ]

Modified: trunk/www/firefox/files/patch-bug807492
==============================================================================
--- trunk/www/firefox/files/patch-bug807492	Thu Sep 19 04:02:10 2013	(r1363)
+++ trunk/www/firefox/files/patch-bug807492	Thu Sep 19 04:06:32 2013	(r1364)
@@ -423,10 +423,10 @@
 index 2a91e3d..31de641 100644
 --- media/webrtc/signaling/signaling.gyp
 +++ media/webrtc/signaling/signaling.gyp
-@@ -212,16 +212,29 @@
+@@ -223,16 +223,29 @@
+             'GIPS_VER=3480',
              'SIPCC_BUILD',
-             'HAVE_WINSOCK2_H',
-             'CPR_STDINT_INCLUDE=\\"mozilla/StandardInteger.h\\"'
+             'HAVE_WINSOCK2_H'
            ],
  
            'cflags_mozilla': [

Modified: trunk/www/firefox/files/patch-bug851992
==============================================================================
--- trunk/www/firefox/files/patch-bug851992	Thu Sep 19 04:02:10 2013	(r1363)
+++ trunk/www/firefox/files/patch-bug851992	Thu Sep 19 04:06:32 2013	(r1364)
@@ -206,7 +206,7 @@
 diff --git a/js/src/configure.in b/js/src/configure.in
 --- js/src/configure.in
 +++ js/src/configure.in
-@@ -4406,59 +4406,68 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE
+@@ -4406,56 +4406,65 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE
      AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION)
      AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION)
  fi
@@ -226,12 +226,9 @@
 +    PKG_CHECK_MODULES(MOZ_ICU, icu-i18n >= 50.1)
 +fi
  
- if test -n "$JS_STANDALONE"; then
-     ENABLE_INTL_API=1
- fi
- MOZ_ARG_ENABLE_BOOL(intl-api,
- [  --enable-intl-api       Enable ECMAScript Internationalization API (default=yes for standalone JS)],
-     ENABLE_INTL_API=1,
+ ENABLE_INTL_API=1
+ MOZ_ARG_DISABLE_BOOL(intl-api,
+ [  --disable-intl-api      Disable the ECMAScript Internationalization API],
      ENABLE_INTL_API= )
  
  dnl Settings for the implementation of the ECMAScript Internationalization API

Added: trunk/www/firefox/files/patch-bug853301
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug853301	Thu Sep 19 04:06:32 2013	(r1364)
@@ -0,0 +1,10 @@
+--- configure.in~
++++ configure.in
+@@ -9454,7 +9454,6 @@ if test "A" = "A"; then
+     #   Desktop:  bug 853301
+     #   Android:  bug 864843
+     #   B2G:      bug 866301
+-    ac_configure_args="$ac_configure_args --disable-intl-api"
+ fi
+ if test "$BUILD_CTYPES"; then
+     # Build js-ctypes on the platforms we can.

Modified: trunk/www/firefox/files/patch-bug878791
==============================================================================
--- trunk/www/firefox/files/patch-bug878791	Thu Sep 19 04:02:10 2013	(r1363)
+++ trunk/www/firefox/files/patch-bug878791	Thu Sep 19 04:06:32 2013	(r1364)
@@ -1,5 +1,5 @@
---- toolkit/components/osfile/osfile_unix_allthreads.jsm.orig	2013-05-11 21:19:53.000000000 +0200
-+++ toolkit/components/osfile/osfile_unix_allthreads.jsm	2013-06-02 17:15:05.000000000 +0200
+--- toolkit/components/osfile/modules/osfile_unix_allthreads.jsm.orig	2013-05-11 21:19:53.000000000 +0200
++++ toolkit/components/osfile/modules/osfile_unix_allthreads.jsm	2013-06-02 17:15:05.000000000 +0200
 @@ -40,7 +40,7 @@ if (typeof Components != "undefined") {
    // Open libc
    let libc;

Deleted: trunk/www/firefox/files/patch-bug889699
==============================================================================
--- trunk/www/firefox/files/patch-bug889699	Thu Sep 19 04:06:32 2013	(r1363)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,175 +0,0 @@
-commit 7eb5827
-Author: Edwin Flores <eflores@mozilla.com>
-Date:   Sat Jul 20 12:03:08 2013 +1200
-
-    Bug 889699 - Make gstreamer backend return more accurate results for canPlayType() r=alessandro.d
----
- content/media/gstreamer/GStreamerFormatHelper.cpp | 90 +++++++++++++++++------
- 1 file changed, 66 insertions(+), 24 deletions(-)
-
-diff --git content/media/gstreamer/GStreamerFormatHelper.cpp content/media/gstreamer/GStreamerFormatHelper.cpp
-index f05ff8f..39f1fdf 100644
---- content/media/gstreamer/GStreamerFormatHelper.cpp
-+++ content/media/gstreamer/GStreamerFormatHelper.cpp
-@@ -6,7 +6,7 @@
- 
- #include "GStreamerFormatHelper.h"
- #include "nsCharSeparatedTokenizer.h"
--#include "nsXPCOMStrings.h"
-+#include "nsString.h"
- #include "GStreamerLoader.h"
- 
- #define ENTRY_FORMAT(entry) entry[0]
-@@ -36,7 +36,7 @@ void GStreamerFormatHelper::Shutdown() {
-   }
- }
- 
--char const *const GStreamerFormatHelper::mContainers[6][2] = {
-+static char const *const sContainers[6][2] = {
-   {"video/mp4", "video/quicktime"},
-   {"video/quicktime", "video/quicktime"},
-   {"audio/mp4", "audio/x-m4a"},
-@@ -45,7 +45,7 @@ char const *const GStreamerFormatHelper::mContainers[6][2] = {
-   {"audio/mp3", "audio/mpeg, mpegversion=(int)1"},
- };
- 
--char const *const GStreamerFormatHelper::mCodecs[9][2] = {
-+static char const *const sCodecs[9][2] = {
-   {"avc1.42E01E", "video/x-h264"},
-   {"avc1.42001E", "video/x-h264"},
-   {"avc1.58A01E", "video/x-h264"},
-@@ -57,6 +57,15 @@ char const *const GStreamerFormatHelper::mCodecs[9][2] = {
-   {"mp3", "audio/mpeg, mpegversion=(int)1"},
- };
- 
-+static char const * const sDefaultCodecCaps[][2] = {
-+  {"video/mp4", "video/x-h264"},
-+  {"video/quicktime", "video/x-h264"},
-+  {"audio/mp4", "audio/mpeg, mpegversion=(int)4"},
-+  {"audio/x-m4a", "audio/mpeg, mpegversion=(int)4"},
-+  {"audio/mp3", "audio/mpeg, layer=(int)3"},
-+  {"audio/mpeg", "audio/mpeg, layer=(int)3"}
-+};
-+
- GStreamerFormatHelper::GStreamerFormatHelper()
-   : mFactories(nullptr),
-     mCookie(static_cast<uint32_t>(-1))
-@@ -66,15 +75,15 @@ GStreamerFormatHelper::GStreamerFormatHelper()
-   }
- 
-   mSupportedContainerCaps = gst_caps_new_empty();
--  for (unsigned int i = 0; i < G_N_ELEMENTS(mContainers); i++) {
--    const char* capsString = mContainers[i][1];
-+  for (unsigned int i = 0; i < G_N_ELEMENTS(sContainers); i++) {
-+    const char* capsString = sContainers[i][1];
-     GstCaps* caps = gst_caps_from_string(capsString);
-     gst_caps_append(mSupportedContainerCaps, caps);
-   }
- 
-   mSupportedCodecCaps = gst_caps_new_empty();
--  for (unsigned int i = 0; i < G_N_ELEMENTS(mCodecs); i++) {
--    const char* capsString = mCodecs[i][1];
-+  for (unsigned int i = 0; i < G_N_ELEMENTS(sCodecs); i++) {
-+    const char* capsString = sCodecs[i][1];
-     GstCaps* caps = gst_caps_from_string(capsString);
-     gst_caps_append(mSupportedCodecCaps, caps);
-   }
-@@ -92,6 +101,41 @@ GStreamerFormatHelper::~GStreamerFormatHelper() {
-     g_list_free(mFactories);
- }
- 
-+static GstCaps *
-+GetContainerCapsFromMIMEType(const char *aType) {
-+  /* convert aMIMEType to gst container caps */
-+  const char* capsString = nullptr;
-+  for (uint32_t i = 0; i < G_N_ELEMENTS(sContainers); i++) {
-+    if (!strcmp(ENTRY_FORMAT(sContainers[i]), aType)) {
-+      capsString = ENTRY_CAPS(sContainers[i]);
-+      break;
-+    }
-+  }
-+
-+  if (!capsString) {
-+    /* we couldn't find any matching caps */
-+    return nullptr;
-+  }
-+
-+  return gst_caps_from_string(capsString);
-+}
-+
-+static GstCaps *
-+GetDefaultCapsFromMIMEType(const char *aType) {
-+  GstCaps *caps = GetContainerCapsFromMIMEType(aType);
-+
-+  for (uint32_t i = 0; i < G_N_ELEMENTS(sDefaultCodecCaps); i++) {
-+    if (!strcmp(sDefaultCodecCaps[i][0], aType)) {
-+      GstCaps *tmp = gst_caps_from_string(sDefaultCodecCaps[i][1]);
-+
-+      gst_caps_append(caps, tmp);
-+      return caps;
-+    }
-+  }
-+
-+  return nullptr;
-+}
-+
- bool GStreamerFormatHelper::CanHandleMediaType(const nsACString& aMIMEType,
-                                                const nsAString* aCodecs) {
-   if (!sLoadOK) {
-@@ -101,7 +145,15 @@ bool GStreamerFormatHelper::CanHandleMediaType(const nsACString& aMIMEType,
-   const char *type;
-   NS_CStringGetData(aMIMEType, &type, NULL);
- 
--  GstCaps* caps = ConvertFormatsToCaps(type, aCodecs);
-+  GstCaps *caps;
-+  if (aCodecs && !aCodecs->IsEmpty()) {
-+    caps = ConvertFormatsToCaps(type, aCodecs);
-+  } else {
-+    // Get a minimal set of codec caps for this MIME type we should support so
-+    // that we don't overreport MIME types we are able to play.
-+    caps = GetDefaultCapsFromMIMEType(type);
-+  }
-+
-   if (!caps) {
-     return false;
-   }
-@@ -118,21 +170,11 @@ GstCaps* GStreamerFormatHelper::ConvertFormatsToCaps(const char* aMIMEType,
- 
-   unsigned int i;
- 
--  /* convert aMIMEType to gst container caps */
--  const char* capsString = nullptr;
--  for (i = 0; i < G_N_ELEMENTS(mContainers); i++) {
--    if (!strcmp(ENTRY_FORMAT(mContainers[i]), aMIMEType)) {
--      capsString = ENTRY_CAPS(mContainers[i]);
--      break;
--    }
--  }
--
--  if (!capsString) {
--    /* we couldn't find any matching caps */
-+  GstCaps *caps = GetContainerCapsFromMIMEType(aMIMEType);
-+  if (!caps) {
-     return nullptr;
-   }
- 
--  GstCaps* caps = gst_caps_from_string(capsString);
-   /* container only */
-   if (!aCodecs) {
-     return caps;
-@@ -141,11 +183,11 @@ GstCaps* GStreamerFormatHelper::ConvertFormatsToCaps(const char* aMIMEType,
-   nsCharSeparatedTokenizer tokenizer(*aCodecs, ',');
-   while (tokenizer.hasMoreTokens()) {
-     const nsSubstring& codec = tokenizer.nextToken();
--    capsString = nullptr;
-+    const char *capsString = nullptr;
- 
--    for (i = 0; i < G_N_ELEMENTS(mCodecs); i++) {
--      if (codec.EqualsASCII(ENTRY_FORMAT(mCodecs[i]))) {
--        capsString = ENTRY_CAPS(mCodecs[i]);
-+    for (i = 0; i < G_N_ELEMENTS(sCodecs); i++) {
-+      if (codec.EqualsASCII(ENTRY_FORMAT(sCodecs[i]))) {
-+        capsString = ENTRY_CAPS(sCodecs[i]);
-         break;
-       }
-     }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309190406.r8J46Wjl071278>