Try to unbreak the build on MirBSD. With this, it compiles all the way through

but then fails to link because the library contains unfulfilled references
to sse2 functions -- even though they are disabled.

3 files changed, 23 insertions, 9 deletions

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index c495a4c7707..07ba77b0375 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2013/11/09 05:28:35 ryoon Exp $
+# $NetBSD: Makefile,v 1.31 2013/11/29 18:33:54 bsiegert Exp $
 
 DISTNAME=	libvpx-v1.2.0
 PKGNAME=	${DISTNAME:S/-v/-/}
@@ -78,6 +78,12 @@ CONFIGURE_ARGS+=	--target=mips32-linux-gcc
 CONFIGURE_ARGS+=	--disable-runtime-cpu-detect
 .endif
 
+.if ${OPSYS} == "MirBSD"
+BUILDLINK_TRANSFORM+=	rm:-lrt
+CONFIGURE_ENV+=		sse2=no sse3=no ssse3=no sse4_1=no runtime_cpu_detect=no
+CONFIGURE_ARGS+=	--disable-runtime-cpu-detect
+.endif
+
 BUILD_TARGET=	# none
 
 post-extract:
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index 25fdec18170..ed9a082b665 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2013/11/09 05:28:35 ryoon Exp $
+$NetBSD: distinfo,v 1.21 2013/11/29 18:33:54 bsiegert Exp $
 
 SHA1 (libvpx-v1.2.0.tar.bz2) = 33fb2df4ee5b06637dc492dafe49425ead117a24
 RMD160 (libvpx-v1.2.0.tar.bz2) = ed43d99dd4a0166baf9caca7a50841ced695eb08
@@ -6,7 +6,7 @@ Size (libvpx-v1.2.0.tar.bz2) = 1715462 bytes
 SHA1 (patch-aa) = efd541c9323b8d36272b57bffb1f95251a0a89f5
 SHA1 (patch-ab) = 468131a66c39d9b42080e62f6afa7cfd3657609b
 SHA1 (patch-ac) = e177ad5416b50b75fe026377d8033032e0ca63c3
-SHA1 (patch-ad) = 43215b6af634dc04a84e0eae89c10c83e7aff25c
+SHA1 (patch-ad) = b312843ea925746ed9676ae404e700af88da29d5
 SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3
 SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
 SHA1 (patch-configure) = 72587d9f326040dd50b55e8ea086a05713533cbe
diff --git a/multimedia/libvpx/patches/patch-ad b/multimedia/libvpx/patches/patch-ad
index 24deb2e0c5d..ff7b8e9a3da 100644
--- a/multimedia/libvpx/patches/patch-ad
+++ b/multimedia/libvpx/patches/patch-ad
@@ -1,9 +1,9 @@
-$NetBSD: patch-ad,v 1.10 2013/11/09 05:28:35 ryoon Exp $
+$NetBSD: patch-ad,v 1.11 2013/11/29 18:33:54 bsiegert Exp $
 
 *BSD and qnx are identified as linux.
 Add another SDK path on Mac OS X.
 
---- build/make/configure.sh.orig	2013-09-04 18:49:22.000000000 +0000
+--- build/make/configure.sh.orig	Wed Sep  4 18:48:57 2013
 +++ build/make/configure.sh
 @@ -645,7 +645,7 @@ process_common_toolchain() {
                  [ -z "$tgt_isa" ] && tgt_isa=x86
@@ -32,7 +32,16 @@ Add another SDK path on Mac OS X.
          check_add_asflags -KPIC
      ;;
      ppc*)
-@@ -1160,10 +1158,29 @@ EOF
+@@ -1152,7 +1155,7 @@ EOF
+     check_cc <<EOF
+     unsigned int e = 'O'<<24 | '2'<<16 | 'B'<<8 | 'E';
+ EOF
+-    [ -f "${TMP_O}" ] && od -A n -t x1 "${TMP_O}" | tr -d '\n' |
++    [ -f "${TMP_O}" ] && od -t x1 "${TMP_O}" | cut -c 8- | tr -d '\n' |
+         grep '4f *32 *42 *45' >/dev/null 2>&1 && enable big_endian
+ 
+     # Almost every platform uses pthreads.
+@@ -1160,9 +1163,28 @@ EOF
          case ${toolchain} in
              *-win*-vs*);;
              *-android-gcc);;
@@ -40,7 +49,7 @@ Add another SDK path on Mac OS X.
 +            *) check_header pthread.h && add_extralibs ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}
          esac
      fi
- 
++
 +    case ${tgt_os} in
 +    darwin*)
 +       add_extralibs -lm
@@ -59,7 +68,6 @@ Add another SDK path on Mac OS X.
 +       esac
 +       ;;
 +    esac
-+
+ 
      # only for MIPS platforms
      case ${toolchain} in
-         mips*)