diff options
| author | drochner <drochner@pkgsrc.org> | 2010-05-07 09:34:43 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2010-05-07 09:34:43 +0000 |
| commit | 7b009d8ed75a6aa904379277c348923cc1c33f3f (patch) | |
| tree | 54b192fbbb165f6eff9f242452519b9e7bbf20aa | |
| parent | 61db49bf6422aa6bbc60dcc4d365c4a9b4d50e1c (diff) | |
| download | pkgsrc-7b009d8ed75a6aa904379277c348923cc1c33f3f.tar.gz | |
as suggested by OBATA Akio, give up on replacing bashisms and
just use bash to run the configure script
| -rw-r--r-- | multimedia/x264-devel/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/x264-devel/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/x264-devel/patches/patch-aa | 15 |
3 files changed, 6 insertions, 18 deletions
diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile index efd3ca71f8f..66529982c87 100644 --- a/multimedia/x264-devel/Makefile +++ b/multimedia/x264-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2010/05/06 17:02:12 drochner Exp $ +# $NetBSD: Makefile,v 1.22 2010/05/07 09:34:43 drochner Exp $ SNAPSHOT_DATE= 20090920 @@ -32,10 +32,11 @@ BUILD_DEPENDS+= yasm>=0.4.0:../../devel/yasm CONFIGURE_ARGS+= --disable-asm .endif -USE_TOOLS+= gmake +USE_TOOLS+= gmake bash USE_LIBTOOL= yes HAS_CONFIGURE= yes +CONFIG_SHELL= ${BASH} CONFIGURE_ARGS+= --enable-pic # uses libtool's -prefer-pic CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --disable-mp4-output # needs GPAC, not in pkgsrc diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo index 654de5dacf5..e940cf0a085 100644 --- a/multimedia/x264-devel/distinfo +++ b/multimedia/x264-devel/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.20 2010/05/06 17:02:12 drochner Exp $ +$NetBSD: distinfo,v 1.21 2010/05/07 09:34:43 drochner Exp $ SHA1 (x264-snapshot-20090920-2245.tar.bz2) = de37c75bdcbfb4e16fba006afd932020b93d8a66 RMD160 (x264-snapshot-20090920-2245.tar.bz2) = c0303b906f4de285eb4c9460882e6df4cf92f4a3 Size (x264-snapshot-20090920-2245.tar.bz2) = 2736477 bytes -SHA1 (patch-aa) = c9c93b1d1bbbfe1b61564cb3ab7df68216d1d9d2 +SHA1 (patch-aa) = e77e346640cb0512f9ca5b678bf325f915a69da7 SHA1 (patch-ab) = 6db45e7995b7986d8b0bf95a777eff71527a189d SHA1 (patch-ac) = b3c91319b287278dd98c822dd7e35e273a238f70 SHA1 (patch-ak) = d8362f3beadcc5cc19684a12b3794d542f502f14 diff --git a/multimedia/x264-devel/patches/patch-aa b/multimedia/x264-devel/patches/patch-aa index b7ddf3ebfd1..dbd4d1f34ba 100644 --- a/multimedia/x264-devel/patches/patch-aa +++ b/multimedia/x264-devel/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.9 2010/05/06 17:02:12 drochner Exp $ +$NetBSD: patch-aa,v 1.10 2010/05/07 09:34:43 drochner Exp $ --- configure.orig 2009-09-20 20:45:09.000000000 +0000 +++ configure @@ -31,19 +31,6 @@ $NetBSD: patch-aa,v 1.9 2010/05/06 17:02:12 drochner Exp $ kfreebsd*-gnu) SYS="FREEBSD" CFLAGS="$CFLAGS -DHAVE_MALLOC_H" -@@ -236,10 +240,10 @@ case $host_cpu in - ARCH="X86" - AS="yasm" - ASFLAGS="$ASFLAGS -O2" -- if [[ "$asm" == yes && "$CFLAGS" != *-march* ]]; then -+ if [ "$asm" = yes -a "$CFLAGS" != *-march* ]; then - CFLAGS="$CFLAGS -march=i686" - fi -- if [[ "$asm" == yes && "$CFLAGS" != *-mfpmath* ]]; then -+ if [ "$asm" = yes -a "$CFLAGS" != *-mfpmath* ]; then - CFLAGS="$CFLAGS -mfpmath=sse -msse" - fi - if [ "$SYS" = MACOSX ]; then @@ -250,7 +254,7 @@ case $host_cpu in ASFLAGS="$ASFLAGS -f elf" fi |