Fix OpenBSD build

Use gcc46 instead of gcc45 for OpenBSD, because gcc45 from pkgsrc does not
support OpenBSD (yet)

3 files changed, 23 insertions, 8 deletions

diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 5e994a0c314..863d40c1eb3 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2014/04/13 07:41:49 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2014/05/05 21:16:28 ryoon Exp $
 
 DISTNAME=	libvpx_1.3.0.orig
 PKGNAME=	${DISTNAME:S/_/-/:S/.orig//}
@@ -11,6 +11,15 @@ HOMEPAGE=	http://code.google.com/p/webm/
 COMMENT=	On2 VP8 library from Google
 LICENSE=	modified-bsd
 
+# PR pkg/48508: GCC 4.4 or later is required to compile ssse3 code.
+# And It seems that gcc 4.4 and 4.5 do not support OpenBSD/amd64 at least.
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_PLATFORM:MOpenBSD-*-amd64)
+GCC_REQD+=	4.6
+.else
+GCC_REQD+=	4.4
+.endif
+
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 USE_LANGUAGES=		c c++
@@ -26,7 +35,8 @@ CONFIGURE_ARGS+=	--disable-unit-tests
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
+	${MACHINE_ARCH} == "amd64"
 . if ${PKGSRC_COMPILER} == "gcc" && (${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS")
 # PR pkg/48508: GCC 4.4 or later is required to compile ssse3 code on NetBSD & Solaris.
 GCC_REQD+=	4.4
@@ -118,7 +128,9 @@ post-extract:
 	${CP} ${FILESDIR}/strip_fPIC.sh ${WRKSRC}
 
 # PR pkg/48508: newer gas from binutils is required to compile ssse3 code.
-.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) || !empty(MACHINE_PLATFORM:MSunOS-5.10*)
+.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) || \
+	!empty(MACHINE_PLATFORM:MSunOS-5.10*) || \
+	!empty(MACHINE_PLATFORM:MOpenBSD-5*)
 .include "../../devel/binutils/buildlink3.mk"
 .include "../../devel/binutils/override-as.mk"
 .endif
diff --git a/multimedia/libvpx/distinfo b/multimedia/libvpx/distinfo
index f8497915166..ea6d336b1a7 100644
--- a/multimedia/libvpx/distinfo
+++ b/multimedia/libvpx/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2014/01/02 15:18:01 ryoon Exp $
+$NetBSD: distinfo,v 1.23 2014/05/05 21:16:28 ryoon Exp $
 
 SHA1 (libvpx_1.3.0.orig.tar.bz2) = fd90afbdba7905b9b3ab6c707c41369627d208e9
 RMD160 (libvpx_1.3.0.orig.tar.bz2) = f90e26d7657b26d8a3bdba82c55db5ecafc23835
@@ -6,7 +6,7 @@ Size (libvpx_1.3.0.orig.tar.bz2) = 2077846 bytes
 SHA1 (patch-aa) = a34e812f51c9fbd6ae99d48d1e23bcf922cf0ac0
 SHA1 (patch-ab) = dfd61002748f01a5651dc58ce6f67a9906f9a456
 SHA1 (patch-ac) = 2086b1896c6c6a23ba7da75824375fae0bdb97d1
-SHA1 (patch-ad) = bc151caa1aecc6278feccccbbd2223771db5c995
+SHA1 (patch-ad) = 865028a8c0eea859591b1b83d8e43d0ae5284d01
 SHA1 (patch-af) = 3eb0c222433a62d044e712f572000d97b1d635a3
 SHA1 (patch-build_make_gen_asm_deps.sh) = db7f9abcf1bdd1ccb8e48c695de3f2276bb5f891
 SHA1 (patch-configure) = de25f725eb4fb693b663022fdc977ed87c1863cd
diff --git a/multimedia/libvpx/patches/patch-ad b/multimedia/libvpx/patches/patch-ad
index 5ab22cf2c2c..37e2d5f9f40 100644
--- a/multimedia/libvpx/patches/patch-ad
+++ b/multimedia/libvpx/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.12 2014/01/02 15:18:01 ryoon Exp $
+$NetBSD: patch-ad,v 1.13 2014/05/05 21:16:28 ryoon Exp $
 
 *BSD and qnx are identified as linux.
 Add another SDK path on Mac OS X.
@@ -41,7 +41,7 @@ Add another SDK path on Mac OS X.
          grep '4f *32 *42 *45' >/dev/null 2>&1 && enable_feature big_endian
  
      # Try to find which inline keywords are supported
-@@ -1235,10 +1233,29 @@ EOF
+@@ -1235,10 +1233,32 @@ EOF
          case ${toolchain} in
              *-win*-vs*);;
              *-android-gcc);;
@@ -57,11 +57,14 @@ Add another SDK path on Mac OS X.
 +    solaris*)
 +       add_extralibs -lm -lrt
 +       ;;
-+       linux*)
++    linux*)
 +       case ${gcctarget} in
 +       *qnx6*)
 +           add_extralibs -lm
 +           ;;
++       *openbsd*)
++           add_extralibs -lm
++           ;;
 +       *)
 +           add_extralibs -lm -lrt
 +           ;;