From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 14 17:20:07 2012 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 67D67106566B for ; Sat, 14 Apr 2012 17:20:07 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 39DA28FC0C for ; Sat, 14 Apr 2012 17:20:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q3EHK705098933 for ; Sat, 14 Apr 2012 17:20:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q3EHK7eY098932; Sat, 14 Apr 2012 17:20:07 GMT (envelope-from gnats) Resent-Date: Sat, 14 Apr 2012 17:20:07 GMT Resent-Message-Id: <201204141720.q3EHK7eY098932@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Thomas Zander Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 59884106566B for ; Sat, 14 Apr 2012 17:17:50 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id 43B238FC0A for ; Sat, 14 Apr 2012 17:17:50 +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 q3EHHoLt047944 for ; Sat, 14 Apr 2012 17:17:50 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id q3EHHooX047942; Sat, 14 Apr 2012 17:17:50 GMT (envelope-from nobody) Message-Id: <201204141717.q3EHHooX047942@red.freebsd.org> Date: Sat, 14 Apr 2012 17:17:50 GMT From: Thomas Zander To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/166946: Update multimedia/mplayer and mencoder to a recent snapshot X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Apr 2012 17:20:07 -0000 >Number: 166946 >Category: ports >Synopsis: Update multimedia/mplayer and mencoder to a recent snapshot >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Apr 14 17:20:06 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Thomas Zander >Release: FreeBSD 8.3-PRERELEASE >Organization: >Environment: >Description: Attached patch contains an update for both multimedia/mplayer and mencoder to a recent snapshot. I've been using these for a few weeks now, a CFT on the ports mailinglist has not shown problems. This patch includes the fix for the build problem in ports/164943 , hence supersedes this one. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -r a484771371ae mencoder/Makefile --- a/mencoder/Makefile Thu Mar 22 15:07:48 2012 +0100 +++ b/mencoder/Makefile Sat Apr 14 19:10:45 2012 +0200 @@ -6,7 +6,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= Convenient video file and movie encoder RESTRICTED= Port has restricted dependencies diff -r a484771371ae mencoder/distinfo --- a/mencoder/distinfo Thu Mar 22 15:07:48 2012 +0100 +++ b/mencoder/distinfo Sat Apr 14 19:10:45 2012 +0200 @@ -1,2 +1,2 @@ -SHA256 (mplayer-1.0rc20111218.tar.xz) = 9e70b0f5d3f0840024583cfedc186b4342d3385ed88b2085efc080e5c006c03f -SIZE (mplayer-1.0rc20111218.tar.xz) = 9132500 +SHA256 (mplayer-1.0rc20120322.tar.xz) = 602a5a1c4e25ae054fdc2df49c19672b189978df12617748feb5307ff16b33cd +SIZE (mplayer-1.0rc20120322.tar.xz) = 10033056 diff -r a484771371ae mplayer/Makefile --- a/mplayer/Makefile Thu Mar 22 15:07:48 2012 +0100 +++ b/mplayer/Makefile Sat Apr 14 19:10:45 2012 +0200 @@ -7,7 +7,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 4 +PORTREVISION= 0 COMMENT= High performance media player supporting many formats .include "${.CURDIR}/Makefile.shared" @@ -283,7 +283,7 @@ .endfor .if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11) @${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer - ${INSTALL_DATA} ${WRKSRC}/gui/ui/pixmaps/mplayer.xpm ${LOCALBASE}/share/pixmaps + ${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${LOCALBASE}/share/pixmaps/mplayer.png .endif @${CAT} ${PKGMESSAGE} diff -r a484771371ae mplayer/Makefile.options --- a/mplayer/Makefile.options Thu Mar 22 15:07:48 2012 +0100 +++ b/mplayer/Makefile.options Sat Apr 14 19:10:45 2012 +0200 @@ -44,12 +44,10 @@ DEBUG_FLAGS= -g -O -fomit-frame-pointer .endif .else -#Historically, we manually set OCFLAGS to -O3 -ffast-math -fomit-frame-pointer -#Nowadays, let mplayer determine its own optimised flags .if defined(WITHOUT_OCFLAGS) CFLAGS+= -O -fomit-frame-pointer .else -CONFIGURE_ENV+= CFLAGS= +CFLAGS+= -O3 -fomit-frame-pointer -ffast-math .endif .endif #WITH_DEBUG diff -r a484771371ae mplayer/Makefile.shared --- a/mplayer/Makefile.shared Thu Mar 22 15:07:48 2012 +0100 +++ b/mplayer/Makefile.shared Sat Apr 14 19:10:45 2012 +0200 @@ -4,7 +4,7 @@ # # $FreeBSD: ports/multimedia/mplayer/Makefile.shared,v 1.16 2012/02/10 23:26:28 amdmi3 Exp $ -MPLAYER_SNAPSHOT_DATE= 2011-12-18 +MPLAYER_SNAPSHOT_DATE= 2012-03-22 MPLAYER_PORT_VERSION= 1.0.r${MPLAYER_SNAPSHOT_DATE:S/-//g} CATEGORIES?= multimedia audio MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \ diff -r a484771371ae mplayer/distinfo --- a/mplayer/distinfo Thu Mar 22 15:07:48 2012 +0100 +++ b/mplayer/distinfo Sat Apr 14 19:10:45 2012 +0200 @@ -1,2 +1,2 @@ -SHA256 (mplayer-1.0rc20111218.tar.xz) = 9e70b0f5d3f0840024583cfedc186b4342d3385ed88b2085efc080e5c006c03f -SIZE (mplayer-1.0rc20111218.tar.xz) = 9132500 +SHA256 (mplayer-1.0rc20120322.tar.xz) = 602a5a1c4e25ae054fdc2df49c19672b189978df12617748feb5307ff16b33cd +SIZE (mplayer-1.0rc20120322.tar.xz) = 10033056 diff -r a484771371ae mplayer/files/patch-Makefile --- a/mplayer/files/patch-Makefile Thu Mar 22 15:07:48 2012 +0100 +++ b/mplayer/files/patch-Makefile Sat Apr 14 19:10:45 2012 +0200 @@ -1,6 +1,6 @@ ---- Makefile.orig 2011-03-28 12:50:56.000000000 -0300 -+++ Makefile 2011-07-18 23:23:16.000000000 -0300 -@@ -899,20 +899,17 @@ +--- Makefile.orig 2012-03-03 17:45:15.000000000 +0100 ++++ Makefile 2012-03-22 15:26:08.719328325 +0100 +@@ -904,20 +904,17 @@ install: $(INSTALL_TARGETS-yes) install-dirs: @@ -10,14 +10,14 @@ - $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR) +install-mplayer: mplayer$(EXESUF) install-dirs + @${BSD_INSTALL_PROGRAM} mplayer$(EXESUF) $(BINDIR) -+ - install-gui: install-mplayer +-install-gui: install-mplayer install-gui-icons - -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF) -- $(INSTALL) -d $(DATADIR)/skins $(prefix)/share/pixmaps $(prefix)/share/applications -- $(INSTALL) -m 644 etc/mplayer.png $(prefix)/share/pixmaps/ +- $(INSTALL) -d $(DATADIR)/skins $(prefix)/share/applications - $(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/ ++install-gui: install-mplayer + install-gui-icons: $(foreach size,$(GUI_ICONSIZES),install-gui-icon-$(size)) install-gui-man: $(foreach lang,$(MAN_LANGS),install-gui-man-$(lang)) install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang)) -install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang)) diff -r a484771371ae mplayer/files/patch-configure --- a/mplayer/files/patch-configure Thu Mar 22 15:07:48 2012 +0100 +++ b/mplayer/files/patch-configure Sat Apr 14 19:10:45 2012 +0200 @@ -1,6 +1,6 @@ ---- configure.orig 2011-12-15 15:01:05.000000000 +0100 -+++ configure 2011-12-29 02:08:51.963305635 +0100 -@@ -635,7 +635,7 @@ +--- configure.orig 2012-03-15 16:20:02.000000000 +0100 ++++ configure 2012-03-22 15:36:16.583006073 +0100 +@@ -637,7 +637,7 @@ _iwmmxt=auto _mtrr=auto _altivec=auto @@ -9,7 +9,7 @@ _ranlib=ranlib _windres=windres _cc=cc -@@ -1447,7 +1447,6 @@ +@@ -1455,7 +1455,6 @@ *) echo "Unknown parameter: $ac_option" @@ -17,7 +17,7 @@ ;; esac -@@ -3565,7 +3564,7 @@ +@@ -3576,7 +3575,7 @@ if linux ; then THREAD_CFLAGS=-D_REENTRANT elif freebsd || netbsd || openbsd || bsdos ; then @@ -26,7 +26,7 @@ fi if test "$_pthreads" = auto ; then cat > $TMPC << EOF -@@ -3575,7 +3574,7 @@ +@@ -3586,7 +3585,7 @@ EOF _pthreads=no if ! hpux ; then @@ -35,7 +35,7 @@ # 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 -@@ -6216,7 +6215,7 @@ +@@ -6245,7 +6244,7 @@ echocheck "libgsm" if test "$_libgsm" = auto ; then _libgsm=no @@ -44,7 +44,7 @@ fi if test "$_libgsm" = yes ; then def_libgsm='#define CONFIG_LIBGSM 1' -@@ -6716,6 +6715,16 @@ +@@ -6705,6 +6704,16 @@ nolibrtmp=no def_librtmp='#define CONFIG_LIBRTMP 1' inputmodules="librtmp $inputmodules" @@ -61,16 +61,16 @@ else nolibrtmp=yes _librtmp=no -@@ -7085,7 +7094,7 @@ +@@ -7097,7 +7106,7 @@ echocheck "mencoder" if test "$_mencoder" = no ; then # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint, - libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER" + libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER" - # needed for codec id -> tag conversion - libavmuxers="AVI_MUXER" fi -@@ -7425,8 +7434,11 @@ + echores "$_mencoder" + +@@ -7435,8 +7444,11 @@ if test "$_gui" = yes ; then # Required libraries @@ -84,7 +84,7 @@ die "The GUI requires libavcodec with PNG support (needs zlib)." fi test "$_freetype" = no && test "$_bitmap_font" = no && -@@ -7991,7 +8003,7 @@ +@@ -8001,7 +8013,7 @@ EXESUF = $_exesuf EXESUFS_ALL = .exe diff -r a484771371ae mplayer/files/patch-libavcodec-Makefile --- a/mplayer/files/patch-libavcodec-Makefile Thu Mar 22 15:07:48 2012 +0100 +++ b/mplayer/files/patch-libavcodec-Makefile Sat Apr 14 19:10:45 2012 +0200 @@ -1,12 +1,11 @@ ---- ffmpeg/libavcodec/Makefile.orig 2011-11-18 19:20:08.000000000 +0100 -+++ ffmpeg/libavcodec/Makefile 2011-11-26 19:47:40.015896744 +0100 -@@ -699,14 +699,14 @@ +--- ffmpeg/libavcodec/Makefile.orig 2012-03-21 19:20:05.000000000 +0100 ++++ ffmpeg/libavcodec/Makefile 2012-03-22 16:12:43.333951792 +0100 +@@ -735,12 +735,14 @@ # well. OBJS-$(!CONFIG_SMALL) += inverse.o ---include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile +-include $(SRC_PATH)/$(SUBDIR)$(MPLAYER_ARCH)/Makefile - ++ SKIPHEADERS += %_tablegen.h \ %_tables.h \ aac_tablegen_decl.h \ diff -r a484771371ae mplayer/files/patch-libavcodec-libgsm.c --- a/mplayer/files/patch-libavcodec-libgsm.c Thu Mar 22 15:07:48 2012 +0100 +++ b/mplayer/files/patch-libavcodec-libgsm.c Sat Apr 14 19:10:45 2012 +0200 @@ -1,11 +1,11 @@ ---- ffmpeg/libavcodec/libgsm.c.orig 2011-03-12 15:13:38.000000000 +0100 -+++ ffmpeg/libavcodec/libgsm.c 2011-03-18 17:17:26.901267039 +0100 -@@ -28,7 +28,7 @@ +--- ffmpeg/libavcodec/libgsm.c.orig 2012-01-29 19:20:05.000000000 +0100 ++++ ffmpeg/libavcodec/libgsm.c 2012-03-22 18:07:58.682722034 +0100 +@@ -27,7 +27,7 @@ + // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html - #include "avcodec.h" -#include +#include - // gsm.h misses some essential constants - #define GSM_BLOCK_SIZE 33 + #include "avcodec.h" + #include "gsm.h" diff -r a484771371ae mplayer/files/patch-libavfilter-Makefile --- a/mplayer/files/patch-libavfilter-Makefile Thu Mar 22 15:07:48 2012 +0100 +++ b/mplayer/files/patch-libavfilter-Makefile Sat Apr 14 19:10:45 2012 +0200 @@ -1,10 +1,9 @@ ---- ffmpeg/libavfilter/Makefile.orig 2011-11-26 19:50:38.592463304 +0100 -+++ ffmpeg/libavfilter/Makefile 2011-11-26 19:50:38.570462855 +0100 -@@ -153,7 +153,7 @@ +--- ffmpeg/libavfilter/Makefile.orig 2012-03-21 19:20:05.000000000 +0100 ++++ ffmpeg/libavfilter/Makefile 2012-03-22 16:09:31.826872990 +0100 +@@ -167,6 +167,7 @@ + OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yvu9.o OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o - ---include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile +-include $(SRC_PATH)/$(SUBDIR)$(MPLAYER_ARCH)/Makefile DIRS = x86 libmpcodecs diff -r a484771371ae mplayer/pkg-plist --- a/mplayer/pkg-plist Thu Mar 22 15:07:48 2012 +0100 +++ b/mplayer/pkg-plist Sat Apr 14 19:10:45 2012 +0200 @@ -1,6 +1,6 @@ bin/mplayer %%GMPLAYER%%bin/gmplayer -%%GMPLAYER%%share/pixmaps/mplayer.xpm +%%GMPLAYER%%share/pixmaps/mplayer.png %%DATADIR%%/examples/etc/example.conf %%DATADIR%%/examples/etc/input.conf %%DATADIR%%/examples/etc/menu.conf >Release-Note: >Audit-Trail: >Unformatted: