Attachment #160366 for bug #202404





PORTNAME=	mplayer2
PORTVERSION=	${MPLAYER2_PORT_VERSION}
PORTREVISION=	14
CATEGORIES=	multimedia audio
MASTER_SITES=	LOCAL/gblach/


LICENSE=	GPLv2

LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
		libfreetype.so:${PORTSDIR}/print/freetype2
		libdvdread.so:${PORTSDIR}/multimedia/libdvdread
BUILD_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
		python3:${PORTSDIR}/lang/python3 \
		rst2man:${PORTSDIR}/textproc/py-docutils

HAS_CONFIGURE=	yes
CONFIGURE_ENV=	TMPDIR="${WRKSRC}"
CONFIGURE_ARGS=	--cc=${CC} \
		--extra-libs='-lavresample ${PORTAUDIOLIB}' \
		--mandir=${PREFIX}/man \
		--enable-libavresample \
		--disable-alsa \
		--disable-liba52 \
		--disable-directfb \
		--disable-faad \
		--disable-mng \
		--disable-libdca \
		--disable-mng \
		--disable-mpg123 \
		--disable-musepack \
		--disable-radio-v4l2 \
		--disable-radio-bsdbt848 \
		--disable-tv \
		--disable-tv-v4l2 \
		--disable-tv-bsdbt848 \
		--disable-v4l2 \
		--disable-xvid
MAKE_ARGS+=	BINDIR=${STAGEDIR}${PREFIX}/bin \
		CONFDIR=${STAGEDIR}${PREFIX}/etc/mplayer

