Date: Fri, 23 Oct 2015 21:48:13 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400061 - in head/multimedia: mencoder mplayer Message-ID: <201510232148.t9NLmDiF027688@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Fri Oct 23 21:48:13 2015 New Revision: 400061 URL: https://svnweb.freebsd.org/changeset/ports/400061 Log: Use ffmpeg 2.8.1 for en/decoding, convert more OPTIONs to helpers Modified: head/multimedia/mencoder/Makefile head/multimedia/mencoder/distinfo head/multimedia/mplayer/Makefile head/multimedia/mplayer/Makefile.common head/multimedia/mplayer/Makefile.options head/multimedia/mplayer/Makefile.optvars (contents, props changed) head/multimedia/mplayer/distinfo Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Fri Oct 23 21:08:38 2015 (r400060) +++ head/multimedia/mencoder/Makefile Fri Oct 23 21:48:13 2015 (r400061) @@ -3,7 +3,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org Modified: head/multimedia/mencoder/distinfo ============================================================================== --- head/multimedia/mencoder/distinfo Fri Oct 23 21:08:38 2015 (r400060) +++ head/multimedia/mencoder/distinfo Fri Oct 23 21:48:13 2015 (r400061) @@ -1,4 +1,4 @@ -SHA256 (ffmpeg-2.8.tar.bz2) = 9565236404d3515aab754283c687c0a001019003148bf7f708e643608c0690b8 -SIZE (ffmpeg-2.8.tar.bz2) = 8563832 +SHA256 (ffmpeg-2.8.1.tar.bz2) = e2ed5ab28dee1af94336739173eb0019afc21a54e38a96f4e3208e94a07866e2 +SIZE (ffmpeg-2.8.1.tar.bz2) = 8564488 SHA256 (mplayer-1.1.20150822.tar.xz) = a01e31b8a54f61d37bdeddd5c3514956c1c6366b65e3e67c25c828c47c98d9f7 SIZE (mplayer-1.1.20150822.tar.xz) = 5162400 Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Fri Oct 23 21:08:38 2015 (r400060) +++ head/multimedia/mplayer/Makefile Fri Oct 23 21:48:13 2015 (r400061) @@ -3,7 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org Modified: head/multimedia/mplayer/Makefile.common ============================================================================== --- head/multimedia/mplayer/Makefile.common Fri Oct 23 21:08:38 2015 (r400060) +++ head/multimedia/mplayer/Makefile.common Fri Oct 23 21:48:13 2015 (r400061) @@ -6,7 +6,7 @@ MPLAYER_SNAPSHOT_DATE= 2015-08-22 MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g} -FFMPEG_VERSION= 2.8 +FFMPEG_VERSION= 2.8.1 MASTER_SITES= LOCAL/riggs/mplayer:local \ http://ffmpeg.org/releases/:ffmpeg DISTFILES+= ffmpeg-${FFMPEG_VERSION}.tar.bz2:ffmpeg \ Modified: head/multimedia/mplayer/Makefile.options ============================================================================== --- head/multimedia/mplayer/Makefile.options Fri Oct 23 21:08:38 2015 (r400060) +++ head/multimedia/mplayer/Makefile.options Fri Oct 23 21:48:13 2015 (r400061) @@ -1,23 +1,17 @@ -# Contains non-trivial handling of option variables -# and build environment. Must be included after -# bsd.port.pre.mk -# -# Some of the knobs are not tunable by the OPTIONS framework. These are -# explained here in detail. -# # $FreeBSD$ # -# 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, 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 +# Non-helper handling of option variables and build environment. +# Include after bsd.port.pre.mk +# +# Almost all of mplayer's build-time configuration is controlled via the +# OPTIONS framework. Exceptions are listed below. These variables must be +# set via make.conf or by passing the variable to make during build, e.g. +# make WITH_DVD_DEVICE=/dev/cd0 # # WITH_DVD_DEVICE=/path/to/desired/device # default: /dev/cd0 -# This option changes the default device where mplayer looks for -# a DVD medium +# This option changes the default device where mplayer looks by default +# for a DVD medium # # WITH_CDROM_DEVICE=/path/to/desired/device # default: /dev/cd0 @@ -44,56 +38,18 @@ DEFAULT_KERN_HZ=${WITH_KERN_HZ} DEFAULT_KERN_HZ=1024 .endif - -# Non-simplified OPTIONS handling -# =============================== - -.if ${PORT_OPTIONS:MIPV6} -CATEGORIES+= ipv6 -.else -CONFIGURE_ARGS+= --disable-inet6 -.endif - -.if ${PORT_OPTIONS:MRTMP} -LIB_DEPENDS+= librtmp.so:${PORTSDIR}/multimedia/librtmp -CONFIGURE_ARGS+= --enable-librtmp -EXTRA_LIBS+= -lrtmp -.else -CONFIGURE_ARGS+= --disable-librtmp -.endif - -.if ${PORT_OPTIONS:MSDL} -USE_SDL= sdl -LIB_DEPENDS+= libaa.so:${PORTSDIR}/graphics/aalib -.else -CONFIGURE_ARGS+= --disable-sdl -.endif - -.if ${PORT_OPTIONS:MV4L} -BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS+= libv4l2.so:${PORTSDIR}/multimedia/libv4l -CONFIGURE_ARGS+= --enable-tv-v4l1 \ - --enable-tv-v4l2 -EXTRA_LIBS+= -lv4l1 -lv4l2 -.else -CONFIGURE_ARGS+= --disable-tv-v4l1 \ - --disable-tv-v4l2 -.endif - - # Build system handling (including OPTIONS) # ========================================= +.if ${ARCH} == "sparc64" +BROKEN= Does not compile on sparc64 +.endif + # Support for aligned_alloc .if ${OSVERSION} >= 1000000 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aligned_alloc .endif -# Unsupported architectures -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 -.endif - .if ${CHOSEN_COMPILER_TYPE} == clang EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang-version # Require 16 byte stack realignment on i386 to interface @@ -101,12 +57,12 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- CFLAGS_i386+= -mstack-alignment=16 -mstackrealign .endif # ${CHOSEN_COMPILER_TYPE} == clang -CFLAGS_armv6+= -no-integrated-as - .if ${ARCH} == "amd64" || ${ARCH} == "i386" BUILD_DEPENDS+= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm .endif +CFLAGS_armv6+= -no-integrated-as + # Extra build options for debugging and optimised CFLAGS # ====================================================== @@ -128,10 +84,3 @@ CONFIGURE_ARGS+= --codecsdir=${LOCALBASE CONFIGURE_ARGS+= --disable-win32dll \ --disable-qtx .endif - -# Additional extra libraries handling -# =================================== - -.if defined(EXTRA_LIBS) -CONFIGURE_ARGS+= --extra-libs="${EXTRA_LIBS}" -.endif Modified: head/multimedia/mplayer/Makefile.optvars ============================================================================== --- head/multimedia/mplayer/Makefile.optvars Fri Oct 23 21:08:38 2015 (r400060) +++ head/multimedia/mplayer/Makefile.optvars Fri Oct 23 21:48:13 2015 (r400061) @@ -1,7 +1,9 @@ -# Contains simple option variables that are used -# before including bsd.port.options.mk -# in Makefiles +# $FreeBSD$ +# +# Handling of variables using helpers +# Include before bsd.port.(pre|options).mk +# OPTIONs AALIB_LIB_DEPENDS= libaa.so:${PORTSDIR}/graphics/aalib AALIB_CONFIGURE_OFF= --disable-aa @@ -44,6 +46,9 @@ GNUTLS_CONFIGURE_OFF= --disable-gnutls GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm GSM_CONFIGURE_OFF= --disable-libgsm +IPV6_CATEGORIES= ipv6 +IPV6_CONFIGURE_OFF= --disable-inet6 + JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CONFIGURE_OFF= --disable-jack @@ -84,9 +89,16 @@ RTC_CONFIGURE_ENABLE= rtc RTCPU_CONFIGURE_ON= --enable-runtime-cpudetection +RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp +RTMP_CONFIGURE_OFF= --disable-librtmp + SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger SCHROEDINGER_CONFIGURE_OFF= --disable-libschroedinger-lavc +SDL_USE= SDL=sdl +SDL_LIB_DEPENDS= libaa.so:${PORTSDIR}/graphics/aalib +SDL_CONFIGURE_OFF= --disable-sdl + SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient SMB_CONFIGURE_OFF= --disable-smb @@ -99,6 +111,11 @@ THEORA_CONFIGURE_OFF= --disable-theora TWOLAME_LIB_DEPENDS= libtwolame.so:${PORTSDIR}/audio/twolame TWOLAME_CONFIGURE_OFF= --disable-twolame +V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat +V4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l +V4L_CONFIGURE_OFF= --disable-tv-v4l1 --disable-tv-v4l2 +V4L_CONFIGURE_ON= --enable-tv-v4l1 --enable-tv-v4l2 --extra-libs="-lv4l1 -lv4l2" + VDPAU_LIB_DEPENDS= libvdpau.so:${PORTSDIR}/multimedia/libvdpau VDPAU_CONFIGURE_OFF= --disable-vdpau Modified: head/multimedia/mplayer/distinfo ============================================================================== --- head/multimedia/mplayer/distinfo Fri Oct 23 21:08:38 2015 (r400060) +++ head/multimedia/mplayer/distinfo Fri Oct 23 21:48:13 2015 (r400061) @@ -1,4 +1,4 @@ -SHA256 (ffmpeg-2.8.tar.bz2) = 9565236404d3515aab754283c687c0a001019003148bf7f708e643608c0690b8 -SIZE (ffmpeg-2.8.tar.bz2) = 8563832 +SHA256 (ffmpeg-2.8.1.tar.bz2) = e2ed5ab28dee1af94336739173eb0019afc21a54e38a96f4e3208e94a07866e2 +SIZE (ffmpeg-2.8.1.tar.bz2) = 8564488 SHA256 (mplayer-1.1.20150822.tar.xz) = a01e31b8a54f61d37bdeddd5c3514956c1c6366b65e3e67c25c828c47c98d9f7 SIZE (mplayer-1.1.20150822.tar.xz) = 5162400
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510232148.t9NLmDiF027688>