Bug 1918268 - (fix-e0fe4200eb) upstream added pragma clang statements that need to be wrapped

marco-c · marco-c · commit 2d9c243969d1 · 2024-10-01T01:26:20.000Z
UltraBlame original commit: 02fac81db780a2e1766ee0eeddc1797b91ee2cda
diff --git a/third_party/libwebrtc/api/audio_codecs/audio_decoder_factory.h b/third_party/libwebrtc/api/audio_codecs/audio_decoder_factory.h
@@ -505,6 +505,12 @@ codec_pair_id
 )
 {
 #
+if
+defined
+(
+__clang__
+)
+#
 pragma
 clang
 diagnostic
@@ -520,6 +526,8 @@ Wdeprecated
 -
 declarations
 "
+#
+endif
 return
 MakeAudioDecoder
 (
@@ -528,10 +536,18 @@ codec_pair_id
 )
 ;
 #
+if
+defined
+(
+__clang__
+)
+#
 pragma
 clang
 diagnostic
 pop
+#
+endif
 }
 }
 ;
diff --git a/third_party/libwebrtc/moz-patch-stack/0122.patch b/third_party/libwebrtc/moz-patch-stack/0122.patch
@@ -0,0 +1,220 @@
+From
+:
+Michael
+Froman
+<
+mfroman
+mozilla
+.
+com
+>
+Date
+:
+Thu
+19
+Sep
+2024
+20
+:
+27
+:
+00
+-
+0500
+Subject
+:
+Bug
+1918268
+-
+(
+fix
+-
+e0fe4200eb
+)
+upstream
+added
+pragma
+clang
+statements
+that
+need
+to
+be
+wrapped
+Mercurial
+Revision
+:
+https
+:
+/
+/
+hg
+.
+mozilla
+.
+org
+/
+mozilla
+-
+central
+/
+rev
+/
+bc593cd2eaf8b31b72e9ec7cb6ff8527097a7041
+-
+-
+-
+api
+/
+audio_codecs
+/
+audio_decoder_factory
+.
+h
+|
+4
++
++
++
++
+1
+file
+changed
+4
+insertions
+(
++
+)
+diff
+-
+-
+git
+a
+/
+api
+/
+audio_codecs
+/
+audio_decoder_factory
+.
+h
+b
+/
+api
+/
+audio_codecs
+/
+audio_decoder_factory
+.
+h
+index
+282d4d9992
+.
+.
+4a157959f0
+100644
+-
+-
+-
+a
+/
+api
+/
+audio_codecs
+/
+audio_decoder_factory
+.
+h
++
++
++
+b
+/
+api
+/
+audio_codecs
+/
+audio_decoder_factory
+.
+h
+-
+60
+10
++
+60
+14
+class
+AudioDecoderFactory
+:
+public
+RefCountInterface
+{
+const
+Environment
+&
+env
+const
+SdpAudioFormat
+&
+format
+absl
+:
+:
+optional
+<
+AudioCodecPairId
+>
+codec_pair_id
+)
+{
++
+#
+if
+defined
+(
+__clang__
+)
+#
+pragma
+clang
+diagnostic
+push
+#
+pragma
+clang
+diagnostic
+ignored
+"
+-
+Wdeprecated
+-
+declarations
+"
++
+#
+endif
+return
+MakeAudioDecoder
+(
+format
+codec_pair_id
+)
+;
++
+#
+if
+defined
+(
+__clang__
+)
+#
+pragma
+clang
+diagnostic
+pop
++
+#
+endif
+}
+}
+;

Original file line number	Diff line number	Diff line change
`@@ -505,6 +505,12 @@ codec_pair_id`
`505`	`505`	`)`
`506`	`506`	`{`
`507`	`507`	`#`
	`508`	`+if`
	`509`	`+defined`
	`510`	`+(`
	`511`	`+__clang__`
	`512`	`+)`
	`513`	`+#`
`508`	`514`	`pragma`
`509`	`515`	`clang`
`510`	`516`	`diagnostic`
`@@ -520,6 +526,8 @@ Wdeprecated`
`520`	`526`	`-`
`521`	`527`	`declarations`
`522`	`528`	`"`
	`529`	`+#`
	`530`	`+endif`
`523`	`531`	`return`
`524`	`532`	`MakeAudioDecoder`
`525`	`533`	`(`
`@@ -528,10 +536,18 @@ codec_pair_id`
`528`	`536`	`)`
`529`	`537`	`;`
`530`	`538`	`#`
	`539`	`+if`
	`540`	`+defined`
	`541`	`+(`
	`542`	`+__clang__`
	`543`	`+)`
	`544`	`+#`
`531`	`545`	`pragma`
`532`	`546`	`clang`
`533`	`547`	`diagnostic`
`534`	`548`	`pop`
	`549`	`+#`
	`550`	`+endif`
`535`	`551`	`}`
`536`	`552`	`}`
`537`	`553`	`;`