FreeBSD Bugzilla – Attachment 160366 Details for
Bug 202404
[MAINTAINER] multimedia/mplayer2: updates to Makefile
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v6
mplayer2.diff (text/plain), 32.16 KB, created by
Carlos J Puga Medina
on 2015-08-26 08:56:35 UTC
(
hide
)
Description:
v6
Filename:
MIME Type:
Creator:
Carlos J Puga Medina
Created:
2015-08-26 08:56:35 UTC
Size:
32.16 KB
patch
obsolete
>diff -urN /usr/ports/multimedia/mplayer2.old/Makefile /usr/ports/multimedia/mplayer2/Makefile >--- /usr/ports/multimedia/mplayer2.old/Makefile 2015-06-22 13:54:24.000000000 +0200 >+++ /usr/ports/multimedia/mplayer2/Makefile 2015-08-26 10:52:22.105444000 +0200 >@@ -2,7 +2,7 @@ > > PORTNAME= mplayer2 > PORTVERSION= ${MPLAYER2_PORT_VERSION} >-PORTREVISION= 13 >+PORTREVISION= 14 > CATEGORIES= multimedia audio > MASTER_SITES= LOCAL/gblach/ > >@@ -12,8 +12,7 @@ > LICENSE= GPLv2 > > LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ >- libfreetype.so:${PORTSDIR}/print/freetype2 \ >- libdvdread.so:${PORTSDIR}/multimedia/libdvdread >+ libfreetype.so:${PORTSDIR}/print/freetype2 > BUILD_DEPENDS= ffmpeg:${PORTSDIR}/multimedia/ffmpeg \ > python3:${PORTSDIR}/lang/python3 \ > rst2man:${PORTSDIR}/textproc/py-docutils >@@ -23,236 +22,166 @@ > 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-xvid \ >+ --disable-mng \ > --disable-mpg123 \ >- --disable-musepack >+ --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 >-WIN32_DESC= Enable win32 codec set on the IA32 arch >-REALPLAYER_DESC=Enable realplayer plugin >-LIRC_DESC= Enable lirc support >+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 >-V4L_DESC= Enable Video4Linux TV 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.* > >-.include <bsd.port.options.mk> >+A52_LIB_DEPENDS= liba52.so:${PORTSDIR}/audio/liba52 >+A52_CONFIGURE_ENABLE= liba52 >+A52_LIBS= -la52 > >-.if ${ARCH} == "sparc64" >-BROKEN= Does not compile on sparc64 >-.endif >+ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass >+ASS_CONFIGURE_OFF= --disable-libass >+ASS_LIBS= -lass > >-WITH_CDROM_DEVICE?= /dev/cd0 >+CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca >+CACA_CONFIGURE_ENABLE= caca >+CACA_LIBS= -lcaca > >-#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 >+DV_LIB_DEPENDS= libdv.so:${PORTSDIR}/multimedia/libdv >+DV_CONFIGURE_ENABLE= libdv > >-.if ${PORT_OPTIONS:MIPV6} >-CATEGORIES+= ipv6 >-.else >-CONFIGURE_ARGS+= --disable-inet6 >-.endif >+DVDREAD_LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread >+DVDREAD_CONFIGURE_ENABLE=dvdread > >-.if ${PORT_OPTIONS:MGIF} >-LIB_DEPENDS+= libgif.so:${PORTSDIR}/graphics/giflib >-.else >-CONFIGURE_ARGS+= --disable-gif >-.endif >+DVDNAV_LIB_DEPENDS= libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav >+DVDNAV_CONFIGURE_ENABLE=dvdnav > >-.if ${PORT_OPTIONS:MMAD} >-LIB_DEPENDS+= libmad.so:${PORTSDIR}/audio/libmad >-.else >-CONFIGURE_ARGS+= --disable-mad >-.endif >+ENCA_LIB_DEPENDS= libenca.so:${PORTSDIR}/converters/enca >+ENCA_CONFIGURE_ENABLE= enca >+ENCA_LIBS= -lenca > >-.if ${PORT_OPTIONS:MDV} >-LIB_DEPENDS+= libdv.so:${PORTSDIR}/multimedia/libdv >-.else >-CONFIGURE_ARGS+= --disable-libdv >-.endif >+GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib >+GIF_CONFIGURE_ENABLE= gif > >-.if ${PORT_OPTIONS:MTHEORA} >-LIB_DEPENDS+= libtheora.so:${PORTSDIR}/multimedia/libtheora >-.else >-CONFIGURE_ARGS+= --disable-theora >-.endif >+IPV6_CATEGORIES= ipv6 >+IPV6_CONFIGURE_ENABLE= inet6 > >-.if ${PORT_OPTIONS:MSPEEX} >-LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex >-.else >-CONFIGURE_ARGS+= --disable-speex >-.endif >+JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack >+JACK_CONFIGURE_ENABLE= jack >+JACK_LIBS= -ljack > >-.if ${PORT_OPTIONS:MJACK} >-LIB_DEPENDS+= libjack.so:${PORTSDIR}/audio/jack >-.else >-CONFIGURE_ARGS+= --disable-jack >-.endif >+LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa >+LADSPA_CONFIGURE_ENABLE=ladspa > >-.if ${PORT_OPTIONS:MPULSE} >-LIB_DEPENDS+= libpulse.so:${PORTSDIR}/audio/pulseaudio >-.else >-CONFIGURE_ARGS+= --disable-pulse >-.endif >+LIBAV_LIB_DEPENDS= libavresample.so:${PORTSDIR}/multimedia/ffmpeg >+LIBAV_CONFIGURE_ENABLE= libavresample >+LIBAV_LIBS= -lavresample > >-.if ${PORT_OPTIONS:MPORTAUDIO} >-LIB_DEPENDS+= libportaudio.so:${PORTSDIR}/audio/portaudio >-PORTAUDIOLIB= -lportaudio >-.else >-CONFIGURE_ARGS+= --disable-portaudio >-.endif >+LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray >+LIBBLURAY_CONFIGURE_ENABLE=bluray > >-.if ${PORT_OPTIONS:MLIBBLURAY} >-LIB_DEPENDS+= libbluray.so:${PORTSDIR}/multimedia/libbluray >-.else >-CONFIGURE_ARGS+= --disable-bluray >-.endif >+LIBCDIO_LIB_DEPENDS= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia >+LIBCDIO_CONFIGURE_ENABLE=libcdio > >-.if ${PORT_OPTIONS:MSMB} >-LIB_DEPENDS+= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient >-.else >-CONFIGURE_ARGS+= --disable-smb >-.endif >+LIRC_LIB_DEPENDS= liblirc_client.so:${PORTSDIR}/comms/lirc >+LIRC_CONFIGURE_ENABLE= lirc > >-.if ${PORT_OPTIONS:MLIBCDIO} >-LIB_DEPENDS+= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia >-.else >-CONFIGURE_ARGS+= --disable-libcdio >-.endif >+MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad >+MAD_CONFIGURE_ENABLE= mad > >-.if ${PORT_OPTIONS:MLADSPA} >-RUN_DEPENDS+= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa >-.else >-CONFIGURE_ARGS+= --disable-ladspa >-.endif >+OPENGL_USE= GL=gl XORG=glproto >+OPENGL_CONFIGURE_ENABLE=gl >+OPENGL_IMPLIES= X11 > >-.if ${ARCH} == "i386" || ${ARCH} == "amd64" >-.if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386" >-CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs >-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 >+PORTAUDIO_LIB_DEPENDS= libportaudio.so:${PORTSDIR}/audio/portaudio >+PORTAUDIO_CONFIGURE_ENABLE=portaudio >+PORTAUDIO_LIBS= -lportaudio > >-.if ${PORT_OPTIONS:MREALPLAYER} >-RUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer >-BUILD_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer >-.else >-CONFIGURE_ARGS+= --disable-real >-.endif >+PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio >+PULSEAUDIO_CONFIGURE_ENABLE=pulse >+PULSEAUDIO_LIBS= -lpulse > >-#.if ${PORT_OPTIONS:MV4L} >-#BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat >-#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 >+REALPLAYER_BUILD_DEPENDS=realplay:${PORTSDIR}/multimedia/linux-realplayer >+REALPLAYER_CONFIGURE_ENABLE=real > >-.if ${PORT_OPTIONS:MASS} >-LIB_DEPENDS+= libass.so:${PORTSDIR}/multimedia/libass >-.else >-CONFIGURE_ARGS+= --disable-libass --disable-enca >-.endif >+RTC_BUILD_DEPENDS= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc >+RTC_CONFIGURE_ENABLE= rtc > >-.if ${PORT_OPTIONS:MX11} >-USE_XORG= x11 xv xxf86vm >-.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 >+SDL_USE= SDL=sdl >+SDL_CONFIGURE_ENABLE= sdl > >-.if ${PORT_OPTIONS:MVDPAU} >-LIB_DEPENDS+= libvdpau.so:${PORTSDIR}/multimedia/libvdpau >-.else >-CONFIGURE_ARGS+= --disable-vdpau >-.endif >+SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient >+SMB_CONFIGURE_ENABLE= smb > >-.if ${PORT_OPTIONS:MRTC} >-BUILD_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc >-RUN_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc >-CONFIGURE_ARGS+= --enable-rtc >-.else >-CONFIGURE_ARGS+= --disable-rtc >-.endif >+SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex >+SPEEX_CONFIGURE_ENABLE= speex > >-.if ${PORT_OPTIONS:MLIBCACA} >-LIB_DEPENDS+= libcaca.so:${PORTSDIR}/graphics/libcaca >-.else >-CONFIGURE_ARGS+= --disable-caca >-.endif >+THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora >+THEORA_CONFIGURE_ENABLE=theora >+THEORA_LIBS= -ltheoradec > >-.if ${PORT_OPTIONS:MLIRC} >-LIB_DEPENDS+= liblirc_client.so:${PORTSDIR}/comms/lirc >-.else >-CONFIGURE_ARGS+= --disable-lirc >-.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> > >-.if ${PORT_OPTIONS:MSDL} >-USE_SDL= sdl >+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_ARGS+= --disable-sdl >+CONFIGURE_ENV+= CPPFLAGS= CFLAGS= LDFLAGS= >+.endif > .endif > > .if defined(WITH_KERN_HZ) >@@ -261,6 +190,13 @@ > 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} "" >@@ -270,17 +206,17 @@ > > post-patch: > .if ${OSVERSION} >= 900010 >- @${REINPLACE_CMD} -e \ >+ ${REINPLACE_CMD} -e \ > '/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \ > ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} > .endif >- @${REINPLACE_CMD} \ >+ ${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 \ >+ ${FIND} -E ${WRKSRC} -type f \ > -iregex ".*(configure|.sh|Makefile)" -print0 | \ > ${XARGS} -x -0 -n 10 \ > ${REINPLACE_CMD} -E \ >@@ -288,21 +224,21 @@ > -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 \ >+ ${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 \ >+ ${REINPLACE_CMD} -e \ > 's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \ > ${WRKSRC}/mplayer.c > .endif > > post-install: >- @${INSTALL_DATA} ${WRKSRC}/etc/example.conf \ >+ ${INSTALL_DATA} ${WRKSRC}/etc/example.conf \ > ${STAGEDIR}${PREFIX}/etc/mplayer/mplayer.conf.sample > .for conf in codecs input >- @${INSTALL_DATA} ${WRKSRC}/etc/${conf}.conf \ >+ ${INSTALL_DATA} ${WRKSRC}/etc/${conf}.conf \ > ${STAGEDIR}${PREFIX}/etc/mplayer/${conf}.conf.sample > .endfor > >diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-configure /usr/ports/multimedia/mplayer2/files/patch-configure >--- /usr/ports/multimedia/mplayer2.old/files/patch-configure 2015-03-25 18:36:47.000000000 +0100 >+++ /usr/ports/multimedia/mplayer2/files/patch-configure 2015-08-26 10:11:28.652825000 +0200 >@@ -1,6 +1,6 @@ >---- configure.orig 2012-05-12 01:08:28.473233004 -0500 >-+++ configure 2012-05-12 01:10:33.294799627 -0500 >-@@ -3111,7 +3111,7 @@ echocheck "pthread" >+--- configure.orig 2013-07-09 16:33:11 UTC >++++ configure >+@@ -2676,7 +2676,7 @@ echocheck "pthread" > if linux ; then > THREAD_CFLAGS=-D_REENTRANT > elif freebsd || netbsd || openbsd || bsdos ; then >@@ -9,7 +9,7 @@ > fi > if test "$_pthreads" = auto ; then > cat > $TMPC << EOF >-@@ -3128,7 +3128,7 @@ int main(void) { >+@@ -2693,7 +2693,7 @@ int main(void) { > EOF > _pthreads=no > if ! hpux ; then >@@ -18,7 +18,7 @@ > # for crosscompilation, we cannot execute the program, be happy if we can link statically > cc_check $THREAD_CFLAGS $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break > done >-@@ -6340,7 +6340,7 @@ TIMER = $_timer >+@@ -5296,7 +5296,7 @@ RST2MAN = $_rst2man > EXESUF = $_exesuf > EXESUFS_ALL = .exe > >diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-libao2-ao_oss.c /usr/ports/multimedia/mplayer2/files/patch-libao2-ao_oss.c >--- /usr/ports/multimedia/mplayer2.old/files/patch-libao2-ao_oss.c 2014-01-22 18:40:44.000000000 +0100 >+++ /usr/ports/multimedia/mplayer2/files/patch-libao2-ao_oss.c 2015-08-26 10:11:28.670737000 +0200 >@@ -1,5 +1,5 @@ >---- libao2/ao_oss.c~ 2012-05-10 23:45:22.000000000 -0500 >-+++ libao2/ao_oss.c 2012-05-11 00:03:17.820525648 -0500 >+--- libao2/ao_oss.c.orig 2013-07-09 16:33:13 UTC >++++ libao2/ao_oss.c > @@ -460,6 +460,7 @@ static void reset(void){ > fcntl(audio_fd, F_SETFD, FD_CLOEXEC); > #endif >diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-libmpcodecs-vd_theora.c /usr/ports/multimedia/mplayer2/files/patch-libmpcodecs-vd_theora.c >--- /usr/ports/multimedia/mplayer2.old/files/patch-libmpcodecs-vd_theora.c 2015-04-30 08:45:26.000000000 +0200 >+++ /usr/ports/multimedia/mplayer2/files/patch-libmpcodecs-vd_theora.c 2015-08-26 10:11:28.689207000 +0200 >@@ -1,6 +1,6 @@ >---- libmpcodecs/vd_theora.c.orig 2015-03-25 00:52:12.768575000 +0100 >-+++ libmpcodecs/vd_theora.c 2015-03-25 01:17:34.162174000 +0100 >-@@ -39,22 +39,23 @@ >+--- libmpcodecs/vd_theora.c.orig 2013-07-09 16:33:13 UTC >++++ libmpcodecs/vd_theora.c >+@@ -39,22 +39,23 @@ static const vd_info_t info = { > > LIBVD_EXTERN(theora) > >@@ -32,7 +32,7 @@ > } > return 0; > } >-@@ -64,7 +65,7 @@ >+@@ -64,7 +65,7 @@ static int control(sh_video_t *sh,int cm > theora_struct_t *context = sh->context; > switch(cmd) { > case VDCTRL_QUERY_FORMAT: >@@ -41,7 +41,7 @@ > return CONTROL_TRUE; > return CONTROL_FALSE; > } >-@@ -88,8 +89,10 @@ >+@@ -88,8 +89,10 @@ static int init(sh_video_t *sh){ > if (!context) > goto err_out; > >@@ -54,7 +54,7 @@ > > /* Read all header packets, pass them to theora_decode_header. */ > for (i = 0; i < THEORA_NUM_HEADER_PACKETS; i++) >-@@ -109,7 +112,7 @@ >+@@ -109,7 +112,7 @@ static int init(sh_video_t *sh){ > op.b_o_s = 1; > } > >@@ -63,7 +63,7 @@ > { > mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Broken Theora header; errorCode=%i!\n", errorCode); > goto err_out; >-@@ -117,23 +120,25 @@ >+@@ -117,23 +120,25 @@ static int init(sh_video_t *sh){ > } > > /* now init codec */ >@@ -97,7 +97,7 @@ > > err_out: > free(context); >-@@ -150,9 +155,9 @@ >+@@ -150,9 +155,9 @@ static void uninit(sh_video_t *sh) > > if (context) > { >@@ -110,7 +110,7 @@ > free (context); > } > } >-@@ -165,7 +170,7 @@ >+@@ -165,7 +170,7 @@ static mp_image_t* decode(sh_video_t *sh > theora_struct_t *context = sh->context; > int errorCode = 0; > ogg_packet op; >@@ -119,7 +119,7 @@ > mp_image_t* mpi; > > // no delayed frames >-@@ -177,31 +182,31 @@ >+@@ -177,31 +182,31 @@ static mp_image_t* decode(sh_video_t *sh > op.packet = data; > op.granulepos = -1; > >diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux-demux_gif.c /usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c >--- /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux-demux_gif.c 2012-12-31 18:32:16.000000000 +0100 >+++ /usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demux_gif.c 1970-01-01 01:00:00.000000000 +0100 >@@ -1,19 +0,0 @@ >---- 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) >diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux-demux_ogg.c /usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demux_ogg.c >--- /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux-demux_ogg.c 2015-04-30 08:45:26.000000000 +0200 >+++ /usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demux_ogg.c 2015-08-26 10:11:28.727788000 +0200 >@@ -1,5 +1,5 @@ >---- libmpdemux/demux_ogg.c.orig 2013-07-09 18:33:16.000000000 +0200 >-+++ libmpdemux/demux_ogg.c 2015-03-25 01:47:19.439377000 +0100 >+--- libmpdemux/demux_ogg.c.orig 2013-07-09 16:33:16 UTC >++++ libmpdemux/demux_ogg.c > @@ -50,21 +50,21 @@ > #endif > >@@ -28,7 +28,7 @@ > } theora_struct_t; > #endif > >-@@ -117,7 +117,7 @@ >+@@ -117,7 +117,7 @@ typedef struct ogg_stream { > float samplerate; /// granulpos 2 time > int64_t lastpos; > int32_t lastsize; >@@ -37,7 +37,7 @@ > > // Logical stream state > ogg_stream_state stream; >-@@ -300,11 +300,10 @@ >+@@ -300,11 +300,10 @@ static unsigned char *demux_ogg_read_pac > have theora_state st, until all header packets were passed to the > decoder. */ > if (!pack->bytes || !(*data&0x80)) { >@@ -51,7 +51,7 @@ > os->lastpos += pack->granulepos & iframemask; > *keyframe = (pack->granulepos & iframemask) == 0; > } else { >-@@ -888,14 +887,15 @@ >+@@ -888,14 +887,15 @@ int demux_ogg_open(demuxer_t *demuxer) > #ifdef CONFIG_OGGTHEORA > } else if (pack.bytes >= 7 && !strncmp (&pack.packet[1], "theora", 6)) { > int errorCode = 0; >@@ -73,7 +73,7 @@ > mp_msg(MSGT_DEMUX, MSGL_ERR, > "Theora header parsing failed: %i \n", errorCode); > } else { >-@@ -904,30 +904,32 @@ >+@@ -904,30 +904,32 @@ int demux_ogg_open(demuxer_t *demuxer) > sh_v->bih = calloc(1, sizeof(*sh_v->bih)); > sh_v->bih->biSize = sizeof(*sh_v->bih); > sh_v->bih->biCompression = sh_v->format = FOURCC_THEORA; >diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux-demuxer.h /usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demuxer.h >--- /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux-demuxer.h 2014-09-19 14:56:27.000000000 +0200 >+++ /usr/ports/multimedia/mplayer2/files/patch-libmpdemux-demuxer.h 2015-08-26 10:11:28.738094000 +0200 >@@ -1,6 +1,6 @@ >---- libmpdemux/demuxer.h.orig 2014-09-19 05:04:22.000000000 +0200 >-+++ libmpdemux/demuxer.h 2014-09-19 05:01:57.000000000 +0200 >-@@ -121,7 +121,7 @@ >+--- libmpdemux/demuxer.h.orig 2013-07-09 16:33:16 UTC >++++ libmpdemux/demuxer.h >+@@ -121,7 +121,7 @@ enum timestamp_type { > #define SEEK_BACKWARD (1 << 3) > > // demux_lavf can pass lavf buffers using FF_INPUT_BUFFER_PADDING_SIZE instead >diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux_demux__gif.c /usr/ports/multimedia/mplayer2/files/patch-libmpdemux_demux__gif.c >--- /usr/ports/multimedia/mplayer2.old/files/patch-libmpdemux_demux__gif.c 1970-01-01 01:00:00.000000000 +0100 >+++ /usr/ports/multimedia/mplayer2/files/patch-libmpdemux_demux__gif.c 2015-08-26 09:55:51.683276000 +0200 >@@ -0,0 +1,86 @@ >+--- 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); >+ } >diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-libvo_vo__gif89a.c /usr/ports/multimedia/mplayer2/files/patch-libvo_vo__gif89a.c >--- /usr/ports/multimedia/mplayer2.old/files/patch-libvo_vo__gif89a.c 1970-01-01 01:00:00.000000000 +0100 >+++ /usr/ports/multimedia/mplayer2/files/patch-libvo_vo__gif89a.c 2015-08-26 10:11:28.750529000 +0200 >@@ -0,0 +1,117 @@ >+--- 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; >diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-stream-tvi_bsdbt848.c /usr/ports/multimedia/mplayer2/files/patch-stream-tvi_bsdbt848.c >--- /usr/ports/multimedia/mplayer2.old/files/patch-stream-tvi_bsdbt848.c 2014-01-22 18:40:44.000000000 +0100 >+++ /usr/ports/multimedia/mplayer2/files/patch-stream-tvi_bsdbt848.c 2015-08-26 10:11:28.761182000 +0200 >@@ -1,6 +1,6 @@ >---- stream/tvi_bsdbt848.c.orig 2009-05-12 21:58:57.000000000 -0500 >-+++ stream/tvi_bsdbt848.c 2009-07-23 20:39:13.536681248 -0500 >-@@ -352,11 +352,11 @@ >+--- stream/tvi_bsdbt848.c.orig 2013-07-09 16:33:36 UTC >++++ stream/tvi_bsdbt848.c >+@@ -368,11 +368,11 @@ static int control(priv_t *priv, int cmd > int req_mode = *(int *)arg; > u_short tmp_fps; > >@@ -14,7 +14,7 @@ > priv->maxheight = PAL_HEIGHT; > priv->maxwidth = PAL_WIDTH; > priv->maxfps = PAL_FPS; >-@@ -377,7 +377,7 @@ >+@@ -393,7 +393,7 @@ static int control(priv_t *priv, int cmd > > if(req_mode == TV_NORM_NTSC) > { >@@ -23,7 +23,7 @@ > priv->maxheight = NTSC_HEIGHT; > priv->maxwidth = NTSC_WIDTH; > priv->maxfps = NTSC_FPS; >-@@ -401,9 +401,28 @@ >+@@ -417,9 +417,28 @@ static int control(priv_t *priv, int cmd > } > } > >@@ -35,7 +35,8 @@ > + priv->maxwidth = PAL_WIDTH; > + priv->maxfps = PAL_FPS; > + priv->fps = PAL_FPS; >-+ >+ >+- if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) > + if(priv->fps > priv->maxfps) priv->fps = priv->maxfps; > + > + if(priv->geom.rows > priv->maxheight) >@@ -48,13 +49,12 @@ > + priv->geom.columns = priv->maxwidth; > + } > + } >- >-- if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) >++ > + if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0) > { >- mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno)); >+ mp_tmsg(MSGT_TV, MSGL_ERR, "tvi_bsdbt848: Call to %s ioctl failed. Error: %s\n", "METEORSFMT", strerror(errno)); > return TVI_CONTROL_FALSE; >-@@ -532,8 +551,9 @@ >+@@ -548,8 +567,9 @@ G_private = priv; /* Oooh, sick */ > /* Video Configuration */ > > priv->videoready = TRUE; >@@ -65,12 +65,12 @@ > priv->maxheight = PAL_HEIGHT; > priv->maxwidth = PAL_WIDTH; > priv->maxfps = PAL_FPS; >-@@ -558,7 +578,7 @@ >+@@ -574,7 +594,7 @@ if(priv->btfd < 0) > } > > if(priv->videoready == TRUE && > - ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) > + ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0) > { >- mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "SETEORSFMT", strerror(errno)); >+ mp_tmsg(MSGT_TV, MSGL_ERR, "tvi_bsdbt848: Call to %s ioctl failed. Error: %s\n", "SETEORSFMT", strerror(errno)); > } >diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-stream-tvi_v4l2.c /usr/ports/multimedia/mplayer2/files/patch-stream-tvi_v4l2.c >--- /usr/ports/multimedia/mplayer2.old/files/patch-stream-tvi_v4l2.c 2014-01-22 18:40:44.000000000 +0100 >+++ /usr/ports/multimedia/mplayer2/files/patch-stream-tvi_v4l2.c 2015-08-26 10:11:28.771504000 +0200 >@@ -1,5 +1,5 @@ >---- stream/tvi_v4l2.c~ 2012-05-10 23:45:22.000000000 -0500 >-+++ stream/tvi_v4l2.c 2012-05-11 00:08:34.930938536 -0500 >+--- stream/tvi_v4l2.c.orig 2013-07-09 16:33:36 UTC >++++ stream/tvi_v4l2.c > @@ -52,7 +52,6 @@ known issues: > #ifdef HAVE_SYS_VIDEOIO_H > #include <sys/videoio.h> >diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-sub-subassconvert.c /usr/ports/multimedia/mplayer2/files/patch-sub-subassconvert.c >--- /usr/ports/multimedia/mplayer2.old/files/patch-sub-subassconvert.c 2014-01-22 18:40:44.000000000 +0100 >+++ /usr/ports/multimedia/mplayer2/files/patch-sub-subassconvert.c 2015-08-26 10:11:28.780861000 +0200 >@@ -1,4 +1,4 @@ >---- sub/subassconvert.c.orig >+--- sub/subassconvert.c.orig 2013-07-09 16:33:36 UTC > +++ sub/subassconvert.c > @@ -18,6 +18,7 @@ > * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >diff -urN /usr/ports/multimedia/mplayer2.old/files/patch-sub-subreader.c /usr/ports/multimedia/mplayer2/files/patch-sub-subreader.c >--- /usr/ports/multimedia/mplayer2.old/files/patch-sub-subreader.c 2014-01-22 18:40:44.000000000 +0100 >+++ /usr/ports/multimedia/mplayer2/files/patch-sub-subreader.c 2015-08-26 10:11:28.792022000 +0200 >@@ -1,4 +1,4 @@ >---- sub/subreader.c.orig >+--- sub/subreader.c.orig 2013-07-09 16:33:36 UTC > +++ sub/subreader.c > @@ -21,6 +21,7 @@ > * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=160366">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 202404
:
159969
|
159970
|
159998
|
160285
|
160300
|
160301
|
160366
|
160375
|
160377
|
160401
|
160430
|
160445
|
160503