10 files changed, 134 insertions, 60 deletions

diff --git a/multimedia/x264-devel/Makefile b/multimedia/x264-devel/Makefile
index 3c37834cc6d6..71a3351d7fe3 100644
--- a/multimedia/x264-devel/Makefile
+++ b/multimedia/x264-devel/Makefile
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	x264
-PORTVERSION=	0.0.20041029
-PORTREVISION=	1
+PORTVERSION=	0.0.20050125
 CATEGORIES=	multimedia
-MASTER_SITES=	http://download.videolan.org/pub/videolan/contrib/ \
-		http://ftp.snt.utwente.nl/pub/software/videolan/contrib/
+MASTER_SITES=	${MASTER_SITE_LOCAL:S|$|ahze/|}
+#		http://download.videolan.org/pub/videolan/contrib/ \
+#		http://ftp.snt.utwente.nl/pub/software/videolan/contrib/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/0.0.//}
 
 MAINTAINER=	ahze@FreeBSD.org
-COMMENT=	Multimedia library for encoding H.264/AVC video streams
+COMMENT=	Multimedia library and tool for encoding H.264/AVC video streams
 
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
-
-ONLY_FOR_ARCHS=	i386
+BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
 USE_GETOPT_LONG=yes
 USE_BZIP2=	yes
@@ -53,8 +51,8 @@ CFLAGS+=-DHAVE_MMXEXT
 CFLAGS+=-DHAVE_SSE2
 .endif
 
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g -DDEBUG
+.if !defined(WITH_DEBUG)
+MAKE_ENV+=	NDEBUG="1"
 .endif
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
@@ -62,7 +60,7 @@ CFLAGS+=	-O2 -funroll-loops
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS} ${CPPFLAGS}|; \
+	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CPPFLAGS} ${CFLAGS}|; \
 		s|%%SHLIB_VER%%|${SHLIB_VER}|; \
 		s|-lm|${LDFLAGS} -lm|' ${WRKSRC}/${MAKEFILE}
 
diff --git a/multimedia/x264-devel/distinfo b/multimedia/x264-devel/distinfo
index 00bacf3bd281..ab337c6cb244 100644
--- a/multimedia/x264-devel/distinfo
+++ b/multimedia/x264-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (x264-20041029.tar.bz2) = 42a34fc79ba7d615db5a990110ce8e51
-SIZE (x264-20041029.tar.bz2) = 230695
+MD5 (x264-20050125.tar.bz2) = 8e43454d1062f84703b3193b1bce8769
+SIZE (x264-20050125.tar.bz2) = 160325
diff --git a/multimedia/x264-devel/files/patch-Makefile b/multimedia/x264-devel/files/patch-Makefile
index 7bd3c4d0f36a..1b48e572bf63 100644
--- a/multimedia/x264-devel/files/patch-Makefile
+++ b/multimedia/x264-devel/files/patch-Makefile
@@ -1,20 +1,20 @@
---- Makefile.orig	Fri Oct 29 06:05:39 2004
-+++ Makefile	Thu Jan 20 01:42:05 2005
-@@ -20,10 +20,11 @@
- SRCS= $(SRCS_COMMON) core/i386/mc-c.c core/i386/dct-c.c core/i386/predict.c
- ASMSRC= core/i386/dct.asm core/i386/cpu.asm core/i386/pixel.asm  core/i386/mc.asm
+--- Makefile.orig	Tue Jan 25 16:36:54 2005
++++ Makefile	Tue Jan 25 20:52:45 2005
+@@ -22,8 +22,11 @@
  OBJASM= $(ASMSRC:%.asm=%.o)
-+SHARED_LIB=	libx264.so
-+SHARED_LIB_VER=	$(SHARED_LIB).%%SHLIB_VER%%
  endif
  
 -CC=gcc
--CFLAGS=-g -Wall -I. -DDEBUG -O4 -funroll-loops -D__X264__ $(PFLAGS)
+-CFLAGS=-Wall -I. -O4 -funroll-loops -D__X264__ $(PFLAGS)
++SHARED_LIB=		libx264.so
++SHARED_LIB_VER=		$(SHARED_LIB).%%SHLIB_VER%%
++  
 +CFLAGS=-I. -D__X264__ %%CFLAGS%% -fPIC
