FreeBSD Bugzilla – Attachment 196428 Details for
Bug 219921
multimedia/libxine: update to version 1.2.9
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
libxine.diff (rebase of previous patch; still broken)
libxine.diff (text/plain), 35.21 KB, created by
Tobias Kortkamp
on 2018-08-22 00:22:11 UTC
(
hide
)
Description:
libxine.diff (rebase of previous patch; still broken)
Filename:
MIME Type:
Creator:
Tobias Kortkamp
Created:
2018-08-22 00:22:11 UTC
Size:
35.21 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 477499) >+++ Makefile (working copy) >@@ -2,8 +2,7 @@ > # $FreeBSD$ > > PORTNAME= xine >-PORTVERSION= 1.2.6 >-PORTREVISION= 18 >+PORTVERSION= 1.2.9 > CATEGORIES= multimedia ipv6 > MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION} > PKGNAMEPREFIX= lib >@@ -15,6 +14,8 @@ > LICENSE= GPLv2+ > LICENSE_FILE= ${WRKSRC}/COPYING > >+BROKEN_aarch64= Fails to configure: error: no acceptable as found in $PATH >+ > BUILD_DEPENDS= v4l_compat>=1.0.20100321:multimedia/v4l_compat > LIB_DEPENDS= libFLAC.so:audio/flac \ > liba52.so:audio/liba52 \ >@@ -33,19 +34,24 @@ > libdca.so:multimedia/libdca \ > libavcodec.so:multimedia/ffmpeg \ > libfaad.so:audio/faad \ >- libvdpau.so:multimedia/libvdpau >+ libvdpau.so:multimedia/libvdpau \ >+ libcdio.so:sysutils/libcdio \ >+ libdvdnav.so:multimedia/libdvdnav \ >+ libvpx.so:multimedia/libvpx \ >+ libogg.so:audio/libogg >+ > .if !defined(PACKAGE_BUILDING) > # DVDCSS version hardcoded in src/input/input_dvd.c misc/cdda_server.c > # and src/input/libdvdnav/dvd_input.c (dlopen'ed) >-LIB_DEPENDS+= libdvdcss.so.2:multimedia/libdvdcss >+LIB_DEPENDS+= libdvdcss.so:multimedia/libdvdcss > .endif > >-USES= compiler cpe gmake iconv libtool:keepla \ >+USES= compiler cpe gmake iconv jpeg libtool:keepla \ > localbase pathfix perl5 pkgconfig tar:xz > CPE_PRODUCT= xine-lib > CPE_VENDOR= xine > GNU_CONFIGURE= yes >-USE_XORG= x11 xv xinerama xext sm ice >+USE_XORG= x11 xcb xv xinerama xext sm ice > USE_GL= gl glu > USE_PERL5= build > USE_SDL= sdl >@@ -68,14 +74,12 @@ > DOCSDIR= ${PREFIX}/share/doc/xine-lib > # Please sync with XINE_PLUGINSDIR in multimedia/xine > # and multimedia/vdr-plugin-xineliboutput >-PLUGINSDIR= lib/xine/plugins/2.5 >+PLUGINSDIR= lib/xine/plugins/2.7 > PLIST_SUB= PLUGINSDIR="${PLUGINSDIR}" > >-BROKEN_aarch64= Fails to configure: error: no acceptable as found in $PATH >- > OPTIONS_DEFINE= NLS CACA ESOUND JACK GNOMEVFS2 PULSEAUDIO XVMC SMB AALIB \ > IMAGEMAGICK PIXBUF WAVPACK VAAPI LIBBLURAY >-OPTIONS_DEFAULT=VAAPI >+OPTIONS_DEFAULT=IMAGEMAGICK PIXBUF VAAPI # IMAGEMAGICK and PIXBUF cause of gxine > OPTIONS_SUB= yes > > NLS_USES= gettext >Index: distinfo >=================================================================== >--- distinfo (revision 477499) >+++ distinfo (working copy) >@@ -1,2 +1,3 @@ >-SHA256 (xine-lib-1.2.6.tar.xz) = bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005 >-SIZE (xine-lib-1.2.6.tar.xz) = 5020964 >+TIMESTAMP = 1519153744 >+SHA256 (xine-lib-1.2.9.tar.xz) = 32b34e8049feb762d75a551d5d2cdb56c396fdd83e35b9b7de5fd08e498e948d >+SIZE (xine-lib-1.2.9.tar.xz) = 5180452 >Index: files/patch-configure >=================================================================== >--- files/patch-configure (revision 477499) >+++ files/patch-configure (working copy) >@@ -1,14 +1,5 @@ > --- configure.orig > +++ configure >-@@ -20349,7 +20349,7 @@ $as_echo "#define ARCH_SPARC /**/" >>con >- >- ;; >- >-- x86_64-*) >-+ x86_64-*|amd64-*) >- arch_x86=64 >- >- $as_echo "#define ARCH_X86_64 /**/" >>confdefs.h > @@ -20685,7 +20685,7 @@ fi > > if test "$sarchopt" != "no"; then >Index: files/patch-ffmpeg3 >=================================================================== >--- files/patch-ffmpeg3 (revision 477499) >+++ files/patch-ffmpeg3 (nonexistent) >@@ -1,57 +0,0 @@ >-Index: src/combined/ffmpeg/ff_audio_decoder.c >-=================================================================== >---- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c >-+++ src/combined/ffmpeg/ff_audio_decoder.c >-@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec >- int got_frame; >- float gain = this->class->gain; >- if (!this->av_frame) >-- this->av_frame = avcodec_alloc_frame (); >-+ this->av_frame = av_frame_alloc (); >- >- consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt); >- if ((consumed >= 0) && got_frame) { >-@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode >- /* try to reset the wma decoder */ >- if( this->decoder_ok ) { >- #if AVAUDIO > 3 >-- avcodec_free_frame (&this->av_frame); >-+ av_frame_free (&this->av_frame); >- #endif >- pthread_mutex_lock (&ffmpeg_lock); >- avcodec_close (this->context); >-@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco >- >- if( this->context && this->decoder_ok ) { >- #if AVAUDIO > 3 >-- avcodec_free_frame (&this->av_frame); >-+ av_frame_free (&this->av_frame); >- #endif >- pthread_mutex_lock (&ffmpeg_lock); >- avcodec_close (this->context); >-Index: src/combined/ffmpeg/ff_video_decoder.c >-=================================================================== >---- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c >-+++ src/combined/ffmpeg/ff_video_decoder.c >-@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl >- this->stream = stream; >- this->class = (ff_video_class_t *) class_gen; >- >-- this->av_frame = avcodec_alloc_frame(); >-+ this->av_frame = av_frame_alloc(); >- this->context = avcodec_alloc_context(); >- this->context->opaque = this; >- #if AVPALETTE == 1 >-Index: src/dxr3/ffmpeg_encoder.c >-=================================================================== >---- src/dxr3/ffmpeg_encoder.c.orig 2016-02-17 07:54:31.950881580 +0000 >-+++ src/dxr3/ffmpeg_encoder.c 2016-02-17 07:55:42.897237494 +0000 >-@@ -161,7 +161,7 @@ >- "dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n"); >- return 0; >- } >-- this->picture = avcodec_alloc_frame(); >-+ this->picture = av_frame_alloc(); >- if (!this->picture) { >- xprintf(drv->class->xine, XINE_VERBOSITY_LOG, >- "dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n"); > >Property changes on: files/patch-ffmpeg3 >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-ffmpeg4 >=================================================================== >--- files/patch-ffmpeg4 (revision 477499) >+++ files/patch-ffmpeg4 (nonexistent) >@@ -1,278 +0,0 @@ >-https://sourceforge.net/p/xine/xine-lib-1.2/ci/e35492bfce45/ >-https://sourceforge.net/p/xine/xine-lib-1.2/ci/abd6e04c7a53/ >- >---- src/combined/ffmpeg/ff_audio_decoder.c.orig 2014-06-09 16:08:42 UTC >-+++ src/combined/ffmpeg/ff_audio_decoder.c >-@@ -137,7 +137,7 @@ static void ff_audio_ensure_buffer_size(ff_audio_decod >- xprintf(this->stream->xine, XINE_VERBOSITY_LOG, >- _("ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"), >- this->bufsize); >-- this->buf = realloc16 (this->buf, this->bufsize + FF_INPUT_BUFFER_PADDING_SIZE); >-+ this->buf = realloc16 (this->buf, this->bufsize + AV_INPUT_BUFFER_PADDING_SIZE); >- } >- } >- >-@@ -148,9 +148,9 @@ static void ff_audio_handle_special_buffer(ff_audio_de >- >- free (this->context->extradata); >- this->context->extradata_size = buf->decoder_info[2]; >-- this->context->extradata = malloc (buf->decoder_info[2] + FF_INPUT_BUFFER_PADDING_SIZE); >-+ this->context->extradata = malloc (buf->decoder_info[2] + AV_INPUT_BUFFER_PADDING_SIZE); >- memcpy (this->context->extradata, buf->decoder_info_ptr[2], buf->decoder_info[2]); >-- memset (this->context->extradata + buf->decoder_info[2], 0, FF_INPUT_BUFFER_PADDING_SIZE); >-+ memset (this->context->extradata + buf->decoder_info[2], 0, AV_INPUT_BUFFER_PADDING_SIZE); >- } >- } >- >-@@ -363,10 +363,10 @@ static void ff_handle_header_buffer(ff_audio_decoder_t >- this->ff_channels, this->ff_bits, this->ff_sample_rate, >- this->context->block_align); >- if (!data_len) break; >-- e = malloc (data_len + FF_INPUT_BUFFER_PADDING_SIZE); >-+ e = malloc (data_len + AV_INPUT_BUFFER_PADDING_SIZE); >- if (!e) break; >- xine_fast_memcpy (e, p, data_len); >-- memset (e + data_len, 0, FF_INPUT_BUFFER_PADDING_SIZE); >-+ memset (e + data_len, 0, AV_INPUT_BUFFER_PADDING_SIZE); >- this->context->extradata = e; >- this->context->extradata_size = data_len; >- break; >-@@ -886,7 +886,7 @@ static void ff_audio_decode_data (audio_decoder_t *thi >- offset = 0; >- >- /* pad input data */ >-- memset(&this->buf[this->size], 0, FF_INPUT_BUFFER_PADDING_SIZE); >-+ memset(&this->buf[this->size], 0, AV_INPUT_BUFFER_PADDING_SIZE); >- >- while (this->size>=0) { >- decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; >---- src/combined/ffmpeg/ff_mpeg_parser.c.orig 2013-09-18 10:04:54 UTC >-+++ src/combined/ffmpeg/ff_mpeg_parser.c >-@@ -26,6 +26,7 @@ >- #define LOG >- */ >- #include "ff_mpeg_parser.h" >-+#include "ffmpeg_compat.h" >- >- /* mpeg frame rate table from lavc */ >- static const int frame_rate_tab[][2] = { >-@@ -50,7 +51,7 @@ static const int frame_rate_tab[][2] = { >- >- void mpeg_parser_init (mpeg_parser_t *parser) >- { >-- parser->chunk_buffer = malloc(BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE); >-+ parser->chunk_buffer = malloc(BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE); >- mpeg_parser_reset(parser); >- } >- >---- src/combined/ffmpeg/ff_video_decoder.c.orig 2014-06-24 16:21:06 UTC >-+++ src/combined/ffmpeg/ff_video_decoder.c >-@@ -1,5 +1,5 @@ >- /* >-- * Copyright (C) 2001-2014 the xine project >-+ * Copyright (C) 2001-2015 the xine project >- * >- * This file is part of xine, a free video player. >- * >-@@ -722,23 +722,28 @@ static void init_video_codec (ff_video_decoder_t *this >- >- this->context->width = this->bih.biWidth; >- this->context->height = this->bih.biHeight; >-- this->context->stream_codec_tag = this->context->codec_tag = >-+#ifdef AVCODEC_HAS_STREAM_CODEC_TAG >-+ this->context->stream_codec_tag = >-+#endif >-+ this->context->codec_tag = >- _x_stream_info_get(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC); >- >- >- this->stream->video_out->open (this->stream->video_out, this->stream); >- >- this->edge = 0; >-- if(this->codec->capabilities & CODEC_CAP_DR1 && this->class->enable_dri) { >-+ if(this->codec->capabilities & AV_CODEC_CAP_DR1 && this->class->enable_dri) { >- if (this->stream->video_out->get_capabilities (this->stream->video_out) & VO_CAP_CROP) { >- /* We can crop. Fine. Lets allow decoders to paint over the frame edges. >- This will be slightly faster. And it is also a workaround for buggy >- v54 who likes to ignore EMU_EDGE for wmv2 and xvid. */ >-+#ifdef CODEC_FLAG_EMU_EDGE >- this->edge = avcodec_get_edge_width (); >- } else { >- /* Some codecs (eg rv10) copy flags in init so it's necessary to set >- * this flag here in case we are going to use direct rendering */ >- this->context->flags |= CODEC_FLAG_EMU_EDGE; >-+#endif >- } >- } >- >-@@ -747,7 +752,7 @@ static void init_video_codec (ff_video_decoder_t *this >- this->context->codec_type = this->codec->type; >- >- if (this->class->choose_speed_over_accuracy) >-- this->context->flags2 |= CODEC_FLAG2_FAST; >-+ this->context->flags2 |= AV_CODEC_FLAG2_FAST; >- >- #ifdef DEPRECATED_AVCODEC_THREAD_INIT >- if (this->class->thread_count > 1) { >-@@ -769,7 +774,7 @@ static void init_video_codec (ff_video_decoder_t *this >- /* enable direct rendering by default */ >- this->output_format = XINE_IMGFMT_YV12; >- #ifdef ENABLE_DIRECT_RENDERING >-- if( this->codec->capabilities & CODEC_CAP_DR1 && this->class->enable_dri ) { >-+ if( this->codec->capabilities & AV_CODEC_CAP_DR1 && this->class->enable_dri ) { >- #ifdef AV_BUFFER >- this->context->get_buffer2 = get_buffer; >- this->context->thread_safe_callbacks = 1; >-@@ -1246,7 +1251,7 @@ static void ff_check_bufsize (ff_video_decoder_t *this >- xprintf(this->stream->xine, XINE_VERBOSITY_LOG, >- _("ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"), >- this->bufsize); >-- this->buf = realloc(this->buf, this->bufsize + FF_INPUT_BUFFER_PADDING_SIZE ); >-+ this->buf = realloc(this->buf, this->bufsize + AV_INPUT_BUFFER_PADDING_SIZE ); >- } >- } >- >-@@ -1386,7 +1391,7 @@ static void ff_handle_header_buffer (ff_video_decoder_ >- if (this->bih.biSize > sizeof(xine_bmiheader)) { >- this->context->extradata_size = this->bih.biSize - sizeof(xine_bmiheader); >- this->context->extradata = malloc(this->context->extradata_size + >-- FF_INPUT_BUFFER_PADDING_SIZE); >-+ AV_INPUT_BUFFER_PADDING_SIZE); >- memcpy(this->context->extradata, this->buf + sizeof(xine_bmiheader), >- this->context->extradata_size); >- } >-@@ -1409,7 +1414,7 @@ static void ff_handle_header_buffer (ff_video_decoder_ >- if (this->context->extradata_size < 8) { >- this->context->extradata_size= 8; >- this->context->extradata = malloc(this->context->extradata_size + >-- FF_INPUT_BUFFER_PADDING_SIZE); >-+ AV_INPUT_BUFFER_PADDING_SIZE); >- ((uint32_t *)this->context->extradata)[0] = 0; >- if (codec_type == BUF_VIDEO_RV10) >- ((uint32_t *)this->context->extradata)[1] = 0x10000000; >-@@ -1417,7 +1422,7 @@ static void ff_handle_header_buffer (ff_video_decoder_ >- ((uint32_t *)this->context->extradata)[1] = 0x10003001; >- } else { >- this->context->extradata = malloc(this->context->extradata_size + >-- FF_INPUT_BUFFER_PADDING_SIZE); >-+ AV_INPUT_BUFFER_PADDING_SIZE); >- memcpy(this->context->extradata, this->buf + 26, >- this->context->extradata_size); >- } >-@@ -1451,7 +1456,7 @@ static void ff_handle_special_buffer (ff_video_decoder >- lprintf("BUF_SPECIAL_STSD_ATOM\n"); >- this->context->extradata_size = buf->decoder_info[2]; >- this->context->extradata = malloc(buf->decoder_info[2] + >-- FF_INPUT_BUFFER_PADDING_SIZE); >-+ AV_INPUT_BUFFER_PADDING_SIZE); >- memcpy(this->context->extradata, buf->decoder_info_ptr[2], >- buf->decoder_info[2]); >- >-@@ -1461,7 +1466,7 @@ static void ff_handle_special_buffer (ff_video_decoder >- lprintf("BUF_SPECIAL_DECODER_CONFIG\n"); >- this->context->extradata_size = buf->decoder_info[2]; >- this->context->extradata = malloc(buf->decoder_info[2] + >-- FF_INPUT_BUFFER_PADDING_SIZE); >-+ AV_INPUT_BUFFER_PADDING_SIZE); >- memcpy(this->context->extradata, buf->decoder_info_ptr[2], >- buf->decoder_info[2]); >- >-@@ -1826,7 +1831,7 @@ static void ff_handle_buffer (ff_video_decoder_t *this >- /* data accumulation */ >- if (buf->size > 0) { >- if ((this->size == 0) && >-- ((buf->size + FF_INPUT_BUFFER_PADDING_SIZE) < buf->max_size) && >-+ ((buf->size + AV_INPUT_BUFFER_PADDING_SIZE) < buf->max_size) && >- (buf->decoder_flags & BUF_FLAG_FRAME_END)) { >- /* buf contains a complete frame */ >- /* no memcpy needed */ >-@@ -1859,7 +1864,7 @@ static void ff_handle_buffer (ff_video_decoder_t *this >- /* note: bitstream, alt bitstream reader or something will cause >- * severe mpeg4 artifacts if padding is less than 32 bits. >- */ >-- memset(&chunk_buf[this->size], 0, FF_INPUT_BUFFER_PADDING_SIZE); >-+ memset(&chunk_buf[this->size], 0, AV_INPUT_BUFFER_PADDING_SIZE); >- >- while (this->size > 0) { >- >-@@ -2532,7 +2537,7 @@ static video_decoder_t *ff_video_open_plugin (video_de >- >- this->decoder_ok = 0; >- this->decoder_init_mode = 1; >-- this->buf = calloc(1, VIDEOBUFSIZE + FF_INPUT_BUFFER_PADDING_SIZE); >-+ this->buf = calloc(1, VIDEOBUFSIZE + AV_INPUT_BUFFER_PADDING_SIZE); >- this->bufsize = VIDEOBUFSIZE; >- >- this->is_mpeg12 = 0; >---- src/combined/ffmpeg/ffmpeg_compat.h.orig 2014-04-30 11:40:50 UTC >-+++ src/combined/ffmpeg/ffmpeg_compat.h >-@@ -1,5 +1,5 @@ >- /* >-- * Copyright (C) 2000-2014 the xine project >-+ * Copyright (C) 2000-2015 the xine project >- * >- * This file is part of xine, a unix video player. >- * >-@@ -58,6 +58,11 @@ >- # define AVCODEC_HAS_SUB_ID >- #endif >- >-+/* not 100% sure about this (between 55.19 and 56.56) */ >-+#if LIBAVCODEC_VERSION_MAJOR < 56 >-+# define AVCODEC_HAS_STREAM_CODEC_TAG >-+#endif >-+ >- /**/ >- #if LIBAVCODEC_VERSION_MAJOR > 53 || (LIBAVCODEC_VERSION_MAJOR == 53 && LIBAVCODEC_VERSION_MINOR >= 8) >- # define avcodec_init() do {} while(0) >-@@ -192,5 +197,16 @@ >- #if LIBAVCODEC_VERSION_INT >= ((55<<16)|100) >- # define AV_BUFFER 1 >- #endif >-+ >-+#ifndef AV_INPUT_BUFFER_PADDING_SIZE >-+# define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE >-+#endif >-+#ifndef AV_CODEC_CAP_DR1 >-+# define AV_CODEC_CAP_DR1 CODEC_CAP_DR1 >-+#endif >-+#ifndef AV_CODEC_FLAG2_FAST >-+# define AV_CODEC_FLAG2_FAST CODEC_FLAG2_FAST >-+#endif >-+ >- >- #endif /* XINE_AVCODEC_COMPAT_H */ >---- src/dxr3/ffmpeg_encoder.c.orig 2014-03-13 04:06:09 UTC >-+++ src/dxr3/ffmpeg_encoder.c >-@@ -207,7 +207,9 @@ static int lavc_on_update_format(dxr3_driver_t *drv, d >- this->context->height = frame->oheight; >- >- this->context->gop_size = 0; /*intra frames only */ >-+#if defined(LIBAVCODEC_VERSION_MAJOR) && LIBAVCODEC_VERSION_MAJOR < 58 >- this->context->me_method = ME_ZERO; /*motion estimation type*/ >-+#endif >- >- this->context->time_base.den = 90000; >- if (frame->vo_frame.duration > 90000 / 24) >---- src/video_out/video_out_vaapi.c.orig 2014-06-09 16:08:42 UTC >-+++ src/video_out/video_out_vaapi.c >-@@ -3119,15 +3119,15 @@ static void vaapi_update_frame_format (vo_driver_t *th >- frame->vo_frame.pitches[0] = 8*((width + 7) / 8); >- frame->vo_frame.pitches[1] = 8*((width + 15) / 16); >- frame->vo_frame.pitches[2] = 8*((width + 15) / 16); >-- frame->vo_frame.base[0] = av_mallocz (frame->vo_frame.pitches[0] * height + FF_INPUT_BUFFER_PADDING_SIZE); >-- frame->vo_frame.base[1] = av_mallocz (frame->vo_frame.pitches[1] * ((height+1)/2) + FF_INPUT_BUFFER_PADDING_SIZE); >-- frame->vo_frame.base[2] = av_mallocz (frame->vo_frame.pitches[2] * ((height+1)/2) + FF_INPUT_BUFFER_PADDING_SIZE); >-+ frame->vo_frame.base[0] = av_mallocz (frame->vo_frame.pitches[0] * height + AV_INPUT_BUFFER_PADDING_SIZE); >-+ frame->vo_frame.base[1] = av_mallocz (frame->vo_frame.pitches[1] * ((height+1)/2) + AV_INPUT_BUFFER_PADDING_SIZE); >-+ frame->vo_frame.base[2] = av_mallocz (frame->vo_frame.pitches[2] * ((height+1)/2) + AV_INPUT_BUFFER_PADDING_SIZE); >- frame->vo_frame.proc_duplicate_frame_data = NULL; >- frame->vo_frame.proc_provide_standard_frame_data = NULL; >- lprintf("XINE_IMGFMT_YV12 width %d height %d\n", width, height); >- } else if (format == XINE_IMGFMT_YUY2){ >- frame->vo_frame.pitches[0] = 8*((width + 3) / 4); >-- frame->vo_frame.base[0] = av_mallocz (frame->vo_frame.pitches[0] * height + FF_INPUT_BUFFER_PADDING_SIZE); >-+ frame->vo_frame.base[0] = av_mallocz (frame->vo_frame.pitches[0] * height + AV_INPUT_BUFFER_PADDING_SIZE); >- frame->vo_frame.proc_duplicate_frame_data = NULL; >- frame->vo_frame.proc_provide_standard_frame_data = NULL; >- lprintf("XINE_IMGFMT_YUY2 width %d height %d\n", width, height); > >Property changes on: files/patch-ffmpeg4 >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-include-xine-xine_internal.h >=================================================================== >--- files/patch-include-xine-xine_internal.h (revision 477499) >+++ files/patch-include-xine-xine_internal.h (working copy) > >Property changes on: files/patch-include-xine-xine_internal.h >___________________________________________________________________ >Added: svn:keywords >## -0,0 +1 ## >+Author Date Id Rev URL >\ No newline at end of property >Index: files/patch-include-xine-xineutils.h >=================================================================== >--- files/patch-include-xine-xineutils.h (revision 477499) >+++ files/patch-include-xine-xineutils.h (working copy) > >Property changes on: files/patch-include-xine-xineutils.h >___________________________________________________________________ >Added: svn:keywords >## -0,0 +1 ## >+Author Date Id Rev URL >\ No newline at end of property >Index: files/patch-src-audio_dec-xine_lpcm_decoder.c >=================================================================== >--- files/patch-src-audio_dec-xine_lpcm_decoder.c (revision 477499) >+++ files/patch-src-audio_dec-xine_lpcm_decoder.c (working copy) >@@ -1,12 +1,13 @@ >---- src/audio_dec/xine_lpcm_decoder.c.orig >+--- src/audio_dec/ine_lpcm_decoder.c.orig 2018-02-21 00:55:48 UTC > +++ src/audio_dec/xine_lpcm_decoder.c >-@@ -30,6 +30,9 @@ >- #endif >+@@ -31,6 +31,10 @@ > /* avoid compiler warnings */ > #define _BSD_SOURCE 1 >+ > +#ifdef __FreeBSD__ > +#define __BSD_VISIBLE 1 > +#endif >- >++ > #ifdef HAVE_CONFIG_H > #include "config.h" >+ #endif >Index: files/patch-src-combined-ffmpeg-Makefile.in.diff >=================================================================== >--- files/patch-src-combined-ffmpeg-Makefile.in.diff (revision 477499) >+++ files/patch-src-combined-ffmpeg-Makefile.in.diff (nonexistent) >@@ -1,13 +0,0 @@ >---- src/combined/ffmpeg/Makefile.in.orig 2013-09-23 15:58:14.000000000 -0500 >-+++ src/combined/ffmpeg/Makefile.in 2013-09-25 03:25:33.000000000 -0500 >-@@ -1037,9 +1037,7 @@ avcodec_audio.list: AV_CODECS:=/CODEC_ID >- avcodec_video.list: AV_CODECS:=/CODEC_ID_MPEG1VIDEO/,/CODEC_ID_PCM_S16LE/ >- >- # that weird shell call just yields full path of the avcodec.h file >--avcodec_audio.list avcodec_video.list: $(shell \ >-- echo '#include "$(srcdir)/ffmpeg_decoder.h"' | $(AV_CPP) -M - |\ >-- sed -e '/avcodec\.h/! d; s%^.* \([^ ]*/avcodec\.h\) .*%\1%') >-+avcodec_audio.list avcodec_video.list: >- $(AM_V_GEN)echo '#include "$(srcdir)/ffmpeg_decoder.h"' | $(AV_CPP) - |\ >- sed -e $(AV_CODECS)'! d; s/^[ \t]*//; s/[=,].*//; /^$$/ d' >$@ >- > >Property changes on: files/patch-src-combined-ffmpeg-Makefile.in.diff >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c >=================================================================== >--- files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c (revision 477499) >+++ files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c (nonexistent) >@@ -1,28 +0,0 @@ >---- src/post/deinterlace/plugins/greedy2frame_template_sse2.c.orig >-+++ src/post/deinterlace/plugins/greedy2frame_template_sse2.c >-@@ -174,8 +174,8 @@ static void DeinterlaceGreedy2Frame_SSE2 >- */ >- "movdqa (%2), %%xmm1 \n\t" /* xmm1 = T1 */ >- "movdqa (%3), %%xmm0 \n\t" /* xmm0 = T0 */ >-- "movdqa (%q4,%2), %%xmm3 \n\t" /* xmm3 = B1 */ >-- "movdqa (%q4,%3), %%xmm2 \n\t" /* xmm2 = B0 */ >-+ "movdqa (%2,%4), %%xmm3 \n\t" /* xmm3 = B1 */ >-+ "movdqa (%3,%4), %%xmm2 \n\t" /* xmm2 = B0 */ >- >- /* calculate |T1-T0| keep T1 put result in xmm5 */ >- "movdqa %%xmm1, %%xmm5 \n\t" >-@@ -192,11 +192,11 @@ static void DeinterlaceGreedy2Frame_SSE2 >- "pcmpgtb %0, %%xmm5 \n\t" >- "pcmpeqd %%xmm7, %%xmm5 \n\t" >- >-- "prefetcht0 64(%q4,%2) \n\t" >-- "prefetcht0 64(%q4,%3) \n\t" >-+ "prefetcht0 64(%2,%4) \n\t" >-+ "prefetcht0 64(%3,%4) \n\t" >- : >- : "m" (GreedyTwoFrameThreshold128), >-- "m" (*Destc), "r" (T1), "r" (T0), "r" (Pitch) ); >-+ "m" (*Destc), "r" (T1), "r" (T0), "r" ((register_t)Pitch) ); >- >- asm volatile ( >- /* calculate |B1-B0| keep B1 put result in xmm4 */ > >Property changes on: files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-src-post-planar-eq2.c >=================================================================== >--- files/patch-src-post-planar-eq2.c (revision 477499) >+++ files/patch-src-post-planar-eq2.c (nonexistent) >@@ -1,11 +0,0 @@ >---- src/post/planar/eq2.c.orig >-+++ src/post/planar/eq2.c >-@@ -129,7 +129,7 @@ void affine_1d_MMX (eq2_param_t *par, un >- "movq (%1), %%mm4 \n\t" >- "pxor %%mm0, %%mm0 \n\t" >- : >-- : "g" (brvec), "g" (contvec) >-+ : "r" (brvec), "r" (contvec) >- ); >- >- while (h-- > 0) { > >Property changes on: files/patch-src-post-planar-eq2.c >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: files/patch-src-vdr-input_vdr.c >=================================================================== >--- files/patch-src-vdr-input_vdr.c (revision 477499) >+++ files/patch-src-vdr-input_vdr.c (working copy) >@@ -1,12 +1,13 @@ >---- src/vdr/input_vdr.c.orig >+--- src/vdr/input_vdr.c.orig 2018-02-21 01:00:13 UTC > +++ src/vdr/input_vdr.c >-@@ -32,6 +32,9 @@ >+@@ -32,6 +32,10 @@ > #include <errno.h> > #include <pthread.h> > > +#ifdef __FreeBSD__ >-+#include <netinet/in.h> >++#define __BSD_VISIBLE 1 > +#endif >++ >+ #ifdef HAVE_SYS_SOCKET_H > #include <sys/socket.h> >- #include <resolv.h> >- #include <netdb.h> >+ #endif >Index: pkg-plist >=================================================================== >--- pkg-plist (revision 477499) >+++ pkg-plist (working copy) >@@ -2,8 +2,8 @@ > bin/xine-list-1.2 > include/xine.h > include/xine/alphablend.h >+include/xine/array.h > include/xine/attributes.h >-include/xine/array.h > include/xine/audio_decoder.h > include/xine/audio_out.h > include/xine/broadcaster.h >@@ -28,8 +28,8 @@ > include/xine/sorted_array.h > include/xine/spu.h > include/xine/spu_decoder.h >+include/xine/vdr.h > include/xine/version.h >-include/xine/vdr.h > include/xine/video_decoder.h > include/xine/video_out.h > include/xine/video_overlay.h >@@ -41,47 +41,11 @@ > include/xine/xineutils.h > include/xine/xmllexer.h > include/xine/xmlparser.h >+lib/libxine-interface.la > lib/libxine.la > lib/libxine.so > lib/libxine.so.2 >-lib/libxine.so.2.5.0 >-lib/libxine-interface.la >-share/xine-lib/fonts/cetus-16.xinefont.gz >-share/xine-lib/fonts/cetus-20.xinefont.gz >-share/xine-lib/fonts/cetus-24.xinefont.gz >-share/xine-lib/fonts/cetus-32.xinefont.gz >-share/xine-lib/fonts/cetus-48.xinefont.gz >-share/xine-lib/fonts/cetus-64.xinefont.gz >-share/xine-lib/fonts/cc-16.xinefont.gz >-share/xine-lib/fonts/cc-20.xinefont.gz >-share/xine-lib/fonts/cc-24.xinefont.gz >-share/xine-lib/fonts/cc-32.xinefont.gz >-share/xine-lib/fonts/cc-48.xinefont.gz >-share/xine-lib/fonts/cc-64.xinefont.gz >-share/xine-lib/fonts/cci-16.xinefont.gz >-share/xine-lib/fonts/cci-20.xinefont.gz >-share/xine-lib/fonts/cci-24.xinefont.gz >-share/xine-lib/fonts/cci-32.xinefont.gz >-share/xine-lib/fonts/cci-48.xinefont.gz >-share/xine-lib/fonts/cci-64.xinefont.gz >-share/xine-lib/fonts/mono-16.xinefont.gz >-share/xine-lib/fonts/mono-20.xinefont.gz >-share/xine-lib/fonts/mono-24.xinefont.gz >-share/xine-lib/fonts/mono-32.xinefont.gz >-share/xine-lib/fonts/mono-48.xinefont.gz >-share/xine-lib/fonts/mono-64.xinefont.gz >-share/xine-lib/fonts/sans-16.xinefont.gz >-share/xine-lib/fonts/sans-20.xinefont.gz >-share/xine-lib/fonts/sans-24.xinefont.gz >-share/xine-lib/fonts/sans-32.xinefont.gz >-share/xine-lib/fonts/sans-48.xinefont.gz >-share/xine-lib/fonts/sans-64.xinefont.gz >-share/xine-lib/fonts/serif-16.xinefont.gz >-share/xine-lib/fonts/serif-20.xinefont.gz >-share/xine-lib/fonts/serif-24.xinefont.gz >-share/xine-lib/fonts/serif-32.xinefont.gz >-share/xine-lib/fonts/serif-48.xinefont.gz >-share/xine-lib/fonts/serif-64.xinefont.gz >+lib/libxine.so.2.7.0 > %%PLUGINSDIR%%/mime.types > %%PLUGINSDIR%%/post/xineplug_post_audio_filters.so > %%PLUGINSDIR%%/post/xineplug_post_goom.so >@@ -90,103 +54,61 @@ > %%PLUGINSDIR%%/post/xineplug_post_switch.so > %%PLUGINSDIR%%/post/xineplug_post_tvtime.so > %%PLUGINSDIR%%/post/xineplug_post_visualizations.so >-%%ESOUND%%%%PLUGINSDIR%%/xineplug_ao_out_esd.so >-%%JACK%%%%PLUGINSDIR%%/xineplug_ao_out_jack.so >-%%PLUGINSDIR%%/xineplug_ao_out_file.so >-%%PLUGINSDIR%%/xineplug_ao_out_none.so > %%PLUGINSDIR%%/xineplug_ao_out_oss.so >-%%PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so > %%PLUGINSDIR%%/xineplug_decode_a52.so >-%%PLUGINSDIR%%/xineplug_decode_bitplane.so > %%PLUGINSDIR%%/xineplug_decode_dts.so > %%PLUGINSDIR%%/xineplug_decode_dvaudio.so > %%PLUGINSDIR%%/xineplug_decode_faad.so > %%PLUGINSDIR%%/xineplug_decode_ff.so >-%%PIXBUF%%%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so > %%PLUGINSDIR%%/xineplug_decode_gsm610.so >-%%IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_decode_image.so > %%PLUGINSDIR%%/xineplug_decode_libjpeg.so > %%PLUGINSDIR%%/xineplug_decode_libvpx.so > %%PLUGINSDIR%%/xineplug_decode_lpcm.so > %%PLUGINSDIR%%/xineplug_decode_mad.so > %%PLUGINSDIR%%/xineplug_decode_mpeg2.so >-%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_decode_qt.so >-%%PLUGINSDIR%%/xineplug_decode_rgb.so >+%%PLUGINSDIR%%/xineplug_decode_rawvideo.so > %%PLUGINSDIR%%/xineplug_decode_spu.so > %%PLUGINSDIR%%/xineplug_decode_spucc.so > %%PLUGINSDIR%%/xineplug_decode_spucmml.so > %%PLUGINSDIR%%/xineplug_decode_spudvb.so > %%PLUGINSDIR%%/xineplug_decode_spuhdmv.so >-%%PLUGINSDIR%%/xineplug_decode_vdpau_h264_alter.so >-%%PLUGINSDIR%%/xineplug_decode_vdpau_h264.so >-%%PLUGINSDIR%%/xineplug_decode_vdpau_mpeg12.so >-%%PLUGINSDIR%%/xineplug_decode_vdpau_mpeg4.so >-%%PLUGINSDIR%%/xineplug_decode_vdpau_vc1.so >-%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_decode_w32dll.so >-%%PLUGINSDIR%%/xineplug_decode_yuv.so >+%%PLUGINSDIR%%/xineplug_decode_vdpau.so > %%PLUGINSDIR%%/xineplug_dmx_asf.so > %%PLUGINSDIR%%/xineplug_dmx_audio.so >-%%PLUGINSDIR%%/xineplug_dmx_avi.so > %%PLUGINSDIR%%/xineplug_dmx_fli.so >-%%PLUGINSDIR%%/xineplug_dmx_flv.so > %%PLUGINSDIR%%/xineplug_dmx_games.so >-%%PLUGINSDIR%%/xineplug_dmx_iff.so > %%WITH_DMX_IMAGE%%%%PLUGINSDIR%%/xineplug_dmx_image.so >-%%PLUGINSDIR%%/xineplug_dmx_matroska.so >+%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so >+%%PLUGINSDIR%%/xineplug_decode_image.so > %%PLUGINSDIR%%/xineplug_dmx_mng.so > %%PLUGINSDIR%%/xineplug_dmx_modplug.so >-%%PLUGINSDIR%%/xineplug_dmx_mpeg.so >-%%PLUGINSDIR%%/xineplug_dmx_mpeg_block.so >-%%PLUGINSDIR%%/xineplug_dmx_mpeg_elem.so >-%%PLUGINSDIR%%/xineplug_dmx_mpeg_pes.so >-%%PLUGINSDIR%%/xineplug_dmx_mpeg_ts.so > %%PLUGINSDIR%%/xineplug_dmx_nsv.so > %%PLUGINSDIR%%/xineplug_dmx_playlist.so > %%PLUGINSDIR%%/xineplug_dmx_pva.so >-%%PLUGINSDIR%%/xineplug_dmx_qt.so >-%%PLUGINSDIR%%/xineplug_dmx_rawdv.so >-%%PLUGINSDIR%%/xineplug_dmx_real.so > %%PLUGINSDIR%%/xineplug_dmx_slave.so >-%%PLUGINSDIR%%/xineplug_dmx_vc1_es.so >-%%PLUGINSDIR%%/xineplug_dmx_yuv4mpeg2.so >-%%PLUGINSDIR%%/xineplug_dmx_yuv_frames.so >+%%PLUGINSDIR%%/xineplug_dmx_video.so > %%PLUGINSDIR%%/xineplug_flac.so > %%PLUGINSDIR%%/xineplug_inp_cdda.so >-%%LIBBLURAY%%%%PLUGINSDIR%%/xineplug_inp_bluray.so > %%PLUGINSDIR%%/xineplug_inp_dvb.so > %%PLUGINSDIR%%/xineplug_inp_dvd.so >-%%PLUGINSDIR%%/xineplug_inp_file.so >-%%GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so >-%%PLUGINSDIR%%/xineplug_inp_http.so > %%PLUGINSDIR%%/xineplug_inp_mms.so >-%%PLUGINSDIR%%/xineplug_inp_net.so >-%%PLUGINSDIR%%/xineplug_inp_pnm.so >+%%PLUGINSDIR%%/xineplug_inp_network.so > %%PLUGINSDIR%%/xineplug_inp_rtp.so >-%%PLUGINSDIR%%/xineplug_inp_rtsp.so >-%%SMB%%%%PLUGINSDIR%%/xineplug_inp_smb.so >-%%PLUGINSDIR%%/xineplug_inp_stdin_fifo.so >-%%PLUGINSDIR%%/xineplug_inp_test.so > %%PLUGINSDIR%%/xineplug_inp_vcd.so > %%PLUGINSDIR%%/xineplug_inp_vcdo.so > %%PLUGINSDIR%%/xineplug_nsf.so > %%PLUGINSDIR%%/xineplug_sputext.so > %%PLUGINSDIR%%/xineplug_vdr.so >-%%AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so >-%%CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so >-%%PLUGINSDIR%%/xineplug_vo_out_none.so > %%PLUGINSDIR%%/xineplug_vo_out_opengl.so > %%PLUGINSDIR%%/xineplug_vo_out_opengl2.so > %%PLUGINSDIR%%/xineplug_vo_out_raw.so > %%PLUGINSDIR%%/xineplug_vo_out_sdl.so >+%%PLUGINSDIR%%/xineplug_vo_out_vaapi.so > %%PLUGINSDIR%%/xineplug_vo_out_vdpau.so > %%PLUGINSDIR%%/xineplug_vo_out_xcbshm.so > %%PLUGINSDIR%%/xineplug_vo_out_xcbxv.so > %%PLUGINSDIR%%/xineplug_vo_out_xshm.so > %%PLUGINSDIR%%/xineplug_vo_out_xv.so >-%%VAAPI%%%%PLUGINSDIR%%/xineplug_vo_out_vaapi.so >-%%XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xvmc.so >-%%XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xxmc.so >-%%WAVPACK%%%%PLUGINSDIR%%/xineplug_wavpack.so > %%PLUGINSDIR%%/xineplug_xiph.so > libdata/pkgconfig/libxine.pc > man/man1/xine-config.1.gz >@@ -218,16 +140,52 @@ > %%DOCSDIR%%/hackersguide/library.png > %%DOCSDIR%%/hackersguide/overlays.png > %%DOCSDIR%%/hackersguide/post_frame.png >-%%NLS%%share/locale/cs/LC_MESSAGES/libxine2.mo >-%%NLS%%share/locale/de/LC_MESSAGES/libxine2.mo >-%%NLS%%share/locale/en_US/LC_MESSAGES/libxine2.mo >-%%NLS%%share/locale/eo/LC_MESSAGES/libxine2.mo >-%%NLS%%share/locale/es/LC_MESSAGES/libxine2.mo >-%%NLS%%share/locale/eu/LC_MESSAGES/libxine2.mo >-%%NLS%%share/locale/fr/LC_MESSAGES/libxine2.mo >-%%NLS%%share/locale/it/LC_MESSAGES/libxine2.mo >-%%NLS%%share/locale/ja/LC_MESSAGES/libxine2.mo >-%%NLS%%share/locale/pl/LC_MESSAGES/libxine2.mo >-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libxine2.mo >-%%NLS%%share/locale/sk/LC_MESSAGES/libxine2.mo >-%%NLS%%share/locale/tr/LC_MESSAGES/libxine2.mo >+share/locale/cs/LC_MESSAGES/libxine2.mo >+share/locale/de/LC_MESSAGES/libxine2.mo >+share/locale/en_US/LC_MESSAGES/libxine2.mo >+share/locale/eo/LC_MESSAGES/libxine2.mo >+share/locale/es/LC_MESSAGES/libxine2.mo >+share/locale/eu/LC_MESSAGES/libxine2.mo >+share/locale/fr/LC_MESSAGES/libxine2.mo >+share/locale/it/LC_MESSAGES/libxine2.mo >+share/locale/ja/LC_MESSAGES/libxine2.mo >+share/locale/pl/LC_MESSAGES/libxine2.mo >+share/locale/pt_BR/LC_MESSAGES/libxine2.mo >+share/locale/sk/LC_MESSAGES/libxine2.mo >+share/locale/tr/LC_MESSAGES/libxine2.mo >+%%DATADIR%%-lib/fonts/cc-16.xinefont.gz >+%%DATADIR%%-lib/fonts/cc-20.xinefont.gz >+%%DATADIR%%-lib/fonts/cc-24.xinefont.gz >+%%DATADIR%%-lib/fonts/cc-32.xinefont.gz >+%%DATADIR%%-lib/fonts/cc-48.xinefont.gz >+%%DATADIR%%-lib/fonts/cc-64.xinefont.gz >+%%DATADIR%%-lib/fonts/cci-16.xinefont.gz >+%%DATADIR%%-lib/fonts/cci-20.xinefont.gz >+%%DATADIR%%-lib/fonts/cci-24.xinefont.gz >+%%DATADIR%%-lib/fonts/cci-32.xinefont.gz >+%%DATADIR%%-lib/fonts/cci-48.xinefont.gz >+%%DATADIR%%-lib/fonts/cci-64.xinefont.gz >+%%DATADIR%%-lib/fonts/cetus-16.xinefont.gz >+%%DATADIR%%-lib/fonts/cetus-20.xinefont.gz >+%%DATADIR%%-lib/fonts/cetus-24.xinefont.gz >+%%DATADIR%%-lib/fonts/cetus-32.xinefont.gz >+%%DATADIR%%-lib/fonts/cetus-48.xinefont.gz >+%%DATADIR%%-lib/fonts/cetus-64.xinefont.gz >+%%DATADIR%%-lib/fonts/mono-16.xinefont.gz >+%%DATADIR%%-lib/fonts/mono-20.xinefont.gz >+%%DATADIR%%-lib/fonts/mono-24.xinefont.gz >+%%DATADIR%%-lib/fonts/mono-32.xinefont.gz >+%%DATADIR%%-lib/fonts/mono-48.xinefont.gz >+%%DATADIR%%-lib/fonts/mono-64.xinefont.gz >+%%DATADIR%%-lib/fonts/sans-16.xinefont.gz >+%%DATADIR%%-lib/fonts/sans-20.xinefont.gz >+%%DATADIR%%-lib/fonts/sans-24.xinefont.gz >+%%DATADIR%%-lib/fonts/sans-32.xinefont.gz >+%%DATADIR%%-lib/fonts/sans-48.xinefont.gz >+%%DATADIR%%-lib/fonts/sans-64.xinefont.gz >+%%DATADIR%%-lib/fonts/serif-16.xinefont.gz >+%%DATADIR%%-lib/fonts/serif-20.xinefont.gz >+%%DATADIR%%-lib/fonts/serif-24.xinefont.gz >+%%DATADIR%%-lib/fonts/serif-32.xinefont.gz >+%%DATADIR%%-lib/fonts/serif-48.xinefont.gz >+%%DATADIR%%-lib/fonts/serif-64.xinefont.gz
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=196428">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 219921
:
190848
|
196428
|
196434