diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2010-04-23 13:15:41 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2010-04-23 13:15:41 +0000 |
| commit | 79dce998b15b5e17d41e20c08b1511f66abb075f (patch) | |
| tree | f71b5111af2a590795d1ae78573d5c5a7f8e257b /multimedia/x264/files | |
| parent | 1067cd9826603c488fb6bdd255df221a22c6260c (diff) | |
| download | ports-79dce998b15b5e17d41e20c08b1511f66abb075f.tar.gz ports-79dce998b15b5e17d41e20c08b1511f66abb075f.zip | |
Notes
Diffstat (limited to 'multimedia/x264/files')
| -rw-r--r-- | multimedia/x264/files/patch-configure | 38 | ||||
| -rw-r--r-- | multimedia/x264/files/patch-version.sh | 8 |
2 files changed, 46 insertions, 0 deletions
diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure new file mode 100644 index 000000000000..d851deb3671e --- /dev/null +++ b/multimedia/x264/files/patch-configure @@ -0,0 +1,38 @@ +--- configure.orig 2010-02-22 22:45:05.000000000 +0100 ++++ configure 2010-04-23 12:56:49.647782200 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + + if test x"$1" = x"-h" -o x"$1" = x"--help" ; then + +@@ -317,11 +317,15 @@ + ARCH="X86" + AS="yasm" + ASFLAGS="$ASFLAGS -O2" +- if [[ "$asm" == yes && "$CFLAGS" != *-march* ]]; then +- CFLAGS="$CFLAGS -march=i686" +- fi +- if [[ "$asm" == yes && "$CFLAGS" != *-mfpmath* ]]; then +- CFLAGS="$CFLAGS -mfpmath=sse -msse" ++ if [ "$asm" = yes ]; then ++ case "$CFLAGS" in ++ *-march*) ;; ++ *) CFLAGS="$CFLAGS -march=i686" ;; ++ esac ++ case "$CFLAGS" in ++ *-mfpmath*) ;; ++ *) CFLAGS="$CFLAGS -mfpmath=sse -msse" ;; ++ esac + fi + if [ "$SYS" = MACOSX ]; then + ASFLAGS="$ASFLAGS -f macho -DPREFIX" +@@ -578,7 +582,7 @@ + [ -n "$LAVF_CFLAGS" ] && CFLAGS="$CFLAGS $LAVF_CFLAGS" + fi + +-MP4_LDFLAGS="-lgpac_static" ++MP4_LDFLAGS="-lgpac" + if [ $SYS = MINGW ]; then + MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm" + fi diff --git a/multimedia/x264/files/patch-version.sh b/multimedia/x264/files/patch-version.sh new file mode 100644 index 000000000000..ca767fdadf7b --- /dev/null +++ b/multimedia/x264/files/patch-version.sh @@ -0,0 +1,8 @@ +--- version.sh.orig 2010-04-23 12:55:03.524324331 +0200 ++++ version.sh 2010-04-23 12:54:56.084537002 +0200 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!/bin/sh + git rev-list HEAD | sort > config.git-hash + LOCALVER=`wc -l config.git-hash | awk '{print $1}'` + if [ $LOCALVER \> 1 ] ; then |