Attachment #159970 for bug #202404




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 V4L
OPTIONS_DEFAULT=X11 ASS

.if !defined(PACKAGE_BUILDING)


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"

CONFIGURE_ARGS+=	--disable-rtc
.endif

.if ${PORT_OPTIONS:MCACA}
LIB_DEPENDS+=		libcaca.so:${PORTSDIR}/graphics/libcaca
.else
CONFIGURE_ARGS+=	--disable-caca

.endif

post-install:
	${INSTALL_DATA} ${WRKSRC}/etc/example.conf \
		${STAGEDIR}${PREFIX}/etc/mplayer/mplayer.conf.sample
.for conf in codecs input
	${INSTALL_DATA} ${WRKSRC}/etc/${conf}.conf \
		${STAGEDIR}${PREFIX}/etc/mplayer/${conf}.conf.sample
.endfor





--- 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

 fi
 if test "$_pthreads" = auto ; then
 cat > $TMPC << EOF
@@ -2693,7 +2693,7 @@ int main(void) {
 EOF
 _pthreads=no
 if ! hpux ; then

     # 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
@@ -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
 

Lines 1-5 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-libao2-ao_oss.c (-2 / +2 lines)
1	--- libao2/ao_oss.c~ 2012-05-10 23:45:22.000000000 -0500	1	--- libao2/ao_oss.c.orig 2013-07-09 16:33:13 UTC
2	+++ libao2/ao_oss.c 2012-05-11 00:03:17.820525648 -0500	2	+++ libao2/ao_oss.c
3	@@ -460,6 +460,7 @@ static void reset(void){	3	@@ -460,6 +460,7 @@ static void reset(void){
4	fcntl(audio_fd, F_SETFD, FD_CLOEXEC);	4	fcntl(audio_fd, F_SETFD, FD_CLOEXEC);
5	#endif	5	#endif




--- 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)
 

     }
     return 0;
 }
@@ -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:

 	    return CONTROL_TRUE;
 	return CONTROL_FALSE;
     }
