From 79dce998b15b5e17d41e20c08b1511f66abb075f Mon Sep 17 00:00:00 2001
From: Martin Matuska <mm@FreeBSD.org>
Date: Fri, 23 Apr 2010 13:15:41 +0000
Subject: - Fix configure issues on i386 [1] - Rework patches

PR:		ports/145959 [1]
Submitted by:	Mark Andrews <marka@isc.org> [1]
---
 multimedia/x264/Makefile               |  6 ++----
 multimedia/x264/files/patch-configure  | 38 ++++++++++++++++++++++++++++++++++
 multimedia/x264/files/patch-version.sh |  8 +++++++
 3 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 multimedia/x264/files/patch-configure
 create mode 100644 multimedia/x264/files/patch-version.sh

(limited to 'multimedia/x264')

diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 7f52e6404a65..3a823f1f9b03 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	x264
 PORTVERSION=	0.0.20100222
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@@ -99,11 +100,8 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
-		s|-lpthread|${PTHREAD_LIBS}|g; \
-		s|bash|sh|; \
-		s|gpac_static|gpac|g' \
+		s|-lpthread |${PTHREAD_LIBS} |g;' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/version.sh
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
 		s|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile
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
-- 
cgit v1.2.3