kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Build the assembly routines under Intel Macs by using a nasm with Mach-O

Browse source 
support.  (nasm is bundled with Xcode... maybe we should detect that and
use the native tool rather than the one in pkgsrc.)
This commit is contained in:
jmmv 2007-01-06 16:31:48 +00:00
parent 4d92505f01
commit d2a917fbbe
3 changed files with 36 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
multimedia/xvidcore/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.26 2007/01/06 12:41:00 jmmv Exp $
# $NetBSD: Makefile,v 1.27 2007/01/06 16:31:48 jmmv Exp $
DISTNAME= xvidcore-1.1.2
CATEGORIES= multimedia
@ -20,7 +20,7 @@ PKG_DESTDIR_SUPPORT= user-destdir
.if ${OPSYS} == "SunOS" || ${MACHINE_ARCH} == "x86_64"
CONFIGURE_ARGS+= --disable-assembly
.elif ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS+= nasm>=0.98.34:../../devel/nasm
BUILD_DEPENDS+= nasm>=0.98.39nb3:../../devel/nasm
#.elif ${MACHINE_ARCH} == "x86_64"
#BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm
.endif
@ -33,7 +33,6 @@ GNU_CONFIGURE= YES
MAKE_ENV+= MKDIR=${MKDIR:Q}
.if ${OPSYS} == "Darwin"
CONFIGURE_ARGS+= --disable-assembly
post-install:
${RM} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so.4
${MV} -f ${DESTDIR}${PREFIX}/lib/libxvidcore.so ${DESTDIR}${PREFIX}/lib/libxvidcore.dylib

4
multimedia/xvidcore/distinfo
View file

@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.14 2006/11/18 21:05:13 wiz Exp $
$NetBSD: distinfo,v 1.15 2007/01/06 16:31:48 jmmv Exp $
SHA1 (xvidcore-1.1.2.tar.bz2) = a524c18f34133dc83b7be90abda7d0ae4ab3b7fb
RMD160 (xvidcore-1.1.2.tar.bz2) = bc3dfbd176ece5f54bbd72f1e655eba4da9baeb4
Size (xvidcore-1.1.2.tar.bz2) = 626741 bytes
SHA1 (patch-aa) = 593ae63ddb5ec646d7f531b99783de64a9d6ceb3
SHA1 (patch-ab) = 445d528602f67079bca03986c2c172af3291b15d
SHA1 (patch-ab) = 19306e1db22eeb58e703b1b416b019c0d2c4a694

34
multimedia/xvidcore/patches/patch-ab
View file

@ -1,6 +1,6 @@
$NetBSD: patch-ab,v 1.2 2006/01/06 17:12:18 wiz Exp $
$NetBSD: patch-ab,v 1.3 2007/01/06 16:31:48 jmmv Exp $
--- configure.orig 2005-12-30 15:45:30.000000000 +0100
--- configure.orig 2006-11-01 11:39:36.000000000 +0100
+++ configure
@@ -3782,7 +3782,7 @@ SHARED_EXTENSION=""
STATIC_EXTENSION=""
@ -20,6 +20,22 @@ $NetBSD: patch-ab,v 1.2 2006/01/06 17:12:18 wiz Exp $
echo "$as_me:$LINENO: result: ok" >&5
echo "${ECHO_T}ok" >&6
STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
@@ -3856,13 +3856,13 @@ echo "${ECHO_T}ok" >&6
echo "$as_me:$LINENO: result: dylib options" >&5
echo "${ECHO_T}dylib options" >&6
SHARED_LIB="libxvidcore.\$(API_MAJOR).\$(SHARED_EXTENSION)"
- SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB)"
+ SPECIFIC_LDFLAGS="-dynamiclib -flat_namespace -compatibility_version \$(API_MAJOR) -current_version \$(API_MAJOR).\$(API_MINOR) -install_name \$(libdir)/\$(SHARED_LIB) -Wl,-read_only_relocs -Wl,warning"
else
echo "$as_me:$LINENO: result: module options" >&5
echo "${ECHO_T}module options" >&6
PRE_SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION)-temp.o"
SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)"
- SPECIFIC_LDFLAGS="-r -keep_private_externs -nostdlib && \$(CC) \$(LDFLAGS) \$(PRE_SHARED_LIB) -o libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -bundle -flat_namespace -undefined suppress"
+ SPECIFIC_LDFLAGS="-r -keep_private_externs -nostdlib && \$(CC) \$(LDFLAGS) \$(PRE_SHARED_LIB) -o libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR) -bundle -flat_namespace -undefined suppress -Wl,-read_only_relocs -Wl,warning"
fi
;;
beos)
@@ -4038,7 +4038,7 @@ echo "$as_me: WARNING: nasm patch versio
echo "$as_me:$LINENO: checking for asm object format" >&5
echo $ECHO_N "checking for asm object format... $ECHO_C" >&6
@ -29,3 +45,17 @@ $NetBSD: patch-ab,v 1.2 2006/01/06 17:12:18 wiz Exp $
echo "$as_me:$LINENO: result: elf" >&5
echo "${ECHO_T}elf" >&6
NASM_FORMAT="elf"
@@ -4052,6 +4052,13 @@ echo "${ECHO_T}win32" >&6
PREFIX="-DPREFIX"
MARK_FUNCS=""
;;
+ darwin*|rhapsody*)
+ echo "$as_me:$LINENO: result: macho" >&5
+echo "${ECHO_T}macho" >&6
+ MARK_FUNCS=""
+ NASM_FORMAT="macho"
+ PREFIX="-DPREFIX"
+ ;;
esac
AS="$chosen_asm_prog"