svn commit: r352424 - in head/multimedia: mencoder mplayer mplayer/files
Thomas Zander
riggs at FreeBSD.org
Sun Apr 27 14:22:27 UTC 2014
Author: riggs
Date: Sun Apr 27 14:22:25 2014
New Revision: 352424
URL: http://svnweb.freebsd.org/changeset/ports/352424
QAT: https://qat.redports.org/buildarchive/r352424/
Log:
- Sync with upstream snapshot of 2014-04-18
- General Makefile cleanup
- Fix x11 dependency handling (xproto was missing)
- Builds with LOCALBASE != PREFIX should work everywhere now
- Remove support for esd unconditionally
- mplayer: default build enables fribidi option, so smplayer and smtube
packages from official FreeBSD package repos will work out of the box
- Add profiling option (disabled by default)
- Remove WITH_LANG knob (was unused for a long time anyway)
- Chase libbluray shared lib version bump from ports/188573
Approved by: thierry (mentor)
Modified:
head/multimedia/mencoder/Makefile
head/multimedia/mencoder/distinfo
head/multimedia/mplayer/Makefile
head/multimedia/mplayer/Makefile.options
head/multimedia/mplayer/Makefile.shared
head/multimedia/mplayer/distinfo
head/multimedia/mplayer/files/patch-configure
head/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c
head/multimedia/mplayer/files/patch-libvo-x11_common.c
Modified: head/multimedia/mencoder/Makefile
==============================================================================
--- head/multimedia/mencoder/Makefile Sun Apr 27 14:14:26 2014 (r352423)
+++ head/multimedia/mencoder/Makefile Sun Apr 27 14:22:25 2014 (r352424)
@@ -3,7 +3,6 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 2
COMMENT= Convenient video file and movie encoder
@@ -12,8 +11,8 @@ COMMENT= Convenient video file and movie
OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG DIRAC \
DV FAAC FONTCONFIG FRIBIDI GIF GSM IPV6 JACK \
LADSPA LIBMNG LZO MAD NAS OCFLAGS OPENAL OPENJPEG \
- OPUS OTCHAIN PULSEAUDIO REAL RTCPU RTMP SCHROEDINGER \
- SMB THEORA TWOLAME V4L VPX WIN32 X264 XVID
+ OPUS OTCHAIN PROFILE PULSEAUDIO REAL RTCPU RTMP \
+ SCHROEDINGER SMB THEORA TWOLAME V4L VPX WIN32 X264 XVID
OPTIONS_DEFAULT=GIF IPV6 OCFLAGS RTCPU WIN32 X264 XVID
@@ -49,7 +48,6 @@ SHEBANG_FILES= TOOLS/calcbpp.pl TOOLS/ch
TOOLS/wma2ogg.pl
.include "${.CURDIR}/../mplayer/Makefile.optvars"
-.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
CONFIGURE_ARGS+= --disable-mplayer \
@@ -58,7 +56,6 @@ CONFIGURE_ARGS+= --disable-mplayer \
--disable-vdpau \
--disable-rtc \
--disable-arts \
- --disable-esd \
--disable-caca \
--disable-lirc \
--disable-sdl \
@@ -81,7 +78,6 @@ pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
@${ECHO_MSG} "OPTIONS framework. At the moment, their defaults are:"
- @${ECHO_MSG} "WITH_LANG=<LanguageCode>"
@${ECHO_MSG} "DEFAULT_DVD_DEVICE=/dev/cd0"
@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=/dev/cd0"
@@ -95,6 +91,7 @@ post-patch:
-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
-e 's|/usr/local|${LOCALBASE}|' \
+ -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-e 's|-lbz2|/usr/lib/libbz2.so|' \
-e 's|-lncurses|/usr/lib/libncurses.so|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
Modified: head/multimedia/mencoder/distinfo
==============================================================================
--- head/multimedia/mencoder/distinfo Sun Apr 27 14:14:26 2014 (r352423)
+++ head/multimedia/mencoder/distinfo Sun Apr 27 14:22:25 2014 (r352424)
@@ -1,2 +1,2 @@
-SHA256 (mplayer-1.1.20131223.tar.xz) = 925401be982510bf1a04da771aa7cbaca27c1acefc70d23100cf2120ba42c7ab
-SIZE (mplayer-1.1.20131223.tar.xz) = 10922300
+SHA256 (mplayer-1.1.20140418.tar.xz) = 8ac4bc58897e4f7d007040eae569cb2bf19f544fe772bb51127d801154350a7e
+SIZE (mplayer-1.1.20140418.tar.xz) = 11105012
Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile Sun Apr 27 14:14:26 2014 (r352423)
+++ head/multimedia/mplayer/Makefile Sun Apr 27 14:22:25 2014 (r352424)
@@ -3,16 +3,15 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 2
COMMENT= High performance media player supporting many formats
.include "${.CURDIR}/Makefile.shared"
OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \
- ENCA ESOUND FRIBIDI GIF GSM GUI IPV6 JACK \
+ ENCA FRIBIDI GIF GSM GUI IPV6 JACK \
LADSPA LIBMNG LIRC LZO NAS OCFLAGS \
- OPENAL OPENGL OPENJPEG OPUS OTCHAIN \
+ OPENAL OPENGL OPENJPEG OPUS OTCHAIN PROFILE \
PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \
SKINS SMB SVGALIB V4L VDPAU VPX WIN32 \
X11 X11DGA X11VM XINERAMA XVIDEO XVMC
@@ -20,7 +19,7 @@ OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLUR
OPTIONS_RADIO= RGCD
OPTIONS_RADIO_RGCD= CDIO CDPARANOIA
-OPTIONS_DEFAULT=GUI IPV6 OCFLAGS OPENGL RTCPU SKINS \
+OPTIONS_DEFAULT=FRIBIDI GUI IPV6 OCFLAGS OPENGL RTCPU SKINS \
WIN32 X11 X11DGA X11VM XINERAMA XVIDEO
BLURAY_DESC?= BluRay support
@@ -43,7 +42,6 @@ CONFFILES= example.conf input.conf menu.
USES+= pkgconfig
.include "${.CURDIR}/Makefile.optvars"
-.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
CONFIGURE_ARGS+= --disable-arts \
@@ -72,16 +70,12 @@ RUN_DEPENDS+= ${LOCALBASE}/share/mplayer
USE_GNOME+= gtk20
CONFIGURE_ARGS+= --enable-gui
-.if defined(WITH_LANG)
-WITH_LANG= ""
-.endif
-
.else
PLIST_SUB+= GMPLAYER="@comment "
.endif #GUI && X11
.if ${PORT_OPTIONS:MX11}
-USE_XORG= x11 xscrnsaver
+USE_XORG= x11 xproto xscrnsaver
.if ${PORT_OPTIONS:MXVIDEO}
USE_XORG+= xv
.else
@@ -122,7 +116,6 @@ pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
@${ECHO_MSG} "OPTIONS framework. At the moment, their defaults are:"
- @${ECHO_MSG} "WITH_LANG=<LanguageCode>"
@${ECHO_MSG} "WITH_KERN_HZ=1024"
@${ECHO_MSG} "DEFAULT_DVD_DEVICE=/dev/cd0"
@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=/dev/cd0"
@@ -144,6 +137,7 @@ post-patch:
-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
-e 's|/usr/local|${LOCALBASE}|' \
+ -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
-e 's|-lbz2|/usr/lib/libbz2.so|' \
-e 's|-lncurses|/usr/lib/libncurses.so|' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
Modified: head/multimedia/mplayer/Makefile.options
==============================================================================
--- head/multimedia/mplayer/Makefile.options Sun Apr 27 14:14:26 2014 (r352423)
+++ head/multimedia/mplayer/Makefile.options Sun Apr 27 14:22:25 2014 (r352424)
@@ -10,7 +10,7 @@
# Feature options:
# These options influence some general behaviour of mplayer. Almost all of the featues,
# for example all the codecs, are selected via the OPTIONS framework.
-# The following options WITH_DVD_DEVICE, WITH_CDROM_DEVICE, WITH_LANG are *not*
+# The following options WITH_DVD_DEVICE, WITH_CDROM_DEVICE, are *not*
# selected via the options framework and must be set via make.conf or by passing
# the variable to make during build, e.g. make WITH_DVD_DEVICE=/dev/cd0
#
@@ -22,19 +22,10 @@
# WITH_CDROM_DEVICE=/path/to/desired/device
# default: /dev/cd0
# This option changes the default cdrom device, maybe useful for VCDs
-#
-# WITH_LANG=<your choice>
-# default: en
-# Enables language support bg, cz, de, dk, en, es, fr, gr, hu, it, ko, nl, no, pl, pt_BR, ro, ru, sk, tr, uk, zh
-#
# Non-OPTIONS knob handling
# =========================
-.if defined(WITH_LANG)
-CONFIGURE_ARGS+=--language=${WITH_LANG}
-.endif
-
.if defined(WITH_DVD_DEVICE)
DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
.else
@@ -57,12 +48,6 @@ DEFAULT_KERN_HZ=1024
# Non-simplified OPTIONS handling
# ===============================
-.if ${PORT_OPTIONS:MESOUND}
-USE_GNOME+= esound
-.else
-CONFIGURE_ARGS+= --disable-esd
-.endif
-
.if ${PORT_OPTIONS:MIPV6}
CATEGORIES+= ipv6
.else
@@ -99,22 +84,6 @@ CONFIGURE_ARGS+= --disable-tv-v4l1 \
# Build system handling (including OPTIONS)
# =========================================
-#On i386, gcc runs out of general purpose registers when
-#trying to compile a debug version with the default flags.
-.if ${PORT_OPTIONS:MDEBUG}
-WITH_DEBUG= yes
-CONFIGURE_ARGS+= --enable-debug
-.if ${ARCH} == "i386"
-DEBUG_FLAGS= -g -fomit-frame-pointer
-.endif
-.else
-.if ${PORT_OPTIONS:MOCFLAGS}
-CFLAGS+= -O3 -fomit-frame-pointer -ffast-math
-.else
-CFLAGS+= -O -fomit-frame-pointer
-.endif #OCFLAGS
-.endif #DEBUG
-
# Supported architectures for clang
.if ${ARCH} == "amd64" || ${ARCH} == "i386"
MPLAYER_CLANG_SUPPORTED_ARCH= yes
@@ -167,6 +136,34 @@ MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bi
.endif
.endif
+
+# Extra build options for debugging and profiling
+# ===============================================
+
+#On i386, gcc runs out of general purpose registers when
+#trying to compile a debug version with the default flags.
+.if ${PORT_OPTIONS:MDEBUG}
+WITH_DEBUG= yes
+CONFIGURE_ARGS+= --enable-debug
+.if ${ARCH} == "i386" && !defined(WITH_BASE_CLANG)
+DEBUG_FLAGS= -g -fomit-frame-pointer
+.endif
+.else
+.if ${PORT_OPTIONS:MOCFLAGS}
+CFLAGS+= -O3 -fomit-frame-pointer -ffast-math
+.else
+CFLAGS+= -O -fomit-frame-pointer
+.endif #OCFLAGS
+.endif #DEBUG
+
+.if ${PORT_OPTIONS:MPROFILE}
+CONFIGURE_ARGS+= --enable-profile
+LDFLAGS+= -pg
+.endif
+
+# Edge case: binary codecs on i386, mostly superseded by internal ffmpeg
+# ======================================================================
+
.if ${ARCH} == "i386" || ${ARCH} == "amd64"
.if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
@@ -180,6 +177,9 @@ CONFIGURE_ARGS+= --disable-win32dll \
.endif # ARCH == i386/amd64
+# Additional extra libraries handling
+# ===================================
+
.if defined(EXTRA_LIBS)
CONFIGURE_ARGS+= --extra-libs="${EXTRA_LIBS}"
.endif
Modified: head/multimedia/mplayer/Makefile.shared
==============================================================================
--- head/multimedia/mplayer/Makefile.shared Sun Apr 27 14:14:26 2014 (r352423)
+++ head/multimedia/mplayer/Makefile.shared Sun Apr 27 14:22:25 2014 (r352424)
@@ -4,15 +4,14 @@
#
# $FreeBSD$
-MPLAYER_SNAPSHOT_DATE= 2013-12-23
+MPLAYER_SNAPSHOT_DATE= 2014-04-18
MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
CATEGORIES?= multimedia audio
-MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
+MASTER_SITES= ${MASTER_SITE_LOCAL}
+MASTER_SITE_SUBDIR= riggs/${PORTNAME}
DISTNAME= mplayer-${MPLAYER_PORT_VERSION:S/.r/./g}
WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
-PROJECTHOST= bsdistfiles
-
MAINTAINER?= riggs at FreeBSD.org
LICENSE= GPLv2
@@ -22,8 +21,7 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/gra
BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
-USES= gmake iconv ncurses
-USE_XZ= yes
+USES= gmake iconv ncurses tar:xz
GNU_CONFIGURE= yes
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
@@ -36,7 +34,10 @@ CONFIGURE_ARGS= --cc="${CC}" \
--disable-alsa \
--disable-bitmap-font \
--disable-crystalhd \
+ --disable-esd \
--disable-faad \
+ --disable-ggi \
+ --disable-ggiwmh \
--disable-liba52 \
--disable-libbs2b \
--disable-libilbc \
@@ -46,6 +47,7 @@ CONFIGURE_ARGS= --cc="${CC}" \
--disable-joystick \
--disable-mad \
--disable-mp3lib \
+ --disable-libmpeg2 \
--disable-nemesi \
--disable-speex \
--enable-ass-internal
Modified: head/multimedia/mplayer/distinfo
==============================================================================
--- head/multimedia/mplayer/distinfo Sun Apr 27 14:14:26 2014 (r352423)
+++ head/multimedia/mplayer/distinfo Sun Apr 27 14:22:25 2014 (r352424)
@@ -1,2 +1,2 @@
-SHA256 (mplayer-1.1.20131223.tar.xz) = 925401be982510bf1a04da771aa7cbaca27c1acefc70d23100cf2120ba42c7ab
-SIZE (mplayer-1.1.20131223.tar.xz) = 10922300
+SHA256 (mplayer-1.1.20140418.tar.xz) = 8ac4bc58897e4f7d007040eae569cb2bf19f544fe772bb51127d801154350a7e
+SIZE (mplayer-1.1.20140418.tar.xz) = 11105012
Modified: head/multimedia/mplayer/files/patch-configure
==============================================================================
--- head/multimedia/mplayer/files/patch-configure Sun Apr 27 14:14:26 2014 (r352423)
+++ head/multimedia/mplayer/files/patch-configure Sun Apr 27 14:22:25 2014 (r352424)
@@ -1,6 +1,6 @@
---- configure.orig 2013-11-08 17:59:55.000000000 +0100
-+++ configure 2013-11-09 14:34:53.996868923 +0100
-@@ -640,7 +640,7 @@
+--- configure.orig 2014-04-15 15:12:18.000000000 +0200
++++ configure 2014-04-21 18:34:48.440563168 +0200
+@@ -645,7 +645,7 @@
_iwmmxt=auto
_mtrr=auto
_altivec=auto
@@ -9,7 +9,16 @@
_ranlib=ranlib
_windres=windres
_cc=cc
-@@ -1452,7 +1452,6 @@
+@@ -995,7 +995,7 @@
+ ld_static=''
+ ;;
+ --enable-profile)
+- _profile='-p'
++ _profile='-pg'
+ ;;
+ --disable-profile)
+ _profile=
+@@ -1466,7 +1466,6 @@
*)
echo "Unknown parameter: $ac_option"
@@ -17,7 +26,7 @@
;;
esac
-@@ -1689,7 +1688,7 @@
+@@ -1719,7 +1718,7 @@
case "$1" in
x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
ia64) host_arch=ia64 ;;
@@ -26,7 +35,7 @@
alpha) host_arch=alpha ;;
sun4*|sparc*) host_arch=sparc ;;
parisc*|hppa*|9000*) host_arch=hppa ;;
-@@ -3822,7 +3821,7 @@
+@@ -3868,7 +3867,7 @@
if linux ; then
THREAD_CFLAGS=-D_REENTRANT
elif freebsd || netbsd || openbsd || bsdos ; then
@@ -35,7 +44,7 @@
fi
if test "$_pthreads" = auto ; then
cat > $TMPC << EOF
-@@ -3832,7 +3831,7 @@
+@@ -3878,7 +3877,7 @@
EOF
_pthreads=no
if ! hpux ; then
@@ -44,16 +53,16 @@
# for crosscompilation, we cannot execute the program, be happy if we can link statically
cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
done
-@@ -3979,7 +3978,7 @@
+@@ -4030,7 +4029,7 @@
# NOTE: -L/usr/lib is a hack to avoid issues due to a
# broken libiconv that e.g. macports installs into /opt/local/lib
# which might get addded to the search path later by e.g. SDL
- for ld_tmp in "" "-L/usr/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
-+ for ld_tmp in "" "-L$_prefix/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
++ for ld_tmp in "" "-L$_prefix/lib -liconv" "-L%%LOCALBASE%%/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
ld_iconv="$ld_tmp" && _iconv=yes && break
done
-@@ -5903,7 +5902,7 @@
+@@ -5974,7 +5973,7 @@
elif dragonfly ; then
default_cdrom_device="/dev/cd0"
elif freebsd ; then
@@ -62,7 +71,7 @@
elif openbsd ; then
default_cdrom_device="/dev/rcd0c"
elif sunos ; then
-@@ -5916,7 +5915,7 @@
+@@ -5987,7 +5986,7 @@
default_cdrom_device="/dev/cdrom"
fi
@@ -71,7 +80,7 @@
default_dvd_device=$default_cdrom_device
elif darwin ; then
default_dvd_device="/dev/rdiskN"
-@@ -6514,7 +6513,7 @@
+@@ -6586,7 +6585,7 @@
echocheck "libgsm"
if test "$_libgsm" = auto ; then
_libgsm=no
@@ -80,7 +89,7 @@
fi
if test "$_libgsm" = yes ; then
def_libgsm='#define CONFIG_LIBGSM 1'
-@@ -6999,6 +6998,16 @@
+@@ -7071,6 +7070,16 @@
nolibrtmp=no
def_librtmp='#define CONFIG_LIBRTMP 1'
inputmodules="librtmp $inputmodules"
@@ -97,7 +106,7 @@
else
nolibrtmp=yes
_librtmp=no
-@@ -7391,7 +7400,7 @@
+@@ -7470,7 +7479,7 @@
echocheck "mencoder"
if test "$_mencoder" = no ; then
# mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
@@ -106,21 +115,7 @@
fi
echores "$_mencoder"
-@@ -7729,8 +7738,11 @@
- if test "$_gui" = yes ; then
-
- # Required libraries
-- if test "$ffmpeg" != yes ||
-- ! echo $libavdecoders | grep -q PNG_DECODER ; then
-+ # Work around a sh bug in FreeBSD < 8
-+ 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 &&
-@@ -8318,7 +8330,7 @@
+@@ -8399,7 +8408,7 @@
EXESUF = $_exesuf
EXESUFS_ALL = .exe
Modified: head/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c
==============================================================================
--- head/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c Sun Apr 27 14:14:26 2014 (r352423)
+++ head/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c Sun Apr 27 14:22:25 2014 (r352424)
@@ -1,10 +1,10 @@
---- ffmpeg/libavcodec/mpegaudio_parser.c.orig 2013-03-05 19:20:04.000000000 +0100
-+++ ffmpeg/libavcodec/mpegaudio_parser.c 2013-03-08 18:28:59.428478324 +0100
-@@ -81,6 +81,7 @@
+--- ffmpeg/libavcodec/mpegaudio_parser.c.orig 2014-02-12 19:20:06.000000000 +0100
++++ ffmpeg/libavcodec/mpegaudio_parser.c 2014-04-19 14:39:15.514132783 +0200
+@@ -83,6 +83,7 @@
avctx->sample_rate= sr;
avctx->channels = channels;
s1->duration = frame_size;
+ avctx->frame_size = frame_size;
+ avctx->codec_id = codec_id;
if (s->no_bitrate || !avctx->bit_rate) {
s->no_bitrate = 1;
- avctx->bit_rate += (bit_rate - avctx->bit_rate) / s->header_count;
Modified: head/multimedia/mplayer/files/patch-libvo-x11_common.c
==============================================================================
--- head/multimedia/mplayer/files/patch-libvo-x11_common.c Sun Apr 27 14:14:26 2014 (r352423)
+++ head/multimedia/mplayer/files/patch-libvo-x11_common.c Sun Apr 27 14:22:25 2014 (r352424)
@@ -1,10 +1,11 @@
---- libvo/x11_common.c 2013-10-16 17:07:12.000000000 -0700
-+++ libvo/x11_common.c 2014-04-16 09:15:27.888658589 -0700
+--- libvo/x11_common.c.orig 2014-02-08 21:39:02.000000000 +0100
++++ libvo/x11_common.c 2014-04-19 14:43:53.715749607 +0200
@@ -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");
+ mp_msg(MSGT_VO, MSGL_WARN, MSGTR_CouldntFindUTF8Locale);
XSetErrorHandler(x11_errorhandler);
+
More information about the svn-ports-all
mailing list