diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2011-06-23 18:09:46 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2011-06-23 18:09:46 +0000 |
| commit | 0c0dda15f1366d8a764886b5b5cbdad71158d609 (patch) | |
| tree | 010a5747df3930f41b8b05cc9cc044587ceb9046 /multimedia/x264 | |
| parent | 4c9a6b7d7c352f4b29ff233537f98898b39c0d5c (diff) | |
Notes
Diffstat (limited to 'multimedia/x264')
| -rw-r--r-- | multimedia/x264/Makefile | 14 | ||||
| -rw-r--r-- | multimedia/x264/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/x264/files/patch-configure | 25 |
3 files changed, 9 insertions, 34 deletions
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index 105708a5ff9f..38d8340060de 100644 --- a/multimedia/x264/Makefile +++ b/multimedia/x264/Makefile @@ -9,10 +9,10 @@ PORTVERSION= 0.${X264_BUILD}.${X264_REV} CATEGORIES= multimedia MASTER_SITES= http://downloads.videolan.org/pub/videolan/x264/snapshots/ \ http://samples.mplayerhq.hu/yuv4mpeg2/:pgo -DISTNAME= ${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245 -DISTFILES= ${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245${EXTRACT_SUFX} +DISTNAME= ${PORTNAME}-snapshot-${X264_SNAP}-2245-stable +DISTFILES= ${PORTNAME}-snapshot-${X264_SNAP}-2245-stable${EXTRACT_SUFX} DIST_SUBDIR= x264 -EXTRACT_ONLY= ${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245${EXTRACT_SUFX} +EXTRACT_ONLY= ${PORTNAME}-snapshot-${X264_SNAP}-2245-stable${EXTRACT_SUFX} MAINTAINER= mm@FreeBSD.org COMMENT?= Library and tool for encoding H.264/AVC video streams @@ -22,9 +22,9 @@ BUILD_DEPENDS= yasm>=0.6.0:${PORTSDIR}/devel/yasm LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -X264_BUILD= 110 -X264_REV= 1820 -X264_SNAPSHOT= 20101211 +X264_BUILD= 115 +X264_REV= 2000 +X264_SNAP= 20110622 USE_BZIP2= yes EXTRACT_AFTER_ARGS?= | ${TAR} -xf - --exclude .svn @@ -43,7 +43,7 @@ OPTIONS= ASM "Assembly optimizations (devel/binutils)" On \ CONFIGURE_ARGS+= --extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/include" \ --extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib" \ - --enable-shared + --enable-static --enable-shared PLIST_SUB+= X264_BUILD=${X264_BUILD} diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo index d3ff5a17b77d..08863bc0f58a 100644 --- a/multimedia/x264/distinfo +++ b/multimedia/x264/distinfo @@ -1,4 +1,4 @@ -SHA256 (x264/x264-snapshot-20101211-2245.tar.bz2) = 29b65bd39bde86464c5370682e4beb53d03288fe34304ea14bb345b554ccd120 -SIZE (x264/x264-snapshot-20101211-2245.tar.bz2) = 473355 +SHA256 (x264/x264-snapshot-20110622-2245-stable.tar.bz2) = e46e63e53dbad17eafae6b3ee22c0037790e574478188828db2eaafddb5c7361 +SIZE (x264/x264-snapshot-20110622-2245-stable.tar.bz2) = 504067 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7 SIZE (x264/example.y4m.bz2) = 4910029 diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure deleted file mode 100644 index 944aaf295a2e..000000000000 --- a/multimedia/x264/files/patch-configure +++ /dev/null @@ -1,25 +0,0 @@ ---- configure.orig 2010-11-28 22:45:04.000000000 +0100 -+++ configure 2010-11-29 22:51:09.651506774 +0100 -@@ -350,12 +350,16 @@ - ARCH="X86" - AS="yasm" - ASFLAGS="$ASFLAGS -O2" -- if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then -- CFLAGS="$CFLAGS -march=i686" -- fi -- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then -- CFLAGS="$CFLAGS -mfpmath=sse -msse" -- fi -+ 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" - elif [ "$SYS" = MINGW ]; then |