Date: Thu, 27 Aug 2015 16:59:10 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r395435 - in head/multimedia/mplayer2: . files Message-ID: <201508271659.t7RGxAdI044788@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Aug 27 16:59:09 2015 New Revision: 395435 URL: https://svnweb.freebsd.org/changeset/ports/395435 Log: multimedia/mplayer2: minor cleanup via portlint - Unsilence INSTALL_* lines - Regenerate patches with makepatch - Remove extra newline PR: 202404 Submitted by: Carlos J Puga Medina <cpm@fbsd.es> (maintainer) Modified: head/multimedia/mplayer2/Makefile (contents, props changed) head/multimedia/mplayer2/files/patch-configure (contents, props changed) head/multimedia/mplayer2/files/patch-libao2-ao_oss.c (contents, props changed) head/multimedia/mplayer2/files/patch-libmpcodecs-vd_theora.c (contents, props changed) head/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c (contents, props changed) head/multimedia/mplayer2/files/patch-libmpdemux-demux_ogg.c (contents, props changed) head/multimedia/mplayer2/files/patch-libmpdemux-demuxer.h (contents, props changed) head/multimedia/mplayer2/files/patch-stream-tvi_bsdbt848.c (contents, props changed) head/multimedia/mplayer2/files/patch-stream-tvi_v4l2.c (contents, props changed) head/multimedia/mplayer2/files/patch-sub-subassconvert.c (contents, props changed) head/multimedia/mplayer2/files/patch-sub-subreader.c (contents, props changed) Modified: head/multimedia/mplayer2/Makefile ============================================================================== --- head/multimedia/mplayer2/Makefile Thu Aug 27 16:58:54 2015 (r395434) +++ head/multimedia/mplayer2/Makefile Thu Aug 27 16:59:09 2015 (r395435) @@ -41,7 +41,6 @@ MAKE_ARGS+= BINDIR=${STAGEDIR}${PREFIX}/ MPLAYER2_SNAPSHOT_DATE= 2013-04-28 MPLAYER2_PORT_VERSION= 2.0.${MPLAYER2_SNAPSHOT_DATE:S/-//g} - OPTIONS_DEFINE= DEBUG RTC IPV6 SMB LIBBLURAY DV THEORA \ X11 XINERAMA OPENGL SDL VDPAU GIF CACA \ MAD SPEEX CDIO LADSPA REALPLAYER \ @@ -294,10 +293,10 @@ post-patch: .endif post-install: - @${INSTALL_DATA} ${WRKSRC}/etc/example.conf \ + ${INSTALL_DATA} ${WRKSRC}/etc/example.conf \ ${STAGEDIR}${PREFIX}/etc/mplayer/mplayer.conf.sample .for conf in codecs input - @${INSTALL_DATA} ${WRKSRC}/etc/${conf}.conf \ + ${INSTALL_DATA} ${WRKSRC}/etc/${conf}.conf \ ${STAGEDIR}${PREFIX}/etc/mplayer/${conf}.conf.sample .endfor Modified: head/multimedia/mplayer2/files/patch-configure ============================================================================== --- head/multimedia/mplayer2/files/patch-configure Thu Aug 27 16:58:54 2015 (r395434) +++ head/multimedia/mplayer2/files/patch-configure Thu Aug 27 16:59:09 2015 (r395435) @@ -1,6 +1,6 @@ ---- configure.orig 2012-05-12 01:08:28.473233004 -0500 -+++ configure 2012-05-12 01:10:33.294799627 -0500 -@@ -3111,7 +3111,7 @@ echocheck "pthread" +--- configure.orig 2013-07-09 16:33:11 UTC ++++ configure +@@ -2676,7 +2676,7 @@ echocheck "pthread" if linux ; then THREAD_CFLAGS=-D_REENTRANT elif freebsd || netbsd || openbsd || bsdos ; then @@ -9,7 +9,7 @@ fi if test "$_pthreads" = auto ; then cat > $TMPC << EOF -@@ -3128,7 +3128,7 @@ int main(void) { +@@ -2693,7 +2693,7 @@ int main(void) { EOF _pthreads=no if ! hpux ; then @@ -18,7 +18,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 -@@ -6340,7 +6340,7 @@ TIMER = $_timer +@@ -5296,7 +5296,7 @@ RST2MAN = $_rst2man EXESUF = $_exesuf EXESUFS_ALL = .exe Modified: head/multimedia/mplayer2/files/patch-libao2-ao_oss.c ============================================================================== --- head/multimedia/mplayer2/files/patch-libao2-ao_oss.c Thu Aug 27 16:58:54 2015 (r395434) +++ head/multimedia/mplayer2/files/patch-libao2-ao_oss.c Thu Aug 27 16:59:09 2015 (r395435) @@ -1,5 +1,5 @@ ---- libao2/ao_oss.c~ 2012-05-10 23:45:22.000000000 -0500 -+++ libao2/ao_oss.c 2012-05-11 00:03:17.820525648 -0500 +--- libao2/ao_oss.c.orig 2013-07-09 16:33:13 UTC ++++ libao2/ao_oss.c @@ -460,6 +460,7 @@ static void reset(void){ fcntl(audio_fd, F_SETFD, FD_CLOEXEC); #endif Modified: head/multimedia/mplayer2/files/patch-libmpcodecs-vd_theora.c ============================================================================== --- head/multimedia/mplayer2/files/patch-libmpcodecs-vd_theora.c Thu Aug 27 16:58:54 2015 (r395434) +++ head/multimedia/mplayer2/files/patch-libmpcodecs-vd_theora.c Thu Aug 27 16:59:09 2015 (r395435) @@ -1,6 +1,6 @@ ---- libmpcodecs/vd_theora.c.orig 2015-03-25 00:52:12.768575000 +0100 -+++ libmpcodecs/vd_theora.c 2015-03-25 01:17:34.162174000 +0100 -@@ -39,22 +39,23 @@ +--- libmpcodecs/vd_theora.c.orig 2013-07-09 16:33:13 UTC ++++ libmpcodecs/vd_theora.c +@@ -39,22 +39,23 @@ static const vd_info_t info = { LIBVD_EXTERN(theora) @@ -32,7 +32,7 @@ } return 0; } -@@ -64,7 +65,7 @@ +@@ -64,7 +65,7 @@ static int control(sh_video_t *sh,int cm theora_struct_t *context = sh->context; switch(cmd) { case VDCTRL_QUERY_FORMAT: @@ -41,7 +41,7 @@ return CONTROL_TRUE; return CONTROL_FALSE; } -@@ -88,8 +89,10 @@ +@@ -88,8 +89,10 @@ static int init(sh_video_t *sh){ if (!context) goto err_out; @@ -54,7 +54,7 @@ /* Read all header packets, pass them to theora_decode_header. */ for (i = 0; i < THEORA_NUM_HEADER_PACKETS; i++) -@@ -109,7 +112,7 @@ +@@ -109,7 +112,7 @@ static int init(sh_video_t *sh){ op.b_o_s = 1; } @@ -63,7 +63,7 @@ { mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Broken Theora header; errorCode=%i!\n", errorCode); goto err_out; -@@ -117,23 +120,25 @@ +@@ -117,23 +120,25 @@ static int init(sh_video_t *sh){ } /* now init codec */ @@ -97,7 +97,7 @@ err_out: free(context); -@@ -150,9 +155,9 @@ +@@ -150,9 +155,9 @@ static void uninit(sh_video_t *sh) if (context) { @@ -110,7 +110,7 @@ free (context); } } -@@ -165,7 +170,7 @@ +@@ -165,7 +170,7 @@ static mp_image_t* decode(sh_video_t *sh theora_struct_t *context = sh->context; int errorCode = 0; ogg_packet op; @@ -119,7 +119,7 @@ mp_image_t* mpi; // no delayed frames -@@ -177,31 +182,31 @@ +@@ -177,31 +182,31 @@ static mp_image_t* decode(sh_video_t *sh op.packet = data; op.granulepos = -1; Modified: head/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c ============================================================================== --- head/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c Thu Aug 27 16:58:54 2015 (r395434) +++ head/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c Thu Aug 27 16:59:09 2015 (r395435) @@ -1,6 +1,6 @@ ---- libmpdemux/demux_gif.c.orig 2012-12-31 00:26:50.000000000 +0100 -+++ libmpdemux/demux_gif.c 2012-12-31 00:30:54.000000000 +0100 -@@ -44,6 +44,16 @@ +--- libmpdemux/demux_gif.c.orig 2013-07-09 16:33:16 UTC ++++ libmpdemux/demux_gif.c +@@ -44,6 +44,16 @@ typedef struct { #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F') Modified: head/multimedia/mplayer2/files/patch-libmpdemux-demux_ogg.c ============================================================================== --- head/multimedia/mplayer2/files/patch-libmpdemux-demux_ogg.c Thu Aug 27 16:58:54 2015 (r395434) +++ head/multimedia/mplayer2/files/patch-libmpdemux-demux_ogg.c Thu Aug 27 16:59:09 2015 (r395435) @@ -1,5 +1,5 @@ ---- libmpdemux/demux_ogg.c.orig 2013-07-09 18:33:16.000000000 +0200 -+++ libmpdemux/demux_ogg.c 2015-03-25 01:47:19.439377000 +0100 +--- libmpdemux/demux_ogg.c.orig 2013-07-09 16:33:16 UTC ++++ libmpdemux/demux_ogg.c @@ -50,21 +50,21 @@ #endif @@ -28,7 +28,7 @@ } theora_struct_t; #endif -@@ -117,7 +117,7 @@ +@@ -117,7 +117,7 @@ typedef struct ogg_stream { float samplerate; /// granulpos 2 time int64_t lastpos; int32_t lastsize; @@ -37,7 +37,7 @@ // Logical stream state ogg_stream_state stream; -@@ -300,11 +300,10 @@ +@@ -300,11 +300,10 @@ static unsigned char *demux_ogg_read_pac have theora_state st, until all header packets were passed to the decoder. */ if (!pack->bytes || !(*data&0x80)) { @@ -51,7 +51,7 @@ os->lastpos += pack->granulepos & iframemask; *keyframe = (pack->granulepos & iframemask) == 0; } else { -@@ -888,14 +887,15 @@ +@@ -888,14 +887,15 @@ int demux_ogg_open(demuxer_t *demuxer) #ifdef CONFIG_OGGTHEORA } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) { int errorCode = 0; @@ -73,7 +73,7 @@ mp_msg(MSGT_DEMUX, MSGL_ERR, "Theora header parsing failed: %i \n", errorCode); } else { -@@ -904,30 +904,32 @@ +@@ -904,30 +904,32 @@ int demux_ogg_open(demuxer_t *demuxer) sh_v->bih = calloc(1, sizeof(*sh_v->bih)); sh_v->bih->biSize = sizeof(*sh_v->bih); sh_v->bih->biCompression = sh_v->format = FOURCC_THEORA; Modified: head/multimedia/mplayer2/files/patch-libmpdemux-demuxer.h ============================================================================== --- head/multimedia/mplayer2/files/patch-libmpdemux-demuxer.h Thu Aug 27 16:58:54 2015 (r395434) +++ head/multimedia/mplayer2/files/patch-libmpdemux-demuxer.h Thu Aug 27 16:59:09 2015 (r395435) @@ -1,6 +1,6 @@ ---- libmpdemux/demuxer.h.orig 2014-09-19 05:04:22.000000000 +0200 -+++ libmpdemux/demuxer.h 2014-09-19 05:01:57.000000000 +0200 -@@ -121,7 +121,7 @@ +--- libmpdemux/demuxer.h.orig 2013-07-09 16:33:16 UTC ++++ libmpdemux/demuxer.h +@@ -121,7 +121,7 @@ enum timestamp_type { #define SEEK_BACKWARD (1 << 3) // demux_lavf can pass lavf buffers using FF_INPUT_BUFFER_PADDING_SIZE instead Modified: head/multimedia/mplayer2/files/patch-stream-tvi_bsdbt848.c ============================================================================== --- head/multimedia/mplayer2/files/patch-stream-tvi_bsdbt848.c Thu Aug 27 16:58:54 2015 (r395434) +++ head/multimedia/mplayer2/files/patch-stream-tvi_bsdbt848.c Thu Aug 27 16:59:09 2015 (r395435) @@ -1,6 +1,6 @@ ---- stream/tvi_bsdbt848.c.orig 2009-05-12 21:58:57.000000000 -0500 -+++ stream/tvi_bsdbt848.c 2009-07-23 20:39:13.536681248 -0500 -@@ -352,11 +352,11 @@ +--- stream/tvi_bsdbt848.c.orig 2013-07-09 16:33:36 UTC ++++ stream/tvi_bsdbt848.c +@@ -368,11 +368,11 @@ static int control(priv_t *priv, int cmd int req_mode = *(int *)arg; u_short tmp_fps; @@ -14,7 +14,7 @@ priv->maxheight = PAL_HEIGHT; priv->maxwidth = PAL_WIDTH; priv->maxfps = PAL_FPS; -@@ -377,7 +377,7 @@ +@@ -393,7 +393,7 @@ static int control(priv_t *priv, int cmd if(req_mode == TV_NORM_NTSC) { @@ -23,7 +23,7 @@ priv->maxheight = NTSC_HEIGHT; priv->maxwidth = NTSC_WIDTH; priv->maxfps = NTSC_FPS; -@@ -401,9 +401,28 @@ +@@ -417,9 +417,28 @@ static int control(priv_t *priv, int cmd } } @@ -35,7 +35,8 @@ + priv->maxwidth = PAL_WIDTH; + priv->maxfps = PAL_FPS; + priv->fps = PAL_FPS; -+ + +- if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) + if(priv->fps > priv->maxfps) priv->fps = priv->maxfps; + + if(priv->geom.rows > priv->maxheight) @@ -48,13 +49,12 @@ + priv->geom.columns = priv->maxwidth; + } + } - -- if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) ++ + if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0) { - mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno)); + mp_tmsg(MSGT_TV, MSGL_ERR, "tvi_bsdbt848: Call to %s ioctl failed. Error: %s\n", "METEORSFMT", strerror(errno)); return TVI_CONTROL_FALSE; -@@ -532,8 +551,9 @@ +@@ -548,8 +567,9 @@ G_private = priv; /* Oooh, sick */ /* Video Configuration */ priv->videoready = TRUE; @@ -65,12 +65,12 @@ priv->maxheight = PAL_HEIGHT; priv->maxwidth = PAL_WIDTH; priv->maxfps = PAL_FPS; -@@ -558,7 +578,7 @@ +@@ -574,7 +594,7 @@ if(priv->btfd < 0) } if(priv->videoready == TRUE && - ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) + ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0) { - mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "SETEORSFMT", strerror(errno)); + mp_tmsg(MSGT_TV, MSGL_ERR, "tvi_bsdbt848: Call to %s ioctl failed. Error: %s\n", "SETEORSFMT", strerror(errno)); } Modified: head/multimedia/mplayer2/files/patch-stream-tvi_v4l2.c ============================================================================== --- head/multimedia/mplayer2/files/patch-stream-tvi_v4l2.c Thu Aug 27 16:58:54 2015 (r395434) +++ head/multimedia/mplayer2/files/patch-stream-tvi_v4l2.c Thu Aug 27 16:59:09 2015 (r395435) @@ -1,5 +1,5 @@ ---- stream/tvi_v4l2.c~ 2012-05-10 23:45:22.000000000 -0500 -+++ stream/tvi_v4l2.c 2012-05-11 00:08:34.930938536 -0500 +--- stream/tvi_v4l2.c.orig 2013-07-09 16:33:36 UTC ++++ stream/tvi_v4l2.c @@ -52,7 +52,6 @@ known issues: #ifdef HAVE_SYS_VIDEOIO_H #include <sys/videoio.h> Modified: head/multimedia/mplayer2/files/patch-sub-subassconvert.c ============================================================================== --- head/multimedia/mplayer2/files/patch-sub-subassconvert.c Thu Aug 27 16:58:54 2015 (r395434) +++ head/multimedia/mplayer2/files/patch-sub-subassconvert.c Thu Aug 27 16:59:09 2015 (r395435) @@ -1,4 +1,4 @@ ---- sub/subassconvert.c.orig +--- sub/subassconvert.c.orig 2013-07-09 16:33:36 UTC +++ sub/subassconvert.c @@ -18,6 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. Modified: head/multimedia/mplayer2/files/patch-sub-subreader.c ============================================================================== --- head/multimedia/mplayer2/files/patch-sub-subreader.c Thu Aug 27 16:58:54 2015 (r395434) +++ head/multimedia/mplayer2/files/patch-sub-subreader.c Thu Aug 27 16:59:09 2015 (r395435) @@ -1,4 +1,4 @@ ---- sub/subreader.c.orig +--- sub/subreader.c.orig 2013-07-09 16:33:36 UTC +++ sub/subreader.c @@ -21,6 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508271659.t7RGxAdI044788>