Title: [152603] trunk/Source/WebCore
- Revision
- 152603
- Author
- [email protected]
- Date
- 2013-07-12 12:30:23 -0700 (Fri, 12 Jul 2013)
Log Message
[Windows] Attempt to satisfy the Open Source Windows bots.
* DerivedSources.make: Restore the HAVE_AVCF macro detection.
* config.h: Return to using HAVE_AVCF to activate AVFoundation code.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (152602 => 152603)
--- trunk/Source/WebCore/ChangeLog 2013-07-12 19:05:04 UTC (rev 152602)
+++ trunk/Source/WebCore/ChangeLog 2013-07-12 19:30:23 UTC (rev 152603)
@@ -1,3 +1,10 @@
+2013-07-12 Brent Fulgham <[email protected]>
+
+ [Windows] Attempt to satisfy the Open Source Windows bots.
+
+ * DerivedSources.make: Restore the HAVE_AVCF macro detection.
+ * config.h: Return to using HAVE_AVCF to activate AVFoundation code.
+
2013-07-12 [email protected] <[email protected]>
[WinCairo] Compile fix.
Modified: trunk/Source/WebCore/DerivedSources.make (152602 => 152603)
--- trunk/Source/WebCore/DerivedSources.make 2013-07-12 19:05:04 UTC (rev 152602)
+++ trunk/Source/WebCore/DerivedSources.make 2013-07-12 19:30:23 UTC (rev 152603)
@@ -1116,6 +1116,8 @@
all : WebCoreHeaderDetection.h
WebCoreHeaderDetection.h : DerivedSources.make
- if [ -f "$(WEBKIT_LIBRARIES)/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h" ]||[ -f "$(WEBKITLIBRARIESDIR)/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h" ]; then echo "#define HAVE_AVCF_LEGIBLE_OUTPUT 1" > $@; else echo > $@; fi
+ echo "/* Identifying AVFoundation Support */" > $@
+ if [ -f "$(WEBKIT_LIBRARIES)/include/AVFoundationCF/AVCFBase.h" ]||[ -f "$(WEBKITLIBRARIESDIR)/include/AVFoundationCF/AVCFBase.h" ]; then echo "#define HAVE_AVCF 1" >> $@; else echo >> $@; fi
+ if [ -f "$(WEBKIT_LIBRARIES)/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h" ]||[ -f "$(WEBKITLIBRARIESDIR)/include/AVFoundationCF/AVCFPlayerItemLegibleOutput.h" ]; then echo "#define HAVE_AVCF_LEGIBLE_OUTPUT 1" >> $@; else echo >> $@; fi
endif # Windows_NT
Modified: trunk/Source/WebCore/config.h (152602 => 152603)
--- trunk/Source/WebCore/config.h 2013-07-12 19:05:04 UTC (rev 152602)
+++ trunk/Source/WebCore/config.h 2013-07-12 19:30:23 UTC (rev 152603)
@@ -17,7 +17,7 @@
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*
- */
+ */
#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
#ifdef BUILDING_WITH_CMAKE
@@ -136,7 +136,7 @@
// FIXME: Move this to _javascript_Core/wtf/Platform.h, which is where we define WTF_USE_AVFOUNDATION on the Mac.
// https://bugs.webkit.org/show_bug.cgi?id=67334
-#if PLATFORM(WIN) && USE(CG)
+#if PLATFORM(WIN) && USE(CG) && HAVE(AVCF)
#define WTF_USE_AVFOUNDATION 1
#if HAVE(AVCF_LEGIBLE_OUTPUT)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
