Fri Sep 13 15:00:43 2013 UTC ()
Fix build with libc++ and clang.


(joerg)
diff -r1.22 -r1.23 pkgsrc/multimedia/libvpx/Makefile
diff -r1.18 -r1.19 pkgsrc/multimedia/libvpx/distinfo
diff -r0 -r1.1 pkgsrc/multimedia/libvpx/patches/patch-test_i420__video__source.h
diff -r0 -r1.1 pkgsrc/multimedia/libvpx/patches/patch-test_sad__test.cc
diff -r0 -r1.1 pkgsrc/multimedia/libvpx/patches/patch-test_sixtap__predict__test.cc
cvs diff -r1.22 -r1.23 pkgsrc/multimedia/libvpx/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/Makefile 2013/09/12 10:50:28 1.22
+++ pkgsrc/multimedia/libvpx/Makefile 2013/09/13 15:00:43 1.23
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.22 2013/09/12 10:50:28 tron Exp $ 1# $NetBSD: Makefile,v 1.23 2013/09/13 15:00:43 joerg Exp $
2 2
3DISTNAME= libvpx-v1.2.0 3DISTNAME= libvpx-v1.2.0
4PKGNAME= ${DISTNAME:S/-v/-/} 4PKGNAME= ${DISTNAME:S/-v/-/}
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= http://webm.googlecode.com/files/ 6MASTER_SITES= http://webm.googlecode.com/files/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= ryoon@NetBSD.org 9MAINTAINER= ryoon@NetBSD.org
10HOMEPAGE= http://code.google.com/p/webm/ 10HOMEPAGE= http://code.google.com/p/webm/
11COMMENT= On2 VP8 library from Google 11COMMENT= On2 VP8 library from Google
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
@@ -55,25 +55,30 @@ CONFIGURE_ARGS+= --target=x86-darwin8-gc @@ -55,25 +55,30 @@ CONFIGURE_ARGS+= --target=x86-darwin8-gc
55CONFIGURE_ARGS+= --target=x86_64-darwin12-gcc 55CONFIGURE_ARGS+= --target=x86_64-darwin12-gcc
56. elif !empty(OS_VERSION:M11.*) 56. elif !empty(OS_VERSION:M11.*)
57CONFIGURE_ARGS+= --target=x86_64-darwin11-gcc 57CONFIGURE_ARGS+= --target=x86_64-darwin11-gcc
58. elif !empty(OS_VERSION:M10.*) 58. elif !empty(OS_VERSION:M10.*)
59CONFIGURE_ARGS+= --target=x86_64-darwin10-gcc 59CONFIGURE_ARGS+= --target=x86_64-darwin10-gcc
60. elif !empty(OS_VERSION:M9.*) 60. elif !empty(OS_VERSION:M9.*)
61CONFIGURE_ARGS+= --target=x86_64-darwin9-gcc 61CONFIGURE_ARGS+= --target=x86_64-darwin9-gcc
62. else 62. else
63CONFIGURE_ARGS+= --target=x86_64-darwin8-gcc 63CONFIGURE_ARGS+= --target=x86_64-darwin8-gcc
64. endif 64. endif
65. endif 65. endif
66.endif 66.endif
67 67
 68.include "../../mk/compiler.mk"
 69.if !empty(PKGSRC_COMPILER:Mclang)
 70CXXFLAGS+= -std=c++11
 71.endif
 72
68.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} 73.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH}
69CONFIGURE_ARGS+= --target=mips32-linux-gcc 74CONFIGURE_ARGS+= --target=mips32-linux-gcc
70.endif 75.endif
71 76
72BUILD_TARGET= # none 77BUILD_TARGET= # none
73 78
74post-extract: 79post-extract:
75 ${CP} ${FILESDIR}/strip_fPIC.sh ${WRKSRC} 80 ${CP} ${FILESDIR}/strip_fPIC.sh ${WRKSRC}
76 81
77.include "../../devel/googletest/buildlink3.mk" 82.include "../../devel/googletest/buildlink3.mk"
78.include "../../mk/pthread.buildlink3.mk" 83.include "../../mk/pthread.buildlink3.mk"
79.include "../../mk/bsd.pkg.mk" 84.include "../../mk/bsd.pkg.mk"
cvs diff -r1.18 -r1.19 pkgsrc/multimedia/libvpx/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/libvpx/distinfo 2013/09/11 15:50:32 1.18
+++ pkgsrc/multimedia/libvpx/distinfo 2013/09/13 15:00:43 1.19
@@ -1,12 +1,15 @@ @@ -1,12 +1,15 @@
1$NetBSD: distinfo,v 1.18 2013/09/11 15:50:32 ryoon Exp $ 1$NetBSD: distinfo,v 1.19 2013/09/13 15:00:43 joerg Exp $
2 2
3SHA1 (libvpx-v1.2.0.tar.bz2) = 33fb2df4ee5b06637dc492dafe49425ead117a24 3SHA1 (libvpx-v1.2.0.tar.bz2) = 33fb2df4ee5b06637dc492dafe49425ead117a24
4RMD160 (libvpx-v1.2.0.tar.bz2) = ed43d99dd4a0166baf9caca7a50841ced695eb08 4RMD160 (libvpx-v1.2.0.tar.bz2) = ed43d99dd4a0166baf9caca7a50841ced695eb08
5Size (libvpx-v1.2.0.tar.bz2) = 1715462 bytes 5Size (libvpx-v1.2.0.tar.bz2) = 1715462 bytes
6SHA1 (patch-aa) = 5b18ef2471039e2b3f9ba7818ed9372d03662cdd 6SHA1 (patch-aa) = 5b18ef2471039e2b3f9ba7818ed9372d03662cdd
7SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b 7SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b
8SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3 8SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3
9SHA1 (patch-ad) = 274dc555219811c72b1f4a3298a0e9b1b300d169 9SHA1 (patch-ad) = 274dc555219811c72b1f4a3298a0e9b1b300d169
10SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3 10SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3
11SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891 11SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
12SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe 12SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe
 13SHA1 (patch-test_i420__video__source.h) = e67478f08339c4b7f4cccf96e4798d1972941a7c
 14SHA1 (patch-test_sad__test.cc) = 0b3037ceec806e2b4b42c6be1c6db19a8f2f34a4
 15SHA1 (patch-test_sixtap__predict__test.cc) = d803819f3e5d282c3159e4410e7fbbd68cd403be
File Added: pkgsrc/multimedia/libvpx/patches/Attic/patch-test_i420__video__source.h
$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;
   }
File Added: pkgsrc/multimedia/libvpx/patches/Attic/patch-test_sad__test.cc
$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;
File Added: pkgsrc/multimedia/libvpx/patches/Attic/patch-test_sixtap__predict__test.cc
$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;