Date: Fri, 30 Dec 2016 07:28: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: r429960 - in head/multimedia: mencoder mplayer mplayer/files Message-ID: <201612300728.uBU7SDdw054724@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Fri Dec 30 07:28:12 2016 New Revision: 429960 URL: https://svnweb.freebsd.org/changeset/ports/429960 Log: Log: - Update to upstream snapshot as of 2016-12-28 - Unbundle ffmpeg; uses multimedia/ffmpeg now - Refactor shared Makefile target - GNU_CONFIGURE -> HAS_CONFIGURE Differential Revision: https://reviews.freebsd.org/D8930 Deleted: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_arm_fft__vfp.S head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmdec.c head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmenc.c head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_mpegaudio__parser.c head/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c head/multimedia/mplayer/files/patch-ffmpeg_libavformat_udp.c head/multimedia/mplayer/files/patch-ffmpeg_libavutil_mem.c head/multimedia/mplayer/files/patch-ffmpeg_libavutil_x86_asm.h Modified: head/multimedia/mencoder/Makefile head/multimedia/mencoder/distinfo head/multimedia/mplayer/Makefile head/multimedia/mplayer/Makefile.common head/multimedia/mplayer/distinfo head/multimedia/mplayer/files/patch-configure Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Fri Dec 30 06:51:00 2016 (r429959) +++ head/multimedia/mencoder/Makefile Fri Dec 30 07:28:12 2016 (r429960) @@ -3,7 +3,6 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 2 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org @@ -91,29 +90,7 @@ pre-everything:: @${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}" @${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}" -post-patch: - @${REINPLACE_CMD} \ - -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|' \ - -e 's|-liconv|${ICONV_LIB}|' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${FIND} -E ${WRKSRC} -type f \ - -iregex ".*(configure|.sh|Makefile)" -print0 | \ - ${XARGS} -x -0 -n 10 \ - ${REINPLACE_CMD} -E \ - -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \ - -e 's|[[:space:]]gcc| ${CC}|' \ - -e 's|\$$\(CC\)|${CC}|' \ - -e 's|/usr/X11R6|${LOCALBASE}|' \ - -e 's|%%LOCALBASE%%|${LOCALBASE}|' - @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \ - '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' +post-patch: common-post-patch do-install: ${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin Modified: head/multimedia/mencoder/distinfo ============================================================================== --- head/multimedia/mencoder/distinfo Fri Dec 30 06:51:00 2016 (r429959) +++ head/multimedia/mencoder/distinfo Fri Dec 30 07:28:12 2016 (r429960) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473848106 -SHA256 (mplayer-1.3.0.20160912.tar.xz) = 8be40d3205c95dbea494ee6250e63a119ee04a785664301b0079e9e97e3c7ec8 -SIZE (mplayer-1.3.0.20160912.tar.xz) = 12736924 +TIMESTAMP = 1482913109 +SHA256 (mplayer-1.3.0.20161228.tar.xz) = 51e7c624ad2db67cd67a6f5ca973fc2509bbcc9310f2e67597011d187f0edbe6 +SIZE (mplayer-1.3.0.20161228.tar.xz) = 5166288 Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Fri Dec 30 06:51:00 2016 (r429959) +++ head/multimedia/mplayer/Makefile Fri Dec 30 07:28:12 2016 (r429960) @@ -134,29 +134,7 @@ pre-everything:: @${ECHO_MSG} "http://www.mplayerhq.hu/" .endif -post-patch: - @${REINPLACE_CMD} \ - -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|' \ - -e 's|-liconv|${ICONV_LIB}|' \ - ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} - @${FIND} -E ${WRKSRC} -type f \ - -iregex ".*(configure|.sh|Makefile)" -print0 | \ - ${XARGS} -x -0 -n 10 \ - ${REINPLACE_CMD} -E \ - -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \ - -e 's|[[:space:]]gcc| ${CC}|' \ - -e 's|\$$\(CC\)|${CC}|' \ - -e 's|/usr/X11R6|${LOCALBASE}|' \ - -e 's|%%LOCALBASE%%|${LOCALBASE}|' - @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \ - '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' +post-patch: common-post-patch post-patch-RTC-on: @${REINPLACE_CMD} -e 's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' ${WRKSRC}/mplayer.c Modified: head/multimedia/mplayer/Makefile.common ============================================================================== --- head/multimedia/mplayer/Makefile.common Fri Dec 30 06:51:00 2016 (r429959) +++ head/multimedia/mplayer/Makefile.common Fri Dec 30 07:28:12 2016 (r429960) @@ -5,8 +5,8 @@ # $FreeBSD$ MPLAYER_PORT_VERSION= 1.3.0 -MPLAYER_SNAPSHOT_DATE= 2016-09-12 -PORTREVISION?= 3 +MPLAYER_SNAPSHOT_DATE= 2016-12-28 +PORTREVISION?= 0 MASTER_SITES= LOCAL/riggs/mplayer DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} @@ -15,15 +15,17 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libpng.so:graphics/png \ + libavcodec.so:multimedia/ffmpeg \ libfreetype.so:print/freetype2 USES= compiler:c11 gmake iconv ncurses tar:xz NOPRECIOUSMAKEVARS= yes # ARCH -GNU_CONFIGURE= yes +HAS_CONFIGURE= yes CONFIGURE_ENV= TMPDIR="${WRKSRC}" CONFIGURE_ARGS= --cc="${CC}" \ --host-cc="${CC}" \ --as="${AS}" \ + --mandir="${PREFIX}/man" \ --extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \ --extra-libs="-L${PREFIX}/lib" \ --disable-alsa \ @@ -31,6 +33,7 @@ CONFIGURE_ARGS= --cc="${CC}" \ --disable-crystalhd \ --disable-esd \ --disable-faad \ + --disable-ffmpeg_a \ --disable-ggi \ --disable-ggiwmh \ --disable-liba52 \ @@ -48,3 +51,27 @@ CONFIGURE_ARGS= --cc="${CC}" \ --enable-ass-internal WANT_GNOME= yes + +common-post-patch: + @${REINPLACE_CMD} \ + -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|' \ + -e 's|-liconv|${ICONV_LIB}|' \ + ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + @${FIND} -E ${WRKSRC} -type f \ + -iregex ".*(configure|.sh|Makefile)" -print0 | \ + ${XARGS} -x -0 -n 10 \ + ${REINPLACE_CMD} -E \ + -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \ + -e 's|[[:space:]]gcc| ${CC}|' \ + -e 's|\$$\(CC\)|${CC}|' \ + -e 's|/usr/X11R6|${LOCALBASE}|' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|' + @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \ + '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' Modified: head/multimedia/mplayer/distinfo ============================================================================== --- head/multimedia/mplayer/distinfo Fri Dec 30 06:51:00 2016 (r429959) +++ head/multimedia/mplayer/distinfo Fri Dec 30 07:28:12 2016 (r429960) @@ -1,3 +1,3 @@ -TIMESTAMP = 1473836368 -SHA256 (mplayer-1.3.0.20160912.tar.xz) = 8be40d3205c95dbea494ee6250e63a119ee04a785664301b0079e9e97e3c7ec8 -SIZE (mplayer-1.3.0.20160912.tar.xz) = 12736924 +TIMESTAMP = 1482906715 +SHA256 (mplayer-1.3.0.20161228.tar.xz) = 51e7c624ad2db67cd67a6f5ca973fc2509bbcc9310f2e67597011d187f0edbe6 +SIZE (mplayer-1.3.0.20161228.tar.xz) = 5166288 Modified: head/multimedia/mplayer/files/patch-configure ============================================================================== --- head/multimedia/mplayer/files/patch-configure Fri Dec 30 06:51:00 2016 (r429959) +++ head/multimedia/mplayer/files/patch-configure Fri Dec 30 07:28:12 2016 (r429960) @@ -1,6 +1,6 @@ ---- configure.orig 2015-12-18 14:53:21 UTC +--- configure.orig 2016-11-14 23:29:59 UTC +++ configure -@@ -646,7 +646,7 @@ armthumb=auto +@@ -649,7 +649,7 @@ armthumb=auto _iwmmxt=auto _mtrr=auto _altivec=auto @@ -9,7 +9,7 @@ _ranlib=ranlib _windres=windres _cc=cc -@@ -988,7 +988,7 @@ for ac_option do +@@ -992,7 +992,7 @@ for ac_option do ld_static='' ;; --enable-profile) @@ -18,7 +18,7 @@ ;; --disable-profile) _profile= -@@ -1459,7 +1459,6 @@ for ac_option do +@@ -1464,7 +1464,6 @@ for ac_option do *) echo "Unknown parameter: $ac_option" @@ -26,7 +26,48 @@ ;; esac -@@ -1712,7 +1711,7 @@ if test -z "$_target" ; then +@@ -1502,40 +1501,6 @@ rm -f "$TMPLOG" + echo configuration: $configuration > "$TMPLOG" + echo >> "$TMPLOG" + +- +-# local FFmpeg checkout handling +-if test -e ffmpeg/.svn ; then +- echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it" +- exit 1 +-fi +- +-FFBRANCH=master +-test -e FFBRANCH && FFBRANCH=$(cat FFMPEG_BRANCH) +- +-if test -e ffmpeg/mp_auto_pull ; then +- echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable" +- (cd ffmpeg && git checkout $FFBRANCH) +- if ! (cd ffmpeg && git pull --rebase --ff-only) ; then +- echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling" +- exit 1 +- fi +-fi +- +-if test "$ffmpeg_a" != "no" && ! test -e ffmpeg ; then +- echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort" +- read tmp +- if ! git clone -b $FFBRANCH --depth 1 git://source.ffmpeg.org/ffmpeg.git ffmpeg ; then +- rm -rf ffmpeg +- echo "Failed to get a FFmpeg checkout" +- echo "Please try again or put FFmpeg source code copy into ffmpeg/ manually." +- echo "Nightly snapshot: http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2" +- echo "To use a github mirror via http (e.g. because a firewall blocks git):" +- echo "git clone --depth 1 https://github.com/FFmpeg/FFmpeg ffmpeg; touch ffmpeg/mp_auto_pull" +- exit 1 +- fi +- touch ffmpeg/mp_auto_pull +-fi +- + list_subparts() { + test ! -e ffmpeg/libav${3} && return 1 + pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p" +@@ -1732,7 +1697,7 @@ if test -z "$_target" ; then 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 ;; @@ -35,7 +76,7 @@ alpha) host_arch=alpha ;; sun4*|sparc*) host_arch=sparc ;; parisc*|hppa*|9000*) host_arch=hppa ;; -@@ -1835,7 +1834,11 @@ echocheck "working compiler" +@@ -1855,7 +1820,11 @@ echocheck "working compiler" cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ." echo "yes" @@ -48,7 +89,7 @@ if test -z "$_target" ; then cat > $TMPC << EOF -@@ -3194,6 +3197,13 @@ if arm ; then +@@ -3224,6 +3193,13 @@ if arm ; then fi echores "$setend" @@ -62,7 +103,7 @@ echocheck "softfloat ABI" softfloat=yes cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no -@@ -3944,7 +3954,7 @@ echocheck "pthread" +@@ -3993,7 +3969,7 @@ echocheck "pthread" if linux ; then THREAD_CFLAGS=-D_REENTRANT elif freebsd || netbsd || openbsd || bsdos ; then @@ -71,7 +112,7 @@ fi if test "$_pthreads" = auto ; then cat > $TMPC << EOF -@@ -3954,7 +3964,7 @@ int main(void) { pthread_t tid; return p +@@ -4003,7 +3979,7 @@ int main(void) { pthread_t tid; return p EOF _pthreads=no if ! hpux ; then @@ -80,7 +121,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 -@@ -4103,7 +4113,7 @@ int main(void) { +@@ -4152,7 +4128,7 @@ int main(void) { } EOF _iconv=no @@ -89,7 +130,7 @@ cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" && ld_iconv="$ld_tmp" && _iconv=yes && break done -@@ -5505,15 +5515,6 @@ EOF +@@ -5565,15 +5541,6 @@ EOF break fi done @@ -105,7 +146,7 @@ if win32 && cc_check -DGL_WIN32 -lopengl32 ; then _gl=yes _gl_win32=yes -@@ -6077,7 +6078,7 @@ elif darwin ; then +@@ -6137,7 +6104,7 @@ elif darwin ; then elif dragonfly ; then default_cdrom_device="/dev/cd0" elif freebsd ; then @@ -114,7 +155,7 @@ elif openbsd ; then default_cdrom_device="/dev/rcd0c" elif sunos ; then -@@ -6090,7 +6091,7 @@ else +@@ -6150,7 +6117,7 @@ else default_cdrom_device="/dev/cdrom" fi @@ -123,7 +164,7 @@ default_dvd_device=$default_cdrom_device elif darwin ; then default_dvd_device="/dev/rdiskN" -@@ -6607,7 +6608,7 @@ echores "$_speex" +@@ -6667,7 +6634,7 @@ echores "$_speex" echocheck "libgsm" if test "$_libgsm" = auto ; then _libgsm=no @@ -132,7 +173,7 @@ fi if test "$_libgsm" = yes ; then def_libgsm='#define CONFIG_LIBGSM 1' -@@ -7092,6 +7093,16 @@ if test "$_librtmp" = yes && test "$netw +@@ -7152,6 +7119,16 @@ if test "$_librtmp" = yes && test "$netw nolibrtmp=no def_librtmp='#define CONFIG_LIBRTMP 1' inputmodules="librtmp $inputmodules" @@ -149,7 +190,7 @@ else nolibrtmp=yes _librtmp=no -@@ -7493,7 +7504,7 @@ echores "$_mp3lame" +@@ -7553,7 +7530,7 @@ echores "$_mp3lame" echocheck "mencoder" if test "$_mencoder" = no ; then # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint, @@ -158,7 +199,7 @@ fi echores "$_mencoder" -@@ -8094,7 +8105,7 @@ libs_mplayer=$ld_tmp +@@ -8159,7 +8136,7 @@ libs_mplayer=$ld_tmp #############################################################################
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612300728.uBU7SDdw054724>