@@ -88,8 +89,10 @@ static int init(sh_video_t *sh){
     if (!context)
         goto err_out;
 

 
     /* Read all header packets, pass them to theora_decode_header. */
     for (i = 0; i < THEORA_NUM_HEADER_PACKETS; i++)
@@ -109,7 +112,7 @@ static int init(sh_video_t *sh){
             op.b_o_s = 1;
         }
 

         {
             mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Broken Theora header; errorCode=%i!\n", errorCode);
             goto err_out;
@@ -117,23 +120,25 @@ static int init(sh_video_t *sh){
     }
 
     /* now init codec */

 
 err_out:
     free(context);
@@ -150,9 +155,9 @@ static void uninit(sh_video_t *sh)
 
    if (context)
    {

       free (context);
    }
 }
@@ -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;

    mp_image_t* mpi;
 
    // no delayed frames
@@ -177,31 +182,31 @@ static mp_image_t* decode(sh_video_t *sh
    op.packet = data;
    op.granulepos = -1;
 

Lines 1-6 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c (-3 / +3 lines)
1	--- libmpdemux/demux_gif.c.orig 2012-12-31 00:26:50.000000000 +0100	1	--- libmpdemux/demux_gif.c.orig 2013-07-09 16:33:16 UTC
2	+++ libmpdemux/demux_gif.c 2012-12-31 00:30:54.000000000 +0100	2	+++ libmpdemux/demux_gif.c
3	@@ -44,6 +44,16 @@	3	@@ -44,6 +44,16 @@ typedef struct {
4		4
5	#define GIF_SIGNATURE (('G' << 16) \| ('I' << 8) \| 'F')	5	#define GIF_SIGNATURE (('G' << 16) \| ('I' << 8) \| 'F')
6		6




--- libmpdemux/demux_ogg.c.orig	2013-07-09 16:33:16 UTC
+++ libmpdemux/demux_ogg.c
@@ -50,21 +50,21 @@
 #endif
 

 } theora_struct_t;
 #endif
 
@@ -117,7 +117,7 @@ typedef struct ogg_stream {
     float   samplerate; /// granulpos 2 time
     int64_t lastpos;
     int32_t lastsize;

 
     // Logical stream state
     ogg_stream_state stream;
@@ -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)) {

                 os->lastpos += pack->granulepos & iframemask;
                 *keyframe = (pack->granulepos & iframemask) == 0;
             } else {
@@ -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;

                 mp_msg(MSGT_DEMUX, MSGL_ERR,
                        "Theora header parsing failed: %i \n", errorCode);
             } else {
@@ -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;

Lines 1-6 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demuxer.h (-3 / +3 lines)
1	--- libmpdemux/demuxer.h.orig 2014-09-19 05:04:22.000000000 +0200	1	--- libmpdemux/demuxer.h.orig 2013-07-09 16:33:16 UTC
2	+++ libmpdemux/demuxer.h 2014-09-19 05:01:57.000000000 +0200	2	+++ libmpdemux/demuxer.h
3	@@ -121,7 +121,7 @@	3	@@ -121,7 +121,7 @@ enum timestamp_type {
4	#define SEEK_BACKWARD (1 << 3)	4	#define SEEK_BACKWARD (1 << 3)
5		5
6	// demux_lavf can pass lavf buffers using FF_INPUT_BUFFER_PADDING_SIZE instead	6	// demux_lavf can pass lavf buffers using FF_INPUT_BUFFER_PADDING_SIZE instead




--- 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;
 

             priv->maxheight = PAL_HEIGHT;
             priv->maxwidth = PAL_WIDTH;
             priv->maxfps = PAL_FPS;
@@ -393,7 +393,7 @@ static int control(priv_t *priv, int cmd
 
         if(req_mode == TV_NORM_NTSC)
             {

             priv->maxheight = NTSC_HEIGHT;
             priv->maxwidth = NTSC_WIDTH;
             priv->maxfps = NTSC_FPS;
@@ -417,9 +417,28 @@ static int control(priv_t *priv, int cmd
                 }
             }
 

+            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)

+                priv->geom.columns = priv->maxwidth;
+                }
+            }
+
-        if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
+        if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
             {
             mp_tmsg(MSGT_TV, MSGL_ERR, "tvi_bsdbt848: Call to %s ioctl failed. Error: %s\n", "METEORSFMT", strerror(errno));
             return TVI_CONTROL_FALSE;
@@ -548,8 +567,9 @@ G_private = priv; /* Oooh, sick */
 /* Video Configuration */
 
 priv->videoready = TRUE;

 priv->maxheight = PAL_HEIGHT;
 priv->maxwidth = PAL_WIDTH;
 priv->maxfps = PAL_FPS;
@@ -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_tmsg(MSGT_TV, MSGL_ERR, "tvi_bsdbt848: Call to %s ioctl failed. Error: %s\n", "SETEORSFMT", strerror(errno));
     }

Lines 1-5 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-stream-tvi_v4l2.c (-2 / +2 lines)
1	--- stream/tvi_v4l2.c~ 2012-05-10 23:45:22.000000000 -0500	1	--- stream/tvi_v4l2.c.orig 2013-07-09 16:33:36 UTC
2	+++ stream/tvi_v4l2.c 2012-05-11 00:08:34.930938536 -0500	2	+++ stream/tvi_v4l2.c
3	@@ -52,7 +52,6 @@ known issues:	3	@@ -52,7 +52,6 @@ known issues:
4	#ifdef HAVE_SYS_VIDEOIO_H	4	#ifdef HAVE_SYS_VIDEOIO_H
5	#include <sys/videoio.h>	5	#include <sys/videoio.h>

Lines 1-4 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-sub-subassconvert.c (-1 / +1 lines)
1	--- sub/subassconvert.c.orig	1	--- sub/subassconvert.c.orig 2013-07-09 16:33:36 UTC
2	+++ sub/subassconvert.c	2	+++ sub/subassconvert.c
3	@@ -18,6 +18,7 @@	3	@@ -18,6 +18,7 @@
4	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	4	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

Lines 1-4 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-sub-subreader.c (-1 / +1 lines)
1	--- sub/subreader.c.orig	1	--- sub/subreader.c.orig 2013-07-09 16:33:36 UTC
2	+++ sub/subreader.c	2	+++ sub/subreader.c
3	@@ -21,6 +21,7 @@	3	@@ -21,6 +21,7 @@
4	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.	4	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

Lines 1-5 Link Here

(-)/usr/ports/multimedia/mplayer2/pkg-plist (-5 lines)
1	bin/mplayer
2	etc/mplayer/codecs.conf.sample
3	etc/mplayer/input.conf.sample
4	etc/mplayer/mplayer.conf.sample
5	man/man1/mplayer.1.gz

Return to bug 202404

Lines 41-51 Link Here

(-)/usr/ports/multimedia/mplayer2/Makefile (-5 / +10 lines)
41	MPLAYER2_SNAPSHOT_DATE= 2013-04-28	41	MPLAYER2_SNAPSHOT_DATE= 2013-04-28
42	MPLAYER2_PORT_VERSION= 2.0.${MPLAYER2_SNAPSHOT_DATE:S/-//g}	42	MPLAYER2_PORT_VERSION= 2.0.${MPLAYER2_SNAPSHOT_DATE:S/-//g}
43		43
44
45	OPTIONS_DEFINE= DEBUG RTC IPV6 SMB LIBBLURAY DV THEORA \	44	OPTIONS_DEFINE= DEBUG RTC IPV6 SMB LIBBLURAY DV THEORA \
46	X11 XINERAMA OPENGL SDL VDPAU GIF CACA \	45	X11 XINERAMA OPENGL SDL VDPAU GIF CACA \
47	MAD SPEEX LIBCDIO LADSPA REALPLAYER \	46	MAD SPEEX LIBCDIO LADSPA REALPLAYER \
48	JACK PULSE PORTAUDIO ASS LIRC	47	JACK PULSE PORTAUDIO ASS LIRC V4L
49	OPTIONS_DEFAULT=X11 ASS	48	OPTIONS_DEFAULT=X11 ASS
50		49
51	.if !defined(PACKAGE_BUILDING)	50	.if !defined(PACKAGE_BUILDING)
Lines 67-72 Link Here
67		66
68	CONFLICTS= mplayer-1.*	67	CONFLICTS= mplayer-1.*
69		68
		69	PLIST_FILES= bin/mplayer \
		70	etc/mplayer/codecs.conf.sample \
		71	etc/mplayer/input.conf.sample \
		72	etc/mplayer/mplayer.conf.sample \
		73	man/man1/mplayer.1.gz
		74
70	.include <bsd.port.options.mk>	75	.include <bsd.port.options.mk>
71		76
72	.if ${ARCH} == "sparc64"	77	.if ${ARCH} == "sparc64"
Lines 237-243 Link Here
237	CONFIGURE_ARGS+= --disable-rtc	242	CONFIGURE_ARGS+= --disable-rtc
238	.endif	243	.endif
239		244
240	.if ${PORT_OPTIONS:MLIBCACA}	245	.if ${PORT_OPTIONS:MCACA}
241	LIB_DEPENDS+= libcaca.so:${PORTSDIR}/graphics/libcaca	246	LIB_DEPENDS+= libcaca.so:${PORTSDIR}/graphics/libcaca
242	.else	247	.else
243	CONFIGURE_ARGS+= --disable-caca	248	CONFIGURE_ARGS+= --disable-caca
Lines 299-308 Link Here
299	.endif	304	.endif
300		305
301	post-install:	306	post-install:
302	@${INSTALL_DATA} ${WRKSRC}/etc/example.conf \	307	${INSTALL_DATA} ${WRKSRC}/etc/example.conf \
303	${STAGEDIR}${PREFIX}/etc/mplayer/mplayer.conf.sample	308	${STAGEDIR}${PREFIX}/etc/mplayer/mplayer.conf.sample
304	.for conf in codecs input	309	.for conf in codecs input
305	@${INSTALL_DATA} ${WRKSRC}/etc/${conf}.conf \	310	${INSTALL_DATA} ${WRKSRC}/etc/${conf}.conf \
306	${STAGEDIR}${PREFIX}/etc/mplayer/${conf}.conf.sample	311	${STAGEDIR}${PREFIX}/etc/mplayer/${conf}.conf.sample
307	.endfor	312	.endfor
308		313

Lines 1-6 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-configure (-5 / +191 lines)
1	--- configure.orig 2012-05-12 01:08:28.473233004 -0500	1	--- configure.orig 2013-07-09 16:33:11 UTC
2	+++ configure 2012-05-12 01:10:33.294799627 -0500	2	+++ configure
3	@@ -3111,7 +3111,7 @@ echocheck "pthread"	3	@@ -1234,7 +1234,7 @@ if test "$(basename $_cc)" = "icc" \|\| te
		4	esac
		5	echores "$cc_version"
		6	else
		7	- for _cc in "$_cc" gcc cc ; do
		8	+ for _cc in "$_cc" cc cc ; do
		9	cc_name_tmp=$($_cc -v 2>&1 \| tail -n 1 \| cut -d ' ' -f 1)
		10	if test "$cc_name_tmp" = "gcc"; then
		11	cc_name=$cc_name_tmp
		12	@@ -1383,7 +1383,7 @@ EOF
		13	if test "$_gcc3_ext" != ""; then
		14	# if we had to disable sse/sse2 because the active kernel does not
		15	# support this instruction set extension, we also have to tell
		16	- # gcc3 to not generate sse/sse2 instructions for normal C code
		17	+ # cc to not generate sse/sse2 instructions for normal C code
		18	cflag_check $_march $_gcc3_ext && _march="$_march $_gcc3_ext"
		19	fi
		20
		21	@@ -1428,15 +1428,15 @@ case "$host_arch" in
		22	# AMD CPUs just from their signature. Instead, we check directly
		23	# whether it supports SSE.
		24	if test "$_sse" = yes; then
		25	- # gcc treats athlon-xp, athlon-4 and athlon-mp similarly.
		26	+ # cc treats athlon-xp, athlon-4 and athlon-mp similarly.
		27	proc=athlon-xp
		28	else
		29	- # Again, gcc treats athlon and athlon-tbird similarly.
		30	+ # Again, cc treats athlon and athlon-tbird similarly.
		31	proc=athlon
		32	fi
		33	;;
		34	15) iproc=686
		35	- # k8 cpu-type only supported in gcc >= 3.4.0, but that will be
		36	+ # k8 cpu-type only supported in cc >= 3.4.0, but that will be
		37	# caught and remedied in the optimization tests below.
		38	proc=k8
		39	;;
		40	@@ -1520,11 +1520,11 @@ case "$host_arch" in
		41	fi # test "$_runtime_cpudetection" = no
		42
		43
		44	- # check that gcc supports our CPU, if not, fall back to earlier ones
		45	+ # check that cc supports our CPU, if not, fall back to earlier ones
		46	# LGB: check -mcpu and -march swithing step by step with enabling
		47	# to fall back till 386.
		48
		49	- # gcc >= 3.4.0 doesn't support -mcpu, we have to use -mtune instead
		50	+ # cc >= 3.4.0 doesn't support -mcpu, we have to use -mtune instead
		51
		52	if [ "$cc_vendor" = "gnu" ] && ([ "$_cc_major" -gt 3 ] \|\| ( [ "$_cc_major" = 3 ] && [ "$_cc_minor" -ge 4 ])) ; then
		53	cpuopt=-mtune
		54	@@ -1648,7 +1648,7 @@ case "$host_arch" in
		55	def_fast_64bit='#define HAVE_FAST_64BIT 1'
		56	iproc='x86_64'
		57
		58	- # gcc >= 3.4.0 doesn't support -mcpu, we have to use -mtune instead
		59	+ # cc >= 3.4.0 doesn't support -mcpu, we have to use -mtune instead
		60	if test "$cc_vendor" = "gnu" && test "$_cc_major" -gt 3 -o "$_cc_major" -eq 3 -a "$_cc_minor" -ge 4 ; then
		61	cpuopt=-mtune
		62	else
		63	@@ -1694,7 +1694,7 @@ case "$host_arch" in
		64	if test "$proc" = "k8"; then
		65	cflag_check -march=$proc $cpuopt=$proc \|\| proc=athlon-xp
		66	fi
		67	- # This will fail if gcc version < 3.3, which is ok because earlier
68	+ # This will fail if cc version < 3.3, which is ok because earlier
69	# versions don't really support 64-bit on amd64.
70	# Is this a valid assumption? -Corey
71	if test "$proc" = "athlon-xp"; then
72	@@ -1793,7 +1793,7 @@ case "$host_arch" in
73	fi
74	;;
75	NetBSD)
76	- # only gcc 3.4 works reliably with AltiVec code under NetBSD
77	+ # only cc 3.4 works reliably with AltiVec code under NetBSD
78	case $cc_version in
79	2\|3.0\|3.1\|3.2\|3.3*)
80	;;
81	@@ -1830,7 +1830,7 @@ case "$host_arch" in
82	POWER3) _march='-mcpu=power3' _mcpu='-mtune=power3' ;;
83	*) ;;
84	esac
85	- # gcc 3.1(.1) and up supports 7400 and 7450
86	+ # cc 3.1(.1) and up supports 7400 and 7450
87	if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "1" \|\| test "$_cc_major" -ge "4"; then
88	case "$proc" in
89	7400\|7410) _march='-mcpu=7400' _mcpu='-mtune=7400' ;;
90	@@ -1838,21 +1838,21 @@ case "$host_arch" in
91	*) ;;
92	esac
93	fi
94	- # gcc 3.2 and up supports 970
95	+ # cc 3.2 and up supports 970
96	if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "3" \|\| test "$_cc_major" -ge "4"; then
97	case "$proc" in
98	970\|PPC970) _march='-mcpu=970' _mcpu='-mtune=970' ;;
99	*) ;;
100	esac
101	fi
102	- # gcc 3.3 and up supports POWER4
103	+ # cc 3.3 and up supports POWER4
104	if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "3" \|\| test "$_cc_major" -ge "4"; then
105	case "$proc" in
106	POWER4) _march='-mcpu=power4' _mcpu='-mtune=power4' ;;
107	*) ;;
108	esac
109	fi
110	- # gcc 3.4 and up supports 440*
111	+ # cc 3.4 and up supports 440*
112	if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "4" \|\| test "$_cc_major" -ge "4"; then
113	case "$proc" in
114	440EP*) _march='-mcpu=440fp' _mcpu='-mtune=440fp' ;;
115	@@ -1860,7 +1860,7 @@ case "$host_arch" in
116	*) ;;
117	esac
118	fi
119	- # gcc 4.0 and up supports POWER5
120	+ # cc 4.0 and up supports POWER5
121	if test "$_cc_major" -ge "4"; then
122	case "$proc" in
123	POWER5*) _march='-mcpu=power5' _mcpu='-mtune=power5' ;;
124	@@ -2025,7 +2025,7 @@ if darwin && test "$cc_vendor" = "gnu" ;
125	echocheck "GCC support of -mstackrealign"
126	# GCC 4.2 and some earlier Apple versions support this flag on x86. Since
127	# Mac OS X/Intel has an ABI different from Windows this is needed to avoid
128	-# crashes when loading Win32 DLLs. Unfortunately some gcc versions create
129	+# crashes when loading Win32 DLLs. Unfortunately some cc versions create
130	# wrong code with this flag, but this can be worked around by adding
131	# -fno-unit-at-a-time as described in the blog post at
132	# http://www.dribin.org/dave/blog/archives/2006/12/05/missing_third_param/
133	@@ -2139,7 +2139,7 @@ int main(void) {
134	"xor %0, %0"
135	:"=b"(x)
136	// just adding ebx to clobber list seems unreliable with some
137	- // compilers, e.g. Haiku's gcc 2.95
138	+ // compilers, e.g. Haiku's cc 2.95
139	);
140	// and the above check does not work for OSX 64 bit...
141	__asm__ volatile("":::"%ebx");
142	@@ -2676,7 +2676,7 @@ echocheck "pthread"
4	if linux ; then	143	if linux ; then
5	THREAD_CFLAGS=-D_REENTRANT	144	THREAD_CFLAGS=-D_REENTRANT
6	elif freebsd \|\| netbsd \|\| openbsd \|\| bsdos ; then	145	elif freebsd \|\| netbsd \|\| openbsd \|\| bsdos ; then
Lines 9-15 Link Here
9	fi	148	fi
10	if test "$_pthreads" = auto ; then	149	if test "$_pthreads" = auto ; then
11	cat > $TMPC << EOF	150	cat > $TMPC << EOF
12	@@ -3128,7 +3128,7 @@ int main(void) {	151	@@ -2693,7 +2693,7 @@ int main(void) {
13	EOF	152	EOF
14	_pthreads=no	153	_pthreads=no
15	if ! hpux ; then	154	if ! hpux ; then
Lines 18-24 Link Here
18	# for crosscompilation, we cannot execute the program, be happy if we can link statically	157	# for crosscompilation, we cannot execute the program, be happy if we can link statically
19	cc_check $THREAD_CFLAGS $_ld_tmp && (tmp_run \|\| test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break	158	cc_check $THREAD_CFLAGS $_ld_tmp && (tmp_run \|\| test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break
20	done	159	done
21	@@ -6340,7 +6340,7 @@ TIMER = $_timer	160	@@ -2898,7 +2898,7 @@ fi #if hpux
		161	echocheck "termcap"
		162	if test "$_termcap" = auto ; then
		163	_termcap=no
		164	- for _ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do
		165	+ for _ld_tmp in "/usr/lib/libncurses.so" "-ltinfo" "-ltermcap"; do
		166	statement_check term.h 'tgetent(0, 0)' $_ld_tmp &&
		167	extra_ldflags="$extra_ldflags $_ld_tmp" && _termcap=yes && break
		168	done
		169	@@ -3355,7 +3355,7 @@ echocheck "X11 headers presence"
		170	fi
		171	done
		172	if test $_cross_compile = no; then
		173	- for I in /usr/X11/include /usr/X11R7/include /usr/local/include /usr/X11R6/include \
		174	+ for I in /usr/X11/include /usr/X11R7/include /usr/local/include /usr/local/include \
		175	/usr/include/X11R6 /usr/openwin/include ; do
		176	if test -f "$I/X11/Xlib.h" ; then
		177	extra_cflags="$extra_cflags -I$I"
		178	@@ -3370,8 +3370,8 @@ echores "$_x11_headers"
		179
		180	echocheck "X11"
		181	if test "$_x11" = auto && test "$_x11_headers" = yes ; then
		182	- for I in "" -L/usr/X11R7/lib -L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib/X11R6 \
		183	- -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
		184	+ for I in "" -L/usr/X11R7/lib -L/usr/local/lib -L/usr/local/lib -L/usr/lib/X11R6 \
		185	+ -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/local/lib64 \
		186	-L/usr/lib ; do
		187	if netbsd; then
		188	_ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R$(echo $I \| sed s/^-L//)"
		189	@@ -4192,7 +4192,7 @@ elif darwin ; then
		190	elif dragonfly ; then
		191	default_cdrom_device="/dev/cd0"
		192	elif freebsd ; then
		193	- default_cdrom_device="/dev/acd0"
		194	+ default_cdrom_device="/dev/cd0"
		195	elif openbsd ; then
		196	default_cdrom_device="/dev/rcd0c"
		197	elif amigaos ; then
		198	@@ -5190,7 +5190,7 @@ echores "$_lircc"
		199
		200	#############################################################################
		201
		202	-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
		203	+CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64"
		204
		205	# This must be the last test to be performed. Any other tests following it
		206	# could fail due to linker errors. libdvdnavmini is intentionally not linked
		207	@@ -5296,7 +5296,7 @@ RST2MAN = $_rst2man
22	EXESUF = $_exesuf	208	EXESUF = $_exesuf
23	EXESUFS_ALL = .exe	209	EXESUFS_ALL = .exe
24		210

Lines 1-6 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-libmpcodecs-vd_theora.c (-10 / +10 lines)
1	--- libmpcodecs/vd_theora.c.orig 2015-03-25 00:52:12.768575000 +0100	1	--- libmpcodecs/vd_theora.c.orig 2013-07-09 16:33:13 UTC
2	+++ libmpcodecs/vd_theora.c 2015-03-25 01:17:34.162174000 +0100	2	+++ libmpcodecs/vd_theora.c
3	@@ -39,22 +39,23 @@	3	@@ -39,22 +39,23 @@ static const vd_info_t info = {
4		4
5	LIBVD_EXTERN(theora)	5	LIBVD_EXTERN(theora)
6		6
Lines 32-38 Link Here
32	}	32	}
33	return 0;	33	return 0;
34	}	34	}
35	@@ -64,7 +65,7 @@	35	@@ -64,7 +65,7 @@ static int control(sh_video_t *sh,int cm
36	theora_struct_t *context = sh->context;	36	theora_struct_t *context = sh->context;
37	switch(cmd) {	37	switch(cmd) {
38	case VDCTRL_QUERY_FORMAT:	38	case VDCTRL_QUERY_FORMAT:
Lines 41-47 Link Here
41	return CONTROL_TRUE;	41	return CONTROL_TRUE;
42	return CONTROL_FALSE;	42	return CONTROL_FALSE;
43	}	43	}
44	@@ -88,8 +89,10 @@	44	@@ -88,8 +89,10 @@ static int init(sh_video_t *sh){
45	if (!context)	45	if (!context)
46	goto err_out;	46	goto err_out;
47		47
Lines 54-60 Link Here
54		54
55	/* Read all header packets, pass them to theora_decode_header. */	55	/* Read all header packets, pass them to theora_decode_header. */
56	for (i = 0; i < THEORA_NUM_HEADER_PACKETS; i++)	56	for (i = 0; i < THEORA_NUM_HEADER_PACKETS; i++)
57	@@ -109,7 +112,7 @@	57	@@ -109,7 +112,7 @@ static int init(sh_video_t *sh){
58	op.b_o_s = 1;	58	op.b_o_s = 1;
59	}	59	}
60		60
Lines 63-69 Link Here
63	{	63	{
64	mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Broken Theora header; errorCode=%i!\n", errorCode);	64	mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Broken Theora header; errorCode=%i!\n", errorCode);
65	goto err_out;	65	goto err_out;
66	@@ -117,23 +120,25 @@	66	@@ -117,23 +120,25 @@ static int init(sh_video_t *sh){
67	}	67	}
68		68
69	/* now init codec */	69	/* now init codec */
Lines 97-103 Link Here
97		97
98	err_out:	98	err_out:
99	free(context);	99	free(context);
100	@@ -150,9 +155,9 @@	100	@@ -150,9 +155,9 @@ static void uninit(sh_video_t *sh)
101		101
102	if (context)	102	if (context)
103	{	103	{
Lines 110-116 Link Here
110	free (context);	110	free (context);
111	}	111	}
112	}	112	}
113	@@ -165,7 +170,7 @@	113	@@ -165,7 +170,7 @@ static mp_image_t* decode(sh_video_t *sh
114	theora_struct_t *context = sh->context;	114	theora_struct_t *context = sh->context;
115	int errorCode = 0;	115	int errorCode = 0;
116	ogg_packet op;	116	ogg_packet op;
Lines 119-125 Link Here
119	mp_image_t* mpi;	119	mp_image_t* mpi;
120		120
121	// no delayed frames	121	// no delayed frames
122	@@ -177,31 +182,31 @@	122	@@ -177,31 +182,31 @@ static mp_image_t* decode(sh_video_t *sh
123	op.packet = data;	123	op.packet = data;
124	op.granulepos = -1;	124	op.granulepos = -1;
125		125

Lines 1-5 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demux_ogg.c (-6 / +6 lines)
1	--- libmpdemux/demux_ogg.c.orig 2013-07-09 18:33:16.000000000 +0200	1	--- libmpdemux/demux_ogg.c.orig 2013-07-09 16:33:16 UTC
2	+++ libmpdemux/demux_ogg.c 2015-03-25 01:47:19.439377000 +0100	2	+++ libmpdemux/demux_ogg.c
3	@@ -50,21 +50,21 @@	3	@@ -50,21 +50,21 @@
4	#endif	4	#endif
5		5
Lines 28-34 Link Here
28	} theora_struct_t;	28	} theora_struct_t;
29	#endif	29	#endif
30		30
31	@@ -117,7 +117,7 @@	31	@@ -117,7 +117,7 @@ typedef struct ogg_stream {
32	float samplerate; /// granulpos 2 time	32	float samplerate; /// granulpos 2 time
33	int64_t lastpos;	33	int64_t lastpos;
34	int32_t lastsize;	34	int32_t lastsize;
Lines 37-43 Link Here
37		37
38	// Logical stream state	38	// Logical stream state
39	ogg_stream_state stream;	39	ogg_stream_state stream;
40	@@ -300,11 +300,10 @@	40	@@ -300,11 +300,10 @@ static unsigned char *demux_ogg_read_pac
41	have theora_state st, until all header packets were passed to the	41	have theora_state st, until all header packets were passed to the
42	decoder. */	42	decoder. */
43	if (!pack->bytes \|\| !(*data&0x80)) {	43	if (!pack->bytes \|\| !(*data&0x80)) {
Lines 51-57 Link Here
51	os->lastpos += pack->granulepos & iframemask;	51	os->lastpos += pack->granulepos & iframemask;
52	*keyframe = (pack->granulepos & iframemask) == 0;	52	*keyframe = (pack->granulepos & iframemask) == 0;
53	} else {	53	} else {
54	@@ -888,14 +887,15 @@	54	@@ -888,14 +887,15 @@ int demux_ogg_open(demuxer_t *demuxer)
55	#ifdef CONFIG_OGGTHEORA	55	#ifdef CONFIG_OGGTHEORA
56	} else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) {	56	} else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) {
57	int errorCode = 0;	57	int errorCode = 0;
Lines 73-79 Link Here
73	mp_msg(MSGT_DEMUX, MSGL_ERR,	73	mp_msg(MSGT_DEMUX, MSGL_ERR,
74	"Theora header parsing failed: %i \n", errorCode);	74	"Theora header parsing failed: %i \n", errorCode);
75	} else {	75	} else {
76	@@ -904,30 +904,32 @@	76	@@ -904,30 +904,32 @@ int demux_ogg_open(demuxer_t *demuxer)
77	sh_v->bih = calloc(1, sizeof(*sh_v->bih));	77	sh_v->bih = calloc(1, sizeof(*sh_v->bih));
78	sh_v->bih->biSize = sizeof(*sh_v->bih);	78	sh_v->bih->biSize = sizeof(*sh_v->bih);
79	sh_v->bih->biCompression = sh_v->format = FOURCC_THEORA;	79	sh_v->bih->biCompression = sh_v->format = FOURCC_THEORA;

Lines 1-6 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-stream-tvi_bsdbt848.c (-12 / +12 lines)
1	--- stream/tvi_bsdbt848.c.orig 2009-05-12 21:58:57.000000000 -0500	1	--- stream/tvi_bsdbt848.c.orig 2013-07-09 16:33:36 UTC
2	+++ stream/tvi_bsdbt848.c 2009-07-23 20:39:13.536681248 -0500	2	+++ stream/tvi_bsdbt848.c
3	@@ -352,11 +352,11 @@	3	@@ -368,11 +368,11 @@ static int control(priv_t *priv, int cmd
4	int req_mode = (int )arg;	4	int req_mode = (int )arg;
5	u_short tmp_fps;	5	u_short tmp_fps;
6		6
Lines 14-20 Link Here
14	priv->maxheight = PAL_HEIGHT;	14	priv->maxheight = PAL_HEIGHT;
15	priv->maxwidth = PAL_WIDTH;	15	priv->maxwidth = PAL_WIDTH;
16	priv->maxfps = PAL_FPS;	16	priv->maxfps = PAL_FPS;
17	@@ -377,7 +377,7 @@	17	@@ -393,7 +393,7 @@ static int control(priv_t *priv, int cmd
18		18
19	if(req_mode == TV_NORM_NTSC)	19	if(req_mode == TV_NORM_NTSC)
20	{	20	{
Lines 23-29 Link Here
23	priv->maxheight = NTSC_HEIGHT;	23	priv->maxheight = NTSC_HEIGHT;
24	priv->maxwidth = NTSC_WIDTH;	24	priv->maxwidth = NTSC_WIDTH;
25	priv->maxfps = NTSC_FPS;	25	priv->maxfps = NTSC_FPS;
26	@@ -401,9 +401,28 @@	26	@@ -417,9 +417,28 @@ static int control(priv_t *priv, int cmd
27	}	27	}
28	}	28	}
29		29
Lines 35-41 Link Here
35	+ priv->maxwidth = PAL_WIDTH;	35	+ priv->maxwidth = PAL_WIDTH;
36	+ priv->maxfps = PAL_FPS;	36	+ priv->maxfps = PAL_FPS;
37	+ priv->fps = PAL_FPS;	37	+ priv->fps = PAL_FPS;
38	+	38
		39	- if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
39	+ if(priv->fps > priv->maxfps) priv->fps = priv->maxfps;	40	+ if(priv->fps > priv->maxfps) priv->fps = priv->maxfps;
40	+	41	+
41	+ if(priv->geom.rows > priv->maxheight)	42	+ if(priv->geom.rows > priv->maxheight)
Lines 48-60 Link Here
48	+ priv->geom.columns = priv->maxwidth;	49	+ priv->geom.columns = priv->maxwidth;
49	+ }	50	+ }
50	+ }	51	+ }
51		52	+
52	- if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
53	+ if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)	53	+ if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
54	{	54	{
55	mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno));	55	mp_tmsg(MSGT_TV, MSGL_ERR, "tvi_bsdbt848: Call to %s ioctl failed. Error: %s\n", "METEORSFMT", strerror(errno));
56	return TVI_CONTROL_FALSE;	56	return TVI_CONTROL_FALSE;
57	@@ -532,8 +551,9 @@	57	@@ -548,8 +567,9 @@ G_private = priv; /* Oooh, sick */
58	/* Video Configuration */	58	/* Video Configuration */
59		59
60	priv->videoready = TRUE;	60	priv->videoready = TRUE;
Lines 65-76 Link Here
65	priv->maxheight = PAL_HEIGHT;	65	priv->maxheight = PAL_HEIGHT;
66	priv->maxwidth = PAL_WIDTH;	66	priv->maxwidth = PAL_WIDTH;
67	priv->maxfps = PAL_FPS;	67	priv->maxfps = PAL_FPS;
68	@@ -558,7 +578,7 @@	68	@@ -574,7 +594,7 @@ if(priv->btfd < 0)
69	}	69	}
70		70
71	if(priv->videoready == TRUE &&	71	if(priv->videoready == TRUE &&
72	- ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)	72	- ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
73	+ ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)	73	+ ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
74	{	74	{
75	mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "SETEORSFMT", strerror(errno));	75	mp_tmsg(MSGT_TV, MSGL_ERR, "tvi_bsdbt848: Call to %s ioctl failed. Error: %s\n", "SETEORSFMT", strerror(errno));
76	}	76	}