Attachment 159970 Details for Bug 202404 – v2

[patch] v2

mplayer2.diff (text/plain), 22.03 KB, created by Carlos J Puga Medina on 2015-08-18 02:13:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos J Puga Medina

Created: 2015-08-18 02:13:34 UTC

Size: 22.03 KB

patch

obsolete

>diff -urN /usr/ports/multimedia/mplayer2.old/Makefile /usr/ports/multimedia/mplayer2/Makefile
>--- /usr/ports/multimedia/mplayer2.old/Makefile	2015-06-22 13:54:24.000000000 +0200
>+++ /usr/ports/multimedia/mplayer2/Makefile	2015-08-18 04:03:46.767147000 +0200
>@@ -41,11 +41,10 @@
> 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 LIBCDIO LADSPA REALPLAYER \
>-		JACK PULSE PORTAUDIO ASS LIRC
>+		JACK PULSE PORTAUDIO ASS LIRC V4L
> OPTIONS_DEFAULT=X11 ASS
> 
> .if !defined(PACKAGE_BUILDING)
>@@ -67,6 +66,12 @@
> 
> CONFLICTS=	mplayer-1.*
> 
>+PLIST_FILES=	bin/mplayer \
>+		etc/mplayer/codecs.conf.sample \
>+		etc/mplayer/input.conf.sample \
>+		etc/mplayer/mplayer.conf.sample \
>+		man/man1/mplayer.1.gz
>+
> .include <bsd.port.options.mk>
> 
> .if ${ARCH} == "sparc64"
>@@ -237,7 +242,7 @@
> CONFIGURE_ARGS+=	--disable-rtc
> .endif
> 
>-.if ${PORT_OPTIONS:MLIBCACA}
>+.if ${PORT_OPTIONS:MCACA}
> LIB_DEPENDS+=		libcaca.so:${PORTSDIR}/graphics/libcaca
> .else
> CONFIGURE_ARGS+=	--disable-caca
>@@ -299,10 +304,10 @@
> .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
> 
>diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-configure /usr/ports/multimedia/mplayer2/files/patch-configure
>--- /usr/ports/multimedia/mplayer2.old/files/patch-configure	2015-03-25 18:36:47.000000000 +0100
>+++ /usr/ports/multimedia/mplayer2/files/patch-configure	2015-08-18 03:45:07.882208000 +0200
>@@ -1,6 +1,145 @@
>---- 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
>+@@ -1234,7 +1234,7 @@ if test "$(basename $_cc)" = "icc" || te
>+   esac
>+   echores "$cc_version"
>+ else
>+-  for _cc in "$_cc" gcc cc ; do
>++  for _cc in "$_cc" cc cc ; do
>+     cc_name_tmp=$($_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1)
>+     if test "$cc_name_tmp" = "gcc"; then
>+       cc_name=$cc_name_tmp
>+@@ -1383,7 +1383,7 @@ EOF
>+   if test "$_gcc3_ext" != ""; then
>+     # if we had to disable sse/sse2 because the active kernel does not
>+     # support this instruction set extension, we also have to tell
>+-    # gcc3 to not generate sse/sse2 instructions for normal C code
>++    # cc to not generate sse/sse2 instructions for normal C code
>+     cflag_check $_march $_gcc3_ext && _march="$_march $_gcc3_ext"
>+   fi
>+ 
>+@@ -1428,15 +1428,15 @@ case "$host_arch" in
>+         # AMD CPUs just from their signature. Instead, we check directly
>+         # whether it supports SSE.
>+         if test "$_sse" = yes; then
>+-            # gcc treats athlon-xp, athlon-4 and athlon-mp similarly.
>++            # cc treats athlon-xp, athlon-4 and athlon-mp similarly.
>+             proc=athlon-xp
>+         else
>+-            # Again, gcc treats athlon and athlon-tbird similarly.
>++            # Again, cc treats athlon and athlon-tbird similarly.
>+             proc=athlon
>+         fi
>+         ;;
>+     15) iproc=686
>+-        # k8 cpu-type only supported in gcc >= 3.4.0, but that will be
>++        # k8 cpu-type only supported in cc >= 3.4.0, but that will be
>+         # caught and remedied in the optimization tests below.
>+         proc=k8
>+         ;;
>+@@ -1520,11 +1520,11 @@ case "$host_arch" in
>+   fi # test "$_runtime_cpudetection" = no
>+ 
>+ 
>+-    # check that gcc supports our CPU, if not, fall back to earlier ones
>++    # check that cc supports our CPU, if not, fall back to earlier ones
>+     # LGB: check -mcpu and -march swithing step by step with enabling
>+     # to fall back till 386.
>+ 
>+-    # gcc >= 3.4.0  doesn't support -mcpu, we have to use -mtune instead
>++    # cc >= 3.4.0  doesn't support -mcpu, we have to use -mtune instead
>+ 
>+     if [ "$cc_vendor" = "gnu" ] && ([ "$_cc_major" -gt 3 ] || ( [ "$_cc_major" = 3 ] && [ "$_cc_minor" -ge 4 ])) ; then
>+         cpuopt=-mtune
>+@@ -1648,7 +1648,7 @@ case "$host_arch" in
>+     def_fast_64bit='#define HAVE_FAST_64BIT 1'
>+     iproc='x86_64'
>+ 
>+-    # gcc >= 3.4.0  doesn't support -mcpu, we have to use -mtune instead
>++    # cc >= 3.4.0  doesn't support -mcpu, we have to use -mtune instead
>+     if test "$cc_vendor" = "gnu" && test "$_cc_major" -gt 3 -o "$_cc_major" -eq 3 -a "$_cc_minor" -ge 4 ; then
>+         cpuopt=-mtune
>+     else
>+@@ -1694,7 +1694,7 @@ case "$host_arch" in
>+       if test "$proc" = "k8"; then
>+         cflag_check -march=$proc $cpuopt=$proc || proc=athlon-xp
>+       fi
>+-      # This will fail if gcc version < 3.3, which is ok because earlier
>++      # This will fail if cc version < 3.3, which is ok because earlier
>+       # versions don't really support 64-bit on amd64.
>+       # Is this a valid assumption? -Corey
>+       if test "$proc" = "athlon-xp"; then
>+@@ -1793,7 +1793,7 @@ case "$host_arch" in
>+         fi
>+         ;;
>+       NetBSD)
>+-        # only gcc 3.4 works reliably with AltiVec code under NetBSD
>++        # only cc 3.4 works reliably with AltiVec code under NetBSD
>+         case $cc_version in
>+             2*|3.0*|3.1*|3.2*|3.3*)
>+                 ;;
>+@@ -1830,7 +1830,7 @@ case "$host_arch" in
>+             POWER3) _march='-mcpu=power3' _mcpu='-mtune=power3' ;;
>+             *) ;;
>+         esac
>+-        # gcc 3.1(.1) and up supports 7400 and 7450
>++        # cc 3.1(.1) and up supports 7400 and 7450
>+         if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "1" || test "$_cc_major" -ge "4"; then
>+             case "$proc" in
>+                 7400*|7410*) _march='-mcpu=7400' _mcpu='-mtune=7400' ;;
>+@@ -1838,21 +1838,21 @@ case "$host_arch" in
>+                 *) ;;
>+             esac
>+         fi
>+-        # gcc 3.2 and up supports 970
>++        # cc 3.2 and up supports 970
>+         if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "3" || test "$_cc_major" -ge "4"; then
>+             case "$proc" in
>+                 970*|PPC970*) _march='-mcpu=970' _mcpu='-mtune=970' ;;
>+                 *) ;;
>+             esac
>+         fi
>+-        # gcc 3.3 and up supports POWER4
>++        # cc 3.3 and up supports POWER4
>+         if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "3" || test "$_cc_major" -ge "4"; then
>+             case "$proc" in
>+                 POWER4) _march='-mcpu=power4' _mcpu='-mtune=power4' ;;
>+                 *) ;;
>+             esac
>+         fi
>+-        # gcc 3.4 and up supports 440*
>++        # cc 3.4 and up supports 440*
>+         if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "4" || test "$_cc_major" -ge "4"; then
>+             case "$proc" in
>+                 440EP*) _march='-mcpu=440fp' _mcpu='-mtune=440fp' ;;
>+@@ -1860,7 +1860,7 @@ case "$host_arch" in
>+                 *) ;;
>+             esac
>+         fi
>+-        # gcc 4.0 and up supports POWER5
>++        # cc 4.0 and up supports POWER5
>+         if test "$_cc_major" -ge "4"; then
>+             case "$proc" in
>+                 POWER5*) _march='-mcpu=power5' _mcpu='-mtune=power5' ;;
>+@@ -2025,7 +2025,7 @@ if darwin && test "$cc_vendor" = "gnu" ;
>+ echocheck "GCC support of -mstackrealign"
>+ # GCC 4.2 and some earlier Apple versions support this flag on x86. Since
>+ # Mac OS X/Intel has an ABI different from Windows this is needed to avoid
>+-# crashes when loading Win32 DLLs. Unfortunately some gcc versions create
>++# crashes when loading Win32 DLLs. Unfortunately some cc versions create
>+ # wrong code with this flag, but this can be worked around by adding
>+ # -fno-unit-at-a-time as described in the blog post at
>+ # http://www.dribin.org/dave/blog/archives/2006/12/05/missing_third_param/
>+@@ -2139,7 +2139,7 @@ int main(void) {
>+         "xor %0, %0"
>+         :"=b"(x)
>+         // just adding ebx to clobber list seems unreliable with some
>+-        // compilers, e.g. Haiku's gcc 2.95
>++        // compilers, e.g. Haiku's cc 2.95
>+     );
>+     // and the above check does not work for OSX 64 bit...
>+     __asm__ volatile("":::"%ebx");
>+@@ -2676,7 +2676,7 @@ echocheck "pthread"
>  if linux ; then
>    THREAD_CFLAGS=-D_REENTRANT
>  elif freebsd || netbsd || openbsd || bsdos ; then
>@@ -9,7 +148,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 +157,54 @@
>      # 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
>+@@ -2898,7 +2898,7 @@ fi #if hpux
>+ echocheck "termcap"
>+ if test "$_termcap" = auto ; then
>+   _termcap=no
>+-  for _ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do
>++  for _ld_tmp in "/usr/lib/libncurses.so" "-ltinfo" "-ltermcap"; do
>+     statement_check term.h 'tgetent(0, 0)' $_ld_tmp &&
>+       extra_ldflags="$extra_ldflags $_ld_tmp" && _termcap=yes && break
>+   done
>+@@ -3355,7 +3355,7 @@ echocheck "X11 headers presence"
>+     fi
>+   done
>+   if test $_cross_compile = no; then
>+-    for I in /usr/X11/include /usr/X11R7/include /usr/local/include /usr/X11R6/include \
>++    for I in /usr/X11/include /usr/X11R7/include /usr/local/include /usr/local/include \
>+              /usr/include/X11R6 /usr/openwin/include ; do
>+       if test -f "$I/X11/Xlib.h" ; then
>+         extra_cflags="$extra_cflags -I$I"
>+@@ -3370,8 +3370,8 @@ echores "$_x11_headers"
>+ 
>+ echocheck "X11"
>+ if test "$_x11" = auto && test "$_x11_headers" = yes ; then
>+-  for I in "" -L/usr/X11R7/lib -L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib/X11R6 \
>+-           -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
>++  for I in "" -L/usr/X11R7/lib -L/usr/local/lib -L/usr/local/lib -L/usr/lib/X11R6 \
>++           -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/local/lib64 \
>+            -L/usr/lib ; do
>+     if netbsd; then
>+       _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
>+@@ -4192,7 +4192,7 @@ elif darwin ; then
>+ elif dragonfly ; then
>+   default_cdrom_device="/dev/cd0"
>+ elif freebsd ; then
>+-  default_cdrom_device="/dev/acd0"
>++  default_cdrom_device="/dev/cd0"
>+ elif openbsd ; then
>+   default_cdrom_device="/dev/rcd0c"
>+ elif amigaos ; then
>+@@ -5190,7 +5190,7 @@ echores "$_lircc"
>+ 
>+ #############################################################################
>+ 
>+-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
>++CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64"
>+ 
>+ # This must be the last test to be performed. Any other tests following it
>+ # could fail due to linker errors. libdvdnavmini is intentionally not linked
>+@@ -5296,7 +5296,7 @@ RST2MAN = $_rst2man
>  EXESUF      = $_exesuf
>  EXESUFS_ALL = .exe
>  
>diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-libao2-ao_oss.c /usr/ports/multimedia/mplayer2/files/patch-libao2-ao_oss.c
>--- /usr/ports/multimedia/mplayer2.old/files/patch-libao2-ao_oss.c	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/multimedia/mplayer2/files/patch-libao2-ao_oss.c	2015-08-18 03:45:07.895431000 +0200
>@@ -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
>diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-libmpcodecs-vd_theora.c /usr/ports/multimedia/mplayer2/files/patch-libmpcodecs-vd_theora.c
>--- /usr/ports/multimedia/mplayer2.old/files/patch-libmpcodecs-vd_theora.c	2015-04-30 08:45:26.000000000 +0200
>+++ /usr/ports/multimedia/mplayer2/files/patch-libmpcodecs-vd_theora.c	2015-08-18 03:45:07.908969000 +0200
>@@ -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;
>  
>diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux-demux_gif.c /usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c
>--- /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux-demux_gif.c	2012-12-31 18:32:16.000000000 +0100
>+++ /usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c	2015-08-18 03:45:07.921451000 +0200
>@@ -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')
>  
>diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux-demux_ogg.c /usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demux_ogg.c
>--- /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux-demux_ogg.c	2015-04-30 08:45:26.000000000 +0200
>+++ /usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demux_ogg.c	2015-08-18 03:45:07.935398000 +0200
>@@ -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;
>diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux-demuxer.h /usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demuxer.h
>--- /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux-demuxer.h	2014-09-19 14:56:27.000000000 +0200
>+++ /usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demuxer.h	2015-08-18 03:45:07.949174000 +0200
>@@ -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
>diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-stream-tvi_bsdbt848.c /usr/ports/multimedia/mplayer2/files/patch-stream-tvi_bsdbt848.c
>--- /usr/ports/multimedia/mplayer2.old/files/patch-stream-tvi_bsdbt848.c	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/multimedia/mplayer2/files/patch-stream-tvi_bsdbt848.c	2015-08-18 03:45:07.962840000 +0200
>@@ -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));
>      }
>diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-stream-tvi_v4l2.c /usr/ports/multimedia/mplayer2/files/patch-stream-tvi_v4l2.c
>--- /usr/ports/multimedia/mplayer2.old/files/patch-stream-tvi_v4l2.c	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/multimedia/mplayer2/files/patch-stream-tvi_v4l2.c	2015-08-18 03:45:07.976510000 +0200
>@@ -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>
>diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-sub-subassconvert.c /usr/ports/multimedia/mplayer2/files/patch-sub-subassconvert.c
>--- /usr/ports/multimedia/mplayer2.old/files/patch-sub-subassconvert.c	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/multimedia/mplayer2/files/patch-sub-subassconvert.c	2015-08-18 03:45:07.988958000 +0200
>@@ -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.
>diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-sub-subreader.c /usr/ports/multimedia/mplayer2/files/patch-sub-subreader.c
>--- /usr/ports/multimedia/mplayer2.old/files/patch-sub-subreader.c	2014-01-22 18:40:44.000000000 +0100
>+++ /usr/ports/multimedia/mplayer2/files/patch-sub-subreader.c	2015-08-18 03:45:08.002005000 +0200
>@@ -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.
>diff -urN /usr/ports/multimedia/mplayer2.old/pkg-plist /usr/ports/multimedia/mplayer2/pkg-plist
>--- /usr/ports/multimedia/mplayer2.old/pkg-plist	2015-02-01 21:24:27.000000000 +0100
>+++ /usr/ports/multimedia/mplayer2/pkg-plist	1970-01-01 01:00:00.000000000 +0100
>@@ -1,5 +0,0 @@
>-bin/mplayer
>-etc/mplayer/codecs.conf.sample
>-etc/mplayer/input.conf.sample
>-etc/mplayer/mplayer.conf.sample
>-man/man1/mplayer.1.gz

Actions: View | Diff

Attachments on bug 202404: 159969 | 159970 | 159998 | 160285 | 160300 | 160301 | 160366 | 160375 | 160377 | 160401 | 160430 | 160445 | 160503