- 
- AS= nasm
- # for linux
-@@ -34,7 +35,7 @@
++
+ ifdef NDEBUG
+ CFLAGS+=-s -DNDEBUG
+ else
+@@ -39,14 +42,17 @@
  OBJS = $(SRCS:%.c=%.o)
  DEP  = depend
  
@@ -23,13 +23,24 @@
  
  libx264.a: $(OBJS) $(OBJASM)
  	ar rc libx264.a $(OBJS) $(OBJASM)
-@@ -42,6 +43,9 @@
+ 	ranlib libx264.a
  
- x264: libx264.a x264.o
- 	$(CC) $(CFLAGS) -o x264 x264.o libx264.a -lm
+-x264: libx264.a x264.o
+-	$(CC) $(CFLAGS) -o x264 x264.o libx264.a -lm
++x264: $(SHARED_LIB_VER) x264.o
++	$(CC) $(CFLAGS) -o x264 x264.o $(SHARED_LIB_VER) -lm
 +
-+$(SHARED_LIB_VER): $(OBJS) x264
++$(SHARED_LIB_VER): $(OBJS) libx264.a
 +	$(CC) $(CFLAGS) -shared -Wl,-soname,$(SHARED_LIB_VER) -o $(SHARED_LIB_VER) $(OBJS) $(OBJASM) -lm
  
  checkasm: testing/checkasm.c libx264.a
  	$(CC) $(CFLAGS) -o checkasm $< libx264.a -lm
+@@ -56,7 +62,7 @@
+ 
+ .depend: $(SRCS) x264.c
+ 	rm -f .depend
+-	$(foreach SRC, $(SRCS) x264.c, $(CC) $(CFLAGS) $(SRC) -MM -MT $(SRC:%.c=%.o) 1>> .depend;)
++	 $(CC) -MM $(CFLAGS) $(SRCS) x264.c 1> .depend
+ 
+ depend: .depend
+ ifneq ($(wildcard .depend),)
diff --git a/multimedia/x264-devel/files/patch-encoder_encoder.c b/multimedia/x264-devel/files/patch-encoder_encoder.c
new file mode 100644
index 000000000000..5395a239f56b
--- /dev/null
+++ b/multimedia/x264-devel/files/patch-encoder_encoder.c
@@ -0,0 +1,27 @@
+--- encoder/encoder.c.orig	Tue Jan 25 21:28:32 2005
++++ encoder/encoder.c	Tue Jan 25 21:30:21 2005
+@@ -1113,12 +1113,14 @@
+     if( i_slice_type == SLICE_TYPE_P && !h->param.rc.b_stat_read 
+         && h->param.i_scenecut_threshold >= 0 )
+     {
++        int i_gop_size;
+         int i_mb_i = h->stat.frame.i_mb_count[I_4x4] + h->stat.frame.i_mb_count[I_16x16];
+         int i_mb_p = h->stat.frame.i_mb_count[P_L0] + h->stat.frame.i_mb_count[P_8x8];
+         int i_mb_s = h->stat.frame.i_mb_count[P_SKIP];
+         int i_mb   = h->sps->i_mb_width * h->sps->i_mb_height;
+         int64_t i_inter_cost = h->stat.frame.i_inter_cost;
+         int64_t i_intra_cost = h->stat.frame.i_intra_cost;
++        float f_bias;
+ 
+         float f_thresh_max = h->param.i_scenecut_threshold / 100.0;
+         /* ratio of 10 pulled out of thin air */
+@@ -1126,8 +1128,7 @@
+                              / ( h->param.i_keyint_max * 4 );
+         if( h->param.i_keyint_min == h->param.i_keyint_max )
+              f_thresh_min= f_thresh_max;
+-        float f_bias;
+-        int i_gop_size = h->fenc->i_frame - h->frames.i_last_idr;
++	i_gop_size = h->fenc->i_frame - h->frames.i_last_idr;
+ 
+         /* macroblock_analyse() doesn't further analyse skipped mbs,
+          * so we have to guess their cost */
diff --git a/multimedia/x264-devel/pkg-descr b/multimedia/x264-devel/pkg-descr
index 3e1bf1a0a3e2..561027d85d3e 100644
--- a/multimedia/x264-devel/pkg-descr
+++ b/multimedia/x264-devel/pkg-descr
@@ -1,4 +1,5 @@
-x264 is a free library for encoding H.264/AVC video streams.
+x264 is a free library for encoding H.264/AVC (aka MPEG-4 Part 10)
+video streams.
 
 Encoder features
  * CAVLC/CABAC
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index 3c37834cc6d6..71a3351d7fe3 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -6,19 +6,17 @@
 #
 
 PORTNAME=	x264
-PORTVERSION=	0.0.20041029
-PORTREVISION=	1
+PORTVERSION=	0.0.20050125
 CATEGORIES=	multimedia
-MASTER_SITES=	http://download.videolan.org/pub/videolan/contrib/ \
-		http://ftp.snt.utwente.nl/pub/software/videolan/contrib/
+MASTER_SITES=	${MASTER_SITE_LOCAL:S|$|ahze/|}
+#		http://download.videolan.org/pub/videolan/contrib/ \
+#		http://ftp.snt.utwente.nl/pub/software/videolan/contrib/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/0.0.//}
 
 MAINTAINER=	ahze@FreeBSD.org
-COMMENT=	Multimedia library for encoding H.264/AVC video streams
+COMMENT=	Multimedia library and tool for encoding H.264/AVC video streams
 
-BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
-
-ONLY_FOR_ARCHS=	i386
+BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 
 USE_GETOPT_LONG=yes
 USE_BZIP2=	yes
@@ -53,8 +51,8 @@ CFLAGS+=-DHAVE_MMXEXT
 CFLAGS+=-DHAVE_SSE2
 .endif
 
-.if defined(WITH_DEBUG)
-CFLAGS+=	-g -DDEBUG
+.if !defined(WITH_DEBUG)
+MAKE_ENV+=	NDEBUG="1"
 .endif
 
 .if defined(WITH_OPTIMIZED_CFLAGS)
@@ -62,7 +60,7 @@ CFLAGS+=	-O2 -funroll-loops
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS} ${CPPFLAGS}|; \
+	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CPPFLAGS} ${CFLAGS}|; \
 		s|%%SHLIB_VER%%|${SHLIB_VER}|; \
 		s|-lm|${LDFLAGS} -lm|' ${WRKSRC}/${MAKEFILE}
 
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index 00bacf3bd281..ab337c6cb244 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,2 +1,2 @@
-MD5 (x264-20041029.tar.bz2) = 42a34fc79ba7d615db5a990110ce8e51
-SIZE (x264-20041029.tar.bz2) = 230695
+MD5 (x264-20050125.tar.bz2) = 8e43454d1062f84703b3193b1bce8769
+SIZE (x264-20050125.tar.bz2) = 160325
diff --git a/multimedia/x264/files/patch-Makefile b/multimedia/x264/files/patch-Makefile
index 7bd3c4d0f36a..1b48e572bf63 100644
--- a/multimedia/x264/files/patch-Makefile
+++ b/multimedia/x264/files/patch-Makefile
@@ -1,20 +1,20 @@
---- Makefile.orig	Fri Oct 29 06:05:39 2004
-+++ Makefile	Thu Jan 20 01:42:05 2005
-@@ -20,10 +20,11 @@
- SRCS= $(SRCS_COMMON) core/i386/mc-c.c core/i386/dct-c.c core/i386/predict.c
- ASMSRC= core/i386/dct.asm core/i386/cpu.asm core/i386/pixel.asm  core/i386/mc.asm
+--- Makefile.orig	Tue Jan 25 16:36:54 2005
++++ Makefile	Tue Jan 25 20:52:45 2005
+@@ -22,8 +22,11 @@
  OBJASM= $(ASMSRC:%.asm=%.o)
-+SHARED_LIB=	libx264.so
-+SHARED_LIB_VER=	$(SHARED_LIB).%%SHLIB_VER%%
  endif
  
 -CC=gcc
--CFLAGS=-g -Wall -I. -DDEBUG -O4 -funroll-loops -D__X264__ $(PFLAGS)
+-CFLAGS=-Wall -I. -O4 -funroll-loops -D__X264__ $(PFLAGS)
++SHARED_LIB=		libx264.so
++SHARED_LIB_VER=		$(SHARED_LIB).%%SHLIB_VER%%
++  
 +CFLAGS=-I. -D__X264__ %%CFLAGS%% -fPIC
- 
- AS= nasm
- # for linux
-@@ -34,7 +35,7 @@
++
+ ifdef NDEBUG
+ CFLAGS+=-s -DNDEBUG
+ else
+@@ -39,14 +42,17 @@
  OBJS = $(SRCS:%.c=%.o)
  DEP  = depend
  
