diff options
| author | Michael Johnson <ahze@FreeBSD.org> | 2008-04-10 01:01:26 +0000 |
|---|---|---|
| committer | Michael Johnson <ahze@FreeBSD.org> | 2008-04-10 01:01:26 +0000 |
| commit | c9426c400ed07d78825c8f59f64e0313b5b250ed (patch) | |
| tree | 1c64308473f06c9d142928d6ee62c04823db5baf /multimedia/x264/files/patch-configure | |
| parent | Update to 3.1h. This release includes several minor bugfixes. (diff) | |
Update to 2008-04-09 snapshot
Requested by: Roman Divacky <rdivacky@freebsd.org>
Notes
Notes:
svn path=/head/; revision=210970
Diffstat (limited to 'multimedia/x264/files/patch-configure')
| -rw-r--r-- | multimedia/x264/files/patch-configure | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure index b3dd7ddf0f2a..052d3036cd26 100644 --- a/multimedia/x264/files/patch-configure +++ b/multimedia/x264/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2007-09-13 16:45:04.000000000 -0400 -+++ configure 2007-09-14 10:39:22.000000000 -0400 -@@ -252,7 +252,7 @@ +--- configure.orig 2008-04-09 16:45:06.000000000 -0400 ++++ configure 2008-04-09 20:48:37.722733173 -0400 +@@ -248,7 +248,7 @@ fi as_check || AS="nasm" ;; @@ -8,23 +8,22 @@ + x86_64 | amd64) ARCH="X86_64" AS="yasm" - ASFLAGS="-f elf -m amd64" -@@ -361,7 +361,7 @@ + if [ "$SYS" = MACOSX ];then +@@ -372,7 +372,7 @@ LDFLAGS="$LDFLAGS $libpthread" fi -MP4_LDFLAGS="-lgpac_static" +MP4_LDFLAGS="-lgpac" - if [ $SYS = CYGWIN -o $SYS = MINGW ]; then + if [ $SYS = MINGW ]; then MP4_LDFLAGS="$MP4_LDFLAGS -lwinmm" fi -@@ -443,7 +443,8 @@ +@@ -458,7 +458,7 @@ cp config.mak gtk/config.mak if [ "$shared" = "yes" ]; then - API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ') -+# API=$(grep '#define X264_BUILD' < x264.h | cut -f 3 -d ' ') + API=50 - echo "SONAME=libx264.so.$API" >> config.mak - echo 'default: $(SONAME)' >> config.mak - if [ "$gtk" = "yes" ]; then + if [ "$SYS" = "MINGW" ]; then + echo "SONAME=libx264-$API.dll" >> config.mak + echo 'IMPLIBNAME=libx264.dll.a' >> config.mak |