Date: Mon, 2 Aug 2010 19:54:19 GMT From: Thomas Zander <thomas.e.zander@googlemail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/149206: [maintainer-update] multimedia/mplayer and mencoder to recent snapshots Message-ID: <201008021954.o72JsJMl057812@www.freebsd.org> Resent-Message-ID: <201008022000.o72K0H4C058413@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 149206
>Category: ports
>Synopsis: [maintainer-update] multimedia/mplayer and mencoder to recent snapshots
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Aug 02 20:00:17 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Thomas Zander
>Release: FreeBSD 8.1-STABLE
>Organization:
>Environment:
FreeBSD 8.1-STABLE
>Description:
The attached diff patches the multimedia/mencoder and mplayer ports to a very recent SVN snapshot. This update includes
- x264 encoding using latest features (build 98 and newer)
- VP8 codec
- demuxer fixes
- libmng to the OPTIONS
The extremely little amount of complaints from the CFT on the ports mailinglist causes hopes that this is a good revision :-)
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
diff -ruN /usr/ports/multimedia/mplayer/Makefile mplayer/Makefile
--- /usr/ports/multimedia/mplayer/Makefile 2010-06-06 22:43:58.000000000 +0200
+++ mplayer/Makefile 2010-07-28 19:14:58.644500597 +0200
@@ -7,7 +7,6 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 2
COMMENT= High performance media player supporting many formats
@@ -37,6 +36,7 @@
OPTIONS+= PULSE "Enable PulseAudio" off
OPTIONS+= LIBUNGIF "Enable gif support" on
OPTIONS+= OPENJPEG "Enable JPEG2000 support" off
+OPTIONS+= MNG "Enable MNG input support" off
OPTIONS+= AALIB "Enable aalib support" off
OPTIONS+= LIBCACA "Enable libcaca support" off
OPTIONS+= SVGALIB "Enable svgalib support" off
@@ -82,6 +82,7 @@
--disable-twolame \
--disable-x264 \
--disable-xvid \
+ --disable-libdirac-lavc \
--disable-mencoder
.include "${.CURDIR}/Makefile.options"
@@ -251,19 +252,12 @@
'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}|' \
${WRKSRC}/mplayer.c
.endif
-#.if defined(WITH_VDPAU)
-# @if [ ! -e ${LOCALBASE}/share/doc/NVIDIA_GLX-1.0/vdpau.h ]; then \
-# ${ECHO_CMD} "For VDPAU support you need a recent version of x11/nvidia-driver installed"; \
-# ${FALSE}; \
-# fi
-# @${MKDIR} ${WRKSRC}/vdpau
-# @${CP} ${LOCALBASE}/share/doc/NVIDIA_GLX-1.0/vdpau*.h ${WRKSRC}/vdpau
-#.endif
post-configure:
@${REINPLACE_CMD} -e 's#-pthread#${PTHREAD_LIBS}#g' \
diff -ruN /usr/ports/multimedia/mplayer/Makefile.options mplayer/Makefile.options
--- /usr/ports/multimedia/mplayer/Makefile.options 2010-04-25 10:29:23.000000000 +0200
+++ mplayer/Makefile.options 2010-07-17 13:37:53.323751376 +0200
@@ -196,16 +196,11 @@
.endif # ARCH == i386/amd64
.if defined(WITH_REALPLAYER)
-CONFIGURE_ARGS+= --realcodecsdir=${LOCALBASE}/lib/RealPlayer/codecs
RUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
BUILD_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
.else
-.if !defined(WITHOUT_WIN32) && !defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS+= --realcodecsdir=${LOCALBASE}/lib/win32
-.else
CONFIGURE_ARGS+= --disable-real
.endif
-.endif
.if defined(WITH_AMR)
LIB_DEPENDS+= opencore-amrwb.0:${PORTSDIR}/audio/opencore-amr
@@ -225,6 +220,12 @@
--disable-tv-v4l2
.endif
+.if defined(WITH_MNG)
+LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng
+.else
+CONFIGURE_ARGS+= --disable-mng
+.endif
+
.if defined(EXTRA_LIBS)
CONFIGURE_ARGS+= --extra-libs="${EXTRA_LIBS}"
.endif
diff -ruN /usr/ports/multimedia/mplayer/Makefile.shared mplayer/Makefile.shared
--- /usr/ports/multimedia/mplayer/Makefile.shared 2010-04-21 15:07:22.000000000 +0200
+++ mplayer/Makefile.shared 2010-07-17 14:09:05.662167472 +0200
@@ -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-01-17
+MPLAYER_SNAPSHOT_DATE= 2010-07-17
MPLAYER_PORT_VERSION= 1.0.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
CATEGORIES?= multimedia audio
MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
@@ -12,6 +12,8 @@
MAINTAINER?= riggs@rrr.de
+LICENSE= GPLv2
+
LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \
freetype.9:${PORTSDIR}/print/freetype2
@@ -24,8 +26,6 @@
TMPDIR="${WRKSRC}"
CONFIGURE_ARGS= --disable-bitmap-font
-CONFIGURE_LOG= configure.log
-
WANT_GNOME= yes
WANT_SDL= yes
diff -ruN /usr/ports/multimedia/mplayer/distinfo mplayer/distinfo
--- /usr/ports/multimedia/mplayer/distinfo 2010-04-21 15:07:22.000000000 +0200
+++ mplayer/distinfo 2010-07-17 12:53:01.128404482 +0200
@@ -1,3 +1,3 @@
-MD5 (mplayer-1.0rc20100117.tar.bz2) = ba9eecc0613c1e592b970383616a679b
-SHA256 (mplayer-1.0rc20100117.tar.bz2) = b9c181671112acb6807d6cdd143941b262854b85616716fe9d1b736fff9c158d
-SIZE (mplayer-1.0rc20100117.tar.bz2) = 8663385
+MD5 (mplayer-1.0rc20100717.tar.bz2) = 3e650938b3729292d1fbee7d72524670
+SHA256 (mplayer-1.0rc20100717.tar.bz2) = 829f149fa74655f84824b4511d69fd93c575e24bc11c429e66ee742642881f0b
+SIZE (mplayer-1.0rc20100717.tar.bz2) = 8988030
diff -ruN /usr/ports/multimedia/mplayer/files/patch-configure mplayer/files/patch-configure
--- /usr/ports/multimedia/mplayer/files/patch-configure 2010-04-21 15:07:22.000000000 +0200
+++ mplayer/files/patch-configure 2010-07-17 12:50:37.969346635 +0200
@@ -1,6 +1,6 @@
---- configure.orig 2010-01-17 00:22:43.000000000 +0100
-+++ configure 2010-01-17 14:29:54.248533341 +0100
-@@ -527,7 +527,7 @@
+--- configure.orig 2010-07-14 15:49:08.000000000 +0200
++++ configure 2010-07-17 12:50:00.937109688 +0200
+@@ -555,7 +555,7 @@
_iwmmxt=auto
_mtrr=auto
_altivec=auto
@@ -9,7 +9,7 @@
_ranlib=ranlib
_windres=windres
_cc=cc
-@@ -1353,7 +1353,6 @@
+@@ -1385,7 +1385,6 @@
*)
echo "Unknown parameter: $ac_option"
@@ -17,7 +17,7 @@
;;
esac
-@@ -1462,8 +1461,8 @@
+@@ -1494,8 +1493,8 @@
_timer=timer-linux.c
_getch=getch2.c
if freebsd ; then
@@ -28,7 +28,7 @@
fi
if netbsd || dragonfly ; then
-@@ -3516,22 +3515,10 @@
+@@ -3618,22 +3617,10 @@
if linux ; then
THREAD_CFLAGS=-D_REENTRANT
elif freebsd || netbsd || openbsd || bsdos ; then
@@ -52,34 +52,47 @@
+_pthreads=yes
+_ld_pthread="${PTHREAD_LIBS}"
if test "$_pthreads" = yes ; then
- test $_ld_pthread && _res_comment="using $_ld_pthread"
+ test $_ld_pthread && res_comment="using $_ld_pthread"
def_pthreads='#define HAVE_PTHREADS 1'
-@@ -7637,8 +7624,8 @@
- if test "$_mencoder" = yes ; then
- def_muxers='#define CONFIG_MUXERS 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 @@
else
-- # mpeg1video for vf_lavc, snow for vf_uspp and vf_mcdeint, png for vf_screenshot
-- _libavencoders="MPEG1VIDEO_ENCODER SNOW_ENCODER"
-+ # mpeg1video for vf_lavc, snow/h263 for vf_uspp and vf_mcdeint, png for vf_screenshot
-+ _libavencoders="MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
- test "$_zlib" = yes && _libavencoders="$_libavencoders PNG_ENCODER"
- _libavmuxers=""
- def_muxers='#define CONFIG_MUXERS 0'
-@@ -8023,8 +8010,11 @@
+ # 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"
+ libavmuxers=""
+@@ -8161,8 +8153,11 @@
if test "$_gui" = yes ; then
# Required libraries
- if test "$_libavcodec" != yes ||
-- ! echo $_libavdecoders | grep -q PNG_DECODER ; then
+- ! echo $libavdecoders | grep -q PNG_DECODER ; then
+ # Work around a sh bug in FreeBSD < 8
+ if test "$_libavcodec" != yes ; then
+ die "The GUI requires libavcodec with PNG support (needs zlib)."
+ fi
-+ if ! echo $_libavdecoders | grep -q PNG_DECODER ; then
++ 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 && \
-@@ -8217,7 +8207,7 @@
+@@ -8352,7 +8347,7 @@
echocheck "joystick"
def_joystick='#undef CONFIG_JOYSTICK'
if test "$_joystick" = yes ; then
diff -ruN /usr/ports/multimedia/mplayer/files/patch-vidix-pci.c mplayer/files/patch-vidix-pci.c
--- /usr/ports/multimedia/mplayer/files/patch-vidix-pci.c 2010-04-21 15:07:23.000000000 +0200
+++ mplayer/files/patch-vidix-pci.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
---- vidix/pci.c.orig 2009-05-12 21:58:57.000000000 -0500
-+++ vidix/pci.c 2009-07-23 20:42:47.861327948 -0500
-@@ -481,8 +481,6 @@
- #include "sysdep/pci_arm32.c"
- #elif defined(__powerpc__)
- #include "sysdep/pci_powerpc.c"
--#elif defined(__x86_64__) || defined(__sh__)
--/* Nothing here right now */
- #else
- #include "sysdep/pci_x86.c"
- #endif
diff -ruN /usr/ports/multimedia/mencoder/Makefile mencoder/Makefile
--- /usr/ports/multimedia/mencoder/Makefile 2010-07-25 12:25:43.000000000 +0200
+++ mencoder/Makefile 2010-07-26 21:03:31.421313655 +0200
@@ -1,14 +1,13 @@
# New ports collection makefile for: mencoder
# Date created: 23 June 2007
# Whom: Thomas E. Zander
-# $FreeBSD: ports/multimedia/mencoder/Makefile,v 1.15 2010/07/25 10:25:43 olgeni Exp $
+# $FreeBSD: ports/multimedia/mencoder/Makefile,v 1.14 2010/06/03 08:54:59 netchild Exp $
#
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 3
COMMENT= Convenient video file and movie encoder
-NO_PACKAGE= Port has restricted dependencies
+RESTRICTED= Port has restricted dependencies
.include "${.CURDIR}/../mplayer/Makefile.shared"
@@ -22,6 +21,7 @@
OPTIONS+= PULSE "Enable PulseAudio" off
OPTIONS+= LIBUNGIF "Enable gif support" on
OPTIONS+= OPENJPEG "Enable JPEG2000 support" off
+OPTIONS+= MNG "Enable MNG input support" off
OPTIONS+= LIBDV "Enable libdv support" off
OPTIONS+= MAD "Enable mad MPEG audio engine support" off
OPTIONS+= AMR "Enable opencore AMR audio codec support" off
@@ -112,7 +112,7 @@
.ifdef(WITH_DIRAC)
LIB_DEPENDS+= dirac_encoder.1:${PORTSDIR}/multimedia/dirac
.else
-CONFIGURE_ARGS+= --disable-libdirac
+CONFIGURE_ARGS+= --disable-libdirac-lavc
.endif
@@ -147,6 +147,7 @@
'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' \
diff -ruN /usr/ports/multimedia/mencoder/distinfo mencoder/distinfo
--- /usr/ports/multimedia/mencoder/distinfo 2010-04-21 15:07:23.000000000 +0200
+++ mencoder/distinfo 2010-07-17 12:53:05.791309015 +0200
@@ -1,3 +1,3 @@
-MD5 (mplayer-1.0rc20100117.tar.bz2) = ba9eecc0613c1e592b970383616a679b
-SHA256 (mplayer-1.0rc20100117.tar.bz2) = b9c181671112acb6807d6cdd143941b262854b85616716fe9d1b736fff9c158d
-SIZE (mplayer-1.0rc20100117.tar.bz2) = 8663385
+MD5 (mplayer-1.0rc20100717.tar.bz2) = 3e650938b3729292d1fbee7d72524670
+SHA256 (mplayer-1.0rc20100717.tar.bz2) = 829f149fa74655f84824b4511d69fd93c575e24bc11c429e66ee742642881f0b
+SIZE (mplayer-1.0rc20100717.tar.bz2) = 8988030
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008021954.o72JsJMl057812>