@@ -23,13 +23,24 @@
  
  libx264.a: $(OBJS) $(OBJASM)
  	ar rc libx264.a $(OBJS) $(OBJASM)
-@@ -42,6 +43,9 @@
+ 	ranlib libx264.a
  
- x264: libx264.a x264.o
- 	$(CC) $(CFLAGS) -o x264 x264.o libx264.a -lm
+-x264: libx264.a x264.o
+-	$(CC) $(CFLAGS) -o x264 x264.o libx264.a -lm
++x264: $(SHARED_LIB_VER) x264.o
++	$(CC) $(CFLAGS) -o x264 x264.o $(SHARED_LIB_VER) -lm
 +
-+$(SHARED_LIB_VER): $(OBJS) x264
++$(SHARED_LIB_VER): $(OBJS) libx264.a
 +	$(CC) $(CFLAGS) -shared -Wl,-soname,$(SHARED_LIB_VER) -o $(SHARED_LIB_VER) $(OBJS) $(OBJASM) -lm
  
  checkasm: testing/checkasm.c libx264.a
  	$(CC) $(CFLAGS) -o checkasm $< libx264.a -lm
+@@ -56,7 +62,7 @@
+ 
+ .depend: $(SRCS) x264.c
+ 	rm -f .depend
+-	$(foreach SRC, $(SRCS) x264.c, $(CC) $(CFLAGS) $(SRC) -MM -MT $(SRC:%.c=%.o) 1>> .depend;)
++	 $(CC) -MM $(CFLAGS) $(SRCS) x264.c 1> .depend
+ 
+ depend: .depend
+ ifneq ($(wildcard .depend),)
diff --git a/multimedia/x264/files/patch-encoder_encoder.c b/multimedia/x264/files/patch-encoder_encoder.c
new file mode 100644
index 000000000000..5395a239f56b
--- /dev/null
+++ b/multimedia/x264/files/patch-encoder_encoder.c
@@ -0,0 +1,27 @@
+--- encoder/encoder.c.orig	Tue Jan 25 21:28:32 2005
++++ encoder/encoder.c	Tue Jan 25 21:30:21 2005
+@@ -1113,12 +1113,14 @@
+     if( i_slice_type == SLICE_TYPE_P && !h->param.rc.b_stat_read 
+         && h->param.i_scenecut_threshold >= 0 )
+     {
++        int i_gop_size;
+         int i_mb_i = h->stat.frame.i_mb_count[I_4x4] + h->stat.frame.i_mb_count[I_16x16];
+         int i_mb_p = h->stat.frame.i_mb_count[P_L0] + h->stat.frame.i_mb_count[P_8x8];
+         int i_mb_s = h->stat.frame.i_mb_count[P_SKIP];
+         int i_mb   = h->sps->i_mb_width * h->sps->i_mb_height;
+         int64_t i_inter_cost = h->stat.frame.i_inter_cost;
+         int64_t i_intra_cost = h->stat.frame.i_intra_cost;
++        float f_bias;
+ 
+         float f_thresh_max = h->param.i_scenecut_threshold / 100.0;
+         /* ratio of 10 pulled out of thin air */
+@@ -1126,8 +1128,7 @@
+                              / ( h->param.i_keyint_max * 4 );
+         if( h->param.i_keyint_min == h->param.i_keyint_max )
+              f_thresh_min= f_thresh_max;
+-        float f_bias;
+-        int i_gop_size = h->fenc->i_frame - h->frames.i_last_idr;
++	i_gop_size = h->fenc->i_frame - h->frames.i_last_idr;
+ 
+         /* macroblock_analyse() doesn't further analyse skipped mbs,
+          * so we have to guess their cost */
diff --git a/multimedia/x264/pkg-descr b/multimedia/x264/pkg-descr
index 3e1bf1a0a3e2..561027d85d3e 100644
--- a/multimedia/x264/pkg-descr
+++ b/multimedia/x264/pkg-descr
@@ -1,4 +1,5 @@
-x264 is a free library for encoding H.264/AVC video streams.
+x264 is a free library for encoding H.264/AVC (aka MPEG-4 Part 10)
+video streams.
 
 Encoder features
  * CAVLC/CABAC