MPLAYER2_SNAPSHOT_DATE=	2013-04-28
MPLAYER2_PORT_VERSION=	2.0.${MPLAYER2_SNAPSHOT_DATE:S/-//g}

OPTIONS_DEFINE=	A52 ASS CACA DEBUG DV DVDREAD DVDNAV ENCA GIF IPV6 JACK \
		LADSPA LIBAV LIBBLURAY LIBCDIO LIRC MAD OPENGL PORTAUDIO \
		PULSEAUDIO REALPLAYER RTC SDL SMB SPEEX THEORA VDPAU X11 \
		XINERAMA
OPTIONS_DEFINE_i386+=	WIN32
OPTIONS_DEFAULT=	ASS ENCA LIBAV X11
OPTIONS_SUB=	yes

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

.if !defined(PACKAGE_BUILDING)
OPTIONS_DEFINE+=	WIN32
OPTIONS_DEFAULT+=	WIN32
.endif

RTC_DESC=	Enable kernel realtime clock timing
PULSE_DESC=	Enable PulseAudio support
THEORA_DESC=	Enable ogg theora video support
ASS_DESC=	Enable ASS/SSA subtitle rendering
DVDREAD_DESC=	DVD Playback support
DVDNAV_DESC=	DVD menu navigation
ENCA_DESC=	Enable encoding detection support
LIBAV_DESC=	Enable libav support
LIBCDIO_DESC=	Enable libcdio support
REALPLAYER_DESC=Enable realplayer plugin
RTC_DESC=	Enable kernel realtime clock timing
WIN32_DESC=	Win32 codec pack support

SUB_FILES=	pkg-message

CONFLICTS=	mplayer-1.*

A52_LIB_DEPENDS=	liba52.so:${PORTSDIR}/audio/liba52
A52_CONFIGURE_ENABLE=	liba52
A52_LIBS=		-la52

ASS_LIB_DEPENDS=	libass.so:${PORTSDIR}/multimedia/libass
ASS_CONFIGURE_OFF=	--disable-libass
ASS_LIBS=		-lass

CACA_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
CACA_CONFIGURE_ENABLE=	caca
CACA_LIBS=		-lcaca

DV_LIB_DEPENDS=		libdv.so:${PORTSDIR}/multimedia/libdv
DV_CONFIGURE_ENABLE=	libdv
.if ${PORT_OPTIONS:MDEBUG}
.if ${ARCH} == "i386"
DEBUG_FLAGS=		-g -O -fomit-frame-pointer
.endif
.else
.if defined(PACKAGE_BUILDING)
CONFIGURE_ARGS+=	--enable-runtime-cpudetection
CFLAGS+=		-O2 -fomit-frame-pointer
.else
CONFIGURE_ENV+=		CPPFLAGS= CFLAGS= LDFLAGS=
.endif
.endif

DVDREAD_LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
DVDREAD_CONFIGURE_ENABLE=dvdread
.else
CONFIGURE_ARGS+=	--disable-inet6
.endif

DVDNAV_LIB_DEPENDS=	libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
DVDNAV_CONFIGURE_ENABLE=dvdnav
.else
CONFIGURE_ARGS+=	--disable-gif
.endif

ENCA_LIB_DEPENDS=	libenca.so:${PORTSDIR}/converters/enca
ENCA_CONFIGURE_ENABLE=	enca
ENCA_LIBS=		-lenca
CONFIGURE_ARGS+=	--disable-mad
.endif

GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
GIF_CONFIGURE_ENABLE=	gif
.else
CONFIGURE_ARGS+=	--disable-libdv
.endif

IPV6_CATEGORIES=	ipv6
IPV6_CONFIGURE_ENABLE=	inet6
.else
CONFIGURE_ARGS+=	--disable-theora
.endif

JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
JACK_CONFIGURE_ENABLE=	jack
JACK_LIBS=		-ljack
CONFIGURE_ARGS+=	--disable-speex
.endif

LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
LADSPA_CONFIGURE_ENABLE=ladspa
.else
CONFIGURE_ARGS+=	--disable-jack
.endif

LIBAV_LIB_DEPENDS=	libavresample.so:${PORTSDIR}/multimedia/ffmpeg
LIBAV_CONFIGURE_ENABLE=	libavresample
LIBAV_LIBS=		-lavresample
CONFIGURE_ARGS+=	--disable-pulse
.endif

LIBBLURAY_LIB_DEPENDS=	libbluray.so:${PORTSDIR}/multimedia/libbluray
LIBBLURAY_CONFIGURE_ENABLE=bluray
PORTAUDIOLIB=		-lportaudio
.else
CONFIGURE_ARGS+=	--disable-portaudio
.endif

LIBCDIO_LIB_DEPENDS=	libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
LIBCDIO_CONFIGURE_ENABLE=libcdio
.else
CONFIGURE_ARGS+=	--disable-bluray
.endif

LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
LIRC_CONFIGURE_ENABLE=	lirc
.else
CONFIGURE_ARGS+=	--disable-smb
.endif

MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
MAD_CONFIGURE_ENABLE=	mad
.else
CONFIGURE_ARGS+=	--disable-libcdio
.endif

OPENGL_USE=		GL=gl XORG=glproto
OPENGL_CONFIGURE_ENABLE=gl
OPENGL_IMPLIES=		X11
CONFIGURE_ARGS+=	--disable-ladspa
.endif

PORTAUDIO_LIB_DEPENDS=	libportaudio.so:${PORTSDIR}/audio/portaudio
PORTAUDIO_CONFIGURE_ENABLE=portaudio
PORTAUDIO_LIBS=		-lportaudio
CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
RUN_DEPENDS+=		${CODEC_DETECTION_FILE}:${CODEC_PORT}
CONFIGURE_ARGS+=	--codecsdir=${LOCALBASE}/lib/win32
.else
CONFIGURE_ARGS+=	--disable-win32dll --disable-qtx
.endif
.endif # ARCH == i386/amd64

PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
PULSEAUDIO_CONFIGURE_ENABLE=pulse
PULSEAUDIO_LIBS=	-lpulse
.else
CONFIGURE_ARGS+=	--disable-real
.endif

REALPLAYER_BUILD_DEPENDS=realplay:${PORTSDIR}/multimedia/linux-realplayer
REALPLAYER_CONFIGURE_ENABLE=real
#LIB_DEPENDS+=		libv4l2.so:${PORTSDIR}/multimedia/libv4l
#CONFIGURE_ARGS+=	--enable-tv-v4l2
#EXTRA_LIBS+=		-lv4l2
#.else
CONFIGURE_ARGS+=	--disable-tv-v4l2
#.endif

#.if defined(EXTRA_LIBS)
#CONFIGURE_ARGS+=	--extra-libs="${EXTRA_LIBS}"
#.endif

RTC_BUILD_DEPENDS=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
RTC_CONFIGURE_ENABLE=	rtc
.else
CONFIGURE_ARGS+=	--disable-libass --disable-enca
.endif

SDL_USE=		SDL=sdl
SDL_CONFIGURE_ENABLE=	sdl
.if ${PORT_OPTIONS:MOPENGL}
USE_XORG+=		glproto
LIB_DEPENDS+=		libGL.so:${PORTSDIR}/graphics/libGL
.else
CONFIGURE_ARGS+=	--disable-gl
.endif
.if ${PORT_OPTIONS:MXINERAMA}
USE_XORG+=		xinerama xineramaproto
.else
CONFIGURE_ARGS+=	--disable-xinerama
.endif
.else			#WITHOUT_X11
CONFIGURE_ARGS+=	--disable-x11
.endif

SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
SMB_CONFIGURE_ENABLE=	smb
.else
CONFIGURE_ARGS+=	--disable-vdpau
.endif

SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
SPEEX_CONFIGURE_ENABLE=	speex
RUN_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
CONFIGURE_ARGS+=	--enable-rtc
.else
CONFIGURE_ARGS+=	--disable-rtc
.endif

THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
THEORA_CONFIGURE_ENABLE=theora
THEORA_LIBS=		-ltheoradec
CONFIGURE_ARGS+=	--disable-caca
.endif

VDPAU_LIB_DEPENDS=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
VDPAU_CONFIGURE_ENABLE=	vdpau

WIN32_RUN_DEPENDS=	win32-codecs>0:${PORTSDIR}/multimedia/win32-codecs
WIN32_CONFIGURE_ON=	--codecsdir=${LOCALBASE}/lib/win32
WIN32_CONFIGURE_OFF=	--disable-win32dll --disable-qtx

X11_USE=		XORG=x11,xv,xxf86vm
X11_CONFIGURE_ENABLE=	x11
X11_LIBS=		-lX11 -lXext

XINERAMA_USE=		XORG=xinerama,xineramaproto
XINERAMA_CONFIGURE_ENABLE=xinerama
XINERAMA_IMPLIES=	X11

.include <bsd.port.options.mk>

BROKEN_sparc64=		Does not compile on sparc64

#On i386, gcc runs out of general purpose registers when
#trying to compile a debug version with the default flags.
.if ${PORT_OPTIONS:MDEBUG}
.if ${ARCH} == "i386"
DEBUG_FLAGS=		-g -O -fomit-frame-pointer
.endif
.else
.if defined(PACKAGE_BUILDING)
CONFIGURE_ARGS+=	--enable-runtime-cpudetection
CFLAGS+=		-O2 -fomit-frame-pointer
.else
CONFIGURE_ENV+=		CPPFLAGS= CFLAGS= LDFLAGS=
.endif
.endif

.if defined(WITH_KERN_HZ)

DEFAULT_KERN_HZ=1024
.endif

CONFIGURE_ARGS+=	--extra-libs="${LIBS}"

# Depend on RESTRICTED package when built manually
.if !defined(PACKAGE_BUILDING)
OPTIONS_DEFAULT_i386+=	WIN32
.endif

pre-everything::
	@${ECHO_MSG} "N - O - T - E"
	@${ECHO_MSG} ""


post-patch:
.if ${OSVERSION} >= 900010
	${REINPLACE_CMD} -e \
		'/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \
		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
.endif
	${REINPLACE_CMD} \
		-e 's|/dev/acd0|${WITH_CDROM_DEVICE}|' \
		-e 's|/usr/local|${LOCALBASE}|' \
		-e 's|-lbz2|/usr/lib/libbz2.so|' \
		-e 's|-lncurses|/usr/lib/libncurses.so|' \
		${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| ${CC}|' \
			-e 's|\$$\(CC\)|${CC}|' \
			-e 's|/usr/X11R6|${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:]]*[[:>:]])|${WITH_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g ; \
		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${WITH_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
.if ${PORT_OPTIONS:MRTC}
	${REINPLACE_CMD} -e \
		's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
		${WRKSRC}/mplayer.c
.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
@@ -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
@@ -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;
 




--- 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 @@
 
 #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
 
+static void PrintGifError(void)
+{
+  char *Err = GifErrorString();
+
+  if (Err != NULL)
+    fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
+  else
+    fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
+}
+
 #ifndef CONFIG_GIF_TVT_HACK
 // not supported by certain versions of the library
 static int my_read_gif(GifFileType *gif, uint8_t *buf, int len)




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




--- libmpdemux/demux_gif.c.orig	2013-07-09 16:33:16 UTC
+++ libmpdemux/demux_gif.c
@@ -93,14 +93,14 @@ static int demux_gif_fill_buffer(demuxer
 
   while (type != IMAGE_DESC_RECORD_TYPE) {
     if (DGifGetRecordType(gif, &type) == GIF_ERROR) {
-      PrintGifError();
+      printf("%s\n", GifErrorString(GIF_ERROR));	
       return 0; // oops
     }
     if (type == TERMINATE_RECORD_TYPE)
       return 0; // eof
     if (type == SCREEN_DESC_RECORD_TYPE) {
       if (DGifGetScreenDesc(gif) == GIF_ERROR) {
-        PrintGifError();
+        printf("%s\n", GifErrorString(GIF_ERROR));
         return 0; // oops
       }
     }
@@ -108,7 +108,7 @@ static int demux_gif_fill_buffer(demuxer
       int code;
       unsigned char *p = NULL;
       if (DGifGetExtension(gif, &code, &p) == GIF_ERROR) {
-        PrintGifError();
+        printf("%s\n", GifErrorString(GIF_ERROR));
         return 0; // oops
       }
       if (code == 0xF9) {
@@ -137,7 +137,7 @@ static int demux_gif_fill_buffer(demuxer
 	  comments[length] = 0;
 	  printf("%s", comments);
           if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) {
-            PrintGifError();
+            printf("%s\n", GifErrorString(GIF_ERROR));
             return 0; // oops
           }
 	}
@@ -145,7 +145,7 @@ static int demux_gif_fill_buffer(demuxer
       }
       while (p != NULL) {
         if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) {
-          PrintGifError();
+          printf("%s\n", GifErrorString(GIF_ERROR));
           return 0; // oops
         }
       }
@@ -153,7 +153,7 @@ static int demux_gif_fill_buffer(demuxer
   }
 
   if (DGifGetImageDesc(gif) == GIF_ERROR) {
-    PrintGifError();
+    printf("%s\n", GifErrorString(GIF_ERROR));
     return 0; // oops
   }
 
@@ -166,7 +166,7 @@ static int demux_gif_fill_buffer(demuxer
     memset(dp->buffer, gif->SBackGroundColor, priv->w * priv->h);
 
   if (DGifGetLine(gif, buf, len) == GIF_ERROR) {
-    PrintGifError();
+    printf("%s\n", GifErrorString(GIF_ERROR));
     free(buf);
     return 0; // oops
   }
@@ -256,10 +256,10 @@ static demuxer_t* demux_open_gif(demuxer
   lseek(demuxer->stream->fd, 0, SEEK_SET);
   gif = DGifOpenFileHandle(demuxer->stream->fd);
 #else
-  gif = DGifOpen(demuxer->stream, my_read_gif);
+  gif = DGifOpen(demuxer->stream, my_read_gif, NULL);
 #endif
   if (!gif) {
-    PrintGifError();
+    printf("%s\n", GifErrorString(GIF_ERROR));
     free(priv);
     return NULL;
   }
@@ -301,7 +301,7 @@ static void demux_close_gif(demuxer_t* d
   gif_priv_t *priv = demuxer->priv;
   if (!priv) return;
   if (priv->gif && DGifCloseFile(priv->gif) == GIF_ERROR)
-    PrintGifError();
+    printf("%s\n", GifErrorString(GIF_ERROR));
   free(priv->refimg);
   free(priv);
 }




--- libvo/vo_gif89a.c.orig	2013-07-09 16:33:16 UTC
+++ libvo/vo_gif89a.c
@@ -44,13 +44,13 @@
  * entire argument being interpretted as the filename.
  */
 
-#include <gif_lib.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <gif_lib.h>
+
 #include "config.h"
 #include "subopt-helper.h"
 #include "video_out.h"
@@ -69,6 +69,15 @@ static const vo_info_t info = {
 
 const LIBVO_EXTERN(gif89a)
 
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+#define EGifOpenFileName(a, b) EGifOpenFileName(a, b, NULL)
+#define MakeMapObject GifMakeMapObject
+#define FreeMapObject GifFreeMapObject
+#define QuantizeBuffer GifQuantizeBuffer
+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1
+#define EGifCloseFile(a) EGifCloseFile(a, NULL)
+#endif
+#endif
 
 // how many frames per second we are aiming for during output.
 static float target_fps;
@@ -92,6 +101,8 @@ static uint32_t img_width;
 static uint32_t img_height;
 // image data for slice rendering
 static uint8_t *slice_data = NULL;
+// pointer for whole frame rendering
+static uint8_t *frame_data = NULL;
 // reduced image data for flip_page
 static uint8_t *reduce_data = NULL;
 // reduced color map for flip_page
@@ -156,7 +167,7 @@ static int config(uint32_t s_width, uint
 		uint32_t d_height, uint32_t flags, char *title,
 		uint32_t format)
 {
-#ifdef CONFIG_GIF_4
+#if defined CONFIG_GIF_4 || GIFLIB_MAJOR >= 5
 	// these are control blocks for the gif looping extension.
 	char LB1[] = "NETSCAPE2.0";
 	char LB2[] = { 1, 0, 0 };
@@ -185,23 +196,25 @@ static int config(uint32_t s_width, uint
 		return 1;
 	}
 
+	new_gif = EGifOpenFileName(gif_filename, 0);
+	if (new_gif == NULL) {
+		mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: error opening file \"%s\" for output.\n", gif_filename);
+		return 1;
+	}
+
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+	EGifSetGifVersion(new_gif, 1);
+#elif defined CONFIG_GIF_4
 	// the EGifSetGifVersion line causes segfaults in certain
 	// earlier versions of libungif.  i don't know exactly which,
 	// but certainly in all those before v4.  if you have problems,
 	// you need to upgrade your gif library.
-#ifdef CONFIG_GIF_4
 	EGifSetGifVersion("89a");
 #else
 	mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Your version of libungif needs to be upgraded.\n");
 	mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Some functionality has been disabled.\n");
 #endif
 
-	new_gif = EGifOpenFileName(gif_filename, 0);
-	if (new_gif == NULL) {
-		mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: error opening file \"%s\" for output.\n", gif_filename);
-		return 1;
-	}
-
 	slice_data = malloc(img_width * img_height * 3);
 	if (slice_data == NULL) {
 		mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: malloc failed.\n");
@@ -231,7 +244,12 @@ static int config(uint32_t s_width, uint
 
 	// set the initial width and height info.
 	EGifPutScreenDesc(new_gif, s_width, s_height, 256, 0, reduce_cmap);
-#ifdef CONFIG_GIF_4
+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
+	EGifPutExtensionLeader(new_gif, 0xFF);
+	EGifPutExtensionBlock(new_gif, 11, LB1);
+	EGifPutExtensionBlock(new_gif, 3, LB2);
+	EGifPutExtensionTrailer(new_gif);
+#elif defined CONFIG_GIF_4
 	// version 3 of libungif does not support multiple control blocks.
 	// looping requires multiple control blocks.
 	// therefore, looping is only enabled for v4 and up.
@@ -311,7 +329,8 @@ static void flip_page(void)
 
 static int draw_frame(uint8_t *src[])
 {
-	return 1;
+	frame_data = src[0];
+	return 0;
 }
 
 static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y)
@@ -370,6 +389,7 @@ static void uninit(void)
 	// set the pointers back to null.
 	new_gif = NULL;
 	gif_filename = NULL;
+	frame_data = NULL;
 	slice_data = NULL;
 	reduce_data = NULL;
 	reduce_cmap = NULL;




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

Return to bug 202404

Lines 2-8 Link Here

(-)/usr/ports/multimedia/mplayer2/Makefile (-193 / +129 lines)
2		2
3	PORTNAME= mplayer2	3	PORTNAME= mplayer2
4	PORTVERSION= ${MPLAYER2_PORT_VERSION}	4	PORTVERSION= ${MPLAYER2_PORT_VERSION}
5	PORTREVISION= 13	5	PORTREVISION= 14
6	CATEGORIES= multimedia audio	6	CATEGORIES= multimedia audio
7	MASTER_SITES= LOCAL/gblach/	7	MASTER_SITES= LOCAL/gblach/
8		8
Lines 12-19 Link Here
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13		13
14	LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \	14	LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
15	libfreetype.so:${PORTSDIR}/print/freetype2 \	15	libfreetype.so:${PORTSDIR}/print/freetype2
16	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
17	BUILD_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg \	16	BUILD_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
18	python3:${PORTSDIR}/lang/python3 \	17	python3:${PORTSDIR}/lang/python3 \
19	rst2man:${PORTSDIR}/textproc/py-docutils	18	rst2man:${PORTSDIR}/textproc/py-docutils
Lines 23-258 Link Here
23	HAS_CONFIGURE= yes	22	HAS_CONFIGURE= yes
24	CONFIGURE_ENV= TMPDIR="${WRKSRC}"	23	CONFIGURE_ENV= TMPDIR="${WRKSRC}"
25	CONFIGURE_ARGS= --cc=${CC} \	24	CONFIGURE_ARGS= --cc=${CC} \
26	--extra-libs='-lavresample ${PORTAUDIOLIB}' \
27	--mandir=${PREFIX}/man \	25	--mandir=${PREFIX}/man \
28	--enable-libavresample \
29	--disable-alsa \	26	--disable-alsa \
30	--disable-liba52 \
31	--disable-directfb \	27	--disable-directfb \
32	--disable-faad \	28	--disable-faad \
33	--disable-mng \
34	--disable-libdca \	29	--disable-libdca \
35	--disable-xvid \	30	--disable-mng \
36	--disable-mpg123 \	31	--disable-mpg123 \
37	--disable-musepack	32	--disable-musepack \
		33	--disable-radio-v4l2 \
		34	--disable-radio-bsdbt848 \
		35	--disable-tv \
		36	--disable-tv-v4l2 \
		37	--disable-tv-bsdbt848 \
		38	--disable-v4l2 \
		39	--disable-xvid
38	MAKE_ARGS+= BINDIR=${STAGEDIR}${PREFIX}/bin \	40	MAKE_ARGS+= BINDIR=${STAGEDIR}${PREFIX}/bin \
39	CONFDIR=${STAGEDIR}${PREFIX}/etc/mplayer	41	CONFDIR=${STAGEDIR}${PREFIX}/etc/mplayer
40		42
41	MPLAYER2_SNAPSHOT_DATE= 2013-04-28	43	MPLAYER2_SNAPSHOT_DATE= 2013-04-28
42	MPLAYER2_PORT_VERSION= 2.0.${MPLAYER2_SNAPSHOT_DATE:S/-//g}	44	MPLAYER2_PORT_VERSION= 2.0.${MPLAYER2_SNAPSHOT_DATE:S/-//g}
43		45
		46	OPTIONS_DEFINE= A52 ASS CACA DEBUG DV DVDREAD DVDNAV ENCA GIF IPV6 JACK \
		47	LADSPA LIBAV LIBBLURAY LIBCDIO LIRC MAD OPENGL PORTAUDIO \
		48	PULSEAUDIO REALPLAYER RTC SDL SMB SPEEX THEORA VDPAU X11 \
		49	XINERAMA
		50	OPTIONS_DEFINE_i386+= WIN32
		51	OPTIONS_DEFAULT= ASS ENCA LIBAV X11
		52	OPTIONS_SUB= yes
44		53
45	OPTIONS_DEFINE= DEBUG RTC IPV6 SMB LIBBLURAY DV THEORA \
46	X11 XINERAMA OPENGL SDL VDPAU GIF CACA \
47	MAD SPEEX LIBCDIO LADSPA REALPLAYER \
48	JACK PULSE PORTAUDIO ASS LIRC
49	OPTIONS_DEFAULT=X11 ASS
50
51	.if !defined(PACKAGE_BUILDING)
52	OPTIONS_DEFINE+= WIN32
53	OPTIONS_DEFAULT+= WIN32
54	.endif
55
56	RTC_DESC= Enable kernel realtime clock timing
57	PULSE_DESC= Enable PulseAudio support
58	THEORA_DESC= Enable ogg theora video support
59	ASS_DESC= Enable ASS/SSA subtitle rendering	54	ASS_DESC= Enable ASS/SSA subtitle rendering
60	WIN32_DESC= Enable win32 codec set on the IA32 arch	55	DVDREAD_DESC= DVD Playback support
61	REALPLAYER_DESC=Enable realplayer plugin	56	DVDNAV_DESC= DVD menu navigation
62	LIRC_DESC= Enable lirc support	57	ENCA_DESC= Enable encoding detection support
		58	LIBAV_DESC= Enable libav support
63	LIBCDIO_DESC= Enable libcdio support	59	LIBCDIO_DESC= Enable libcdio support
64	V4L_DESC= Enable Video4Linux TV support	60	REALPLAYER_DESC=Enable realplayer plugin
		61	RTC_DESC= Enable kernel realtime clock timing
		62	WIN32_DESC= Win32 codec pack support
65		63
66	SUB_FILES= pkg-message	64	SUB_FILES= pkg-message
67		65
68	CONFLICTS= mplayer-1.*	66	CONFLICTS= mplayer-1.*
69		67
70	.include <bsd.port.options.mk>	68	A52_LIB_DEPENDS= liba52.so:${PORTSDIR}/audio/liba52
		69	A52_CONFIGURE_ENABLE= liba52
		70	A52_LIBS= -la52
71		71
72	.if ${ARCH} == "sparc64"	72	ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass
73	BROKEN= Does not compile on sparc64	73	ASS_CONFIGURE_OFF= --disable-libass
74	.endif	74	ASS_LIBS= -lass
75		75
76	WITH_CDROM_DEVICE?= /dev/cd0	76	CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca
		77	CACA_CONFIGURE_ENABLE= caca
		78	CACA_LIBS= -lcaca
77		79
78	#On i386, gcc runs out of general purpose registers when	80	DV_LIB_DEPENDS= libdv.so:${PORTSDIR}/multimedia/libdv
79	#trying to compile a debug version with the default flags.	81	DV_CONFIGURE_ENABLE= libdv
80	.if ${PORT_OPTIONS:MDEBUG}
81	.if ${ARCH} == "i386"
82	DEBUG_FLAGS= -g -O -fomit-frame-pointer
83	.endif
84	.else
85	.if defined(PACKAGE_BUILDING)
86	CONFIGURE_ARGS+= --enable-runtime-cpudetection
87	CFLAGS+= -O2 -fomit-frame-pointer
88	.else
89	CONFIGURE_ENV+= CPPFLAGS= CFLAGS= LDFLAGS=
90	.endif
91	.endif
92		82
93	.if ${PORT_OPTIONS:MIPV6}	83	DVDREAD_LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread
94	CATEGORIES+= ipv6	84	DVDREAD_CONFIGURE_ENABLE=dvdread
95	.else
96	CONFIGURE_ARGS+= --disable-inet6
97	.endif
98		85
99	.if ${PORT_OPTIONS:MGIF}	86	DVDNAV_LIB_DEPENDS= libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
100	LIB_DEPENDS+= libgif.so:${PORTSDIR}/graphics/giflib	87	DVDNAV_CONFIGURE_ENABLE=dvdnav
101	.else
102	CONFIGURE_ARGS+= --disable-gif
103	.endif
104		88
105	.if ${PORT_OPTIONS:MMAD}	89	ENCA_LIB_DEPENDS= libenca.so:${PORTSDIR}/converters/enca
106	LIB_DEPENDS+= libmad.so:${PORTSDIR}/audio/libmad	90	ENCA_CONFIGURE_ENABLE= enca
107	.else	91	ENCA_LIBS= -lenca
108	CONFIGURE_ARGS+= --disable-mad
109	.endif
110		92
111	.if ${PORT_OPTIONS:MDV}	93	GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib
112	LIB_DEPENDS+= libdv.so:${PORTSDIR}/multimedia/libdv	94	GIF_CONFIGURE_ENABLE= gif
113	.else
114	CONFIGURE_ARGS+= --disable-libdv
115	.endif
116		95
117	.if ${PORT_OPTIONS:MTHEORA}	96	IPV6_CATEGORIES= ipv6
118	LIB_DEPENDS+= libtheora.so:${PORTSDIR}/multimedia/libtheora	97	IPV6_CONFIGURE_ENABLE= inet6
119	.else
120	CONFIGURE_ARGS+= --disable-theora
121	.endif
122		98
123	.if ${PORT_OPTIONS:MSPEEX}	99	JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
124	LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex	100	JACK_CONFIGURE_ENABLE= jack
125	.else	101	JACK_LIBS= -ljack
126	CONFIGURE_ARGS+= --disable-speex
127	.endif
128		102
129	.if ${PORT_OPTIONS:MJACK}	103	LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
130	LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack	104	LADSPA_CONFIGURE_ENABLE=ladspa
131	.else
132	CONFIGURE_ARGS+= --disable-jack
133	.endif
134		105
135	.if ${PORT_OPTIONS:MPULSE}	106	LIBAV_LIB_DEPENDS= libavresample.so:${PORTSDIR}/multimedia/ffmpeg
136	LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio	107	LIBAV_CONFIGURE_ENABLE= libavresample
137	.else	108	LIBAV_LIBS= -lavresample
138	CONFIGURE_ARGS+= --disable-pulse
139	.endif
140		109
141	.if ${PORT_OPTIONS:MPORTAUDIO}	110	LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray
142	LIB_DEPENDS+= libportaudio.so:${PORTSDIR}/audio/portaudio	111	LIBBLURAY_CONFIGURE_ENABLE=bluray
143	PORTAUDIOLIB= -lportaudio
144	.else
145	CONFIGURE_ARGS+= --disable-portaudio
146	.endif
147		112
148	.if ${PORT_OPTIONS:MLIBBLURAY}	113	LIBCDIO_LIB_DEPENDS= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
149	LIB_DEPENDS+= libbluray.so:${PORTSDIR}/multimedia/libbluray	114	LIBCDIO_CONFIGURE_ENABLE=libcdio
150	.else
151	CONFIGURE_ARGS+= --disable-bluray
152	.endif
153		115
154	.if ${PORT_OPTIONS:MSMB}	116	LIRC_LIB_DEPENDS= liblirc_client.so:${PORTSDIR}/comms/lirc
155	LIB_DEPENDS+= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient	117	LIRC_CONFIGURE_ENABLE= lirc
156	.else
157	CONFIGURE_ARGS+= --disable-smb
158	.endif
159		118
160	.if ${PORT_OPTIONS:MLIBCDIO}	119	MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad
161	LIB_DEPENDS+= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia	120	MAD_CONFIGURE_ENABLE= mad
162	.else
163	CONFIGURE_ARGS+= --disable-libcdio
164	.endif
165		121
166	.if ${PORT_OPTIONS:MLADSPA}	122	OPENGL_USE= GL=gl XORG=glproto
167	RUN_DEPENDS+= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa	123	OPENGL_CONFIGURE_ENABLE=gl
168	.else	124	OPENGL_IMPLIES= X11
169	CONFIGURE_ARGS+= --disable-ladspa
170	.endif
171		125
172	.if ${ARCH} == "i386" \|\| ${ARCH} == "amd64"	126	PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio
173	.if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"	127	PORTAUDIO_CONFIGURE_ENABLE=portaudio
174	CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs	128	PORTAUDIO_LIBS= -lportaudio
175	CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
176	RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
177	CONFIGURE_ARGS+= --codecsdir=${LOCALBASE}/lib/win32
178	.else
179	CONFIGURE_ARGS+= --disable-win32dll --disable-qtx
180	.endif
181	.endif # ARCH == i386/amd64
182		129
183	.if ${PORT_OPTIONS:MREALPLAYER}	130	PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
184	RUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer	131	PULSEAUDIO_CONFIGURE_ENABLE=pulse
185	BUILD_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer	132	PULSEAUDIO_LIBS= -lpulse
186	.else
187	CONFIGURE_ARGS+= --disable-real
188	.endif
189		133
190	#.if ${PORT_OPTIONS:MV4L}	134	REALPLAYER_BUILD_DEPENDS=realplay:${PORTSDIR}/multimedia/linux-realplayer
191	#BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat	135	REALPLAYER_CONFIGURE_ENABLE=real
192	#LIB_DEPENDS+= libv4l2.so:${PORTSDIR}/multimedia/libv4l
193	#CONFIGURE_ARGS+= --enable-tv-v4l2
194	#EXTRA_LIBS+= -lv4l2
195	#.else
196	CONFIGURE_ARGS+= --disable-tv-v4l2
197	#.endif
198
199	#.if defined(EXTRA_LIBS)
200	#CONFIGURE_ARGS+= --extra-libs="${EXTRA_LIBS}"
201	#.endif
202		136
203	.if ${PORT_OPTIONS:MASS}	137	RTC_BUILD_DEPENDS= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
204	LIB_DEPENDS+= libass.so:${PORTSDIR}/multimedia/libass	138	RTC_CONFIGURE_ENABLE= rtc
205	.else
206	CONFIGURE_ARGS+= --disable-libass --disable-enca
207	.endif
208		139
209	.if ${PORT_OPTIONS:MX11}	140	SDL_USE= SDL=sdl
210	USE_XORG= x11 xv xxf86vm	141	SDL_CONFIGURE_ENABLE= sdl
211	.if ${PORT_OPTIONS:MOPENGL}
212	USE_XORG+= glproto
213	LIB_DEPENDS+= libGL.so:${PORTSDIR}/graphics/libGL
214	.else
215	CONFIGURE_ARGS+= --disable-gl
216	.endif
217	.if ${PORT_OPTIONS:MXINERAMA}
218	USE_XORG+= xinerama xineramaproto
219	.else
220	CONFIGURE_ARGS+= --disable-xinerama
221	.endif
222	.else #WITHOUT_X11
223	CONFIGURE_ARGS+= --disable-x11
224	.endif
225		142
226	.if ${PORT_OPTIONS:MVDPAU}	143	SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
227	LIB_DEPENDS+= libvdpau.so:${PORTSDIR}/multimedia/libvdpau	144	SMB_CONFIGURE_ENABLE= smb
228	.else
229	CONFIGURE_ARGS+= --disable-vdpau
230	.endif
231		145
232	.if ${PORT_OPTIONS:MRTC}	146	SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex
233	BUILD_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc	147	SPEEX_CONFIGURE_ENABLE= speex
234	RUN_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
235	CONFIGURE_ARGS+= --enable-rtc
236	.else
237	CONFIGURE_ARGS+= --disable-rtc
238	.endif
239		148
240	.if ${PORT_OPTIONS:MLIBCACA}	149	THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora
241	LIB_DEPENDS+= libcaca.so:${PORTSDIR}/graphics/libcaca	150	THEORA_CONFIGURE_ENABLE=theora
242	.else	151	THEORA_LIBS= -ltheoradec
243	CONFIGURE_ARGS+= --disable-caca
244	.endif
245		152
246	.if ${PORT_OPTIONS:MLIRC}	153	VDPAU_LIB_DEPENDS= libvdpau.so:${PORTSDIR}/multimedia/libvdpau
247	LIB_DEPENDS+= liblirc_client.so:${PORTSDIR}/comms/lirc	154	VDPAU_CONFIGURE_ENABLE= vdpau
248	.else	155
249	CONFIGURE_ARGS+= --disable-lirc	156	WIN32_RUN_DEPENDS= win32-codecs>0:${PORTSDIR}/multimedia/win32-codecs
250	.endif	157	WIN32_CONFIGURE_ON= --codecsdir=${LOCALBASE}/lib/win32
		158	WIN32_CONFIGURE_OFF= --disable-win32dll --disable-qtx
		159
		160	X11_USE= XORG=x11,xv,xxf86vm
		161	X11_CONFIGURE_ENABLE= x11
		162	X11_LIBS= -lX11 -lXext
		163
		164	XINERAMA_USE= XORG=xinerama,xineramaproto
		165	XINERAMA_CONFIGURE_ENABLE=xinerama
		166	XINERAMA_IMPLIES= X11
		167
		168	.include <bsd.port.options.mk>
251		169
252	.if ${PORT_OPTIONS:MSDL}	170	BROKEN_sparc64= Does not compile on sparc64
253	USE_SDL= sdl	171
		172	#On i386, gcc runs out of general purpose registers when
		173	#trying to compile a debug version with the default flags.
		174	.if ${PORT_OPTIONS:MDEBUG}
		175	.if ${ARCH} == "i386"
		176	DEBUG_FLAGS= -g -O -fomit-frame-pointer
		177	.endif
		178	.else
		179	.if defined(PACKAGE_BUILDING)
		180	CONFIGURE_ARGS+= --enable-runtime-cpudetection
		181	CFLAGS+= -O2 -fomit-frame-pointer
254	.else	182	.else
255	CONFIGURE_ARGS+= --disable-sdl	183	CONFIGURE_ENV+= CPPFLAGS= CFLAGS= LDFLAGS=
		184	.endif
256	.endif	185	.endif
257		186
258	.if defined(WITH_KERN_HZ)	187	.if defined(WITH_KERN_HZ)
Lines 261-266 Link Here
261	DEFAULT_KERN_HZ=1024	190	DEFAULT_KERN_HZ=1024
262	.endif	191	.endif
263		192
		193	CONFIGURE_ARGS+= --extra-libs="${LIBS}"
		194
		195	# Depend on RESTRICTED package when built manually
		196	.if !defined(PACKAGE_BUILDING)
		197	OPTIONS_DEFAULT_i386+= WIN32
		198	.endif
		199
264	pre-everything::	200	pre-everything::
265	@${ECHO_MSG} "N - O - T - E"	201	@${ECHO_MSG} "N - O - T - E"
266	@${ECHO_MSG} ""	202	@${ECHO_MSG} ""
Lines 270-286 Link Here
270		206
271	post-patch:	207	post-patch:
272	.if ${OSVERSION} >= 900010	208	.if ${OSVERSION} >= 900010
273	@${REINPLACE_CMD} -e \	209	${REINPLACE_CMD} -e \
274	'/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \	210	'/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \
275	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	211	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
276	.endif	212	.endif
277	@${REINPLACE_CMD} \	213	${REINPLACE_CMD} \
278	-e 's\|/dev/acd0\|${WITH_CDROM_DEVICE}\|' \	214	-e 's\|/dev/acd0\|${WITH_CDROM_DEVICE}\|' \
279	-e 's\|/usr/local\|${LOCALBASE}\|' \	215	-e 's\|/usr/local\|${LOCALBASE}\|' \
280	-e 's\|-lbz2\|/usr/lib/libbz2.so\|' \	216	-e 's\|-lbz2\|/usr/lib/libbz2.so\|' \
281	-e 's\|-lncurses\|/usr/lib/libncurses.so\|' \	217	-e 's\|-lncurses\|/usr/lib/libncurses.so\|' \
282	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}	218	${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
283	@${FIND} -E ${WRKSRC} -type f \	219	${FIND} -E ${WRKSRC} -type f \
284	-iregex ".*(configure\|.sh\|Makefile)" -print0 \| \	220	-iregex ".*(configure\|.sh\|Makefile)" -print0 \| \
285	${XARGS} -x -0 -n 10 \	221	${XARGS} -x -0 -n 10 \
286	${REINPLACE_CMD} -E \	222	${REINPLACE_CMD} -E \
Lines 288-308 Link Here
288	-e 's\|[[:space:]]gcc\| ${CC}\|' \	224	-e 's\|[[:space:]]gcc\| ${CC}\|' \
289	-e 's\|\$$\(CC\)\|${CC}\|' \	225	-e 's\|\$$\(CC\)\|${CC}\|' \
290	-e 's\|/usr/X11R6\|${LOCALBASE}\|'	226	-e 's\|/usr/X11R6\|${LOCALBASE}\|'
291	@${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" \| ${XARGS} ${REINPLACE_CMD} -E -e \	227	${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" \| ${XARGS} ${REINPLACE_CMD} -E -e \
292	's\|/usr/\\:local/\\:etc/\\:mplayer\|${DATADIR:S/\//\/\\\:/g}\|g ; \	228	's\|/usr/\\:local/\\:etc/\\:mplayer\|${DATADIR:S/\//\/\\\:/g}\|g ; \
293	s\|/dev/\\:(dvd[[:alnum:]]*[[:>:]])\|${WITH_CDROM_DEVICE:S/dev\//dev\/\\\:/}\|g ; \	229	s\|/dev/\\:(dvd[[:alnum:]]*[[:>:]])\|${WITH_CDROM_DEVICE:S/dev\//dev\/\\\:/}\|g ; \
294	s\|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])\|${WITH_CDROM_DEVICE:S/dev\//dev\/\\\:/}\|g'	230	s\|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])\|${WITH_CDROM_DEVICE:S/dev\//dev\/\\\:/}\|g'
295	.if ${PORT_OPTIONS:MRTC}	231	.if ${PORT_OPTIONS:MRTC}
296	@${REINPLACE_CMD} -e \	232	${REINPLACE_CMD} -e \
297	's\|irqp = 1024\|irqp = ${DEFAULT_KERN_HZ}\|' \	233	's\|irqp = 1024\|irqp = ${DEFAULT_KERN_HZ}\|' \
298	${WRKSRC}/mplayer.c	234	${WRKSRC}/mplayer.c
299	.endif	235	.endif
300		236
301	post-install:	237	post-install:
302	@${INSTALL_DATA} ${WRKSRC}/etc/example.conf \	238	${INSTALL_DATA} ${WRKSRC}/etc/example.conf \
303	${STAGEDIR}${PREFIX}/etc/mplayer/mplayer.conf.sample	239	${STAGEDIR}${PREFIX}/etc/mplayer/mplayer.conf.sample
304	.for conf in codecs input	240	.for conf in codecs input
305	@${INSTALL_DATA} ${WRKSRC}/etc/${conf}.conf \	241	${INSTALL_DATA} ${WRKSRC}/etc/${conf}.conf \
306	${STAGEDIR}${PREFIX}/etc/mplayer/${conf}.conf.sample	242	${STAGEDIR}${PREFIX}/etc/mplayer/${conf}.conf.sample
307	.endfor	243	.endfor
308		244

Lines 1-6 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-configure (-5 / +5 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	@@ -2676,7 +2676,7 @@ echocheck "pthread"
4	if linux ; then	4	if linux ; then
5	THREAD_CFLAGS=-D_REENTRANT	5	THREAD_CFLAGS=-D_REENTRANT
6	elif freebsd \|\| netbsd \|\| openbsd \|\| bsdos ; then	6	elif freebsd \|\| netbsd \|\| openbsd \|\| bsdos ; then
Lines 9-15 Link Here
9	fi	9	fi
10	if test "$_pthreads" = auto ; then	10	if test "$_pthreads" = auto ; then
11	cat > $TMPC << EOF	11	cat > $TMPC << EOF
12	@@ -3128,7 +3128,7 @@ int main(void) {	12	@@ -2693,7 +2693,7 @@ int main(void) {
13	EOF	13	EOF
14	_pthreads=no	14	_pthreads=no
15	if ! hpux ; then	15	if ! hpux ; then
Lines 18-24 Link Here
18	# for crosscompilation, we cannot execute the program, be happy if we can link statically	18	# 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	19	cc_check $THREAD_CFLAGS $_ld_tmp && (tmp_run \|\| test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break
20	done	20	done
21	@@ -6340,7 +6340,7 @@ TIMER = $_timer	21	@@ -5296,7 +5296,7 @@ RST2MAN = $_rst2man
22	EXESUF = $_exesuf	22	EXESUF = $_exesuf
23	EXESUFS_ALL = .exe	23	EXESUFS_ALL = .exe
24		24

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-19 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c (-19 lines)
1	--- libmpdemux/demux_gif.c.orig 2012-12-31 00:26:50.000000000 +0100
2	+++ libmpdemux/demux_gif.c 2012-12-31 00:30:54.000000000 +0100
3	@@ -44,6 +44,16 @@
4
5	#define GIF_SIGNATURE (('G' << 16) \| ('I' << 8) \| 'F')
6
7	+static void PrintGifError(void)
8	+{
9	+ char *Err = GifErrorString();
10	+
11	+ if (Err != NULL)
12	+ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
13	+ else
14	+ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
15	+}
16	+
17	#ifndef CONFIG_GIF_TVT_HACK
18	// not supported by certain versions of the library
19	static int my_read_gif(GifFileType gif, uint8_t buf, int len)

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;

Line 0 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-libmpdemux_demux__gif.c (+86 lines)
		1	--- libmpdemux/demux_gif.c.orig 2013-07-09 16:33:16 UTC
		2	+++ libmpdemux/demux_gif.c
		3	@@ -93,14 +93,14 @@ static int demux_gif_fill_buffer(demuxer
		4
		5	while (type != IMAGE_DESC_RECORD_TYPE) {
		6	if (DGifGetRecordType(gif, &type) == GIF_ERROR) {
		7	- PrintGifError();
		8	+ printf("%s\n", GifErrorString(GIF_ERROR));
		9	return 0; // oops
		10	}
		11	if (type == TERMINATE_RECORD_TYPE)
		12	return 0; // eof
		13	if (type == SCREEN_DESC_RECORD_TYPE) {
		14	if (DGifGetScreenDesc(gif) == GIF_ERROR) {
		15	- PrintGifError();
		16	+ printf("%s\n", GifErrorString(GIF_ERROR));
		17	return 0; // oops
		18	}
		19	}
		20	@@ -108,7 +108,7 @@ static int demux_gif_fill_buffer(demuxer
		21	int code;
		22	unsigned char *p = NULL;
		23	if (DGifGetExtension(gif, &code, &p) == GIF_ERROR) {
		24	- PrintGifError();
		25	+ printf("%s\n", GifErrorString(GIF_ERROR));
		26	return 0; // oops
		27	}
		28	if (code == 0xF9) {
		29	@@ -137,7 +137,7 @@ static int demux_gif_fill_buffer(demuxer
		30	comments[length] = 0;
		31	printf("%s", comments);
		32	if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) {
		33	- PrintGifError();
		34	+ printf("%s\n", GifErrorString(GIF_ERROR));
		35	return 0; // oops
		36	}
		37	}
		38	@@ -145,7 +145,7 @@ static int demux_gif_fill_buffer(demuxer
		39	}
		40	while (p != NULL) {
		41	if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) {
		42	- PrintGifError();
		43	+ printf("%s\n", GifErrorString(GIF_ERROR));
		44	return 0; // oops
		45	}
		46	}
		47	@@ -153,7 +153,7 @@ static int demux_gif_fill_buffer(demuxer
		48	}
		49
		50	if (DGifGetImageDesc(gif) == GIF_ERROR) {
		51	- PrintGifError();
		52	+ printf("%s\n", GifErrorString(GIF_ERROR));
		53	return 0; // oops
		54	}
		55
		56	@@ -166,7 +166,7 @@ static int demux_gif_fill_buffer(demuxer
		57	memset(dp->buffer, gif->SBackGroundColor, priv->w * priv->h);
		58
		59	if (DGifGetLine(gif, buf, len) == GIF_ERROR) {
		60	- PrintGifError();
		61	+ printf("%s\n", GifErrorString(GIF_ERROR));
		62	free(buf);
		63	return 0; // oops
		64	}
65	@@ -256,10 +256,10 @@ static demuxer_t* demux_open_gif(demuxer
66	lseek(demuxer->stream->fd, 0, SEEK_SET);
67	gif = DGifOpenFileHandle(demuxer->stream->fd);
68	#else
69	- gif = DGifOpen(demuxer->stream, my_read_gif);
70	+ gif = DGifOpen(demuxer->stream, my_read_gif, NULL);
71	#endif
72	if (!gif) {
73	- PrintGifError();
74	+ printf("%s\n", GifErrorString(GIF_ERROR));
75	free(priv);
76	return NULL;
77	}
78	@@ -301,7 +301,7 @@ static void demux_close_gif(demuxer_t* d
79	gif_priv_t *priv = demuxer->priv;
80	if (!priv) return;
81	if (priv->gif && DGifCloseFile(priv->gif) == GIF_ERROR)
82	- PrintGifError();
83	+ printf("%s\n", GifErrorString(GIF_ERROR));
84	free(priv->refimg);
85	free(priv);
86	}

Line 0 Link Here

(-)/usr/ports/multimedia/mplayer2/files/patch-libvo_vo__gif89a.c (+117 lines)
		1	--- libvo/vo_gif89a.c.orig 2013-07-09 16:33:16 UTC
		2	+++ libvo/vo_gif89a.c
		3	@@ -44,13 +44,13 @@
		4	* entire argument being interpretted as the filename.
		5	*/
		6
		7	-#include <gif_lib.h>
		8	-
		9	#include <stdio.h>
		10	#include <stdlib.h>
		11	#include <string.h>
		12	#include <unistd.h>
		13
		14	+#include <gif_lib.h>
		15	+
		16	#include "config.h"
		17	#include "subopt-helper.h"
		18	#include "video_out.h"
		19	@@ -69,6 +69,15 @@ static const vo_info_t info = {
		20
		21	const LIBVO_EXTERN(gif89a)
		22
		23	+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
		24	+#define EGifOpenFileName(a, b) EGifOpenFileName(a, b, NULL)
		25	+#define MakeMapObject GifMakeMapObject
		26	+#define FreeMapObject GifFreeMapObject
		27	+#define QuantizeBuffer GifQuantizeBuffer
		28	+#if defined GIFLIB_MINOR && GIFLIB_MINOR >= 1
		29	+#define EGifCloseFile(a) EGifCloseFile(a, NULL)
		30	+#endif
		31	+#endif
		32
		33	// how many frames per second we are aiming for during output.
		34	static float target_fps;
		35	@@ -92,6 +101,8 @@ static uint32_t img_width;
		36	static uint32_t img_height;
		37	// image data for slice rendering
		38	static uint8_t *slice_data = NULL;
		39	+// pointer for whole frame rendering
		40	+static uint8_t *frame_data = NULL;
		41	// reduced image data for flip_page
		42	static uint8_t *reduce_data = NULL;
		43	// reduced color map for flip_page
		44	@@ -156,7 +167,7 @@ static int config(uint32_t s_width, uint
		45	uint32_t d_height, uint32_t flags, char *title,
		46	uint32_t format)
		47	{
		48	-#ifdef CONFIG_GIF_4
		49	+#if defined CONFIG_GIF_4 \|\| GIFLIB_MAJOR >= 5
		50	// these are control blocks for the gif looping extension.
		51	char LB1[] = "NETSCAPE2.0";
		52	char LB2[] = { 1, 0, 0 };
		53	@@ -185,23 +196,25 @@ static int config(uint32_t s_width, uint
		54	return 1;
		55	}
		56
		57	+ new_gif = EGifOpenFileName(gif_filename, 0);
		58	+ if (new_gif == NULL) {
		59	+ mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: error opening file \"%s\" for output.\n", gif_filename);
		60	+ return 1;
		61	+ }
		62	+
		63	+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
		64	+ EGifSetGifVersion(new_gif, 1);
65	+#elif defined CONFIG_GIF_4
66	// the EGifSetGifVersion line causes segfaults in certain
67	// earlier versions of libungif. i don't know exactly which,
68	// but certainly in all those before v4. if you have problems,
69	// you need to upgrade your gif library.
70	-#ifdef CONFIG_GIF_4
71	EGifSetGifVersion("89a");
72	#else
73	mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Your version of libungif needs to be upgraded.\n");
74	mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: Some functionality has been disabled.\n");
75	#endif
76
77	- new_gif = EGifOpenFileName(gif_filename, 0);
78	- if (new_gif == NULL) {
79	- mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: error opening file \"%s\" for output.\n", gif_filename);
80	- return 1;
81	- }
82	-
83	slice_data = malloc(img_width * img_height * 3);
84	if (slice_data == NULL) {
85	mp_msg(MSGT_VO, MSGL_ERR, "GIF89a: malloc failed.\n");
86	@@ -231,7 +244,12 @@ static int config(uint32_t s_width, uint
87
88	// set the initial width and height info.
89	EGifPutScreenDesc(new_gif, s_width, s_height, 256, 0, reduce_cmap);
90	-#ifdef CONFIG_GIF_4
91	+#if defined GIFLIB_MAJOR && GIFLIB_MAJOR >= 5
92	+ EGifPutExtensionLeader(new_gif, 0xFF);
93	+ EGifPutExtensionBlock(new_gif, 11, LB1);
94	+ EGifPutExtensionBlock(new_gif, 3, LB2);
95	+ EGifPutExtensionTrailer(new_gif);
96	+#elif defined CONFIG_GIF_4
97	// version 3 of libungif does not support multiple control blocks.
98	// looping requires multiple control blocks.
99	// therefore, looping is only enabled for v4 and up.
100	@@ -311,7 +329,8 @@ static void flip_page(void)
101
102	static int draw_frame(uint8_t *src[])
103	{
104	- return 1;
105	+ frame_data = src[0];
106	+ return 0;
107	}
108
109	static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y)
110	@@ -370,6 +389,7 @@ static void uninit(void)
111	// set the pointers back to null.
112	new_gif = NULL;
113	gif_filename = NULL;
114	+ frame_data = NULL;
115	slice_data = NULL;
116	reduce_data = NULL;
117	reduce_cmap = NULL;

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	}