Re-enable MMX/SSE2 support on amd64/i386 now that we have gcc4.

from Brad (maintainer)
This commit is contained in:
ajacoutot 2012-01-25 15:34:02 +00:00
parent ac120789bc
commit e18cdcafd8
2 changed files with 13 additions and 5 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2011/08/30 18:53:24 jasper Exp $
# $OpenBSD: Makefile,v 1.14 2012/01/25 15:34:02 ajacoutot Exp $
COMMENT= ISO MPEG-4 compliant video codec
DISTNAME= xvidcore-1.3.2
REVISION= 0
CATEGORIES= multimedia
MASTER_SITES= http://downloads.xvid.org/downloads/
@ -23,12 +24,19 @@ WANTLIB= m
WRKDIST= ${WRKDIR}/xvidcore
WRKBUILD= ${WRKSRC}/build/generic
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= devel/yasm
.endif
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-assembly
CONFIGURE_ENV= API_MAJOR=${LIBxvidcore_VERSION:R} \
API_MINOR=${LIBxvidcore_VERSION:E}
.if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "i386"
CONFIGURE_ARGS+=--disable-assembly
.endif
NO_REGRESS= Yes
do-install:

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-build_generic_configure,v 1.6 2011/08/30 18:53:24 jasper Exp $
$OpenBSD: patch-build_generic_configure,v 1.7 2012/01/25 15:34:02 ajacoutot Exp $
--- build/generic/configure.orig Mon May 23 06:22:01 2011
+++ build/generic/configure Wed Jun 15 14:46:41 2011
+++ build/generic/configure Sat Dec 24 11:52:46 2011
@@ -2243,8 +2243,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@ -15,7 +15,7 @@ $OpenBSD: patch-build_generic_configure,v 1.6 2011/08/30 18:53:24 jasper Exp $
STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
- SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -shared -lc -lm"
+ SPECIFIC_LDFLAGS="-shared -lm"
+ SPECIFIC_LDFLAGS="-shared -fPIC -lm"
SPECIFIC_CFLAGS="-fPIC"
;;
[cC][yY][gG][wW][iI][nN]*|mingw32*|mks*)