Date: Fri, 8 Mar 2013 08:21:31 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1203 - in trunk: mail/thunderbird www/firefox www/firefox-nightly www/firefox-nightly/files Message-ID: <201303080821.r288LVoM067212@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Mar 8 08:21:31 2013 New Revision: 1203 Log: update Added: trunk/www/firefox-nightly/files/patch-bug829653 Modified: trunk/mail/thunderbird/Makefile trunk/mail/thunderbird/distinfo trunk/www/firefox-nightly/Makefile.hgrev trunk/www/firefox-nightly/distinfo trunk/www/firefox/Makefile trunk/www/firefox/distinfo Modified: trunk/mail/thunderbird/Makefile ============================================================================== --- trunk/mail/thunderbird/Makefile Thu Mar 7 11:19:02 2013 (r1202) +++ trunk/mail/thunderbird/Makefile Fri Mar 8 08:21:31 2013 (r1203) @@ -2,16 +2,12 @@ # $FreeBSD: head/mail/thunderbird/Makefile 310165 2013-01-09 23:28:19Z flo $ PORTNAME= thunderbird -PORTVERSION= 20.0.b1 -DISTVERSION= 2.17b1 +DISTVERSION= 20.0b1 CATEGORIES= mail ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source -DISTFILES= seamonkey-${DISTVERSION}.source${EXTRACT_SUFX} -EXTRACT_ONLY= seamonkey-${DISTVERSION}.source${EXTRACT_SUFX} -#MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source -#DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} -#EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} +MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${DISTVERSION}/source +DISTFILES= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org COMMENT= Mozilla Thunderbird is standalone mail and news that stands above Modified: trunk/mail/thunderbird/distinfo ============================================================================== --- trunk/mail/thunderbird/distinfo Thu Mar 7 11:19:02 2013 (r1202) +++ trunk/mail/thunderbird/distinfo Fri Mar 8 08:21:31 2013 (r1203) @@ -1,4 +1,4 @@ -SHA256 (seamonkey-2.17b1.source.tar.bz2) = e9d1c8009e2706789cd45841dc73e866577143d53f5920dc9d5aa61837f2dfa6 -SIZE (seamonkey-2.17b1.source.tar.bz2) = 122818269 +SHA256 (thunderbird-20.0b1.source.tar.bz2) = f54febc37d2520a4b18262c2029f2473e6edc1032774d297795a03d7eaf2cac0 +SIZE (thunderbird-20.0b1.source.tar.bz2) = 122575872 SHA256 (enigmail-1.5.1.tar.gz) = 234ca3c8f7c74afb64ebdaa4762e358f35a72c1f8de007b992497fc2db803af0 SIZE (enigmail-1.5.1.tar.gz) = 1213954 Modified: trunk/www/firefox-nightly/Makefile.hgrev ============================================================================== --- trunk/www/firefox-nightly/Makefile.hgrev Thu Mar 7 11:19:02 2013 (r1202) +++ trunk/www/firefox-nightly/Makefile.hgrev Fri Mar 8 08:21:31 2013 (r1203) @@ -1 +1 @@ -HGREV= 123690:55477ae32280 +HGREV= 124110:0e7639e3bdfb Modified: trunk/www/firefox-nightly/distinfo ============================================================================== --- trunk/www/firefox-nightly/distinfo Thu Mar 7 11:19:02 2013 (r1202) +++ trunk/www/firefox-nightly/distinfo Fri Mar 8 08:21:31 2013 (r1203) @@ -1,2 +1,2 @@ -SHA256 (firefox-nightly/55477ae32280.tar.bz2) = 8402ac5fed9290db7bcc854bc34490e0f11bf7441f19e35a4ddd2e86570c197d -SIZE (firefox-nightly/55477ae32280.tar.bz2) = 110214193 +SHA256 (firefox-nightly/0e7639e3bdfb.tar.bz2) = d9222d211aaa9c4af638b9c366e1664cd1c00b6615b3df2ad4e6db340f8a413c +SIZE (firefox-nightly/0e7639e3bdfb.tar.bz2) = 110668706 Added: trunk/www/firefox-nightly/files/patch-bug829653 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug829653 Fri Mar 8 08:21:31 2013 (r1203) @@ -0,0 +1,78 @@ +dro.d@gmail.com> +Bug 829653 - fix content/media build with --enable-gstreamer + + +diff --git a/content/media/DecoderTraits.cpp b/content/media/DecoderTraits.cpp +index d4f1e42..ab1d0d5 100644 +--- content/media/DecoderTraits.cpp ++++ content/media/DecoderTraits.cpp +@@ -178,16 +178,22 @@ IsWebMType(const nsACString& aType) + static const char* const gH264Types[4] = { + "video/mp4", + "video/3gpp", + "video/quicktime", + nullptr + }; + + static bool ++IsH264Type(const nsACString& aType) ++{ ++ return CodecListContains(gH264Types, aType); ++} ++ ++static bool + IsGStreamerSupportedType(const nsACString& aMimeType) + { + if (!MediaDecoder::IsGStreamerEnabled()) + return false; + if (IsH264Type(aMimeType)) + return true; + if (!Preferences::GetBool("media.prefer-gstreamer", false)) + return false; +@@ -196,22 +202,16 @@ IsGStreamerSupportedType(const nsACString& aMimeType) + return true; + #endif + #ifdef MOZ_OGG + if (IsOggType(aMimeType)) + return true; + #endif + return false; + } +- +-static bool +-IsH264Type(const nsACString& aType) +-{ +- return CodecListContains(gH264Types, aType); +-} + #endif + + #ifdef MOZ_WIDGET_GONK + static const char* const gOmxTypes[6] = { + "audio/mpeg", + "audio/mp4", + "video/mp4", + "video/3gpp", +diff --git a/content/media/Makefile.in b/content/media/Makefile.in +index 4b24c94..df28c17 100644 +--- content/media/Makefile.in ++++ content/media/Makefile.in +@@ -72,15 +72,19 @@ ifdef MOZ_SYDNEYAUDIO + EXPORTS += \ + AudioStream.h \ + $(NULL) + CPPSRCS += \ + AudioStream.cpp \ + $(NULL) + endif + ++ifdef MOZ_GSTREAMER ++OS_CXXFLAGS += $(GSTREAMER_CFLAGS) ++endif ++ + FORCE_STATIC_LIB = 1 + + include $(topsrcdir)/config/config.mk + include $(topsrcdir)/ipc/chromium/chromium-config.mk + include $(topsrcdir)/config/rules.mk + + DEFINES += -D_IMPL_NS_LAYOUT Modified: trunk/www/firefox/Makefile ============================================================================== --- trunk/www/firefox/Makefile Thu Mar 7 11:19:02 2013 (r1202) +++ trunk/www/firefox/Makefile Fri Mar 8 08:21:31 2013 (r1203) @@ -2,7 +2,7 @@ # $FreeBSD: head/www/firefox/Makefile 310227 2013-01-11 10:22:40Z ehaupt $ PORTNAME= firefox -DISTVERSION= 20.0b2 +DISTVERSION= 20.0b4 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA} Modified: trunk/www/firefox/distinfo ============================================================================== --- trunk/www/firefox/distinfo Thu Mar 7 11:19:02 2013 (r1202) +++ trunk/www/firefox/distinfo Fri Mar 8 08:21:31 2013 (r1203) @@ -1,2 +1,2 @@ -SHA256 (firefox-20.0b2.source.tar.bz2) = 40dc7947130cdedf3c6e762fa3270cd42ef8d24ddfd3d212e08b75406dddd88a -SIZE (firefox-20.0b2.source.tar.bz2) = 100014190 +SHA256 (firefox-20.0b4.source.tar.bz2) = fc8b9a2712d4dad3e0356a062e0cdb9d47c977eba4ff6fe9d9b34cd9f9eebfb9 +SIZE (firefox-20.0b4.source.tar.bz2) = 99859184
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303080821.r288LVoM067212>