Attachment #196434 for bug #219921




# $FreeBSD$

PORTNAME=	xine
PORTVERSION=	1.2.9
PORTREVISION=	18
CATEGORIES=	multimedia ipv6
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
PKGNAMEPREFIX=	lib

		libdca.so:multimedia/libdca \
		libavcodec.so:multimedia/ffmpeg \
		libfaad.so:audio/faad \
		libvdpau.so:multimedia/libvdpau \
		libvpx.so:multimedia/libvpx \
		libiso9660.so:sysutils/libcdio \
		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
.endif

USES=		compiler cpe gmake iconv libtool:keepla jpeg\
		localbase pathfix perl5 pkgconfig tar:xz
CPE_PRODUCT=	xine-lib
CPE_VENDOR=	xine
GNU_CONFIGURE=	yes
USE_GNOME=	glib20 gconf2 gdkpixbuf2
USE_XORG=	x11 xcb xv xinerama xext sm ice
USE_GL=		gl glu
USE_PERL5=	build
USE_SDL=	sdl

		--disable-real-codecs \
		--disable-v4l \
		--without-alsa \
		--disable-musepack

MAKE_ENV=	V=1
MAKE_ARGS=	pkgdatadir="${PREFIX}/share/${PORTNAME}" \
		datadir="${PREFIX}/share/${PORTNAME}" \
		libdir="${PREFIX}/lib"
LLD_UNSAFE=	yes

DOCSDIR=	${PREFIX}/share/doc/xine-lib
# Please sync with XINE_PLUGINSDIR in multimedia/xine
# and multimedia/vdr-plugin-xineliboutput
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 IMAGEMAGICK
OPTIONS_SUB=	yes

AALIB_LIB_DEPENDS=		libaa.so:graphics/aalib
AALIB_CONFIGURE_OFF=		--disable-aalib --disable-aalibtest
CACA_LIB_DEPENDS=		libcaca.so:graphics/libcaca
CACA_CONFIGURE_OFF=		--without-caca --disable-cacatest
ESOUND_BUILD_DEPENDS=		esound>0:audio/esound
ESOUND_RUN_DEPENDS=		esound>0:audio/esound
ESOUND_CONFIGURE_WITH=		esound
GNOMEVFS2_BUILD_DEPENDS=	gnome-vfs>0:devel/gnome-vfs
GNOMEVFS2_RUN_DEPENDS=		gnome-vfs>0:devel/gnome-vfs
GNOMEVFS2_CONFIGURE_ENABLE=	gnomevfs
IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick
IMAGEMAGICK_CONFIGURE_WITH=	imagemagick
JACK_LIB_DEPENDS=		libjack.so:audio/jack
JACK_CONFIGURE_WITH=		jack
LIBBLURAY_LIB_DEPENDS=		libbluray.so:multimedia/libbluray
LIBBLURAY_CONFIGURE_ENABLE=	bluray
NLS_USES=			gettext
NLS_CONFIGURE_ENABLE=		nls
PIXBUF_USE_GNOME=		gdkpixbuf2 glib20
PIXBUF_CONFIGURE_ENABLE=	gdkpixbuf
PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
SMB_USES=			samba:lib
SMB_CONFIGURE_ENV=		LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
				LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"
SMB_CONFIGURE_ENABLE=		samba
VAAPI_LIB_DEPENDS=		libva.so:multimedia/libva
VAAPI_CONFIGURE_ENABLE=		vaapi
WAVPACK_LIB_DEPENDS=		libwavpack.so:audio/wavpack
WAVPACK_CONFIGURE_WITH=		wavpack
.if defined(WITH_NVIDIA304_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1)
XVMC_CONFIGURE_ON=		--with-xvmc-lib=XvMCNVIDIA
XVMC_LIB_DEPENDS=		libXvMCNVIDIA.so:x11/nvidia-driver-304
.else
XVMC_CONFIGURE_ON=		--with-xvmc-lib=XvMCW
XVMC_LIB_DEPENDS=		libXvMC.so:x11/libXvMC
.endif
XVMC_CONFIGURE_ENABLE=		xvmc
SMB_USES=		samba:lib
SMB_CONFIGURE_ENV=	LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
			LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"
SMB_CONFIGURE_ENABLE=	samba
AALIB_LIB_DEPENDS=	libaa.so:graphics/aalib
AALIB_CONFIGURE_OFF=	--disable-aalib --disable-aalibtest
IMAGEMAGICK_LIB_DEPENDS=	libMagickWand-6.so:graphics/ImageMagick
IMAGEMAGICK_CONFIGURE_OFF=	--without-imagemagick
PIXBUF_USE=		GNOME=gdkpixbuf2
PIXBUF_CONFIGURE_OFF=	--disable-gdkpixbuf
WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
WAVPACK_CONFIGURE_WITH=	wavpack
VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
VAAPI_CONFIGURE_ON=	--enable-vaapi
LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
LIBBLURAY_CONFIGURE_ENABLE=	bluray

.include <bsd.port.options.mk>


Lines 1-2 Link Here

(-)multimedia/libxine/distinfo (-2 / +3 lines)
1	SHA256 (xine-lib-1.2.6.tar.xz) = bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005	1	TIMESTAMP = 1534897956
2	SIZE (xine-lib-1.2.6.tar.xz) = 5020964	2	SHA256 (xine-lib-1.2.9.tar.xz) = 32b34e8049feb762d75a551d5d2cdb56c396fdd83e35b9b7de5fd08e498e948d
		3	SIZE (xine-lib-1.2.9.tar.xz) = 5180452




--- 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
                     case "$host_or_hostalias" in
-                        i386-*)         archopt_val="i386" ;;
+                        i386-*)         ;;
                         i486-*)         archopt_val="i486" ;;
                         i586-*)         archopt_val="pentium" ;;
                         pentium-mmx-*)  archopt_val="pentium-mmx" ;;
@@ -26280,7 +26280,7 @@ fi
 
     if test x"$enable_dvb" != x"no"; then
         case "$host_os" in
-            linux*) have_dvb=yes ;;
+            linux*|freebsd*) have_dvb=yes ;;
             *) have_dvb=no ;;
         esac
         if test x"$hard_enable_dvb" = x"yes" && test x"$have_dvb" != x"yes"; then




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




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




--- include/xine/xine_internal.h.orig
+++ include/xine/xine_internal.h
@@ -72,6 +72,124 @@
 #  include <xine/alphablend.h>
 #endif
 
+#ifndef INT8_MIN
+#define INT8_MIN	(-0x7f-1)
+#endif
+
+#ifndef INT8_MAX
+#define INT8_MAX	0x7f
+#endif
+
+#ifndef INT16_MAX
+#define INT16_MAX 0x7fff
+#endif
+
+#ifndef INT16_MIN
+#define INT16_MIN (-0x7fff-1)
+#endif
+
+#ifndef INT32_MAX
+#define INT32_MAX 0x7fffffff
+#endif
+
+#ifndef INT32_MIN
+#define INT32_MIN (-0x7fffffff-1)
+#endif
+
+#ifndef PRIdMAX
+#define PRIdMAX "lld"
+#endif
+
+#ifndef SCNdMAX
+#define SCNdMAX "lld"
+#endif
+
+#ifndef PRIiMAX
+#define PRIiMAX "lld"
+typedef long long intmax_t;
+#endif
+
+
+#ifndef PRId32
+#define PRId32 "d"
+#endif
+
+#ifndef SCNd32
+#define SCNd32 "d"
+#endif
+
+#ifndef PRIdFAST16
+#define PRIdFAST16 "d"
+#endif
+
+#ifndef PRIdFAST32
+#define PRIdFAST32 "d"
+#endif
+
+#ifndef SCNu32
+#define SCNu32 "u"
+#endif
+
+
+#ifndef PRId64
+#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__)
+#define PRId64 "ld"
+#else if defined(__i386__) || defined(__powerpc__)
+#define PRId64 "lld"
+#endif
+#endif
+
+#ifndef SCNd64
+#define SCNd64 PRId64
+#endif
+
+#ifndef PRIu64
+#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__)
+#define PRIu64 "lu"
+#else if defined(__i386__) || defined(__powerpc__)
+#define PRIu64 "llu"
+#endif
+#endif
+
+#ifndef SCNu64
+#define SCNu64 PRIu64
+#endif
+
+#ifndef PRIX64
+#if defined(__alpha__) || defined(__amd64__) || defined(__ia64__) || defined(__sparc64__)
+#define PRIX64 "lX"
+#else if defined(__i386__) || defined(__powerpc__)
+#define PRIX64 "llX"
+#endif
+#endif
+
+
+#ifndef PRIx32
+#define	PRIx32	"x"
+#endif
+
+#ifndef PRIx16
+#define	PRIx16	"x"
+#endif
+
+#ifndef PRIx8
+#define	PRIx8	"x"
+#endif
+
+#ifndef PRIXMAX
+#define	PRIXMAX	"llX"
+#endif
+
+#ifndef PRIxMAX
+#define	PRIxMAX	"llx"
+#endif
+
+#ifndef UINT64_C
+#define	UINT64_C(c)	(c ## ULL)
+#endif
+
+
+
 
 #define XINE_MAX_EVENT_LISTENERS         50
 #define XINE_MAX_EVENT_TYPES             100

Lines 1-11 Link Here

