- Update to snapshot 20100420 (library version 93)

4 files changed, 24 insertions, 12 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index ba42d4687f0c..1fffbaeb924c 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -6,7 +6,7 @@
 #      $Id: Makefile 30 2006-10-30 22:15:26Z buhnux $
 
 PORTNAME=	x264
-PORTVERSION=	0.0.20100222
+PORTVERSION=	0.0.20100420
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.videolan.org/pub/videolan/x264/snapshots/ \
 		http://samples.mplayerhq.hu/yuv4mpeg2/:pgo
@@ -18,7 +18,7 @@ EXTRACT_ONLY=	${PORTNAME}-snapshot-${PORTVERSION:S/0.0.//}-2245${EXTRACT_SUFX}
 MAINTAINER=	mm@FreeBSD.org
 COMMENT?=	Library and tool for encoding H.264/AVC video streams
 
-CONFLICTS=	x264-0.0.2009*
+CONFLICTS=	x264-0.0.2009* x264-0.0.20100[1-2]*
 
 BUILD_DEPENDS=	yasm>=0.6.0:${PORTSDIR}/devel/yasm \
 		as:${PORTSDIR}/devel/binutils
@@ -26,7 +26,6 @@ BUILD_DEPENDS=	yasm>=0.6.0:${PORTSDIR}/devel/yasm \
 USE_BZIP2=	yes
 EXTRACT_AFTER_ARGS?=	| ${TAR} -xf - --exclude .svn
 WRKSRC=		${WRKDIR}/${DISTNAME}
-USE_GCC?=	4.4+
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 HAS_CONFIGURE=	yes
@@ -34,6 +33,7 @@ MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	DEBUG "Enable Debugging" Off \
 		PGO "Enable Profile-Guided Optimization" Off \
+		GCC44 "Use gcc 4.4+" Off \
 		GPAC "Enable MPEG-4 Output" On \
 		X11_OUTPUT "Enable X11 Output" Off
 
@@ -41,8 +41,15 @@ CONFIGURE_ARGS+=	--extra-cflags="${CPPFLAGS} ${CFLAGS} -fPIC -I${LOCALBASE}/incl
 			--extra-ldflags="${LDFLAGS} -L${LOCALBASE}/lib -L${LOCALBASE}/lib" \
 			--enable-shared
 
+CONFIGURE_ENV+=		COMPILER_PATH=${LOCALBASE}/bin
+MAKE_ENV+=		COMPILER_PATH=${LOCALBASE}/bin
+
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_GCC44)
+USE_GCC?=	4.4+
+.endif
+
 # Around the time GCC stack protection (aka Propolice) for userland
 # was enabled on src/share/mk/bsd.sys.mk
 # SVN rev 180012 on 2008-06-25 21:33:28Z by ru
@@ -103,6 +110,11 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${PREFIX}/libdata/pkgconfig|; \
 		s|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/Makefile
+.if !defined(WITH_GCC44)
+	@${REINPLACE_CMD} -e 's|$$(CC) -shared -o|COMPILER_PATH= $$(CC) -shared -o|g' \
+		-e 's|$$(CC) -o|COMPILER_PATH= $$(CC) -o|g' \
+		${WRKSRC}/Makefile
+.endif
 
 .if ${SLAVE_PORT:L}=="no"
 .if 0 # BROKEN
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 5f2428bd15e8..2b18df704ba4 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (x264/x264-snapshot-20100222-2245.tar.bz2) = a68827d2e47920ee3ae655f8b8c51013
-SHA256 (x264/x264-snapshot-20100222-2245.tar.bz2) = 6f197d825315f077fabaf6340c324462cdceaf0417500dadea3511b1ad26ac2f
-SIZE (x264/x264-snapshot-20100222-2245.tar.bz2) = 400392
+MD5 (x264/x264-snapshot-20100420-2245.tar.bz2) = ea874a8ce8b359f148e5e5a59de2a8de
+SHA256 (x264/x264-snapshot-20100420-2245.tar.bz2) = 0abd59e3079c43f6be45b11b0cb4b016731d8b2813db95116a4ee665fd3e8af0
+SIZE (x264/x264-snapshot-20100420-2245.tar.bz2) = 415956
 MD5 (x264/example.y4m.bz2) = e0948016cd4a52e75d6a74d998bd6ae6
 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
 SIZE (x264/example.y4m.bz2) = 4910029
diff --git a/multimedia/x264-devel/files/patch-Makefile b/multimedia/x264-devel/files/patch-Makefile
index 5c743b2b520e..83826677b943 100644
--- a/multimedia/x264-devel/files/patch-Makefile
+++ b/multimedia/x264-devel/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2010-02-22 22:45:05.000000000 +0100
-+++ Makefile	2010-04-18 10:43:06.325179277 +0200
-@@ -53,12 +53,12 @@
+--- Makefile.orig	2010-04-20 22:45:09.000000000 +0200
++++ Makefile	2010-04-21 14:07:39.258797099 +0200
+@@ -54,12 +54,12 @@
            cpu-a.asm dct-32.asm
  X86SRC = $(X86SRC0:%=common/x86/%)
  
@@ -15,12 +15,12 @@
  ARCH_X86 = yes
  ASMSRC   = $(X86SRC:-32.asm=-64.asm)
  ASFLAGS += -DARCH_X86_64
-@@ -74,7 +74,7 @@
+@@ -75,7 +75,7 @@
  endif
  
  # AltiVec optims
 -ifeq ($(ARCH),PPC)
 +ifeq ($(ARCH),powerpc)
+ ifneq ($(AS),)
  SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \
          common/ppc/quant.c common/ppc/deblock.c \
-         common/ppc/predict.c
diff --git a/multimedia/x264-devel/pkg-plist b/multimedia/x264-devel/pkg-plist
index 0a24c478cdf9..c6f117700746 100644
--- a/multimedia/x264-devel/pkg-plist
+++ b/multimedia/x264-devel/pkg-plist
@@ -2,5 +2,5 @@ bin/x264
 include/x264.h
 lib/libx264.a
 lib/libx264.so
-lib/libx264.so.85
+lib/libx264.so.93
 libdata/pkgconfig/x264.pc