Fix build with libc++ and clang.

5 files changed, 55 insertions, 2 deletions

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index be6e10f9247..45ae10cb43d 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2013/09/12 10:50:28 tron Exp $
+# $NetBSD: Makefile,v 1.23 2013/09/13 15:00:43 joerg Exp $
 
 DISTNAME=	libvpx-v1.2.0
 PKGNAME=	${DISTNAME:S/-v/-/}
@@ -65,6 +65,11 @@ CONFIGURE_ARGS+=	--target=x86_64-darwin8-gcc
 .  endif
 .endif
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+CXXFLAGS+=	-std=c++11
+.endif
+
 .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH}
 CONFIGURE_ARGS+=	--target=mips32-linux-gcc
 .endif
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index dd860e92f91..fa1d9c3f5f2 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2013/09/11 15:50:32 ryoon Exp $
+$NetBSD: distinfo,v 1.19 2013/09/13 15:00:43 joerg Exp $
 
 SHA1 (libvpx-v1.2.0.tar.bz2) = 33fb2df4ee5b06637dc492dafe49425ead117a24
 RMD160 (libvpx-v1.2.0.tar.bz2) = ed43d99dd4a0166baf9caca7a50841ced695eb08
@@ -10,3 +10,6 @@ SHA1 (patch-ad) = 274dc555219811c72b1f4a3298a0e9b1b300d169
 SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3
 SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
 SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe
+SHA1 (patch-test_i420__video__source.h) = e67478f08339c4b7f4cccf96e4798d1972941a7c
+SHA1 (patch-test_sad__test.cc) = 0b3037ceec806e2b4b42c6be1c6db19a8f2f34a4
+SHA1 (patch-test_sixtap__predict__test.cc) = d803819f3e5d282c3159e4410e7fbbd68cd403be
diff --git a/multimedia/libvpx/patches/patch-test_i420__video__source.h b/multimedia/libvpx/patches/patch-test_i420__video__source.h
new file mode 100644
index 00000000000..53db1658f21
--- /dev/null
+++ b/multimedia/libvpx/patches/patch-test_i420__video__source.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-test_i420__video__source.h,v 1.1 2013/09/13 15:00:43 joerg Exp $
+
+--- test/i420_video_source.h.orig	2013-09-12 10:09:36.000000000 +0000
++++ test/i420_video_source.h
+@@ -72,7 +72,7 @@ class I420VideoSource : public VideoSour
+   virtual unsigned long duration() const { return 1; }
+ 
+   virtual vpx_rational_t timebase() const {
+-    const vpx_rational_t t = { framerate_denominator_, framerate_numerator_ };
++    const vpx_rational_t t = { static_cast<int>(framerate_denominator_), static_cast<int>(framerate_numerator_) };
+     return t;
+   }
+ 
diff --git a/multimedia/libvpx/patches/patch-test_sad__test.cc b/multimedia/libvpx/patches/patch-test_sad__test.cc
new file mode 100644
index 00000000000..179e8af0914
--- /dev/null
+++ b/multimedia/libvpx/patches/patch-test_sad__test.cc
@@ -0,0 +1,16 @@
+$NetBSD: patch-test_sad__test.cc,v 1.1 2013/09/13 15:00:43 joerg Exp $
+
+--- test/sad_test.cc.orig	2013-09-12 10:19:23.000000000 +0000
++++ test/sad_test.cc
+@@ -182,7 +182,11 @@ TEST_P(SADTest, MaxSAD) {
+   CheckSad(128);
+ }
+ 
++#if __cplusplus >= 201103L
++using std::make_tuple;
++#else
+ using std::tr1::make_tuple;
++#endif
+ 
+ const sad_m_by_n_fn_t sad_16x16_c = vp8_sad16x16_c;
+ const sad_m_by_n_fn_t sad_8x16_c = vp8_sad8x16_c;
diff --git a/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc b/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc
new file mode 100644
index 00000000000..67e20342a09
--- /dev/null
+++ b/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc
@@ -0,0 +1,16 @@
+$NetBSD: patch-test_sixtap__predict__test.cc,v 1.1 2013/09/13 15:00:43 joerg Exp $
+
+--- test/sixtap_predict_test.cc.orig	2013-09-12 10:12:12.000000000 +0000
++++ test/sixtap_predict_test.cc
+@@ -175,7 +175,11 @@ TEST_P(SixtapPredictTest, TestWithRandom
+   }
+ }
+ 
++#if __cplusplus >= 201103L
++using std::make_tuple;
++#else
+ using std::tr1::make_tuple;
++#endif
+ 
+ const sixtap_predict_fn_t sixtap_16x16_c = vp8_sixtap_predict16x16_c;
+ const sixtap_predict_fn_t sixtap_8x8_c = vp8_sixtap_predict8x8_c;