(-)multimedia/libxine/files/patch-include-xine-xineutils.h (-11 lines)
1	--- include/xine/xineutils.h.orig
2	+++ include/xine/xineutils.h
3	@@ -146,7 +146,7 @@ void *xine_xcalloc(size_t nmemb, size_t
4	* Free allocated memory and set pointer to NULL
5	* @param ptr Pointer to the pointer to the memory block which should be freed.
6	*/
7	-static inline void _x_freep(void *ptr) {
8	+static void _x_freep(void *ptr) {
9	void p = (void )ptr;
10	free (*p);
11	*p = NULL;




--- src/audio_dec/xine_lpcm_decoder.c.orig
+++ src/audio_dec/xine_lpcm_decoder.c
@@ -30,6 +30,9 @@
 #endif
 /* avoid compiler warnings */
 #define _BSD_SOURCE 1
+#ifdef __FreeBSD__
+#define __BSD_VISIBLE 1
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"




--- 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' >$@
 




--- src/libw32dll/wine/registry.c.orig
+++ src/libw32dll/wine/registry.c
@@ -7,6 +7,10 @@
 #include <pwd.h>
 #include <sys/types.h>
 
+#ifdef __FreeBSD__
+#include <sys/stat.h>
+#endif
+
 #include "winbase.h"
 #include "winreg.h"
 #include "winnt.h"




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

Lines 1-11 Link Here

(-)multimedia/libxine/files/patch-src-post-planar-eq2.c (-11 lines)
1	--- src/post/planar/eq2.c.orig
2	+++ src/post/planar/eq2.c
3	@@ -129,7 +129,7 @@ void affine_1d_MMX (eq2_param_t *par, un
4	"movq (%1), %%mm4 \n\t"
5	"pxor %%mm0, %%mm0 \n\t"
6	:
7	- : "g" (brvec), "g" (contvec)
8	+ : "r" (brvec), "r" (contvec)
9	);
10
11	while (h-- > 0) {




--- src/vdr/input_vdr.c.orig
+++ src/vdr/input_vdr.c
@@ -32,6 +32,9 @@
 #include <errno.h>
 #include <pthread.h>
 
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif
 #include <sys/socket.h>
 #include <resolv.h>
 #include <netdb.h>




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

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

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.7.0
%%AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so
%%CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so
%%ESOUND%%%%PLUGINSDIR%%/xineplug_ao_out_esd.so
%%JACK%%%%PLUGINSDIR%%/xineplug_ao_out_jack.so
%%GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so
%%IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_decode_image.so
%%IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_dmx_image.so
%%LIBBLURAY%%%%PLUGINSDIR%%/xineplug_inp_bluray.so
%%PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so
%%PIXBUF%%%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so
%%SMB%%%%PLUGINSDIR%%/xineplug_inp_smb.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
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
%%PLUGINSDIR%%/mime.types
%%PLUGINSDIR%%/post/xineplug_post_audio_filters.so
%%PLUGINSDIR%%/post/xineplug_post_goom.so

%%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
%%PLUGINSDIR%%/xineplug_decode_rawvideo.so
%%PLUGINSDIR%%/xineplug_decode_rgb.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.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_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_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_video.so
%%PLUGINSDIR%%/xineplug_dmx_yuv4mpeg2.so
%%PLUGINSDIR%%/xineplug_dmx_yuv_frames.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_network.so
%%PLUGINSDIR%%/xineplug_inp_pnm.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_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
man/man1/xine-list-1.2.1.gz
man/man5/xine.5.gz
%%PORTDOCS%%%%DOCSDIR%%/COPYING
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/README.MINGWCROSS
%%PORTDOCS%%%%DOCSDIR%%/README.WIN32
%%PORTDOCS%%%%DOCSDIR%%/README.cetus
%%PORTDOCS%%%%DOCSDIR%%/README.dvb
%%PORTDOCS%%%%DOCSDIR%%/README.dxr3
%%PORTDOCS%%%%DOCSDIR%%/README.freebsd
%%PORTDOCS%%%%DOCSDIR%%/README.irix
%%PORTDOCS%%%%DOCSDIR%%/README.macosx
%%PORTDOCS%%%%DOCSDIR%%/README.network_dvd
%%PORTDOCS%%%%DOCSDIR%%/README.opengl
%%PORTDOCS%%%%DOCSDIR%%/README.solaris
%%PORTDOCS%%%%DOCSDIR%%/README_xxmc.html
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/faq.html
%%PORTDOCS%%%%DOCSDIR%%/faq.txt
%%PORTDOCS%%%%DOCSDIR%%/hackersguide/architecture.png
%%PORTDOCS%%%%DOCSDIR%%/hackersguide/hackersguide.html
%%PORTDOCS%%%%DOCSDIR%%/hackersguide/library.png
%%PORTDOCS%%%%DOCSDIR%%/hackersguide/overlays.png
%%PORTDOCS%%%%DOCSDIR%%/hackersguide/post_frame.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/pt_BR/LC_MESSAGES/libxine2.mo
%%NLS%%share/locale/sk/LC_MESSAGES/libxine2.mo
%%NLS%%share/locale/tr/LC_MESSAGES/libxine2.mo
%%DATADIR%%/aclocal/xine.m4
%%DATADIR%%/fonts/cc-16.xinefont.gz
%%DATADIR%%/fonts/cc-20.xinefont.gz
%%DATADIR%%/fonts/cc-24.xinefont.gz
%%DATADIR%%/fonts/cc-32.xinefont.gz
%%DATADIR%%/fonts/cc-48.xinefont.gz
%%DATADIR%%/fonts/cc-64.xinefont.gz
%%DATADIR%%/fonts/cci-16.xinefont.gz
%%DATADIR%%/fonts/cci-20.xinefont.gz
%%DATADIR%%/fonts/cci-24.xinefont.gz
%%DATADIR%%/fonts/cci-32.xinefont.gz
%%DATADIR%%/fonts/cci-48.xinefont.gz
%%DATADIR%%/fonts/cci-64.xinefont.gz
%%DATADIR%%/fonts/cetus-16.xinefont.gz
%%DATADIR%%/fonts/cetus-20.xinefont.gz
%%DATADIR%%/fonts/cetus-24.xinefont.gz
%%DATADIR%%/fonts/cetus-32.xinefont.gz
%%DATADIR%%/fonts/cetus-48.xinefont.gz
%%DATADIR%%/fonts/cetus-64.xinefont.gz
%%DATADIR%%/fonts/mono-16.xinefont.gz
%%DATADIR%%/fonts/mono-20.xinefont.gz
%%DATADIR%%/fonts/mono-24.xinefont.gz
%%DATADIR%%/fonts/mono-32.xinefont.gz
%%DATADIR%%/fonts/mono-48.xinefont.gz
%%DATADIR%%/fonts/mono-64.xinefont.gz
%%DATADIR%%/fonts/sans-16.xinefont.gz
%%DATADIR%%/fonts/sans-20.xinefont.gz
%%DATADIR%%/fonts/sans-24.xinefont.gz
%%DATADIR%%/fonts/sans-32.xinefont.gz
%%DATADIR%%/fonts/sans-48.xinefont.gz
%%DATADIR%%/fonts/sans-64.xinefont.gz
%%DATADIR%%/fonts/serif-16.xinefont.gz
%%DATADIR%%/fonts/serif-20.xinefont.gz
%%DATADIR%%/fonts/serif-24.xinefont.gz
%%DATADIR%%/fonts/serif-32.xinefont.gz
%%DATADIR%%/fonts/serif-48.xinefont.gz
%%DATADIR%%/fonts/serif-64.xinefont.gz

Return to bug 219921

Lines 2-9 Link Here

(-)multimedia/libxine/Makefile (-42 / +51 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= xine	4	PORTNAME= xine
5	PORTVERSION= 1.2.6	5	PORTVERSION= 1.2.9
6	PORTREVISION= 18
7	CATEGORIES= multimedia ipv6	6	CATEGORIES= multimedia ipv6
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
9	PKGNAMEPREFIX= lib	8	PKGNAMEPREFIX= lib
Lines 33-39 Link Here
33	libdca.so:multimedia/libdca \	32	libdca.so:multimedia/libdca \
34	libavcodec.so:multimedia/ffmpeg \	33	libavcodec.so:multimedia/ffmpeg \
35	libfaad.so:audio/faad \	34	libfaad.so:audio/faad \
36	libvdpau.so:multimedia/libvdpau	35	libvdpau.so:multimedia/libvdpau \
		36	libvpx.so:multimedia/libvpx \
		37	libiso9660.so:sysutils/libcdio \
		38	libogg.so:audio/libogg
		39
37	.if !defined(PACKAGE_BUILDING)	40	.if !defined(PACKAGE_BUILDING)
38	# DVDCSS version hardcoded in src/input/input_dvd.c misc/cdda_server.c	41	# DVDCSS version hardcoded in src/input/input_dvd.c misc/cdda_server.c
39	# and src/input/libdvdnav/dvd_input.c (dlopen'ed)	42	# and src/input/libdvdnav/dvd_input.c (dlopen'ed)
Lines 40-51 Link Here
40	LIB_DEPENDS+= libdvdcss.so.2:multimedia/libdvdcss	43	LIB_DEPENDS+= libdvdcss.so.2:multimedia/libdvdcss
41	.endif	44	.endif
42		45
43	USES= compiler cpe gmake iconv libtool:keepla \	46	USES= compiler cpe gmake iconv libtool:keepla jpeg\
44	localbase pathfix perl5 pkgconfig tar:xz	47	localbase pathfix perl5 pkgconfig tar:xz
45	CPE_PRODUCT= xine-lib	48	CPE_PRODUCT= xine-lib
46	CPE_VENDOR= xine	49	CPE_VENDOR= xine
47	GNU_CONFIGURE= yes	50	GNU_CONFIGURE= yes
48	USE_XORG= x11 xv xinerama xext sm ice	51	USE_GNOME= glib20 gconf2 gdkpixbuf2
		52	USE_XORG= x11 xcb xv xinerama xext sm ice
49	USE_GL= gl glu	53	USE_GL= gl glu
50	USE_PERL5= build	54	USE_PERL5= build
51	USE_SDL= sdl	55	USE_SDL= sdl
Lines 60-74 Link Here
60	--disable-real-codecs \	64	--disable-real-codecs \
61	--disable-v4l \	65	--disable-v4l \
62	--without-alsa \	66	--without-alsa \
63	--disable-musepack \	67	--disable-musepack
64	--enable-dvb	68
65	MAKE_ENV= V=1	69	MAKE_ENV= V=1
		70	MAKE_ARGS= pkgdatadir="${PREFIX}/share/${PORTNAME}" \
		71	datadir="${PREFIX}/share/${PORTNAME}" \
		72	libdir="${PREFIX}/lib"
66	LLD_UNSAFE= yes	73	LLD_UNSAFE= yes
67		74
68	DOCSDIR= ${PREFIX}/share/doc/xine-lib	75	DOCSDIR= ${PREFIX}/share/doc/xine-lib
69	# Please sync with XINE_PLUGINSDIR in multimedia/xine	76	# Please sync with XINE_PLUGINSDIR in multimedia/xine
70	# and multimedia/vdr-plugin-xineliboutput	77	# and multimedia/vdr-plugin-xineliboutput
71	PLUGINSDIR= lib/xine/plugins/2.5	78	PLUGINSDIR= lib/xine/plugins/2.7
72	PLIST_SUB= PLUGINSDIR="${PLUGINSDIR}"	79	PLIST_SUB= PLUGINSDIR="${PLUGINSDIR}"
73		80
74	BROKEN_aarch64= Fails to configure: error: no acceptable as found in $PATH	81	BROKEN_aarch64= Fails to configure: error: no acceptable as found in $PATH
Lines 75-119 Link Here
75		82
76	OPTIONS_DEFINE= NLS CACA ESOUND JACK GNOMEVFS2 PULSEAUDIO XVMC SMB AALIB \	83	OPTIONS_DEFINE= NLS CACA ESOUND JACK GNOMEVFS2 PULSEAUDIO XVMC SMB AALIB \
77	IMAGEMAGICK PIXBUF WAVPACK VAAPI LIBBLURAY	84	IMAGEMAGICK PIXBUF WAVPACK VAAPI LIBBLURAY
78	OPTIONS_DEFAULT=VAAPI	85	OPTIONS_DEFAULT=VAAPI IMAGEMAGICK
79	OPTIONS_SUB= yes	86	OPTIONS_SUB= yes
80		87
81	NLS_USES= gettext	88	AALIB_LIB_DEPENDS= libaa.so:graphics/aalib
82	NLS_CONFIGURE_ENABLE= nls	89	AALIB_CONFIGURE_OFF= --disable-aalib --disable-aalibtest
83	CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca	90	CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca
84	CACA_CONFIGURE_OFF= --without-caca --disable-cacatest	91	CACA_CONFIGURE_OFF= --without-caca --disable-cacatest
85	ESOUND_USE= GNOME=esound	92	ESOUND_BUILD_DEPENDS= esound>0:audio/esound
86	ESOUND_CONFIGURE_OFF= --without-esound	93	ESOUND_RUN_DEPENDS= esound>0:audio/esound
87	JACK_LIB_DEPENDS= libjack.so:audio/jack	94	ESOUND_CONFIGURE_WITH= esound
88	JACK_CONFIGURE_OFF= --without-jack	95	GNOMEVFS2_BUILD_DEPENDS= gnome-vfs>0:devel/gnome-vfs
89	GNOMEVFS2_USE= GNOME=gnomevfs2	96	GNOMEVFS2_RUN_DEPENDS= gnome-vfs>0:devel/gnome-vfs
90	GNOMEVFS2_CONFIGURE_OFF=--disable-gnomevfs	97	GNOMEVFS2_CONFIGURE_ENABLE= gnomevfs
91	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	98	IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick
92	PULSEAUDIO_CONFIGURE_OFF=--without-pulseaudio	99	IMAGEMAGICK_CONFIGURE_WITH= imagemagick
		100	JACK_LIB_DEPENDS= libjack.so:audio/jack
		101	JACK_CONFIGURE_WITH= jack
		102	LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray
		103	LIBBLURAY_CONFIGURE_ENABLE= bluray
		104	NLS_USES= gettext
		105	NLS_CONFIGURE_ENABLE= nls
		106	PIXBUF_USE_GNOME= gdkpixbuf2 glib20
		107	PIXBUF_CONFIGURE_ENABLE= gdkpixbuf
		108	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
		109	PULSEAUDIO_CONFIGURE_WITH= pulseaudio
		110	SMB_USES= samba:lib
		111	SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
		112	LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"
		113	SMB_CONFIGURE_ENABLE= samba
		114	VAAPI_LIB_DEPENDS= libva.so:multimedia/libva
		115	VAAPI_CONFIGURE_ENABLE= vaapi
		116	WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack
		117	WAVPACK_CONFIGURE_WITH= wavpack
93	.if defined(WITH_NVIDIA304_GL) \|\| exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1)	118	.if defined(WITH_NVIDIA304_GL) \|\| exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1)
94	XVMC_CONFIGURE_ON= --with-xvmc-lib=XvMCNVIDIA	119	XVMC_CONFIGURE_ON= --with-xvmc-lib=XvMCNVIDIA
95	XVMC_LIB_DEPENDS= libXvMCNVIDIA.so:x11/nvidia-driver-304	120	XVMC_LIB_DEPENDS= libXvMCNVIDIA.so:x11/nvidia-driver-304
96	.else	121	.else
97	XVMC_CONFIGURE_ON= --with-xvmc-lib=XvMCW	122	XVMC_CONFIGURE_ON= --with-xvmc-lib=XvMCW
98	XVMC_LIB_DEPENDS= libXvMC.so:x11/libXvMC	123	XVMC_LIB_DEPENDS= libXvMC.so:x11/libXvMC
99	.endif	124	.endif
100	XVMC_CONFIGURE_OFF= --disable-xvmc	125	XVMC_CONFIGURE_ENABLE= xvmc
101	SMB_USES= samba:lib
102	SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
103	LIBSMBCLIENT_CFLAGS="-I${SAMBAINCLUDES}"
104	SMB_CONFIGURE_ENABLE= samba
105	AALIB_LIB_DEPENDS= libaa.so:graphics/aalib
106	AALIB_CONFIGURE_OFF= --disable-aalib --disable-aalibtest
107	IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:graphics/ImageMagick
108	IMAGEMAGICK_CONFIGURE_OFF= --without-imagemagick
109	PIXBUF_USE= GNOME=gdkpixbuf2
110	PIXBUF_CONFIGURE_OFF= --disable-gdkpixbuf
111	WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack
112	WAVPACK_CONFIGURE_WITH= wavpack
113	VAAPI_LIB_DEPENDS= libva.so:multimedia/libva
114	VAAPI_CONFIGURE_ON= --enable-vaapi
115	LIBBLURAY_LIB_DEPENDS= libbluray.so:multimedia/libbluray
116	LIBBLURAY_CONFIGURE_ENABLE= bluray
117		126
118	.include <bsd.port.options.mk>	127	.include <bsd.port.options.mk>
119		128

Lines 1-29 Link Here

(-)multimedia/libxine/files/patch-configure (-29 lines)
1	--- configure.orig
2	+++ configure
3	@@ -20349,7 +20349,7 @@ $as_echo "#define ARCH_SPARC /**/" >>con
4
5	;;
6
7	- x86_64-*)
8	+ x86_64-\|amd64-)
9	arch_x86=64
10
11	$as_echo "#define ARCH_X86_64 /**/" >>confdefs.h
12	@@ -20685,7 +20685,7 @@ fi
13
14	if test "$sarchopt" != "no"; then
15	case "$host_or_hostalias" in
16	- i386-*) archopt_val="i386" ;;
17	+ i386-*) ;;
18	i486-*) archopt_val="i486" ;;
19	i586-*) archopt_val="pentium" ;;
20	pentium-mmx-*) archopt_val="pentium-mmx" ;;
21	@@ -26280,7 +26280,7 @@ fi
22
23	if test x"$enable_dvb" != x"no"; then
24	case "$host_os" in
25	- linux*) have_dvb=yes ;;
26	+ linux\|freebsd) have_dvb=yes ;;
27	*) have_dvb=no ;;
28	esac
29	if test x"$hard_enable_dvb" = x"yes" && test x"$have_dvb" != x"yes"; then

