From nobody@FreeBSD.org  Tue Nov 30 19:20:53 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2EE44106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Nov 2010 19:20:53 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (unknown [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 1CA8A8FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Nov 2010 19:20:53 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id oAUJKqHR013707
	for <freebsd-gnats-submit@FreeBSD.org>; Tue, 30 Nov 2010 19:20:52 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id oAUJKq6M013706;
	Tue, 30 Nov 2010 19:20:52 GMT
	(envelope-from nobody)
Message-Id: <201011301920.oAUJKq6M013706@red.freebsd.org>
Date: Tue, 30 Nov 2010 19:20:52 GMT
From: Thomas Zander <thomas.e.zander@googlemail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [maintainer-update] multimedia/mplayer and mencoder to recent snapshots
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: riggs@rrr.de

>Number:         152714
>Category:       ports
>Synopsis:       [maintainer-update] multimedia/mplayer and mencoder to recent snapshots
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 30 19:30:11 UTC 2010
>Closed-Date:    Thu Dec 02 09:19:01 UTC 2010
>Last-Modified:  Thu Dec  2 09:20:17 UTC 2010
>Originator:     Thomas Zander
>Release:        
>Organization:
>Environment:
>Description:
The attached patch updates the mplayer and mencoder ports to a current snapshot.

Thanks to all my trusty testers!
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN /usr/ports/multimedia/mplayer/Makefile mplayer/Makefile
--- /usr/ports/multimedia/mplayer/Makefile	2010-10-29 15:22:54.000000000 +0200
+++ mplayer/Makefile	2010-11-11 19:26:09.582416315 +0100
@@ -7,7 +7,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	3
+PORTREVISION=	0
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/Makefile.shared"
@@ -84,6 +84,7 @@
 			--disable-xvid \
 			--disable-libdirac-lavc \
 			--disable-mencoder \
+			--disable-mpg123 \
 			--disable-musepack
 
 .include "${.CURDIR}/Makefile.options"
@@ -236,10 +237,13 @@
 		'/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
-	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
+	@${REINPLACE_CMD} \
+		-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
 		s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's!/usr/local!${PREFIX}!' \
+		-e 's|/usr/local|${LOCALBASE}|' \
+		-e 's|-lbz2|/usr/lib/libbz2.so|' \
+		-e 's|-L$$_prefix/lib|-L${LOCALBASE}/lib|' \
+		-e 's|-I$$_prefix/include|-I${LOCALBASE}/include|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \
@@ -253,7 +257,6 @@
 		's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
 		 s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
-	@cd ${WRKSRC}/libavcodec && ${LN} -s x86 i386 && ${LN} -s x86 amd64
 .if defined(WITH_RTC)
 	@${REINPLACE_CMD} -e \
 		's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
@@ -263,6 +266,11 @@
 post-configure:
 	@${REINPLACE_CMD} -e 's#-pthread#${PTHREAD_LIBS}#g' \
 		${WRKSRC}/config.mak
+	@${REINPLACE_CMD} \
+		-e 's#HAVE_FAST_CMOV 1#HAVE_FAST_CMOV 0#g' \
+		-e 's#HAVE_LOG2 1#HAVE_LOG2 0#g' \
+		-e 's#HAVE_LOG2F 1#HAVE_LOG2F 0#g' \
+		${WRKSRC}/config.h
 
 post-install:
 	@${MKDIR} ${DATADIR}
diff -ruN /usr/ports/multimedia/mplayer/Makefile.options mplayer/Makefile.options
--- /usr/ports/multimedia/mplayer/Makefile.options	2010-10-13 00:45:08.000000000 +0200
+++ mplayer/Makefile.options	2010-11-17 19:50:39.791582552 +0100
@@ -103,7 +103,7 @@
 .endif
 
 .if defined(WITH_LIVEMEDIA)
-RUN_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
+#RUN_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
 BUILD_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
 .else
 CONFIGURE_ARGS+=	--disable-live
@@ -122,8 +122,6 @@
 .endif
 
 .if defined(WITH_OPENAL)
-#TODO: test this
-#LIB_DEPENDS+=	openal.1:${PORTSDIR}/audio/openal-soft
 USE_OPENAL=	soft
 .else
 CONFIGURE_ARGS+=	--disable-openal
diff -ruN /usr/ports/multimedia/mplayer/Makefile.shared mplayer/Makefile.shared
--- /usr/ports/multimedia/mplayer/Makefile.shared	2010-09-02 21:56:12.000000000 +0200
+++ mplayer/Makefile.shared	2010-11-06 17:51:29.025178666 +0100
@@ -2,7 +2,7 @@
 # mplayer and mencoder....the variables that we need to set
 # before we include bsd.port.pre.mk
 
-MPLAYER_SNAPSHOT_DATE=	2010-07-17
+MPLAYER_SNAPSHOT_DATE=	2010-11-06
 MPLAYER_PORT_VERSION=	1.0.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
 CATEGORIES?=	multimedia audio
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
diff -ruN /usr/ports/multimedia/mplayer/distinfo mplayer/distinfo
--- /usr/ports/multimedia/mplayer/distinfo	2010-08-03 14:37:28.000000000 +0200
+++ mplayer/distinfo	2010-11-06 17:52:10.245259963 +0100
@@ -1,3 +1,2 @@
-MD5 (mplayer-1.0rc20100717.tar.bz2) = 3e650938b3729292d1fbee7d72524670
-SHA256 (mplayer-1.0rc20100717.tar.bz2) = 829f149fa74655f84824b4511d69fd93c575e24bc11c429e66ee742642881f0b
-SIZE (mplayer-1.0rc20100717.tar.bz2) = 8988030
+SHA256 (mplayer-1.0rc20101106.tar.bz2) = 00ea68f869435b1a5e363d87cf35fd6711f703aaa05a93f9e4d03a52f3ec8751
+SIZE (mplayer-1.0rc20101106.tar.bz2) = 10014975
diff -ruN /usr/ports/multimedia/mplayer/files/patch-configure mplayer/files/patch-configure
--- /usr/ports/multimedia/mplayer/files/patch-configure	2010-10-08 15:10:42.000000000 +0200
+++ mplayer/files/patch-configure	2010-11-06 18:22:32.295372360 +0100
@@ -1,6 +1,6 @@
---- configure.orig	2010-07-14 15:49:08.000000000 +0200
-+++ configure	2010-07-17 12:50:00.937109688 +0200
-@@ -555,7 +555,7 @@
+--- configure.orig	2010-11-03 09:12:22.000000000 +0100
++++ configure	2010-11-06 18:21:38.162592186 +0100
+@@ -565,7 +565,7 @@
  _iwmmxt=auto
  _mtrr=auto
  _altivec=auto
@@ -9,7 +9,7 @@
  _ranlib=ranlib
  _windres=windres
  _cc=cc
-@@ -1385,7 +1385,6 @@
+@@ -1371,7 +1371,6 @@
  
    *)
      echo "Unknown parameter: $ac_option"
@@ -17,7 +17,7 @@
      ;;
  
    esac
-@@ -1494,8 +1493,8 @@
+@@ -1480,8 +1479,8 @@
  _timer=timer-linux.c
  _getch=getch2.c
  if freebsd ; then
@@ -28,7 +28,7 @@
  fi
  
  if netbsd || dragonfly ; then
-@@ -3618,22 +3617,10 @@
+@@ -3535,22 +3534,10 @@
  if linux ; then
    THREAD_CFLAGS=-D_REENTRANT
  elif freebsd || netbsd || openbsd || bsdos ; then
@@ -37,7 +37,7 @@
 -if test "$_pthreads" = auto ; then
 -cat > $TMPC << EOF
 -#include <pthread.h>
--void* func(void *arg) { return arg; }
+-static void *func(void *arg) { return arg; }
 -int main(void) { pthread_t tid; return pthread_create(&tid, 0, func, 0) == 0 ? 0 : 1; }
 -EOF
 -_pthreads=no
@@ -54,54 +54,39 @@
  if test "$_pthreads" = yes ; then
    test $_ld_pthread && res_comment="using $_ld_pthread"
    def_pthreads='#define HAVE_PTHREADS 1'
-@@ -3746,8 +3733,13 @@
- 
- 
- echocheck "sys/dvdio.h"
-+cat > $TMPC << EOF
-+#include <unistd.h>
-+#include <sys/dvdio.h>
-+int main(void) { return 0; }
-+EOF
- _dvdio=no
--header_check sys/dvdio.h && _dvdio=yes
-+cc_check && _dvdio=yes
- if test "$_dvdio" = yes ; then
-   def_dvdio='#define DVD_STRUCT_IN_SYS_DVDIO_H 1'
- else
-@@ -7800,7 +7792,7 @@
+@@ -3828,7 +3815,7 @@
+ #define _ISOC99_SOURCE
+ #include <stdarg.h>
+ #include <stdio.h>
+-int main(void) { va_list ap = NULL; vsscanf("foo", "bar", ap); return 0; }
++int main(void) { va_list ap; vsscanf("foo", "bar", ap); return 0; }
+ EOF
+ _vsscanf=no
+ cc_check && _vsscanf=yes
+@@ -7283,7 +7270,7 @@
+   def_muxers='#define CONFIG_MUXERS 1'
  else
    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
-   # png for vf_screenshot, mjpeg for zr
--  libavencoders="MPEG1VIDEO_ENCODER SNOW_ENCODER"
-+  libavencoders="MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
-   test "$_zlib" = yes && libavencoders="$libavencoders PNG_ENCODER"
-   test "$_zr" = yes && libavencoders="$libavencoders MJPEG_ENCODER"
+-  libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER"
++  libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
    libavmuxers=""
-@@ -8161,8 +8153,11 @@
+   def_muxers='#define CONFIG_MUXERS 0'
+ fi
+@@ -7645,8 +7632,11 @@
  if test "$_gui" = yes ; then
  
    # Required libraries
--  if test "$_libavcodec" != yes ||
+-  if test "$ffmpeg" != yes ||
 -      ! echo $libavdecoders | grep -q PNG_DECODER ; then
 +  # Work around a sh bug in FreeBSD < 8
-+  if test "$_libavcodec" != yes ; then
++  if test "$ffmpeg" != yes ; then
 +    die "The GUI requires libavcodec with PNG support (needs zlib)."
 +  fi
 +  if ! echo $libavdecoders | grep -q PNG_DECODER ; then
      die "The GUI requires libavcodec with PNG support (needs zlib)."
    fi
    test "$_freetype" = no && test "$_bitmap_font" = no && \
-@@ -8352,7 +8347,7 @@
- echocheck "joystick"
- def_joystick='#undef CONFIG_JOYSTICK'
- if test "$_joystick" = yes ; then
--  if linux ; then
-+  if linux || freebsd ; then
-     # TODO add some check
-     def_joystick='#define CONFIG_JOYSTICK 1'
-   else
-@@ -8560,7 +8555,7 @@
+@@ -8034,7 +8024,7 @@
  EXESUF      = $_exesuf
  EXESUFS_ALL = .exe
  
diff -ruN /usr/ports/multimedia/mplayer/files/patch-libavcodec-Makefile mplayer/files/patch-libavcodec-Makefile
--- /usr/ports/multimedia/mplayer/files/patch-libavcodec-Makefile	2010-10-08 15:10:42.000000000 +0200
+++ mplayer/files/patch-libavcodec-Makefile	2010-11-04 21:23:24.723706832 +0100
@@ -1,8 +1,8 @@
---- libavcodec/Makefile.orig	2010-09-26 20:31:26.000000000 +0200
-+++ libavcodec/Makefile	2010-09-26 20:31:52.000000000 +0200
-@@ -608,7 +608,7 @@
- 
- OBJS-$(CONFIG_MLIB)                    += mlib/dsputil_mlib.o           \
+--- ffmpeg/libavcodec/Makefile.orig	2010-11-02 09:32:04.000000000 +0100
++++ ffmpeg/libavcodec/Makefile	2010-11-04 21:14:51.158501798 +0100
+@@ -623,7 +623,7 @@
+ # well.
+ OBJS-$(!CONFIG_SMALL)                  += inverse.o
  
 --include $(SUBDIR)$(ARCH)/Makefile
 +-include $(SUBDIR)$(MPLAYER_ARCH)/Makefile
diff -ruN /usr/ports/multimedia/mplayer/files/patch-libavcodec-vorbis_dec.c mplayer/files/patch-libavcodec-vorbis_dec.c
--- /usr/ports/multimedia/mplayer/files/patch-libavcodec-vorbis_dec.c	2010-10-29 15:22:54.000000000 +0200
+++ mplayer/files/patch-libavcodec-vorbis_dec.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,63 +0,0 @@
---- libavcodec/vorbis_dec.c.orig	2010-07-02 19:05:36.000000000 +0200
-+++ libavcodec/vorbis_dec.c	2010-09-16 17:32:17.754521304 +0200
-@@ -81,7 +81,7 @@
-         } t0;
-         struct vorbis_floor1_s {
-             uint_fast8_t partitions;
--            uint_fast8_t partition_class[32];
-+            uint8_t      partition_class[32];
-             uint_fast8_t class_dimensions[16];
-             uint_fast8_t class_subclasses[16];
-             uint_fast8_t class_masterbook[16];
-@@ -97,13 +97,13 @@
-     uint_fast16_t type;
-     uint_fast32_t begin;
-     uint_fast32_t end;
--    uint_fast32_t partition_size;
-+    unsigned      partition_size;
-     uint_fast8_t  classifications;
-     uint_fast8_t  classbook;
-     int_fast16_t  books[64][8];
-     uint_fast8_t  maxpass;
-     uint_fast16_t ptns_to_read;
--    uint_fast8_t *classifs;
-+    uint8_t *classifs;
- } vorbis_residue;
- 
- typedef struct {
-@@ -467,7 +467,7 @@
- static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
- {
-     GetBitContext *gb = &vc->gb;
--    uint_fast16_t i,j,k;
-+    int i,j,k;
- 
-     vc->floor_count = get_bits(gb, 6) + 1;
- 
-@@ -655,7 +655,7 @@
-         if (res_setup->begin>res_setup->end ||
-             res_setup->end > vc->avccontext->channels * vc->blocksize[1] / (res_setup->type == 2 ? 1 : 2) ||
-             (res_setup->end-res_setup->begin) / res_setup->partition_size > V_MAX_PARTITIONS) {
--            av_log(vc->avccontext, AV_LOG_ERROR, "partition out of bounds: type, begin, end, size, blocksize: %"PRIdFAST16", %"PRIdFAST32", %"PRIdFAST32", %"PRIdFAST32", %"PRIdFAST32"\n", res_setup->type, res_setup->begin, res_setup->end, res_setup->partition_size, vc->blocksize[1] / 2);
-+            av_log(vc->avccontext, AV_LOG_ERROR, "partition out of bounds: type, begin, end, size, blocksize: %"PRIdFAST16", %"PRIdFAST32", %"PRIdFAST32", %u, %"PRIdFAST32"\n", res_setup->type, res_setup->begin, res_setup->end, res_setup->partition_size, vc->blocksize[1] / 2);
-             return -1;
-         }
- 
-@@ -667,6 +667,8 @@
-         res_setup->classifs = av_malloc(res_setup->ptns_to_read *
-                                         vc->audio_channels *
-                                         sizeof(*res_setup->classifs));
-+        if (!res_setup->classifs)
-+            return AVERROR(ENOMEM);
- 
-         AV_DEBUG("    begin %d end %d part.size %d classif.s %d classbook %d \n", res_setup->begin, res_setup->end, res_setup->partition_size,
-           res_setup->classifications, res_setup->classbook);
-@@ -1267,7 +1269,7 @@
-     GetBitContext *gb = &vc->gb;
-     uint_fast8_t c_p_c = vc->codebooks[vr->classbook].dimensions;
-     uint_fast16_t ptns_to_read = vr->ptns_to_read;
--    uint_fast8_t *classifs = vr->classifs;
-+    uint8_t *classifs = vr->classifs;
-     uint_fast8_t pass;
-     uint_fast8_t ch_used;
-     uint_fast8_t i,j,l;
diff -ruN /usr/ports/multimedia/mplayer/files/patch-libavutil-x86_cpu.h mplayer/files/patch-libavutil-x86_cpu.h
--- /usr/ports/multimedia/mplayer/files/patch-libavutil-x86_cpu.h	2010-04-21 15:07:22.000000000 +0200
+++ mplayer/files/patch-libavutil-x86_cpu.h	2010-11-04 21:02:34.731404534 +0100
@@ -1,6 +1,6 @@
---- libavutil/x86_cpu.h~	2009-03-19 09:49:47.000000000 -0500
-+++ libavutil/x86_cpu.h	2009-07-24 14:20:58.308327513 -0500
-@@ -69,7 +69,7 @@
+--- ffmpeg/libavutil/x86_cpu.h.orig	2010-10-06 03:26:13.000000000 +0200
++++ ffmpeg/libavutil/x86_cpu.h	2010-11-04 21:01:40.581647958 +0100
+@@ -71,7 +71,7 @@
  #define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
  #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
  
diff -ruN /usr/ports/multimedia/mplayer/files/pkg-message.in mplayer/files/pkg-message.in
--- /usr/ports/multimedia/mplayer/files/pkg-message.in	2010-04-21 15:07:23.000000000 +0200
+++ mplayer/files/pkg-message.in	2010-11-17 19:59:49.142919028 +0100
@@ -6,7 +6,6 @@
 homepage in the documentation section:
 
 http://www.mplayerhq.hu/design7/info.html#docs
-
 ===================================================================
 MPlayer's system-wide configuration dir is
 
@@ -18,4 +17,10 @@
 
 %%DATADIR%%/examples/etc
 ===================================================================
+If seeking in streams causes the playback volume to be reset to
+the previous setting (on 8.x or newer system with VPC enabled),
+you and you dislike this behaviour, you have two options:
+- Use mplayer's -softvol command line option
+- Set the sysctl hw.snd.vpc_autoreset to 0
+===================================================================
 
diff -ruN /usr/ports/multimedia/mencoder/Makefile mencoder/Makefile
--- /usr/ports/multimedia/mencoder/Makefile	2010-10-05 07:57:28.000000000 +0200
+++ mencoder/Makefile	2010-11-30 19:45:55.994578745 +0100
@@ -6,7 +6,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	2
+PORTREVISION=	0
 COMMENT=	Convenient video file and movie encoder
 RESTRICTED=	Port has restricted dependencies
 
@@ -79,6 +79,7 @@
 			--disable-joystick \
 			--disable-directfb \
 			--disable-ssse3 \
+			--disable-mpg123 \
 			--disable-musepack
 
 ALL_TARGET=	mencoder
@@ -98,7 +99,7 @@
 .endif
 
 .if !defined(WITHOUT_X264)
-LIB_DEPENDS+=	x264.98:${PORTSDIR}/multimedia/x264
+LIB_DEPENDS+=	x264.110:${PORTSDIR}/multimedia/x264
 .else
 CONFIGURE_ARGS+=	--disable-x264
 .endif
@@ -130,10 +131,13 @@
 		'/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
-	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
+	@${REINPLACE_CMD} \
+		-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
 		s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
-		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's!/usr/local!${PREFIX}!' \
+		-e 's|/usr/local|${LOCALBASE}|' \
+		-e 's|-lbz2|/usr/lib/libbz2.so|' \
+		-e 's|-L$$_prefix/lib|-L${LOCALBASE}/lib|' \
+		-e 's|-I$$_prefix/include|-I${LOCALBASE}/include|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \
@@ -147,11 +151,15 @@
 		's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
 		 s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
-	@cd ${WRKSRC}/libavcodec && ${LN} -s x86 i386 && ${LN} -s x86 amd64
 
 post-configure:
 	@${REINPLACE_CMD} -e 's#-pthread#${PTHREAD_LIBS}#g' \
 		${WRKSRC}/config.mak
+	@${REINPLACE_CMD} \
+		-e 's#HAVE_FAST_CMOV 1#HAVE_FAST_CMOV 0#g' \
+		-e 's#HAVE_LOG2 1#HAVE_LOG2 0#g' \
+		-e 's#HAVE_LOG2F 1#HAVE_LOG2F 0#g' \
+		${WRKSRC}/config.h
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${PREFIX}/bin
diff -ruN /usr/ports/multimedia/mencoder/distinfo mencoder/distinfo
--- /usr/ports/multimedia/mencoder/distinfo	2010-08-03 14:37:28.000000000 +0200
+++ mencoder/distinfo	2010-11-06 17:52:24.328942600 +0100
@@ -1,3 +1,2 @@
-MD5 (mplayer-1.0rc20100717.tar.bz2) = 3e650938b3729292d1fbee7d72524670
-SHA256 (mplayer-1.0rc20100717.tar.bz2) = 829f149fa74655f84824b4511d69fd93c575e24bc11c429e66ee742642881f0b
-SIZE (mplayer-1.0rc20100717.tar.bz2) = 8988030
+SHA256 (mplayer-1.0rc20101106.tar.bz2) = 00ea68f869435b1a5e363d87cf35fd6711f703aaa05a93f9e4d03a52f3ec8751
+SIZE (mplayer-1.0rc20101106.tar.bz2) = 10014975


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: maintainer-update->change-request 
Class-Changed-By: edwin 
Class-Changed-When: Tue Nov 30 19:30:20 UTC 2010 
Class-Changed-Why:  
Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152714 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Nov 30 19:30:28 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152714 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: riggs@rrr.de
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/152714: [maintainer-update] multimedia/mplayer and mencoder to recent snapshots
Date: Tue, 30 Nov 2010 19:30:25 UT

 Maintainer of multimedia/mplayer,
 
 Please note that PR ports/152714 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/152714
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Thomas Zander <thomas.e.zander@googlemail.com>
To: edwin@freebsd.org
Cc:  
Subject: Re: ports/152714: [maintainer-update] multimedia/mplayer and
 mencoder to recent snapshots
Date: Tue, 30 Nov 2010 21:10:51 +0100

 On Tue, Nov 30, 2010 at 20:30,  <edwin@freebsd.org> wrote:
 > Synopsis: [maintainer-update] multimedia/mplayer and mencoder to recent snapshots
 
 Approved :-)
 
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: beech 
Responsible-Changed-When: Tue Nov 30 22:32:30 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152714 
State-Changed-From-To: feedback->open 
State-Changed-By: beech 
State-Changed-When: Tue Nov 30 23:29:18 UTC 2010 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152714 

From: Beech Rintoul <beech@akherb.com>
To: bug-followup@freebsd.org,
 beech@freebsd.org
Cc:  
Subject: ports/152714: [maintainer-update] multimedia/mplayer and mencoder to recent snapshots
Date: Tue, 30 Nov 2010 15:16:08 -0900

 I'm getting a config error, missing depend:
 
 Checking for yasm ... 
 Error: yasm not found, use --yasm='' if you really want to compile without
 
 Full log:
 
 http://stargate.akherb.com/tb/errors/9.0-FreeBSD/mplayer-1.0.r20101106.log
 
 Beech
 -- 
 ---------------------------------------------------------------------------------------
 Beech Rintoul - FreeBSD Developer - beech@FreeBSD.org
 /"\   ASCII Ribbon Campaign  | FreeBSD Since 4.x
 \ / - NO HTML/RTF in e-mail  | http://people.freebsd.org/~beech
  X  - NO Word docs in e-mail | Skype: akbeech
 / \ - http://www.FreeBSD.org/releases/8.0R/announce.html
 ---------------------------------------------------------------------------------------
 
 
 
State-Changed-From-To: open->feedback 
State-Changed-By: beech 
State-Changed-When: Wed Dec 1 00:43:36 UTC 2010 
State-Changed-Why:  
Both ports have depend errors. 
Back to maintainer for fix. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152714 

From: Thomas Zander <thomas.e.zander@googlemail.com>
To: FreeBSD-gnats-submit@freebsd.org, freebsd-ports-bugs@freebsd.org
Cc:  
Subject: Re: ports/152714: [maintainer-update] multimedia/mplayer and mencoder
 to recent snapshots
Date: Wed, 1 Dec 2010 08:01:05 +0100

 --0016363b870e78d477049653def0
 Content-Type: text/plain; charset=ISO-8859-1
 
 Try the attached diff instead. Fixes the yasm build dependency, thanks
 to beech@...
 
 Riggs
 
 --0016363b870e78d477049653def0
 Content-Type: text/plain; charset=US-ASCII; name="mdiff.txt"
 Content-Disposition: attachment; filename="mdiff.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_gh5vbfrb0
 
 ZGlmZiAtcnVOIC91c3IvcG9ydHMvbXVsdGltZWRpYS9tcGxheWVyL01ha2VmaWxlIG1wbGF5ZXIv
 TWFrZWZpbGUKLS0tIC91c3IvcG9ydHMvbXVsdGltZWRpYS9tcGxheWVyL01ha2VmaWxlCTIwMTAt
 MTAtMjkgMTU6MjI6NTQuMDAwMDAwMDAwICswMjAwCisrKyBtcGxheWVyL01ha2VmaWxlCTIwMTAt
 MTEtMTEgMTk6MjY6MDkuNTgyNDE2MzE1ICswMTAwCkBAIC03LDcgKzcsNyBAQAogCiBQT1JUTkFN
 RT0JbXBsYXllcgogUE9SVFZFUlNJT049CSR7TVBMQVlFUl9QT1JUX1ZFUlNJT059Ci1QT1JUUkVW
 SVNJT049CTMKK1BPUlRSRVZJU0lPTj0JMAogQ09NTUVOVD0JSGlnaCBwZXJmb3JtYW5jZSBtZWRp
 YSBwbGF5ZXIgc3VwcG9ydGluZyBtYW55IGZvcm1hdHMKIAogLmluY2x1ZGUgIiR7LkNVUkRJUn0v
 TWFrZWZpbGUuc2hhcmVkIgpAQCAtODQsNiArODQsNyBAQAogCQkJLS1kaXNhYmxlLXh2aWQgXAog
 CQkJLS1kaXNhYmxlLWxpYmRpcmFjLWxhdmMgXAogCQkJLS1kaXNhYmxlLW1lbmNvZGVyIFwKKwkJ
 CS0tZGlzYWJsZS1tcGcxMjMgXAogCQkJLS1kaXNhYmxlLW11c2VwYWNrCiAKIC5pbmNsdWRlICIk
 ey5DVVJESVJ9L01ha2VmaWxlLm9wdGlvbnMiCkBAIC0yMzYsMTAgKzIzNywxMyBAQAogCQknL0NG
 TEFHUy4qLURfTEFSR0VGSUxFNjRfU09VUkNFLyBzLy1EX0xBUkdFRklMRTY0X1NPVVJDRS8tRF9G
 SUxFX09GRlNFVF9CSVRTPTY0LycgXAogCQkke0NPTkZJR1VSRV9XUktTUkN9LyR7Q09ORklHVVJF
 X1NDUklQVH0KIC5lbmRpZgotCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzfC9kZXYvZHZkfCR7REVG
 QVVMVF9EVkRfREVWSUNFfXw7IFwKKwlAJHtSRUlOUExBQ0VfQ01EfSBcCisJCS1lICdzfC9kZXYv
 ZHZkfCR7REVGQVVMVF9EVkRfREVWSUNFfXw7IFwKIAkJc3wvZGV2L2Nkcm9tfCR7REVGQVVMVF9D
 RFJPTV9ERVZJQ0V9fCcgXAotCQkke0NPTkZJR1VSRV9XUktTUkN9LyR7Q09ORklHVVJFX1NDUklQ
 VH0KLQlAJHtSRUlOUExBQ0VfQ01EfSAtZSAncyEvdXNyL2xvY2FsISR7UFJFRklYfSEnIFwKKwkJ
 LWUgJ3N8L3Vzci9sb2NhbHwke0xPQ0FMQkFTRX18JyBcCisJCS1lICdzfC1sYnoyfC91c3IvbGli
 L2xpYmJ6Mi5zb3wnIFwKKwkJLWUgJ3N8LUwkJF9wcmVmaXgvbGlifC1MJHtMT0NBTEJBU0V9L2xp
 YnwnIFwKKwkJLWUgJ3N8LUkkJF9wcmVmaXgvaW5jbHVkZXwtSSR7TE9DQUxCQVNFfS9pbmNsdWRl
 fCcgXAogCQkke0NPTkZJR1VSRV9XUktTUkN9LyR7Q09ORklHVVJFX1NDUklQVH0KIAlAJHtGSU5E
 fSAtRSAke1dSS1NSQ30gLXR5cGUgZiBcCiAJCS1pcmVnZXggIi4qKGNvbmZpZ3VyZXwuc2h8TWFr
 ZWZpbGUpIiAtcHJpbnQwIHwgXApAQCAtMjUzLDcgKzI1Nyw2IEBACiAJCSdzfC91c3IvXFw6bG9j
 YWwvXFw6ZXRjL1xcOm1wbGF5ZXJ8JHtEQVRBRElSOlMvXC8vXC9cXFw6L2d9fGcgOyBcCiAJCSBz
 fC9kZXYvXFw6KGR2ZFtbOmFsbnVtOl1dKltbOj46XV0pfCR7REVGQVVMVF9EVkRfREVWSUNFOlMv
 ZGV2XC8vZGV2XC9cXFw6L318ZyA7IFwKIAkJIHN8L2Rldi9cXDooY2Ryb21bWzphbG51bTpdXSpb
 Wzo+Ol1dKXwke0RFRkFVTFRfQ0RST01fREVWSUNFOlMvZGV2XC8vZGV2XC9cXFw6L318ZycKLQlA
 Y2QgJHtXUktTUkN9L2xpYmF2Y29kZWMgJiYgJHtMTn0gLXMgeDg2IGkzODYgJiYgJHtMTn0gLXMg
 eDg2IGFtZDY0CiAuaWYgZGVmaW5lZChXSVRIX1JUQykKIAlAJHtSRUlOUExBQ0VfQ01EfSAtZSBc
 CiAJCSdzfGlycXAgPSAxMDI0fGlycXAgPSAke0RFRkFVTFRfS0VSTl9IWn18JyBcCkBAIC0yNjMs
 NiArMjY2LDExIEBACiBwb3N0LWNvbmZpZ3VyZToKIAlAJHtSRUlOUExBQ0VfQ01EfSAtZSAncyMt
 cHRocmVhZCMke1BUSFJFQURfTElCU30jZycgXAogCQkke1dSS1NSQ30vY29uZmlnLm1haworCUAk
 e1JFSU5QTEFDRV9DTUR9IFwKKwkJLWUgJ3MjSEFWRV9GQVNUX0NNT1YgMSNIQVZFX0ZBU1RfQ01P
 ViAwI2cnIFwKKwkJLWUgJ3MjSEFWRV9MT0cyIDEjSEFWRV9MT0cyIDAjZycgXAorCQktZSAncyNI
 QVZFX0xPRzJGIDEjSEFWRV9MT0cyRiAwI2cnIFwKKwkJJHtXUktTUkN9L2NvbmZpZy5oCiAKIHBv
 c3QtaW5zdGFsbDoKIAlAJHtNS0RJUn0gJHtEQVRBRElSfQpkaWZmIC1ydU4gL3Vzci9wb3J0cy9t
 dWx0aW1lZGlhL21wbGF5ZXIvTWFrZWZpbGUub3B0aW9ucyBtcGxheWVyL01ha2VmaWxlLm9wdGlv
 bnMKLS0tIC91c3IvcG9ydHMvbXVsdGltZWRpYS9tcGxheWVyL01ha2VmaWxlLm9wdGlvbnMJMjAx
 MC0xMC0xMyAwMDo0NTowOC4wMDAwMDAwMDAgKzAyMDAKKysrIG1wbGF5ZXIvTWFrZWZpbGUub3B0
 aW9ucwkyMDEwLTEyLTAxIDA3OjU2OjE4LjY0MDc2ODU1OSArMDEwMApAQCAtMTAzLDcgKzEwMyw2
 IEBACiAuZW5kaWYKIAogLmlmIGRlZmluZWQoV0lUSF9MSVZFTUVESUEpCi1SVU5fREVQRU5EUys9
 CQkke0xPQ0FMQkFTRX0vbGl2ZS9saXZlTWVkaWEvbGlibGl2ZU1lZGlhLmE6JHtQT1JUU0RJUn0v
 bmV0L2xpdmVNZWRpYQogQlVJTERfREVQRU5EUys9CQkke0xPQ0FMQkFTRX0vbGl2ZS9saXZlTWVk
 aWEvbGlibGl2ZU1lZGlhLmE6JHtQT1JUU0RJUn0vbmV0L2xpdmVNZWRpYQogLmVsc2UKIENPTkZJ
 R1VSRV9BUkdTKz0JLS1kaXNhYmxlLWxpdmUKQEAgLTEyMiw4ICsxMjEsNiBAQAogLmVuZGlmCiAK
 IC5pZiBkZWZpbmVkKFdJVEhfT1BFTkFMKQotI1RPRE86IHRlc3QgdGhpcwotI0xJQl9ERVBFTkRT
 Kz0Jb3BlbmFsLjE6JHtQT1JUU0RJUn0vYXVkaW8vb3BlbmFsLXNvZnQKIFVTRV9PUEVOQUw9CXNv
 ZnQKIC5lbHNlCiBDT05GSUdVUkVfQVJHUys9CS0tZGlzYWJsZS1vcGVuYWwKZGlmZiAtcnVOIC91
 c3IvcG9ydHMvbXVsdGltZWRpYS9tcGxheWVyL01ha2VmaWxlLnNoYXJlZCBtcGxheWVyL01ha2Vm
 aWxlLnNoYXJlZAotLS0gL3Vzci9wb3J0cy9tdWx0aW1lZGlhL21wbGF5ZXIvTWFrZWZpbGUuc2hh
 cmVkCTIwMTAtMDktMDIgMjE6NTY6MTIuMDAwMDAwMDAwICswMjAwCisrKyBtcGxheWVyL01ha2Vm
 aWxlLnNoYXJlZAkyMDEwLTEyLTAxIDA3OjUzOjIzLjc2NTQ3NzAzNSArMDEwMApAQCAtMiw3ICsy
 LDcgQEAKICMgbXBsYXllciBhbmQgbWVuY29kZXIuLi4udGhlIHZhcmlhYmxlcyB0aGF0IHdlIG5l
 ZWQgdG8gc2V0CiAjIGJlZm9yZSB3ZSBpbmNsdWRlIGJzZC5wb3J0LnByZS5tawogCi1NUExBWUVS
 X1NOQVBTSE9UX0RBVEU9CTIwMTAtMDctMTcKK01QTEFZRVJfU05BUFNIT1RfREFURT0JMjAxMC0x
 MS0wNgogTVBMQVlFUl9QT1JUX1ZFUlNJT049CTEuMC5yJHtNUExBWUVSX1NOQVBTSE9UX0RBVEU6
 Uy8tLy9nfQogQ0FURUdPUklFUz89CW11bHRpbWVkaWEgYXVkaW8KIE1BU1RFUl9TSVRFUz0JaHR0
 cDovL2ZyZWVic2QudW5peGZyZXVuZGUuZGUvc291cmNlcy8gXApAQCAtMTcsNiArMTcsOCBAQAog
 TElCX0RFUEVORFM9CXBuZy42OiR7UE9SVFNESVJ9L2dyYXBoaWNzL3BuZyBcCiAJCWZyZWV0eXBl
 Ljk6JHtQT1JUU0RJUn0vcHJpbnQvZnJlZXR5cGUyCiAKK0JVSUxEX0RFUEVORFM9CXlhc206JHtQ
 T1JUU0RJUn0vZGV2ZWwveWFzbQorCiBVU0VfQlpJUDI9CXllcwogVVNFX0dNQUtFPQl5ZXMKIFVT
 RV9JQ09OVj0JeWVzCmRpZmYgLXJ1TiAvdXNyL3BvcnRzL211bHRpbWVkaWEvbXBsYXllci9kaXN0
 aW5mbyBtcGxheWVyL2Rpc3RpbmZvCi0tLSAvdXNyL3BvcnRzL211bHRpbWVkaWEvbXBsYXllci9k
 aXN0aW5mbwkyMDEwLTA4LTAzIDE0OjM3OjI4LjAwMDAwMDAwMCArMDIwMAorKysgbXBsYXllci9k
 aXN0aW5mbwkyMDEwLTExLTA2IDE3OjUyOjEwLjI0NTI1OTk2MyArMDEwMApAQCAtMSwzICsxLDIg
 QEAKLU1ENSAobXBsYXllci0xLjByYzIwMTAwNzE3LnRhci5iejIpID0gM2U2NTA5MzhiMzcyOTI5
 MmQxZmJlZTdkNzI1MjQ2NzAKLVNIQTI1NiAobXBsYXllci0xLjByYzIwMTAwNzE3LnRhci5iejIp
 ID0gODI5ZjE0OWZhNzQ2NTVmODQ4MjRiNDUxMWQ2OWZkOTNjNTc1ZTI0YmMxMWM0MjllNjZlZTc0
 MjY0Mjg4MWYwYgotU0laRSAobXBsYXllci0xLjByYzIwMTAwNzE3LnRhci5iejIpID0gODk4ODAz
 MAorU0hBMjU2IChtcGxheWVyLTEuMHJjMjAxMDExMDYudGFyLmJ6MikgPSAwMGVhNjhmODY5NDM1
 YjFhNWUzNjNkODdjZjM1ZmQ2NzExZjcwM2FhYTA1YTkzZjllNGQwM2E1MmYzZWM4NzUxCitTSVpF
 IChtcGxheWVyLTEuMHJjMjAxMDExMDYudGFyLmJ6MikgPSAxMDAxNDk3NQpkaWZmIC1ydU4gL3Vz
 ci9wb3J0cy9tdWx0aW1lZGlhL21wbGF5ZXIvZmlsZXMvcGF0Y2gtY29uZmlndXJlIG1wbGF5ZXIv
 ZmlsZXMvcGF0Y2gtY29uZmlndXJlCi0tLSAvdXNyL3BvcnRzL211bHRpbWVkaWEvbXBsYXllci9m
 aWxlcy9wYXRjaC1jb25maWd1cmUJMjAxMC0xMC0wOCAxNToxMDo0Mi4wMDAwMDAwMDAgKzAyMDAK
 KysrIG1wbGF5ZXIvZmlsZXMvcGF0Y2gtY29uZmlndXJlCTIwMTAtMTEtMDYgMTg6MjI6MzIuMjk1
 MzcyMzYwICswMTAwCkBAIC0xLDYgKzEsNiBAQAotLS0tIGNvbmZpZ3VyZS5vcmlnCTIwMTAtMDct
 MTQgMTU6NDk6MDguMDAwMDAwMDAwICswMjAwCi0rKysgY29uZmlndXJlCTIwMTAtMDctMTcgMTI6
 NTA6MDAuOTM3MTA5Njg4ICswMjAwCi1AQCAtNTU1LDcgKzU1NSw3IEBACistLS0gY29uZmlndXJl
 Lm9yaWcJMjAxMC0xMS0wMyAwOToxMjoyMi4wMDAwMDAwMDAgKzAxMDAKKysrKyBjb25maWd1cmUJ
 MjAxMC0xMS0wNiAxODoyMTozOC4xNjI1OTIxODYgKzAxMDAKK0BAIC01NjUsNyArNTY1LDcgQEAK
 ICBfaXdtbXh0PWF1dG8KICBfbXRycj1hdXRvCiAgX2FsdGl2ZWM9YXV0bwpAQCAtOSw3ICs5LDcg
 QEAKICBfcmFubGliPXJhbmxpYgogIF93aW5kcmVzPXdpbmRyZXMKICBfY2M9Y2MKLUBAIC0xMzg1
 LDcgKzEzODUsNiBAQAorQEAgLTEzNzEsNyArMTM3MSw2IEBACiAgCiAgICAqKQogICAgICBlY2hv
 ICJVbmtub3duIHBhcmFtZXRlcjogJGFjX29wdGlvbiIKQEAgLTE3LDcgKzE3LDcgQEAKICAgICAg
 OzsKICAKICAgIGVzYWMKLUBAIC0xNDk0LDggKzE0OTMsOCBAQAorQEAgLTE0ODAsOCArMTQ3OSw4
 IEBACiAgX3RpbWVyPXRpbWVyLWxpbnV4LmMKICBfZ2V0Y2g9Z2V0Y2gyLmMKICBpZiBmcmVlYnNk
 IDsgdGhlbgpAQCAtMjgsNyArMjgsNyBAQAogIGZpCiAgCiAgaWYgbmV0YnNkIHx8IGRyYWdvbmZs
 eSA7IHRoZW4KLUBAIC0zNjE4LDIyICszNjE3LDEwIEBACitAQCAtMzUzNSwyMiArMzUzNCwxMCBA
 QAogIGlmIGxpbnV4IDsgdGhlbgogICAgVEhSRUFEX0NGTEFHUz0tRF9SRUVOVFJBTlQKICBlbGlm
 IGZyZWVic2QgfHwgbmV0YnNkIHx8IG9wZW5ic2QgfHwgYnNkb3MgOyB0aGVuCkBAIC0zNyw3ICsz
 Nyw3IEBACiAtaWYgdGVzdCAiJF9wdGhyZWFkcyIgPSBhdXRvIDsgdGhlbgogLWNhdCA+ICRUTVBD
 IDw8IEVPRgogLSNpbmNsdWRlIDxwdGhyZWFkLmg+Ci0tdm9pZCogZnVuYyh2b2lkICphcmcpIHsg
 cmV0dXJuIGFyZzsgfQorLXN0YXRpYyB2b2lkICpmdW5jKHZvaWQgKmFyZykgeyByZXR1cm4gYXJn
 OyB9CiAtaW50IG1haW4odm9pZCkgeyBwdGhyZWFkX3QgdGlkOyByZXR1cm4gcHRocmVhZF9jcmVh
 dGUoJnRpZCwgMCwgZnVuYywgMCkgPT0gMCA/IDAgOiAxOyB9CiAtRU9GCiAtX3B0aHJlYWRzPW5v
 CkBAIC01NCw1NCArNTQsMzkgQEAKICBpZiB0ZXN0ICIkX3B0aHJlYWRzIiA9IHllcyA7IHRoZW4K
 ICAgIHRlc3QgJF9sZF9wdGhyZWFkICYmIHJlc19jb21tZW50PSJ1c2luZyAkX2xkX3B0aHJlYWQi
 CiAgICBkZWZfcHRocmVhZHM9JyNkZWZpbmUgSEFWRV9QVEhSRUFEUyAxJwotQEAgLTM3NDYsOCAr
 MzczMywxMyBAQAotIAotIAotIGVjaG9jaGVjayAic3lzL2R2ZGlvLmgiCi0rY2F0ID4gJFRNUEMg
 PDwgRU9GCi0rI2luY2x1ZGUgPHVuaXN0ZC5oPgotKyNpbmNsdWRlIDxzeXMvZHZkaW8uaD4KLStp
 bnQgbWFpbih2b2lkKSB7IHJldHVybiAwOyB9Ci0rRU9GCi0gX2R2ZGlvPW5vCi0taGVhZGVyX2No
 ZWNrIHN5cy9kdmRpby5oICYmIF9kdmRpbz15ZXMKLStjY19jaGVjayAmJiBfZHZkaW89eWVzCi0g
 aWYgdGVzdCAiJF9kdmRpbyIgPSB5ZXMgOyB0aGVuCi0gICBkZWZfZHZkaW89JyNkZWZpbmUgRFZE
 X1NUUlVDVF9JTl9TWVNfRFZESU9fSCAxJwotIGVsc2UKLUBAIC03ODAwLDcgKzc3OTIsNyBAQAor
 QEAgLTM4MjgsNyArMzgxNSw3IEBACisgI2RlZmluZSBfSVNPQzk5X1NPVVJDRQorICNpbmNsdWRl
 IDxzdGRhcmcuaD4KKyAjaW5jbHVkZSA8c3RkaW8uaD4KKy1pbnQgbWFpbih2b2lkKSB7IHZhX2xp
 c3QgYXAgPSBOVUxMOyB2c3NjYW5mKCJmb28iLCAiYmFyIiwgYXApOyByZXR1cm4gMDsgfQorK2lu
 dCBtYWluKHZvaWQpIHsgdmFfbGlzdCBhcDsgdnNzY2FuZigiZm9vIiwgImJhciIsIGFwKTsgcmV0
 dXJuIDA7IH0KKyBFT0YKKyBfdnNzY2FuZj1ubworIGNjX2NoZWNrICYmIF92c3NjYW5mPXllcwor
 QEAgLTcyODMsNyArNzI3MCw3IEBACisgICBkZWZfbXV4ZXJzPScjZGVmaW5lIENPTkZJR19NVVhF
 UlMgMScKICBlbHNlCiAgICAjIG1wZWcxdmlkZW8gZm9yIHZmX2xhdmMsIHNub3cgZm9yIHZmX3Vz
 cHAgLyB2Zl9tY2RlaW50LAotICAgIyBwbmcgZm9yIHZmX3NjcmVlbnNob3QsIG1qcGVnIGZvciB6
 cgotLSAgbGliYXZlbmNvZGVycz0iTVBFRzFWSURFT19FTkNPREVSIFNOT1dfRU5DT0RFUiIKLSsg
 IGxpYmF2ZW5jb2RlcnM9Ik1QRUcxVklERU9fRU5DT0RFUiBIMjYzX0VOQ09ERVIgU05PV19FTkNP
 REVSIgotICAgdGVzdCAiJF96bGliIiA9IHllcyAmJiBsaWJhdmVuY29kZXJzPSIkbGliYXZlbmNv
 ZGVycyBQTkdfRU5DT0RFUiIKLSAgIHRlc3QgIiRfenIiID0geWVzICYmIGxpYmF2ZW5jb2RlcnM9
 IiRsaWJhdmVuY29kZXJzIE1KUEVHX0VOQ09ERVIiCistICBsaWJhdmVuY29kZXJzPSIkbXBsYXll
 cl9lbmNvZGVycyBNUEVHMVZJREVPX0VOQ09ERVIgU05PV19FTkNPREVSIgorKyAgbGliYXZlbmNv
 ZGVycz0iJG1wbGF5ZXJfZW5jb2RlcnMgTVBFRzFWSURFT19FTkNPREVSIEgyNjNfRU5DT0RFUiBT
 Tk9XX0VOQ09ERVIiCiAgICBsaWJhdm11eGVycz0iIgotQEAgLTgxNjEsOCArODE1MywxMSBAQAor
 ICAgZGVmX211eGVycz0nI2RlZmluZSBDT05GSUdfTVVYRVJTIDAnCisgZmkKK0BAIC03NjQ1LDgg
 Kzc2MzIsMTEgQEAKICBpZiB0ZXN0ICIkX2d1aSIgPSB5ZXMgOyB0aGVuCiAgCiAgICAjIFJlcXVp
 cmVkIGxpYnJhcmllcwotLSAgaWYgdGVzdCAiJF9saWJhdmNvZGVjIiAhPSB5ZXMgfHwKKy0gIGlm
 IHRlc3QgIiRmZm1wZWciICE9IHllcyB8fAogLSAgICAgICEgZWNobyAkbGliYXZkZWNvZGVycyB8
 IGdyZXAgLXEgUE5HX0RFQ09ERVIgOyB0aGVuCiArICAjIFdvcmsgYXJvdW5kIGEgc2ggYnVnIGlu
 IEZyZWVCU0QgPCA4Ci0rICBpZiB0ZXN0ICIkX2xpYmF2Y29kZWMiICE9IHllcyA7IHRoZW4KKysg
 IGlmIHRlc3QgIiRmZm1wZWciICE9IHllcyA7IHRoZW4KICsgICAgZGllICJUaGUgR1VJIHJlcXVp
 cmVzIGxpYmF2Y29kZWMgd2l0aCBQTkcgc3VwcG9ydCAobmVlZHMgemxpYikuIgogKyAgZmkKICsg
 IGlmICEgZWNobyAkbGliYXZkZWNvZGVycyB8IGdyZXAgLXEgUE5HX0RFQ09ERVIgOyB0aGVuCiAg
 ICAgIGRpZSAiVGhlIEdVSSByZXF1aXJlcyBsaWJhdmNvZGVjIHdpdGggUE5HIHN1cHBvcnQgKG5l
 ZWRzIHpsaWIpLiIKICAgIGZpCiAgICB0ZXN0ICIkX2ZyZWV0eXBlIiA9IG5vICYmIHRlc3QgIiRf
 Yml0bWFwX2ZvbnQiID0gbm8gJiYgXAotQEAgLTgzNTIsNyArODM0Nyw3IEBACi0gZWNob2NoZWNr
 ICJqb3lzdGljayIKLSBkZWZfam95c3RpY2s9JyN1bmRlZiBDT05GSUdfSk9ZU1RJQ0snCi0gaWYg
 dGVzdCAiJF9qb3lzdGljayIgPSB5ZXMgOyB0aGVuCi0tICBpZiBsaW51eCA7IHRoZW4KLSsgIGlm
 IGxpbnV4IHx8IGZyZWVic2QgOyB0aGVuCi0gICAgICMgVE9ETyBhZGQgc29tZSBjaGVjawotICAg
 ICBkZWZfam95c3RpY2s9JyNkZWZpbmUgQ09ORklHX0pPWVNUSUNLIDEnCi0gICBlbHNlCi1AQCAt
 ODU2MCw3ICs4NTU1LDcgQEAKK0BAIC04MDM0LDcgKzgwMjQsNyBAQAogIEVYRVNVRiAgICAgID0g
 JF9leGVzdWYKICBFWEVTVUZTX0FMTCA9IC5leGUKICAKZGlmZiAtcnVOIC91c3IvcG9ydHMvbXVs
 dGltZWRpYS9tcGxheWVyL2ZpbGVzL3BhdGNoLWxpYmF2Y29kZWMtTWFrZWZpbGUgbXBsYXllci9m
 aWxlcy9wYXRjaC1saWJhdmNvZGVjLU1ha2VmaWxlCi0tLSAvdXNyL3BvcnRzL211bHRpbWVkaWEv
 bXBsYXllci9maWxlcy9wYXRjaC1saWJhdmNvZGVjLU1ha2VmaWxlCTIwMTAtMTAtMDggMTU6MTA6
 NDIuMDAwMDAwMDAwICswMjAwCisrKyBtcGxheWVyL2ZpbGVzL3BhdGNoLWxpYmF2Y29kZWMtTWFr
 ZWZpbGUJMjAxMC0xMS0wNCAyMToyMzoyNC43MjM3MDY4MzIgKzAxMDAKQEAgLTEsOCArMSw4IEBA
 Ci0tLS0gbGliYXZjb2RlYy9NYWtlZmlsZS5vcmlnCTIwMTAtMDktMjYgMjA6MzE6MjYuMDAwMDAw
 MDAwICswMjAwCi0rKysgbGliYXZjb2RlYy9NYWtlZmlsZQkyMDEwLTA5LTI2IDIwOjMxOjUyLjAw
 MDAwMDAwMCArMDIwMAotQEAgLTYwOCw3ICs2MDgsNyBAQAotIAotIE9CSlMtJChDT05GSUdfTUxJ
 QikgICAgICAgICAgICAgICAgICAgICs9IG1saWIvZHNwdXRpbF9tbGliLm8gICAgICAgICAgIFwK
 Ky0tLSBmZm1wZWcvbGliYXZjb2RlYy9NYWtlZmlsZS5vcmlnCTIwMTAtMTEtMDIgMDk6MzI6MDQu
 MDAwMDAwMDAwICswMTAwCisrKysgZmZtcGVnL2xpYmF2Y29kZWMvTWFrZWZpbGUJMjAxMC0xMS0w
 NCAyMToxNDo1MS4xNTg1MDE3OTggKzAxMDAKK0BAIC02MjMsNyArNjIzLDcgQEAKKyAjIHdlbGwu
 CisgT0JKUy0kKCFDT05GSUdfU01BTEwpICAgICAgICAgICAgICAgICAgKz0gaW52ZXJzZS5vCiAg
 CiAtLWluY2x1ZGUgJChTVUJESVIpJChBUkNIKS9NYWtlZmlsZQogKy1pbmNsdWRlICQoU1VCRElS
 KSQoTVBMQVlFUl9BUkNIKS9NYWtlZmlsZQpkaWZmIC1ydU4gL3Vzci9wb3J0cy9tdWx0aW1lZGlh
 L21wbGF5ZXIvZmlsZXMvcGF0Y2gtbGliYXZjb2RlYy12b3JiaXNfZGVjLmMgbXBsYXllci9maWxl
 cy9wYXRjaC1saWJhdmNvZGVjLXZvcmJpc19kZWMuYwotLS0gL3Vzci9wb3J0cy9tdWx0aW1lZGlh
 L21wbGF5ZXIvZmlsZXMvcGF0Y2gtbGliYXZjb2RlYy12b3JiaXNfZGVjLmMJMjAxMC0xMC0yOSAx
 NToyMjo1NC4wMDAwMDAwMDAgKzAyMDAKKysrIG1wbGF5ZXIvZmlsZXMvcGF0Y2gtbGliYXZjb2Rl
 Yy12b3JiaXNfZGVjLmMJMTk3MC0wMS0wMSAwMTowMDowMC4wMDAwMDAwMDAgKzAxMDAKQEAgLTEs
 NjMgKzAsMCBAQAotLS0tIGxpYmF2Y29kZWMvdm9yYmlzX2RlYy5jLm9yaWcJMjAxMC0wNy0wMiAx
 OTowNTozNi4wMDAwMDAwMDAgKzAyMDAKLSsrKyBsaWJhdmNvZGVjL3ZvcmJpc19kZWMuYwkyMDEw
 LTA5LTE2IDE3OjMyOjE3Ljc1NDUyMTMwNCArMDIwMAotQEAgLTgxLDcgKzgxLDcgQEAKLSAgICAg
 ICAgIH0gdDA7Ci0gICAgICAgICBzdHJ1Y3Qgdm9yYmlzX2Zsb29yMV9zIHsKLSAgICAgICAgICAg
 ICB1aW50X2Zhc3Q4X3QgcGFydGl0aW9uczsKLS0gICAgICAgICAgICB1aW50X2Zhc3Q4X3QgcGFy
 dGl0aW9uX2NsYXNzWzMyXTsKLSsgICAgICAgICAgICB1aW50OF90ICAgICAgcGFydGl0aW9uX2Ns
 YXNzWzMyXTsKLSAgICAgICAgICAgICB1aW50X2Zhc3Q4X3QgY2xhc3NfZGltZW5zaW9uc1sxNl07
 Ci0gICAgICAgICAgICAgdWludF9mYXN0OF90IGNsYXNzX3N1YmNsYXNzZXNbMTZdOwotICAgICAg
 ICAgICAgIHVpbnRfZmFzdDhfdCBjbGFzc19tYXN0ZXJib29rWzE2XTsKLUBAIC05NywxMyArOTcs
 MTMgQEAKLSAgICAgdWludF9mYXN0MTZfdCB0eXBlOwotICAgICB1aW50X2Zhc3QzMl90IGJlZ2lu
 OwotICAgICB1aW50X2Zhc3QzMl90IGVuZDsKLS0gICAgdWludF9mYXN0MzJfdCBwYXJ0aXRpb25f
 c2l6ZTsKLSsgICAgdW5zaWduZWQgICAgICBwYXJ0aXRpb25fc2l6ZTsKLSAgICAgdWludF9mYXN0
 OF90ICBjbGFzc2lmaWNhdGlvbnM7Ci0gICAgIHVpbnRfZmFzdDhfdCAgY2xhc3Nib29rOwotICAg
 ICBpbnRfZmFzdDE2X3QgIGJvb2tzWzY0XVs4XTsKLSAgICAgdWludF9mYXN0OF90ICBtYXhwYXNz
 OwotICAgICB1aW50X2Zhc3QxNl90IHB0bnNfdG9fcmVhZDsKLS0gICAgdWludF9mYXN0OF90ICpj
 bGFzc2lmczsKLSsgICAgdWludDhfdCAqY2xhc3NpZnM7Ci0gfSB2b3JiaXNfcmVzaWR1ZTsKLSAK
 LSB0eXBlZGVmIHN0cnVjdCB7Ci1AQCAtNDY3LDcgKzQ2Nyw3IEBACi0gc3RhdGljIGludCB2b3Ji
 aXNfcGFyc2Vfc2V0dXBfaGRyX2Zsb29ycyh2b3JiaXNfY29udGV4dCAqdmMpCi0gewotICAgICBH
 ZXRCaXRDb250ZXh0ICpnYiA9ICZ2Yy0+Z2I7Ci0tICAgIHVpbnRfZmFzdDE2X3QgaSxqLGs7Ci0r
 ICAgIGludCBpLGosazsKLSAKLSAgICAgdmMtPmZsb29yX2NvdW50ID0gZ2V0X2JpdHMoZ2IsIDYp
 ICsgMTsKLSAKLUBAIC02NTUsNyArNjU1LDcgQEAKLSAgICAgICAgIGlmIChyZXNfc2V0dXAtPmJl
 Z2luPnJlc19zZXR1cC0+ZW5kIHx8Ci0gICAgICAgICAgICAgcmVzX3NldHVwLT5lbmQgPiB2Yy0+
 YXZjY29udGV4dC0+Y2hhbm5lbHMgKiB2Yy0+YmxvY2tzaXplWzFdIC8gKHJlc19zZXR1cC0+dHlw
 ZSA9PSAyID8gMSA6IDIpIHx8Ci0gICAgICAgICAgICAgKHJlc19zZXR1cC0+ZW5kLXJlc19zZXR1
 cC0+YmVnaW4pIC8gcmVzX3NldHVwLT5wYXJ0aXRpb25fc2l6ZSA+IFZfTUFYX1BBUlRJVElPTlMp
 IHsKLS0gICAgICAgICAgICBhdl9sb2codmMtPmF2Y2NvbnRleHQsIEFWX0xPR19FUlJPUiwgInBh
 cnRpdGlvbiBvdXQgb2YgYm91bmRzOiB0eXBlLCBiZWdpbiwgZW5kLCBzaXplLCBibG9ja3NpemU6
 ICUiUFJJZEZBU1QxNiIsICUiUFJJZEZBU1QzMiIsICUiUFJJZEZBU1QzMiIsICUiUFJJZEZBU1Qz
 MiIsICUiUFJJZEZBU1QzMiJcbiIsIHJlc19zZXR1cC0+dHlwZSwgcmVzX3NldHVwLT5iZWdpbiwg
 cmVzX3NldHVwLT5lbmQsIHJlc19zZXR1cC0+cGFydGl0aW9uX3NpemUsIHZjLT5ibG9ja3NpemVb
 MV0gLyAyKTsKLSsgICAgICAgICAgICBhdl9sb2codmMtPmF2Y2NvbnRleHQsIEFWX0xPR19FUlJP
 UiwgInBhcnRpdGlvbiBvdXQgb2YgYm91bmRzOiB0eXBlLCBiZWdpbiwgZW5kLCBzaXplLCBibG9j
 a3NpemU6ICUiUFJJZEZBU1QxNiIsICUiUFJJZEZBU1QzMiIsICUiUFJJZEZBU1QzMiIsICV1LCAl
 IlBSSWRGQVNUMzIiXG4iLCByZXNfc2V0dXAtPnR5cGUsIHJlc19zZXR1cC0+YmVnaW4sIHJlc19z
 ZXR1cC0+ZW5kLCByZXNfc2V0dXAtPnBhcnRpdGlvbl9zaXplLCB2Yy0+YmxvY2tzaXplWzFdIC8g
 Mik7Ci0gICAgICAgICAgICAgcmV0dXJuIC0xOwotICAgICAgICAgfQotIAotQEAgLTY2Nyw2ICs2
 NjcsOCBAQAotICAgICAgICAgcmVzX3NldHVwLT5jbGFzc2lmcyA9IGF2X21hbGxvYyhyZXNfc2V0
 dXAtPnB0bnNfdG9fcmVhZCAqCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
 ICAgIHZjLT5hdWRpb19jaGFubmVscyAqCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
 ICAgICAgICAgIHNpemVvZigqcmVzX3NldHVwLT5jbGFzc2lmcykpOwotKyAgICAgICAgaWYgKCFy
 ZXNfc2V0dXAtPmNsYXNzaWZzKQotKyAgICAgICAgICAgIHJldHVybiBBVkVSUk9SKEVOT01FTSk7
 Ci0gCi0gICAgICAgICBBVl9ERUJVRygiICAgIGJlZ2luICVkIGVuZCAlZCBwYXJ0LnNpemUgJWQg
 Y2xhc3NpZi5zICVkIGNsYXNzYm9vayAlZCBcbiIsIHJlc19zZXR1cC0+YmVnaW4sIHJlc19zZXR1
 cC0+ZW5kLCByZXNfc2V0dXAtPnBhcnRpdGlvbl9zaXplLAotICAgICAgICAgICByZXNfc2V0dXAt
 PmNsYXNzaWZpY2F0aW9ucywgcmVzX3NldHVwLT5jbGFzc2Jvb2spOwotQEAgLTEyNjcsNyArMTI2
 OSw3IEBACi0gICAgIEdldEJpdENvbnRleHQgKmdiID0gJnZjLT5nYjsKLSAgICAgdWludF9mYXN0
 OF90IGNfcF9jID0gdmMtPmNvZGVib29rc1t2ci0+Y2xhc3Nib29rXS5kaW1lbnNpb25zOwotICAg
 ICB1aW50X2Zhc3QxNl90IHB0bnNfdG9fcmVhZCA9IHZyLT5wdG5zX3RvX3JlYWQ7Ci0tICAgIHVp
 bnRfZmFzdDhfdCAqY2xhc3NpZnMgPSB2ci0+Y2xhc3NpZnM7Ci0rICAgIHVpbnQ4X3QgKmNsYXNz
 aWZzID0gdnItPmNsYXNzaWZzOwotICAgICB1aW50X2Zhc3Q4X3QgcGFzczsKLSAgICAgdWludF9m
 YXN0OF90IGNoX3VzZWQ7Ci0gICAgIHVpbnRfZmFzdDhfdCBpLGosbDsKZGlmZiAtcnVOIC91c3Iv
 cG9ydHMvbXVsdGltZWRpYS9tcGxheWVyL2ZpbGVzL3BhdGNoLWxpYmF2dXRpbC14ODZfY3B1Lmgg
 bXBsYXllci9maWxlcy9wYXRjaC1saWJhdnV0aWwteDg2X2NwdS5oCi0tLSAvdXNyL3BvcnRzL211
 bHRpbWVkaWEvbXBsYXllci9maWxlcy9wYXRjaC1saWJhdnV0aWwteDg2X2NwdS5oCTIwMTAtMDQt
 MjEgMTU6MDc6MjIuMDAwMDAwMDAwICswMjAwCisrKyBtcGxheWVyL2ZpbGVzL3BhdGNoLWxpYmF2
 dXRpbC14ODZfY3B1LmgJMjAxMC0xMS0wNCAyMTowMjozNC43MzE0MDQ1MzQgKzAxMDAKQEAgLTEs
 NiArMSw2IEBACi0tLS0gbGliYXZ1dGlsL3g4Nl9jcHUuaH4JMjAwOS0wMy0xOSAwOTo0OTo0Ny4w
 MDAwMDAwMDAgLTA1MDAKLSsrKyBsaWJhdnV0aWwveDg2X2NwdS5oCTIwMDktMDctMjQgMTQ6MjA6
 NTguMzA4MzI3NTEzIC0wNTAwCi1AQCAtNjksNyArNjksNyBAQAorLS0tIGZmbXBlZy9saWJhdnV0
 aWwveDg2X2NwdS5oLm9yaWcJMjAxMC0xMC0wNiAwMzoyNjoxMy4wMDAwMDAwMDAgKzAyMDAKKysr
 KyBmZm1wZWcvbGliYXZ1dGlsL3g4Nl9jcHUuaAkyMDEwLTExLTA0IDIxOjAxOjQwLjU4MTY0Nzk1
 OCArMDEwMAorQEAgLTcxLDcgKzcxLDcgQEAKICAjZGVmaW5lIEhBVkVfN1JFR1MgKEFSQ0hfWDg2
 XzY0IHx8IChIQVZFX0VCWF9BVkFJTEFCTEUgJiYgSEFWRV9FQlBfQVZBSUxBQkxFKSkKICAjZGVm
 aW5lIEhBVkVfNlJFR1MgKEFSQ0hfWDg2XzY0IHx8IChIQVZFX0VCWF9BVkFJTEFCTEUgfHwgSEFW
 RV9FQlBfQVZBSUxBQkxFKSkKICAKZGlmZiAtcnVOIC91c3IvcG9ydHMvbXVsdGltZWRpYS9tcGxh
 eWVyL2ZpbGVzL3BrZy1tZXNzYWdlLmluIG1wbGF5ZXIvZmlsZXMvcGtnLW1lc3NhZ2UuaW4KLS0t
 IC91c3IvcG9ydHMvbXVsdGltZWRpYS9tcGxheWVyL2ZpbGVzL3BrZy1tZXNzYWdlLmluCTIwMTAt
 MDQtMjEgMTU6MDc6MjMuMDAwMDAwMDAwICswMjAwCisrKyBtcGxheWVyL2ZpbGVzL3BrZy1tZXNz
 YWdlLmluCTIwMTAtMTEtMTcgMTk6NTk6NDkuMTQyOTE5MDI4ICswMTAwCkBAIC02LDcgKzYsNiBA
 QAogaG9tZXBhZ2UgaW4gdGhlIGRvY3VtZW50YXRpb24gc2VjdGlvbjoKIAogaHR0cDovL3d3dy5t
 cGxheWVyaHEuaHUvZGVzaWduNy9pbmZvLmh0bWwjZG9jcwotCiA9PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiBNUGxheWVy
 J3Mgc3lzdGVtLXdpZGUgY29uZmlndXJhdGlvbiBkaXIgaXMKIApAQCAtMTgsNCArMTcsMTAgQEAK
 IAogJSVEQVRBRElSJSUvZXhhbXBsZXMvZXRjCiA9PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CitJZiBzZWVraW5nIGluIHN0
 cmVhbXMgY2F1c2VzIHRoZSBwbGF5YmFjayB2b2x1bWUgdG8gYmUgcmVzZXQgdG8KK3RoZSBwcmV2
 aW91cyBzZXR0aW5nIChvbiA4Lnggb3IgbmV3ZXIgc3lzdGVtIHdpdGggVlBDIGVuYWJsZWQpLAor
 eW91IGFuZCB5b3UgZGlzbGlrZSB0aGlzIGJlaGF2aW91ciwgeW91IGhhdmUgdHdvIG9wdGlvbnM6
 CistIFVzZSBtcGxheWVyJ3MgLXNvZnR2b2wgY29tbWFuZCBsaW5lIG9wdGlvbgorLSBTZXQgdGhl
 IHN5c2N0bCBody5zbmQudnBjX2F1dG9yZXNldCB0byAwCis9PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CiAKZGlmZiAtcnVO
 IC91c3IvcG9ydHMvbXVsdGltZWRpYS9tZW5jb2Rlci9NYWtlZmlsZSBtZW5jb2Rlci9NYWtlZmls
 ZQotLS0gL3Vzci9wb3J0cy9tdWx0aW1lZGlhL21lbmNvZGVyL01ha2VmaWxlCTIwMTAtMTAtMDUg
 MDc6NTc6MjguMDAwMDAwMDAwICswMjAwCisrKyBtZW5jb2Rlci9NYWtlZmlsZQkyMDEwLTExLTMw
 IDE5OjQ1OjU1Ljk5NDU3ODc0NSArMDEwMApAQCAtNiw3ICs2LDcgQEAKIAogUE9SVE5BTUU9CW1l
 bmNvZGVyCiBQT1JUVkVSU0lPTj0JJHtNUExBWUVSX1BPUlRfVkVSU0lPTn0KLVBPUlRSRVZJU0lP
 Tj0JMgorUE9SVFJFVklTSU9OPQkwCiBDT01NRU5UPQlDb252ZW5pZW50IHZpZGVvIGZpbGUgYW5k
 IG1vdmllIGVuY29kZXIKIFJFU1RSSUNURUQ9CVBvcnQgaGFzIHJlc3RyaWN0ZWQgZGVwZW5kZW5j
 aWVzCiAKQEAgLTc5LDYgKzc5LDcgQEAKIAkJCS0tZGlzYWJsZS1qb3lzdGljayBcCiAJCQktLWRp
 c2FibGUtZGlyZWN0ZmIgXAogCQkJLS1kaXNhYmxlLXNzc2UzIFwKKwkJCS0tZGlzYWJsZS1tcGcx
 MjMgXAogCQkJLS1kaXNhYmxlLW11c2VwYWNrCiAKIEFMTF9UQVJHRVQ9CW1lbmNvZGVyCkBAIC05
 OCw3ICs5OSw3IEBACiAuZW5kaWYKIAogLmlmICFkZWZpbmVkKFdJVEhPVVRfWDI2NCkKLUxJQl9E
 RVBFTkRTKz0JeDI2NC45ODoke1BPUlRTRElSfS9tdWx0aW1lZGlhL3gyNjQKK0xJQl9ERVBFTkRT
 Kz0JeDI2NC4xMTA6JHtQT1JUU0RJUn0vbXVsdGltZWRpYS94MjY0CiAuZWxzZQogQ09ORklHVVJF
 X0FSR1MrPQktLWRpc2FibGUteDI2NAogLmVuZGlmCkBAIC0xMzAsMTAgKzEzMSwxMyBAQAogCQkn
 L0NGTEFHUy4qLURfTEFSR0VGSUxFNjRfU09VUkNFLyBzLy1EX0xBUkdFRklMRTY0X1NPVVJDRS8t
 RF9GSUxFX09GRlNFVF9CSVRTPTY0LycgXAogCQkke0NPTkZJR1VSRV9XUktTUkN9LyR7Q09ORklH
 VVJFX1NDUklQVH0KIC5lbmRpZgotCUAke1JFSU5QTEFDRV9DTUR9IC1lICdzfC9kZXYvZHZkfCR7
 REVGQVVMVF9EVkRfREVWSUNFfXw7IFwKKwlAJHtSRUlOUExBQ0VfQ01EfSBcCisJCS1lICdzfC9k
 ZXYvZHZkfCR7REVGQVVMVF9EVkRfREVWSUNFfXw7IFwKIAkJc3wvZGV2L2Nkcm9tfCR7REVGQVVM
 VF9DRFJPTV9ERVZJQ0V9fCcgXAotCQkke0NPTkZJR1VSRV9XUktTUkN9LyR7Q09ORklHVVJFX1ND
 UklQVH0KLQlAJHtSRUlOUExBQ0VfQ01EfSAtZSAncyEvdXNyL2xvY2FsISR7UFJFRklYfSEnIFwK
 KwkJLWUgJ3N8L3Vzci9sb2NhbHwke0xPQ0FMQkFTRX18JyBcCisJCS1lICdzfC1sYnoyfC91c3Iv
 bGliL2xpYmJ6Mi5zb3wnIFwKKwkJLWUgJ3N8LUwkJF9wcmVmaXgvbGlifC1MJHtMT0NBTEJBU0V9
 L2xpYnwnIFwKKwkJLWUgJ3N8LUkkJF9wcmVmaXgvaW5jbHVkZXwtSSR7TE9DQUxCQVNFfS9pbmNs
 dWRlfCcgXAogCQkke0NPTkZJR1VSRV9XUktTUkN9LyR7Q09ORklHVVJFX1NDUklQVH0KIAlAJHtG
 SU5EfSAtRSAke1dSS1NSQ30gLXR5cGUgZiBcCiAJCS1pcmVnZXggIi4qKGNvbmZpZ3VyZXwuc2h8
 TWFrZWZpbGUpIiAtcHJpbnQwIHwgXApAQCAtMTQ3LDExICsxNTEsMTUgQEAKIAkJJ3N8L3Vzci9c
 XDpsb2NhbC9cXDpldGMvXFw6bXBsYXllcnwke0RBVEFESVI6Uy9cLy9cL1xcXDovZ318ZyA7IFwK
 IAkJIHN8L2Rldi9cXDooZHZkW1s6YWxudW06XV0qW1s6PjpdXSl8JHtERUZBVUxUX0RWRF9ERVZJ
 Q0U6Uy9kZXZcLy9kZXZcL1xcXDovfXxnIDsgXAogCQkgc3wvZGV2L1xcOihjZHJvbVtbOmFsbnVt
 Ol1dKltbOj46XV0pfCR7REVGQVVMVF9DRFJPTV9ERVZJQ0U6Uy9kZXZcLy9kZXZcL1xcXDovfXxn
 JwotCUBjZCAke1dSS1NSQ30vbGliYXZjb2RlYyAmJiAke0xOfSAtcyB4ODYgaTM4NiAmJiAke0xO
 fSAtcyB4ODYgYW1kNjQKIAogcG9zdC1jb25maWd1cmU6CiAJQCR7UkVJTlBMQUNFX0NNRH0gLWUg
 J3MjLXB0aHJlYWQjJHtQVEhSRUFEX0xJQlN9I2cnIFwKIAkJJHtXUktTUkN9L2NvbmZpZy5tYWsK
 KwlAJHtSRUlOUExBQ0VfQ01EfSBcCisJCS1lICdzI0hBVkVfRkFTVF9DTU9WIDEjSEFWRV9GQVNU
 X0NNT1YgMCNnJyBcCisJCS1lICdzI0hBVkVfTE9HMiAxI0hBVkVfTE9HMiAwI2cnIFwKKwkJLWUg
 J3MjSEFWRV9MT0cyRiAxI0hBVkVfTE9HMkYgMCNnJyBcCisJCSR7V1JLU1JDfS9jb25maWcuaAog
 CiBkby1pbnN0YWxsOgogCUAke0lOU1RBTExfUFJPR1JBTX0gJHtXUktTUkN9L21lbmNvZGVyICR7
 UFJFRklYfS9iaW4KZGlmZiAtcnVOIC91c3IvcG9ydHMvbXVsdGltZWRpYS9tZW5jb2Rlci9kaXN0
 aW5mbyBtZW5jb2Rlci9kaXN0aW5mbwotLS0gL3Vzci9wb3J0cy9tdWx0aW1lZGlhL21lbmNvZGVy
 L2Rpc3RpbmZvCTIwMTAtMDgtMDMgMTQ6Mzc6MjguMDAwMDAwMDAwICswMjAwCisrKyBtZW5jb2Rl
 ci9kaXN0aW5mbwkyMDEwLTExLTA2IDE3OjUyOjI0LjMyODk0MjYwMCArMDEwMApAQCAtMSwzICsx
 LDIgQEAKLU1ENSAobXBsYXllci0xLjByYzIwMTAwNzE3LnRhci5iejIpID0gM2U2NTA5MzhiMzcy
 OTI5MmQxZmJlZTdkNzI1MjQ2NzAKLVNIQTI1NiAobXBsYXllci0xLjByYzIwMTAwNzE3LnRhci5i
 ejIpID0gODI5ZjE0OWZhNzQ2NTVmODQ4MjRiNDUxMWQ2OWZkOTNjNTc1ZTI0YmMxMWM0MjllNjZl
 ZTc0MjY0Mjg4MWYwYgotU0laRSAobXBsYXllci0xLjByYzIwMTAwNzE3LnRhci5iejIpID0gODk4
 ODAzMAorU0hBMjU2IChtcGxheWVyLTEuMHJjMjAxMDExMDYudGFyLmJ6MikgPSAwMGVhNjhmODY5
 NDM1YjFhNWUzNjNkODdjZjM1ZmQ2NzExZjcwM2FhYTA1YTkzZjllNGQwM2E1MmYzZWM4NzUxCitT
 SVpFIChtcGxheWVyLTEuMHJjMjAxMDExMDYudGFyLmJ6MikgPSAxMDAxNDk3NQo=
 --0016363b870e78d477049653def0--
State-Changed-From-To: feedback->open 
State-Changed-By: beech 
State-Changed-When: Wed Dec 1 07:58:07 UTC 2010 
State-Changed-Why:  
Maintainer response. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152714 
State-Changed-From-To: open->closed 
State-Changed-By: beech 
State-Changed-When: Thu Dec 2 09:18:45 UTC 2010 
State-Changed-Why:  
Committed, Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152714 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/152714: commit references a PR
Date: Thu,  2 Dec 2010 09:18:05 +0000 (UTC)

 beech       2010-12-02 09:18:01 UTC
 
   FreeBSD ports repository
 
   Modified files:
     multimedia/mencoder  Makefile distinfo 
     multimedia/mplayer   Makefile Makefile.options Makefile.shared 
                          distinfo 
     multimedia/mplayer/files patch-configure 
                              patch-libavcodec-Makefile 
                              patch-libavcodec-vorbis_dec.c 
                              patch-libavutil-x86_cpu.h 
                              pkg-message.in 
   Log:
   Update mplayer and mencoder to the latest snapshots.
   
   PR:             ports/152714
   Submitted by:   Thomas Zander (thomas.e.zander@googlemail.com) (maintainer)
   Approved by:    itetcu (mentor) (implicit)
   
   Revision  Changes    Path
   1.21      +13 -5     ports/multimedia/mencoder/Makefile
   1.5       +2 -3      ports/multimedia/mencoder/distinfo
   1.200     +13 -5     ports/multimedia/mplayer/Makefile
   1.16      +1 -3      ports/multimedia/mplayer/Makefile.options
   1.10      +3 -1      ports/multimedia/mplayer/Makefile.shared
   1.39      +2 -3      ports/multimedia/mplayer/distinfo
   1.4       +26 -41    ports/multimedia/mplayer/files/patch-configure
   1.4       +5 -5      ports/multimedia/mplayer/files/patch-libavcodec-Makefile
   1.2       +0 -63     ports/multimedia/mplayer/files/patch-libavcodec-vorbis_dec.c
   1.2       +3 -3      ports/multimedia/mplayer/files/patch-libavutil-x86_cpu.h
   1.4       +6 -1      ports/multimedia/mplayer/files/pkg-message.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
