From owner-svn-ports-head@FreeBSD.ORG Fri Apr 18 15:07:39 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E555B802; Fri, 18 Apr 2014 15:07:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B775619D4; Fri, 18 Apr 2014 15:07:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3IF7dY4001058; Fri, 18 Apr 2014 15:07:39 GMT (envelope-from riggs@svn.freebsd.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3IF7dCc001054; Fri, 18 Apr 2014 15:07:39 GMT (envelope-from riggs@svn.freebsd.org) Message-Id: <201404181507.s3IF7dCc001054@svn.freebsd.org> From: Thomas Zander Date: Fri, 18 Apr 2014 15:07:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351544 - in head/multimedia: mencoder mplayer mplayer/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Apr 2014 15:07:40 -0000 Author: riggs Date: Fri Apr 18 15:07:38 2014 New Revision: 351544 URL: http://svnweb.freebsd.org/changeset/ports/351544 QAT: https://qat.redports.org/buildarchive/r351544/ Log: - Bring back VPX option, thus fixing potential (de-)install dependencies - Handle UTF-8 charset properly in libvo - Bump PORTREVISION PR: ports/188657, ports/188697 Submitted by: anonymous Approved by: jadawin (co-mentor) MFH: 2014Q2 Added: head/multimedia/mplayer/files/patch-libvo-x11_common.c (contents, props changed) Modified: head/multimedia/mencoder/Makefile head/multimedia/mplayer/Makefile Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Fri Apr 18 15:05:06 2014 (r351543) +++ head/multimedia/mencoder/Makefile Fri Apr 18 15:07:38 2014 (r351544) @@ -3,7 +3,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Convenient video file and movie encoder Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Fri Apr 18 15:05:06 2014 (r351543) +++ head/multimedia/mplayer/Makefile Fri Apr 18 15:07:38 2014 (r351544) @@ -3,7 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= High performance media player supporting many formats @@ -14,7 +14,7 @@ OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLUR LADSPA LIBMNG LIRC LZO NAS OCFLAGS \ OPENAL OPENGL OPENJPEG OPUS OTCHAIN \ PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \ - SKINS SMB SVGALIB V4L VDPAU WIN32 \ + SKINS SMB SVGALIB V4L VDPAU VPX WIN32 \ X11 X11DGA X11VM XINERAMA XVIDEO XVMC OPTIONS_RADIO= RGCD Added: head/multimedia/mplayer/files/patch-libvo-x11_common.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/files/patch-libvo-x11_common.c Fri Apr 18 15:07:38 2014 (r351544) @@ -0,0 +1,10 @@ +--- libvo/x11_common.c 2013-10-16 17:07:12.000000000 -0700 ++++ libvo/x11_common.c 2014-04-16 09:15:27.888658589 -0700 +@@ -430,7 +430,7 @@ + } + + // Required so that XLookupString returns UTF-8 +- if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8")) ++ if (!setlocale(LC_CTYPE, "en_US.UTF-8")) + mp_msg(MSGT_VO, MSGL_WARN, "Could not find a UTF-8 locale, some keys will not be handled.\n"); + XSetErrorHandler(x11_errorhandler);