Lines 1-57 Link Here

(-)multimedia/libxine/files/patch-ffmpeg3 (-57 lines)
1	Index: src/combined/ffmpeg/ff_audio_decoder.c
2	===================================================================
3	--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_audio_decoder.c
4	+++ src/combined/ffmpeg/ff_audio_decoder.c
5	@@ -590,7 +590,7 @@ static int ff_audio_decode (ff_audio_dec
6	int got_frame;
7	float gain = this->class->gain;
8	if (!this->av_frame)
9	- this->av_frame = avcodec_alloc_frame ();
10	+ this->av_frame = av_frame_alloc ();
11
12	consumed = avcodec_decode_audio4 (this->context, this->av_frame, &got_frame, &avpkt);
13	if ((consumed >= 0) && got_frame) {
14	@@ -1071,7 +1071,7 @@ static void ff_audio_reset (audio_decode
15	/* try to reset the wma decoder */
16	if( this->decoder_ok ) {
17	#if AVAUDIO > 3
18	- avcodec_free_frame (&this->av_frame);
19	+ av_frame_free (&this->av_frame);
20	#endif
21	pthread_mutex_lock (&ffmpeg_lock);
22	avcodec_close (this->context);
23	@@ -1105,7 +1105,7 @@ static void ff_audio_dispose (audio_deco
24
25	if( this->context && this->decoder_ok ) {
26	#if AVAUDIO > 3
27	- avcodec_free_frame (&this->av_frame);
28	+ av_frame_free (&this->av_frame);
29	#endif
30	pthread_mutex_lock (&ffmpeg_lock);
31	avcodec_close (this->context);
32	Index: src/combined/ffmpeg/ff_video_decoder.c
33	===================================================================
34	--- xine-lib-1.2.6.orig/src/combined/ffmpeg/ff_video_decoder.c
35	+++ src/combined/ffmpeg/ff_video_decoder.c
36	@@ -2523,7 +2523,7 @@ static video_decoder_t *ff_video_open_pl
37	this->stream = stream;
38	this->class = (ff_video_class_t *) class_gen;
39
40	- this->av_frame = avcodec_alloc_frame();
41	+ this->av_frame = av_frame_alloc();
42	this->context = avcodec_alloc_context();
43	this->context->opaque = this;
44	#if AVPALETTE == 1
45	Index: src/dxr3/ffmpeg_encoder.c
46	===================================================================
47	--- src/dxr3/ffmpeg_encoder.c.orig 2016-02-17 07:54:31.950881580 +0000
48	+++ src/dxr3/ffmpeg_encoder.c 2016-02-17 07:55:42.897237494 +0000
49	@@ -161,7 +161,7 @@
50	"dxr3_mpeg_encoder: Couldn't start the ffmpeg library\n");
51	return 0;
52	}
53	- this->picture = avcodec_alloc_frame();
54	+ this->picture = av_frame_alloc();
55	if (!this->picture) {
56	xprintf(drv->class->xine, XINE_VERBOSITY_LOG,
57	"dxr3_mpeg_encoder: Couldn't allocate ffmpeg frame\n");

Lines 1-278 Link Here

(-)multimedia/libxine/files/patch-ffmpeg4 (-278 lines)
1	https://sourceforge.net/p/xine/xine-lib-1.2/ci/e35492bfce45/
2	https://sourceforge.net/p/xine/xine-lib-1.2/ci/abd6e04c7a53/
3
4	--- src/combined/ffmpeg/ff_audio_decoder.c.orig 2014-06-09 16:08:42 UTC
5	+++ src/combined/ffmpeg/ff_audio_decoder.c
6	@@ -137,7 +137,7 @@ static void ff_audio_ensure_buffer_size(ff_audio_decod
7	xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
8	_("ffmpeg_audio_dec: increasing buffer to %d to avoid overflow.\n"),
9	this->bufsize);
10	- this->buf = realloc16 (this->buf, this->bufsize + FF_INPUT_BUFFER_PADDING_SIZE);
11	+ this->buf = realloc16 (this->buf, this->bufsize + AV_INPUT_BUFFER_PADDING_SIZE);
12	}
13	}
14
15	@@ -148,9 +148,9 @@ static void ff_audio_handle_special_buffer(ff_audio_de
16
17	free (this->context->extradata);
18	this->context->extradata_size = buf->decoder_info[2];
19	- this->context->extradata = malloc (buf->decoder_info[2] + FF_INPUT_BUFFER_PADDING_SIZE);
20	+ this->context->extradata = malloc (buf->decoder_info[2] + AV_INPUT_BUFFER_PADDING_SIZE);
21	memcpy (this->context->extradata, buf->decoder_info_ptr[2], buf->decoder_info[2]);
22	- memset (this->context->extradata + buf->decoder_info[2], 0, FF_INPUT_BUFFER_PADDING_SIZE);
23	+ memset (this->context->extradata + buf->decoder_info[2], 0, AV_INPUT_BUFFER_PADDING_SIZE);
24	}
25	}
26
27	@@ -363,10 +363,10 @@ static void ff_handle_header_buffer(ff_audio_decoder_t
28	this->ff_channels, this->ff_bits, this->ff_sample_rate,
29	this->context->block_align);
30	if (!data_len) break;
31	- e = malloc (data_len + FF_INPUT_BUFFER_PADDING_SIZE);
32	+ e = malloc (data_len + AV_INPUT_BUFFER_PADDING_SIZE);
33	if (!e) break;
34	xine_fast_memcpy (e, p, data_len);
35	- memset (e + data_len, 0, FF_INPUT_BUFFER_PADDING_SIZE);
36	+ memset (e + data_len, 0, AV_INPUT_BUFFER_PADDING_SIZE);
37	this->context->extradata = e;
38	this->context->extradata_size = data_len;
39	break;
40	@@ -886,7 +886,7 @@ static void ff_audio_decode_data (audio_decoder_t *thi
41	offset = 0;
42
43	/* pad input data */
44	- memset(&this->buf[this->size], 0, FF_INPUT_BUFFER_PADDING_SIZE);
45	+ memset(&this->buf[this->size], 0, AV_INPUT_BUFFER_PADDING_SIZE);
46
47	while (this->size>=0) {
48	decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
49	--- src/combined/ffmpeg/ff_mpeg_parser.c.orig 2013-09-18 10:04:54 UTC
50	+++ src/combined/ffmpeg/ff_mpeg_parser.c
51	@@ -26,6 +26,7 @@
52	#define LOG
53	*/
54	#include "ff_mpeg_parser.h"
55	+#include "ffmpeg_compat.h"
56
57	/* mpeg frame rate table from lavc */
58	static const int frame_rate_tab[][2] = {
59	@@ -50,7 +51,7 @@ static const int frame_rate_tab[][2] = {
60
61	void mpeg_parser_init (mpeg_parser_t *parser)
62	{
63	- parser->chunk_buffer = malloc(BUFFER_SIZE + FF_INPUT_BUFFER_PADDING_SIZE);
64	+ parser->chunk_buffer = malloc(BUFFER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE);
65	mpeg_parser_reset(parser);
66	}
67
68	--- src/combined/ffmpeg/ff_video_decoder.c.orig 2014-06-24 16:21:06 UTC
69	+++ src/combined/ffmpeg/ff_video_decoder.c
70	@@ -1,5 +1,5 @@
71	/*
72	- * Copyright (C) 2001-2014 the xine project
73	+ * Copyright (C) 2001-2015 the xine project
74	*
75	* This file is part of xine, a free video player.
76	*
77	@@ -722,23 +722,28 @@ static void init_video_codec (ff_video_decoder_t *this
78
79	this->context->width = this->bih.biWidth;
80	this->context->height = this->bih.biHeight;
81	- this->context->stream_codec_tag = this->context->codec_tag =
82	+#ifdef AVCODEC_HAS_STREAM_CODEC_TAG
83	+ this->context->stream_codec_tag =
84	+#endif
85	+ this->context->codec_tag =
86	_x_stream_info_get(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC);
87
88
89	this->stream->video_out->open (this->stream->video_out, this->stream);
90
91	this->edge = 0;
92	- if(this->codec->capabilities & CODEC_CAP_DR1 && this->class->enable_dri) {
93	+ if(this->codec->capabilities & AV_CODEC_CAP_DR1 && this->class->enable_dri) {
94	if (this->stream->video_out->get_capabilities (this->stream->video_out) & VO_CAP_CROP) {
95	/* We can crop. Fine. Lets allow decoders to paint over the frame edges.
96	This will be slightly faster. And it is also a workaround for buggy
97	v54 who likes to ignore EMU_EDGE for wmv2 and xvid. */
98	+#ifdef CODEC_FLAG_EMU_EDGE
99	this->edge = avcodec_get_edge_width ();
100	} else {
101	/* Some codecs (eg rv10) copy flags in init so it's necessary to set
102	* this flag here in case we are going to use direct rendering */
103	this->context->flags \|= CODEC_FLAG_EMU_EDGE;
104	+#endif
105	}
106	}
107
108	@@ -747,7 +752,7 @@ static void init_video_codec (ff_video_decoder_t *this
109	this->context->codec_type = this->codec->type;
110
111	if (this->class->choose_speed_over_accuracy)
112	- this->context->flags2 \|= CODEC_FLAG2_FAST;
113	+ this->context->flags2 \|= AV_CODEC_FLAG2_FAST;
114
115	#ifdef DEPRECATED_AVCODEC_THREAD_INIT
116	if (this->class->thread_count > 1) {
117	@@ -769,7 +774,7 @@ static void init_video_codec (ff_video_decoder_t *this
118	/* enable direct rendering by default */
119	this->output_format = XINE_IMGFMT_YV12;
120	#ifdef ENABLE_DIRECT_RENDERING
121	- if( this->codec->capabilities & CODEC_CAP_DR1 && this->class->enable_dri ) {
122	+ if( this->codec->capabilities & AV_CODEC_CAP_DR1 && this->class->enable_dri ) {
123	#ifdef AV_BUFFER
124	this->context->get_buffer2 = get_buffer;
125	this->context->thread_safe_callbacks = 1;
126	@@ -1246,7 +1251,7 @@ static void ff_check_bufsize (ff_video_decoder_t *this
127	xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
128	_("ffmpeg_video_dec: increasing buffer to %d to avoid overflow.\n"),
129	this->bufsize);
130	- this->buf = realloc(this->buf, this->bufsize + FF_INPUT_BUFFER_PADDING_SIZE );
131	+ this->buf = realloc(this->buf, this->bufsize + AV_INPUT_BUFFER_PADDING_SIZE );
132	}
133	}
134
135	@@ -1386,7 +1391,7 @@ static void ff_handle_header_buffer (ff_video_decoder_
136	if (this->bih.biSize > sizeof(xine_bmiheader)) {
137	this->context->extradata_size = this->bih.biSize - sizeof(xine_bmiheader);
138	this->context->extradata = malloc(this->context->extradata_size +
139	- FF_INPUT_BUFFER_PADDING_SIZE);
140	+ AV_INPUT_BUFFER_PADDING_SIZE);
141	memcpy(this->context->extradata, this->buf + sizeof(xine_bmiheader),
142	this->context->extradata_size);
143	}
144	@@ -1409,7 +1414,7 @@ static void ff_handle_header_buffer (ff_video_decoder_
145	if (this->context->extradata_size < 8) {
146	this->context->extradata_size= 8;
147	this->context->extradata = malloc(this->context->extradata_size +
148	- FF_INPUT_BUFFER_PADDING_SIZE);
149	+ AV_INPUT_BUFFER_PADDING_SIZE);
150	((uint32_t *)this->context->extradata)[0] = 0;
151	if (codec_type == BUF_VIDEO_RV10)
152	((uint32_t *)this->context->extradata)[1] = 0x10000000;
153	@@ -1417,7 +1422,7 @@ static void ff_handle_header_buffer (ff_video_decoder_
154	((uint32_t *)this->context->extradata)[1] = 0x10003001;
155	} else {
156	this->context->extradata = malloc(this->context->extradata_size +
157	- FF_INPUT_BUFFER_PADDING_SIZE);
158	+ AV_INPUT_BUFFER_PADDING_SIZE);
159	memcpy(this->context->extradata, this->buf + 26,
160	this->context->extradata_size);
161	}
162	@@ -1451,7 +1456,7 @@ static void ff_handle_special_buffer (ff_video_decoder
163	lprintf("BUF_SPECIAL_STSD_ATOM\n");
164	this->context->extradata_size = buf->decoder_info[2];
165	this->context->extradata = malloc(buf->decoder_info[2] +
166	- FF_INPUT_BUFFER_PADDING_SIZE);
167	+ AV_INPUT_BUFFER_PADDING_SIZE);
168	memcpy(this->context->extradata, buf->decoder_info_ptr[2],
169	buf->decoder_info[2]);
170
171	@@ -1461,7 +1466,7 @@ static void ff_handle_special_buffer (ff_video_decoder
172	lprintf("BUF_SPECIAL_DECODER_CONFIG\n");
173	this->context->extradata_size = buf->decoder_info[2];
174	this->context->extradata = malloc(buf->decoder_info[2] +
175	- FF_INPUT_BUFFER_PADDING_SIZE);
176	+ AV_INPUT_BUFFER_PADDING_SIZE);
177	memcpy(this->context->extradata, buf->decoder_info_ptr[2],
178	buf->decoder_info[2]);
179
180	@@ -1826,7 +1831,7 @@ static void ff_handle_buffer (ff_video_decoder_t *this
181	/* data accumulation */
182	if (buf->size > 0) {
183	if ((this->size == 0) &&
184	- ((buf->size + FF_INPUT_BUFFER_PADDING_SIZE) < buf->max_size) &&
185	+ ((buf->size + AV_INPUT_BUFFER_PADDING_SIZE) < buf->max_size) &&
186	(buf->decoder_flags & BUF_FLAG_FRAME_END)) {
187	/* buf contains a complete frame */
188	/* no memcpy needed */
189	@@ -1859,7 +1864,7 @@ static void ff_handle_buffer (ff_video_decoder_t *this
190	/* note: bitstream, alt bitstream reader or something will cause
191	* severe mpeg4 artifacts if padding is less than 32 bits.
192	*/
193	- memset(&chunk_buf[this->size], 0, FF_INPUT_BUFFER_PADDING_SIZE);
194	+ memset(&chunk_buf[this->size], 0, AV_INPUT_BUFFER_PADDING_SIZE);
195
196	while (this->size > 0) {
197
198	@@ -2532,7 +2537,7 @@ static video_decoder_t *ff_video_open_plugin (video_de
199
200	this->decoder_ok = 0;
201	this->decoder_init_mode = 1;
202	- this->buf = calloc(1, VIDEOBUFSIZE + FF_INPUT_BUFFER_PADDING_SIZE);
203	+ this->buf = calloc(1, VIDEOBUFSIZE + AV_INPUT_BUFFER_PADDING_SIZE);
204	this->bufsize = VIDEOBUFSIZE;
205
206	this->is_mpeg12 = 0;
207	--- src/combined/ffmpeg/ffmpeg_compat.h.orig 2014-04-30 11:40:50 UTC
208	+++ src/combined/ffmpeg/ffmpeg_compat.h
209	@@ -1,5 +1,5 @@
210	/*
211	- * Copyright (C) 2000-2014 the xine project
212	+ * Copyright (C) 2000-2015 the xine project
213	*
214	* This file is part of xine, a unix video player.
215	*
216	@@ -58,6 +58,11 @@
217	# define AVCODEC_HAS_SUB_ID
218	#endif
219
220	+/* not 100% sure about this (between 55.19 and 56.56) */
221	+#if LIBAVCODEC_VERSION_MAJOR < 56
222	+# define AVCODEC_HAS_STREAM_CODEC_TAG
223	+#endif
224	+
225	/**/
226	#if LIBAVCODEC_VERSION_MAJOR > 53 \|\| (LIBAVCODEC_VERSION_MAJOR == 53 && LIBAVCODEC_VERSION_MINOR >= 8)
227	# define avcodec_init() do {} while(0)
228	@@ -192,5 +197,16 @@
229	#if LIBAVCODEC_VERSION_INT >= ((55<<16)\|100)
230	# define AV_BUFFER 1
231	#endif
232	+
233	+#ifndef AV_INPUT_BUFFER_PADDING_SIZE
234	+# define AV_INPUT_BUFFER_PADDING_SIZE FF_INPUT_BUFFER_PADDING_SIZE
235	+#endif
236	+#ifndef AV_CODEC_CAP_DR1
237	+# define AV_CODEC_CAP_DR1 CODEC_CAP_DR1
238	+#endif
239	+#ifndef AV_CODEC_FLAG2_FAST
240	+# define AV_CODEC_FLAG2_FAST CODEC_FLAG2_FAST
241	+#endif
242	+
243
244	#endif /* XINE_AVCODEC_COMPAT_H */
245	--- src/dxr3/ffmpeg_encoder.c.orig 2014-03-13 04:06:09 UTC
246	+++ src/dxr3/ffmpeg_encoder.c
247	@@ -207,7 +207,9 @@ static int lavc_on_update_format(dxr3_driver_t *drv, d
248	this->context->height = frame->oheight;
249
250	this->context->gop_size = 0; /intra frames only /
251	+#if defined(LIBAVCODEC_VERSION_MAJOR) && LIBAVCODEC_VERSION_MAJOR < 58
252	this->context->me_method = ME_ZERO; /motion estimation type/
253	+#endif
254
255	this->context->time_base.den = 90000;
256	if (frame->vo_frame.duration > 90000 / 24)
257	--- src/video_out/video_out_vaapi.c.orig 2014-06-09 16:08:42 UTC
258	+++ src/video_out/video_out_vaapi.c
259	@@ -3119,15 +3119,15 @@ static void vaapi_update_frame_format (vo_driver_t *th
260	frame->vo_frame.pitches[0] = 8*((width + 7) / 8);
261	frame->vo_frame.pitches[1] = 8*((width + 15) / 16);
262	frame->vo_frame.pitches[2] = 8*((width + 15) / 16);
263	- frame->vo_frame.base[0] = av_mallocz (frame->vo_frame.pitches[0] * height + FF_INPUT_BUFFER_PADDING_SIZE);
264	- frame->vo_frame.base[1] = av_mallocz (frame->vo_frame.pitches[1] * ((height+1)/2) + FF_INPUT_BUFFER_PADDING_SIZE);
265	- frame->vo_frame.base[2] = av_mallocz (frame->vo_frame.pitches[2] * ((height+1)/2) + FF_INPUT_BUFFER_PADDING_SIZE);
266	+ frame->vo_frame.base[0] = av_mallocz (frame->vo_frame.pitches[0] * height + AV_INPUT_BUFFER_PADDING_SIZE);
267	+ frame->vo_frame.base[1] = av_mallocz (frame->vo_frame.pitches[1] * ((height+1)/2) + AV_INPUT_BUFFER_PADDING_SIZE);
268	+ frame->vo_frame.base[2] = av_mallocz (frame->vo_frame.pitches[2] * ((height+1)/2) + AV_INPUT_BUFFER_PADDING_SIZE);
269	frame->vo_frame.proc_duplicate_frame_data = NULL;
270	frame->vo_frame.proc_provide_standard_frame_data = NULL;
271	lprintf("XINE_IMGFMT_YV12 width %d height %d\n", width, height);
272	} else if (format == XINE_IMGFMT_YUY2){
273	frame->vo_frame.pitches[0] = 8*((width + 3) / 4);
274	- frame->vo_frame.base[0] = av_mallocz (frame->vo_frame.pitches[0] * height + FF_INPUT_BUFFER_PADDING_SIZE);
275	+ frame->vo_frame.base[0] = av_mallocz (frame->vo_frame.pitches[0] * height + AV_INPUT_BUFFER_PADDING_SIZE);
276	frame->vo_frame.proc_duplicate_frame_data = NULL;
277	frame->vo_frame.proc_provide_standard_frame_data = NULL;
278	lprintf("XINE_IMGFMT_YUY2 width %d height %d\n", width, height);

Lines 1-127 Link Here

(-)multimedia/libxine/files/patch-include-xine-xine_internal.h (-127 lines)
1	--- include/xine/xine_internal.h.orig
2	+++ include/xine/xine_internal.h
3	@@ -72,6 +72,124 @@
4	# include <xine/alphablend.h>
5	#endif
6
7	+#ifndef INT8_MIN
8	+#define INT8_MIN (-0x7f-1)
9	+#endif
10	+
11	+#ifndef INT8_MAX
12	+#define INT8_MAX 0x7f
13	+#endif
14	+
15	+#ifndef INT16_MAX
16	+#define INT16_MAX 0x7fff
17	+#endif
18	+
19	+#ifndef INT16_MIN
20	+#define INT16_MIN (-0x7fff-1)
21	+#endif
22	+
23	+#ifndef INT32_MAX
24	+#define INT32_MAX 0x7fffffff
25	+#endif
26	+
27	+#ifndef INT32_MIN
28	+#define INT32_MIN (-0x7fffffff-1)
29	+#endif
30	+
31	+#ifndef PRIdMAX
32	+#define PRIdMAX "lld"
33	+#endif
34	+
35	+#ifndef SCNdMAX
36	+#define SCNdMAX "lld"
37	+#endif
38	+
39	+#ifndef PRIiMAX
40	+#define PRIiMAX "lld"
41	+typedef long long intmax_t;
42	+#endif
43	+
44	+
45	+#ifndef PRId32
46	+#define PRId32 "d"
47	+#endif
48	+
49	+#ifndef SCNd32
50	+#define SCNd32 "d"
51	+#endif
52	+
53	+#ifndef PRIdFAST16
54	+#define PRIdFAST16 "d"
55	+#endif
56	+
57	+#ifndef PRIdFAST32
58	+#define PRIdFAST32 "d"
59	+#endif
60	+
61	+#ifndef SCNu32
62	+#define SCNu32 "u"
63	+#endif
64	+
65	+
66	+#ifndef PRId64
67	+#if defined(__alpha__) \|\| defined(__amd64__) \|\| defined(__ia64__) \|\| defined(__sparc64__)
68	+#define PRId64 "ld"
69	+#else if defined(__i386__) \|\| defined(__powerpc__)
70	+#define PRId64 "lld"
71	+#endif
72	+#endif
73	+
74	+#ifndef SCNd64
75	+#define SCNd64 PRId64
76	+#endif
77	+
78	+#ifndef PRIu64
79	+#if defined(__alpha__) \|\| defined(__amd64__) \|\| defined(__ia64__) \|\| defined(__sparc64__)
80	+#define PRIu64 "lu"
81	+#else if defined(__i386__) \|\| defined(__powerpc__)
82	+#define PRIu64 "llu"
83	+#endif
84	+#endif
85	+
86	+#ifndef SCNu64
87	+#define SCNu64 PRIu64
88	+#endif
89	+
90	+#ifndef PRIX64
91	+#if defined(__alpha__) \|\| defined(__amd64__) \|\| defined(__ia64__) \|\| defined(__sparc64__)
92	+#define PRIX64 "lX"
93	+#else if defined(__i386__) \|\| defined(__powerpc__)
94	+#define PRIX64 "llX"
95	+#endif
96	+#endif
97	+
98	+
99	+#ifndef PRIx32
100	+#define PRIx32 "x"
101	+#endif
102	+
103	+#ifndef PRIx16
104	+#define PRIx16 "x"
105	+#endif
106	+
107	+#ifndef PRIx8
108	+#define PRIx8 "x"
109	+#endif
110	+
111	+#ifndef PRIXMAX
112	+#define PRIXMAX "llX"
113	+#endif
114	+
115	+#ifndef PRIxMAX
116	+#define PRIxMAX "llx"
117	+#endif
118	+
119	+#ifndef UINT64_C
120	+#define UINT64_C(c) (c ## ULL)
121	+#endif
122	+
123	+
124	+
125
126	#define XINE_MAX_EVENT_LISTENERS 50
127	#define XINE_MAX_EVENT_TYPES 100

Lines 1-12 Link Here

(-)multimedia/libxine/files/patch-src-audio_dec-xine_lpcm_decoder.c (-12 lines)
1	--- src/audio_dec/xine_lpcm_decoder.c.orig
2	+++ src/audio_dec/xine_lpcm_decoder.c
3	@@ -30,6 +30,9 @@
4	#endif
5	/* avoid compiler warnings */
6	#define _BSD_SOURCE 1
7	+#ifdef __FreeBSD__
8	+#define __BSD_VISIBLE 1
9	+#endif
10
11	#ifdef HAVE_CONFIG_H
12	#include "config.h"

Lines 1-13 Link Here

(-)multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff (-13 lines)
1	--- src/combined/ffmpeg/Makefile.in.orig 2013-09-23 15:58:14.000000000 -0500
2	+++ src/combined/ffmpeg/Makefile.in 2013-09-25 03:25:33.000000000 -0500
3	@@ -1037,9 +1037,7 @@ avcodec_audio.list: AV_CODECS:=/CODEC_ID
4	avcodec_video.list: AV_CODECS:=/CODEC_ID_MPEG1VIDEO/,/CODEC_ID_PCM_S16LE/
5
6	# that weird shell call just yields full path of the avcodec.h file
7	-avcodec_audio.list avcodec_video.list: $(shell \
8	- echo '#include "$(srcdir)/ffmpeg_decoder.h"' \| $(AV_CPP) -M - \|\
9	- sed -e '/avcodec\.h/! d; s%^.* \([^ ]/avcodec\.h\) .%\1%')
10	+avcodec_audio.list avcodec_video.list:
11	$(AM_V_GEN)echo '#include "$(srcdir)/ffmpeg_decoder.h"' \| $(AV_CPP) - \|\
12	sed -e $(AV_CODECS)'! d; s/^[ \t]//; s/[=,].//; /^$$/ d' >$@
13

Lines 1-13 Link Here

(-)multimedia/libxine/files/patch-src-libw32dll-wine-registry.c (-13 lines)
1	--- src/libw32dll/wine/registry.c.orig
2	+++ src/libw32dll/wine/registry.c
3	@@ -7,6 +7,10 @@
4	#include <pwd.h>
5	#include <sys/types.h>
6
7	+#ifdef __FreeBSD__
8	+#include <sys/stat.h>
9	+#endif
10	+
11	#include "winbase.h"
12	#include "winreg.h"
13	#include "winnt.h"

Lines 1-28 Link Here

(-)multimedia/libxine/files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c (-28 lines)
1	--- src/post/deinterlace/plugins/greedy2frame_template_sse2.c.orig
2	+++ src/post/deinterlace/plugins/greedy2frame_template_sse2.c
3	@@ -174,8 +174,8 @@ static void DeinterlaceGreedy2Frame_SSE2
4	*/
5	"movdqa (%2), %%xmm1 \n\t" /* xmm1 = T1 */
6	"movdqa (%3), %%xmm0 \n\t" /* xmm0 = T0 */
7	- "movdqa (%q4,%2), %%xmm3 \n\t" /* xmm3 = B1 */
8	- "movdqa (%q4,%3), %%xmm2 \n\t" /* xmm2 = B0 */
9	+ "movdqa (%2,%4), %%xmm3 \n\t" /* xmm3 = B1 */
10	+ "movdqa (%3,%4), %%xmm2 \n\t" /* xmm2 = B0 */
11
12	/* calculate \|T1-T0\| keep T1 put result in xmm5 */
13	"movdqa %%xmm1, %%xmm5 \n\t"
14	@@ -192,11 +192,11 @@ static void DeinterlaceGreedy2Frame_SSE2
15	"pcmpgtb %0, %%xmm5 \n\t"
16	"pcmpeqd %%xmm7, %%xmm5 \n\t"
17
18	- "prefetcht0 64(%q4,%2) \n\t"
19	- "prefetcht0 64(%q4,%3) \n\t"
20	+ "prefetcht0 64(%2,%4) \n\t"
21	+ "prefetcht0 64(%3,%4) \n\t"
22	:
23	: "m" (GreedyTwoFrameThreshold128),
24	- "m" (*Destc), "r" (T1), "r" (T0), "r" (Pitch) );
25	+ "m" (*Destc), "r" (T1), "r" (T0), "r" ((register_t)Pitch) );
26
27	asm volatile (
28	/* calculate \|B1-B0\| keep B1 put result in xmm4 */

Lines 1-12 Link Here

(-)multimedia/libxine/files/patch-src-vdr-input_vdr.c (-12 lines)
1	--- src/vdr/input_vdr.c.orig
2	+++ src/vdr/input_vdr.c
3	@@ -32,6 +32,9 @@
4	#include <errno.h>
5	#include <pthread.h>
6
7	+#ifdef __FreeBSD__
8	+#include <netinet/in.h>
9	+#endif
10	#include <sys/socket.h>
11	#include <resolv.h>
12	#include <netdb.h>

Lines 2-9 Link Here

(-)multimedia/libxine/pkg-plist (-117 / +85 lines)
2	bin/xine-list-1.2	2	bin/xine-list-1.2
3	include/xine.h	3	include/xine.h
4	include/xine/alphablend.h	4	include/xine/alphablend.h
		5	include/xine/array.h
5	include/xine/attributes.h	6	include/xine/attributes.h
6	include/xine/array.h
7	include/xine/audio_decoder.h	7	include/xine/audio_decoder.h
8	include/xine/audio_out.h	8	include/xine/audio_out.h
9	include/xine/broadcaster.h	9	include/xine/broadcaster.h
Lines 28-35 Link Here
28	include/xine/sorted_array.h	28	include/xine/sorted_array.h
29	include/xine/spu.h	29	include/xine/spu.h
30	include/xine/spu_decoder.h	30	include/xine/spu_decoder.h
		31	include/xine/vdr.h
31	include/xine/version.h	32	include/xine/version.h
32	include/xine/vdr.h
33	include/xine/video_decoder.h	33	include/xine/video_decoder.h
34	include/xine/video_out.h	34	include/xine/video_out.h
35	include/xine/video_overlay.h	35	include/xine/video_overlay.h
Lines 41-87 Link Here
41	include/xine/xineutils.h	41	include/xine/xineutils.h
42	include/xine/xmllexer.h	42	include/xine/xmllexer.h
43	include/xine/xmlparser.h	43	include/xine/xmlparser.h
		44	lib/libxine-interface.la
44	lib/libxine.la	45	lib/libxine.la
45	lib/libxine.so	46	lib/libxine.so
46	lib/libxine.so.2	47	lib/libxine.so.2
47	lib/libxine.so.2.5.0	48	lib/libxine.so.2.7.0
48	lib/libxine-interface.la	49	%%AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so
49	share/xine-lib/fonts/cetus-16.xinefont.gz	50	%%CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so
50	share/xine-lib/fonts/cetus-20.xinefont.gz	51	%%ESOUND%%%%PLUGINSDIR%%/xineplug_ao_out_esd.so
51	share/xine-lib/fonts/cetus-24.xinefont.gz	52	%%JACK%%%%PLUGINSDIR%%/xineplug_ao_out_jack.so
52	share/xine-lib/fonts/cetus-32.xinefont.gz	53	%%GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so
53	share/xine-lib/fonts/cetus-48.xinefont.gz	54	%%IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_decode_image.so
54	share/xine-lib/fonts/cetus-64.xinefont.gz	55	%%IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_dmx_image.so
55	share/xine-lib/fonts/cc-16.xinefont.gz	56	%%LIBBLURAY%%%%PLUGINSDIR%%/xineplug_inp_bluray.so
56	share/xine-lib/fonts/cc-20.xinefont.gz	57	%%PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so
57	share/xine-lib/fonts/cc-24.xinefont.gz	58	%%PIXBUF%%%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so
58	share/xine-lib/fonts/cc-32.xinefont.gz	59	%%SMB%%%%PLUGINSDIR%%/xineplug_inp_smb.so
59	share/xine-lib/fonts/cc-48.xinefont.gz	60	%%VAAPI%%%%PLUGINSDIR%%/xineplug_vo_out_vaapi.so
60	share/xine-lib/fonts/cc-64.xinefont.gz	61	%%XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xvmc.so
61	share/xine-lib/fonts/cci-16.xinefont.gz	62	%%XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xxmc.so
62	share/xine-lib/fonts/cci-20.xinefont.gz	63	%%WAVPACK%%%%PLUGINSDIR%%/xineplug_wavpack.so
63	share/xine-lib/fonts/cci-24.xinefont.gz
64	share/xine-lib/fonts/cci-32.xinefont.gz
65	share/xine-lib/fonts/cci-48.xinefont.gz
66	share/xine-lib/fonts/cci-64.xinefont.gz
67	share/xine-lib/fonts/mono-16.xinefont.gz
68	share/xine-lib/fonts/mono-20.xinefont.gz
69	share/xine-lib/fonts/mono-24.xinefont.gz
70	share/xine-lib/fonts/mono-32.xinefont.gz
71	share/xine-lib/fonts/mono-48.xinefont.gz
72	share/xine-lib/fonts/mono-64.xinefont.gz
73	share/xine-lib/fonts/sans-16.xinefont.gz
74	share/xine-lib/fonts/sans-20.xinefont.gz
75	share/xine-lib/fonts/sans-24.xinefont.gz
76	share/xine-lib/fonts/sans-32.xinefont.gz
77	share/xine-lib/fonts/sans-48.xinefont.gz
78	share/xine-lib/fonts/sans-64.xinefont.gz
79	share/xine-lib/fonts/serif-16.xinefont.gz
80	share/xine-lib/fonts/serif-20.xinefont.gz
81	share/xine-lib/fonts/serif-24.xinefont.gz
82	share/xine-lib/fonts/serif-32.xinefont.gz
83	share/xine-lib/fonts/serif-48.xinefont.gz
84	share/xine-lib/fonts/serif-64.xinefont.gz
85	%%PLUGINSDIR%%/mime.types	64	%%PLUGINSDIR%%/mime.types
86	%%PLUGINSDIR%%/post/xineplug_post_audio_filters.so	65	%%PLUGINSDIR%%/post/xineplug_post_audio_filters.so
87	%%PLUGINSDIR%%/post/xineplug_post_goom.so	66	%%PLUGINSDIR%%/post/xineplug_post_goom.so
Lines 90-179 Link Here
90	%%PLUGINSDIR%%/post/xineplug_post_switch.so	69	%%PLUGINSDIR%%/post/xineplug_post_switch.so
91	%%PLUGINSDIR%%/post/xineplug_post_tvtime.so	70	%%PLUGINSDIR%%/post/xineplug_post_tvtime.so
92	%%PLUGINSDIR%%/post/xineplug_post_visualizations.so	71	%%PLUGINSDIR%%/post/xineplug_post_visualizations.so
93	%%ESOUND%%%%PLUGINSDIR%%/xineplug_ao_out_esd.so
94	%%JACK%%%%PLUGINSDIR%%/xineplug_ao_out_jack.so
95	%%PLUGINSDIR%%/xineplug_ao_out_file.so
96	%%PLUGINSDIR%%/xineplug_ao_out_none.so
97	%%PLUGINSDIR%%/xineplug_ao_out_oss.so	72	%%PLUGINSDIR%%/xineplug_ao_out_oss.so
98	%%PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so
99	%%PLUGINSDIR%%/xineplug_decode_a52.so	73	%%PLUGINSDIR%%/xineplug_decode_a52.so
100	%%PLUGINSDIR%%/xineplug_decode_bitplane.so
101	%%PLUGINSDIR%%/xineplug_decode_dts.so	74	%%PLUGINSDIR%%/xineplug_decode_dts.so
102	%%PLUGINSDIR%%/xineplug_decode_dvaudio.so	75	%%PLUGINSDIR%%/xineplug_decode_dvaudio.so
103	%%PLUGINSDIR%%/xineplug_decode_faad.so	76	%%PLUGINSDIR%%/xineplug_decode_faad.so
104	%%PLUGINSDIR%%/xineplug_decode_ff.so	77	%%PLUGINSDIR%%/xineplug_decode_ff.so
105	%%PIXBUF%%%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so
106	%%PLUGINSDIR%%/xineplug_decode_gsm610.so	78	%%PLUGINSDIR%%/xineplug_decode_gsm610.so
107	%%IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_decode_image.so
108	%%PLUGINSDIR%%/xineplug_decode_libjpeg.so	79	%%PLUGINSDIR%%/xineplug_decode_libjpeg.so
109	%%PLUGINSDIR%%/xineplug_decode_libvpx.so	80	%%PLUGINSDIR%%/xineplug_decode_libvpx.so
110	%%PLUGINSDIR%%/xineplug_decode_lpcm.so	81	%%PLUGINSDIR%%/xineplug_decode_lpcm.so
111	%%PLUGINSDIR%%/xineplug_decode_mad.so	82	%%PLUGINSDIR%%/xineplug_decode_mad.so
112	%%PLUGINSDIR%%/xineplug_decode_mpeg2.so	83	%%PLUGINSDIR%%/xineplug_decode_mpeg2.so
113	%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_decode_qt.so	84	%%PLUGINSDIR%%/xineplug_decode_rawvideo.so
114	%%PLUGINSDIR%%/xineplug_decode_rgb.so
115	%%PLUGINSDIR%%/xineplug_decode_spu.so	85	%%PLUGINSDIR%%/xineplug_decode_spu.so
116	%%PLUGINSDIR%%/xineplug_decode_spucc.so	86	%%PLUGINSDIR%%/xineplug_decode_spucc.so
117	%%PLUGINSDIR%%/xineplug_decode_spucmml.so	87	%%PLUGINSDIR%%/xineplug_decode_spucmml.so
118	%%PLUGINSDIR%%/xineplug_decode_spudvb.so	88	%%PLUGINSDIR%%/xineplug_decode_spudvb.so
119	%%PLUGINSDIR%%/xineplug_decode_spuhdmv.so	89	%%PLUGINSDIR%%/xineplug_decode_spuhdmv.so
120	%%PLUGINSDIR%%/xineplug_decode_vdpau_h264_alter.so	90	%%PLUGINSDIR%%/xineplug_decode_vdpau.so
121	%%PLUGINSDIR%%/xineplug_decode_vdpau_h264.so
122	%%PLUGINSDIR%%/xineplug_decode_vdpau_mpeg12.so
123	%%PLUGINSDIR%%/xineplug_decode_vdpau_mpeg4.so
124	%%PLUGINSDIR%%/xineplug_decode_vdpau_vc1.so
125	%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_decode_w32dll.so
126	%%PLUGINSDIR%%/xineplug_decode_yuv.so
127	%%PLUGINSDIR%%/xineplug_dmx_asf.so	91	%%PLUGINSDIR%%/xineplug_dmx_asf.so
128	%%PLUGINSDIR%%/xineplug_dmx_audio.so	92	%%PLUGINSDIR%%/xineplug_dmx_audio.so
129	%%PLUGINSDIR%%/xineplug_dmx_avi.so
130	%%PLUGINSDIR%%/xineplug_dmx_fli.so	93	%%PLUGINSDIR%%/xineplug_dmx_fli.so
131	%%PLUGINSDIR%%/xineplug_dmx_flv.so
132	%%PLUGINSDIR%%/xineplug_dmx_games.so	94	%%PLUGINSDIR%%/xineplug_dmx_games.so
133	%%PLUGINSDIR%%/xineplug_dmx_iff.so
134	%%WITH_DMX_IMAGE%%%%PLUGINSDIR%%/xineplug_dmx_image.so
135	%%PLUGINSDIR%%/xineplug_dmx_matroska.so
136	%%PLUGINSDIR%%/xineplug_dmx_mng.so	95	%%PLUGINSDIR%%/xineplug_dmx_mng.so
137	%%PLUGINSDIR%%/xineplug_dmx_modplug.so	96	%%PLUGINSDIR%%/xineplug_dmx_modplug.so
138	%%PLUGINSDIR%%/xineplug_dmx_mpeg.so
139	%%PLUGINSDIR%%/xineplug_dmx_mpeg_block.so
140	%%PLUGINSDIR%%/xineplug_dmx_mpeg_elem.so
141	%%PLUGINSDIR%%/xineplug_dmx_mpeg_pes.so
142	%%PLUGINSDIR%%/xineplug_dmx_mpeg_ts.so
143	%%PLUGINSDIR%%/xineplug_dmx_nsv.so	97	%%PLUGINSDIR%%/xineplug_dmx_nsv.so
144	%%PLUGINSDIR%%/xineplug_dmx_playlist.so	98	%%PLUGINSDIR%%/xineplug_dmx_playlist.so
145	%%PLUGINSDIR%%/xineplug_dmx_pva.so	99	%%PLUGINSDIR%%/xineplug_dmx_pva.so
146	%%PLUGINSDIR%%/xineplug_dmx_qt.so
147	%%PLUGINSDIR%%/xineplug_dmx_rawdv.so
148	%%PLUGINSDIR%%/xineplug_dmx_real.so
149	%%PLUGINSDIR%%/xineplug_dmx_slave.so	100	%%PLUGINSDIR%%/xineplug_dmx_slave.so
150	%%PLUGINSDIR%%/xineplug_dmx_vc1_es.so	101	%%PLUGINSDIR%%/xineplug_dmx_video.so
151	%%PLUGINSDIR%%/xineplug_dmx_yuv4mpeg2.so
152	%%PLUGINSDIR%%/xineplug_dmx_yuv_frames.so
153	%%PLUGINSDIR%%/xineplug_flac.so	102	%%PLUGINSDIR%%/xineplug_flac.so
154	%%PLUGINSDIR%%/xineplug_inp_cdda.so	103	%%PLUGINSDIR%%/xineplug_inp_cdda.so
155	%%LIBBLURAY%%%%PLUGINSDIR%%/xineplug_inp_bluray.so
156	%%PLUGINSDIR%%/xineplug_inp_dvb.so
157	%%PLUGINSDIR%%/xineplug_inp_dvd.so	104	%%PLUGINSDIR%%/xineplug_inp_dvd.so
158	%%PLUGINSDIR%%/xineplug_inp_file.so
159	%%GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so
160	%%PLUGINSDIR%%/xineplug_inp_http.so
161	%%PLUGINSDIR%%/xineplug_inp_mms.so	105	%%PLUGINSDIR%%/xineplug_inp_mms.so
162	%%PLUGINSDIR%%/xineplug_inp_net.so	106	%%PLUGINSDIR%%/xineplug_inp_network.so
163	%%PLUGINSDIR%%/xineplug_inp_pnm.so
164	%%PLUGINSDIR%%/xineplug_inp_rtp.so	107	%%PLUGINSDIR%%/xineplug_inp_rtp.so
165	%%PLUGINSDIR%%/xineplug_inp_rtsp.so
166	%%SMB%%%%PLUGINSDIR%%/xineplug_inp_smb.so
167	%%PLUGINSDIR%%/xineplug_inp_stdin_fifo.so
168	%%PLUGINSDIR%%/xineplug_inp_test.so
169	%%PLUGINSDIR%%/xineplug_inp_vcd.so	108	%%PLUGINSDIR%%/xineplug_inp_vcd.so
170	%%PLUGINSDIR%%/xineplug_inp_vcdo.so	109	%%PLUGINSDIR%%/xineplug_inp_vcdo.so
171	%%PLUGINSDIR%%/xineplug_nsf.so	110	%%PLUGINSDIR%%/xineplug_nsf.so
172	%%PLUGINSDIR%%/xineplug_sputext.so	111	%%PLUGINSDIR%%/xineplug_sputext.so
173	%%PLUGINSDIR%%/xineplug_vdr.so	112	%%PLUGINSDIR%%/xineplug_vdr.so
174	%%AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so
175	%%CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so
176	%%PLUGINSDIR%%/xineplug_vo_out_none.so
177	%%PLUGINSDIR%%/xineplug_vo_out_opengl.so	113	%%PLUGINSDIR%%/xineplug_vo_out_opengl.so
178	%%PLUGINSDIR%%/xineplug_vo_out_opengl2.so	114	%%PLUGINSDIR%%/xineplug_vo_out_opengl2.so
179	%%PLUGINSDIR%%/xineplug_vo_out_raw.so	115	%%PLUGINSDIR%%/xineplug_vo_out_raw.so
Lines 183-223 Link Here
183	%%PLUGINSDIR%%/xineplug_vo_out_xcbxv.so	119	%%PLUGINSDIR%%/xineplug_vo_out_xcbxv.so
184	%%PLUGINSDIR%%/xineplug_vo_out_xshm.so	120	%%PLUGINSDIR%%/xineplug_vo_out_xshm.so
185	%%PLUGINSDIR%%/xineplug_vo_out_xv.so	121	%%PLUGINSDIR%%/xineplug_vo_out_xv.so
186	%%VAAPI%%%%PLUGINSDIR%%/xineplug_vo_out_vaapi.so
187	%%XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xvmc.so
188	%%XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xxmc.so
189	%%WAVPACK%%%%PLUGINSDIR%%/xineplug_wavpack.so
190	%%PLUGINSDIR%%/xineplug_xiph.so	122	%%PLUGINSDIR%%/xineplug_xiph.so
191	libdata/pkgconfig/libxine.pc	123	libdata/pkgconfig/libxine.pc
192	man/man1/xine-config.1.gz	124	man/man1/xine-config.1.gz
193	man/man1/xine-list-1.2.1.gz	125	man/man1/xine-list-1.2.1.gz
194	man/man5/xine.5.gz	126	man/man5/xine.5.gz
195	share/aclocal/xine.m4	127	%%PORTDOCS%%%%DOCSDIR%%/COPYING
196	%%DOCSDIR%%/COPYING	128	%%PORTDOCS%%%%DOCSDIR%%/CREDITS
197	%%DOCSDIR%%/CREDITS	129	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
198	%%DOCSDIR%%/ChangeLog	130	%%PORTDOCS%%%%DOCSDIR%%/NEWS
199	%%DOCSDIR%%/NEWS	131	%%PORTDOCS%%%%DOCSDIR%%/README
200	%%DOCSDIR%%/README	132	%%PORTDOCS%%%%DOCSDIR%%/README.MINGWCROSS
201	%%DOCSDIR%%/README.MINGWCROSS	133	%%PORTDOCS%%%%DOCSDIR%%/README.WIN32
202	%%DOCSDIR%%/README.WIN32	134	%%PORTDOCS%%%%DOCSDIR%%/README.cetus
203	%%DOCSDIR%%/README.cetus	135	%%PORTDOCS%%%%DOCSDIR%%/README.dvb
204	%%DOCSDIR%%/README.dvb	136	%%PORTDOCS%%%%DOCSDIR%%/README.dxr3
205	%%DOCSDIR%%/README.dxr3	137	%%PORTDOCS%%%%DOCSDIR%%/README.freebsd
206	%%DOCSDIR%%/README.freebsd	138	%%PORTDOCS%%%%DOCSDIR%%/README.irix
207	%%DOCSDIR%%/README.irix	139	%%PORTDOCS%%%%DOCSDIR%%/README.macosx
208	%%DOCSDIR%%/README.macosx	140	%%PORTDOCS%%%%DOCSDIR%%/README.network_dvd
209	%%DOCSDIR%%/README.network_dvd	141	%%PORTDOCS%%%%DOCSDIR%%/README.opengl
210	%%DOCSDIR%%/README.opengl	142	%%PORTDOCS%%%%DOCSDIR%%/README.solaris
211	%%DOCSDIR%%/README.solaris	143	%%PORTDOCS%%%%DOCSDIR%%/README_xxmc.html
212	%%DOCSDIR%%/README_xxmc.html	144	%%PORTDOCS%%%%DOCSDIR%%/TODO
213	%%DOCSDIR%%/TODO	145	%%PORTDOCS%%%%DOCSDIR%%/faq.html
214	%%DOCSDIR%%/faq.html	146	%%PORTDOCS%%%%DOCSDIR%%/faq.txt
215	%%DOCSDIR%%/faq.txt	147	%%PORTDOCS%%%%DOCSDIR%%/hackersguide/architecture.png
216	%%DOCSDIR%%/hackersguide/architecture.png	148	%%PORTDOCS%%%%DOCSDIR%%/hackersguide/hackersguide.html
217	%%DOCSDIR%%/hackersguide/hackersguide.html	149	%%PORTDOCS%%%%DOCSDIR%%/hackersguide/library.png
218	%%DOCSDIR%%/hackersguide/library.png	150	%%PORTDOCS%%%%DOCSDIR%%/hackersguide/overlays.png
219	%%DOCSDIR%%/hackersguide/overlays.png	151	%%PORTDOCS%%%%DOCSDIR%%/hackersguide/post_frame.png
220	%%DOCSDIR%%/hackersguide/post_frame.png
221	%%NLS%%share/locale/cs/LC_MESSAGES/libxine2.mo	152	%%NLS%%share/locale/cs/LC_MESSAGES/libxine2.mo
222	%%NLS%%share/locale/de/LC_MESSAGES/libxine2.mo	153	%%NLS%%share/locale/de/LC_MESSAGES/libxine2.mo
223	%%NLS%%share/locale/en_US/LC_MESSAGES/libxine2.mo	154	%%NLS%%share/locale/en_US/LC_MESSAGES/libxine2.mo
Lines 231-233 Link Here
231	%%NLS%%share/locale/pt_BR/LC_MESSAGES/libxine2.mo	162	%%NLS%%share/locale/pt_BR/LC_MESSAGES/libxine2.mo
232	%%NLS%%share/locale/sk/LC_MESSAGES/libxine2.mo	163	%%NLS%%share/locale/sk/LC_MESSAGES/libxine2.mo
233	%%NLS%%share/locale/tr/LC_MESSAGES/libxine2.mo	164	%%NLS%%share/locale/tr/LC_MESSAGES/libxine2.mo
		165	%%DATADIR%%/aclocal/xine.m4
		166	%%DATADIR%%/fonts/cc-16.xinefont.gz
		167	%%DATADIR%%/fonts/cc-20.xinefont.gz
		168	%%DATADIR%%/fonts/cc-24.xinefont.gz
		169	%%DATADIR%%/fonts/cc-32.xinefont.gz
		170	%%DATADIR%%/fonts/cc-48.xinefont.gz
		171	%%DATADIR%%/fonts/cc-64.xinefont.gz
		172	%%DATADIR%%/fonts/cci-16.xinefont.gz
		173	%%DATADIR%%/fonts/cci-20.xinefont.gz
		174	%%DATADIR%%/fonts/cci-24.xinefont.gz
		175	%%DATADIR%%/fonts/cci-32.xinefont.gz
		176	%%DATADIR%%/fonts/cci-48.xinefont.gz
		177	%%DATADIR%%/fonts/cci-64.xinefont.gz
		178	%%DATADIR%%/fonts/cetus-16.xinefont.gz
		179	%%DATADIR%%/fonts/cetus-20.xinefont.gz
		180	%%DATADIR%%/fonts/cetus-24.xinefont.gz
		181	%%DATADIR%%/fonts/cetus-32.xinefont.gz
		182	%%DATADIR%%/fonts/cetus-48.xinefont.gz
		183	%%DATADIR%%/fonts/cetus-64.xinefont.gz
		184	%%DATADIR%%/fonts/mono-16.xinefont.gz
		185	%%DATADIR%%/fonts/mono-20.xinefont.gz
		186	%%DATADIR%%/fonts/mono-24.xinefont.gz
		187	%%DATADIR%%/fonts/mono-32.xinefont.gz
		188	%%DATADIR%%/fonts/mono-48.xinefont.gz
		189	%%DATADIR%%/fonts/mono-64.xinefont.gz
		190	%%DATADIR%%/fonts/sans-16.xinefont.gz
		191	%%DATADIR%%/fonts/sans-20.xinefont.gz
		192	%%DATADIR%%/fonts/sans-24.xinefont.gz
		193	%%DATADIR%%/fonts/sans-32.xinefont.gz
		194	%%DATADIR%%/fonts/sans-48.xinefont.gz
		195	%%DATADIR%%/fonts/sans-64.xinefont.gz
		196	%%DATADIR%%/fonts/serif-16.xinefont.gz
		197	%%DATADIR%%/fonts/serif-20.xinefont.gz
		198	%%DATADIR%%/fonts/serif-24.xinefont.gz
		199	%%DATADIR%%/fonts/serif-32.xinefont.gz
		200	%%DATADIR%%/fonts/serif-48.xinefont.gz
		201	%%DATADIR%%/fonts/serif-64.xinefont.gz