Index: audio/atunes/Makefile =================================================================== --- audio/atunes/Makefile +++ audio/atunes/Makefile @@ -3,7 +3,7 @@ PORTNAME= atunes PORTVERSION= 3.1.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio java MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/aTunes%20${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-bin Index: devel/efl/Makefile =================================================================== --- devel/efl/Makefile +++ devel/efl/Makefile @@ -3,6 +3,7 @@ PORTNAME= efl DISTVERSION= 1.20.7 +PORTREVISION= 1 CATEGORIES= devel enlightenment MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/ DIST_SUBDIR= enlightenment Index: graphics/gimageview/Makefile =================================================================== --- graphics/gimageview/Makefile +++ graphics/gimageview/Makefile @@ -3,7 +3,7 @@ PORTNAME= gimageview PORTVERSION= 0.2.27 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= graphics MASTER_SITES= SF/gtkmmviewer/${PORTNAME}/${PORTVERSION} Index: graphics/opencv/Makefile =================================================================== --- graphics/opencv/Makefile +++ graphics/opencv/Makefile @@ -3,7 +3,7 @@ PORTNAME= opencv PORTVERSION= 3.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org Index: graphics/osg-devel/Makefile =================================================================== --- graphics/osg-devel/Makefile +++ graphics/osg-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= osg PORTVERSION= 3.5.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://trac.openscenegraph.org/downloads/developer_releases/ \ http://mirror.amdmi3.ru/distfiles/ Index: graphics/osg/Makefile =================================================================== --- graphics/osg/Makefile +++ graphics/osg/Makefile @@ -4,7 +4,7 @@ PORTNAME= osg PORTVERSION= 3.4.1 DISTVERSIONPREFIX= OpenSceneGraph- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org Index: multimedia/gxine/Makefile =================================================================== --- multimedia/gxine/Makefile +++ multimedia/gxine/Makefile @@ -3,6 +3,7 @@ PORTNAME= gxine PORTVERSION= 0.5.910 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF/xine/${PORTNAME}/${PORTVERSION} Index: multimedia/gxine/pkg-plist =================================================================== --- multimedia/gxine/pkg-plist +++ multimedia/gxine/pkg-plist @@ -13,6 +13,7 @@ man/man1/gxine.1.gz man/man1/gxine_client.1.gz share/applications/gxine.desktop +%%DATADIR%%/logo.jpg %%DATADIR%%/logo.mpv %%DATADIR%%/mediamarks %%DATADIR%%/pixmaps/gxine-icon.xpm Index: multimedia/k9copy-kde4/Makefile =================================================================== --- multimedia/k9copy-kde4/Makefile +++ multimedia/k9copy-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= k9copy PORTVERSION= 2.3.4 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= multimedia kde MASTER_SITES= LOCAL/rakuco DISTNAME= ${PORTNAME}-${PORTVERSION}-Source Index: multimedia/libxine/Makefile =================================================================== --- multimedia/libxine/Makefile +++ multimedia/libxine/Makefile @@ -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 @@ -33,107 +32,101 @@ libdca.so:multimedia/libdca \ libavcodec.so:multimedia/ffmpeg \ libfaad.so:audio/faad \ - libvdpau.so:multimedia/libvdpau -.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 + libvdpau.so:multimedia/libvdpau \ + libvpx.so:multimedia/libvpx \ + libiso9660.so:sysutils/libcdio \ + libogg.so:audio/libogg \ + libdvdnav.so:multimedia/libdvdnav -USES= compiler cpe gmake iconv libtool:keepla \ +USES= compiler cpe gmake gnome iconv libtool:keepla jpeg \ localbase pathfix perl5 pkgconfig tar:xz +LLD_UNSAFE= yes 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 USE_LDCONFIG= yes -CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 \ - --enable-ipv6 \ - --with-external-libmad \ - --with-external-libdts \ - --with-libflac \ - --with-external-ffmpeg \ - --with-external-libfaad \ +CONFIGURE_ARGS= --with-libflac \ --disable-real-codecs \ --disable-v4l \ --without-alsa \ - --disable-musepack \ - --enable-dvb + --disable-musepack + MAKE_ENV= V=1 -LLD_UNSAFE= yes +MAKE_ARGS= pkgdatadir="${DATADIR}" \ + datadir="${DATADIR}" \ + libdir="${PREFIX}/lib" +CFLAGS_i386= -fomit-frame-pointer + 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= DOCS NLS CACA DVB DMX_IMAGE ESOUND IPV6 IMAGEMAGICK JACK \ + GNOMEVFS2 PIXBUF PULSEAUDIO XVMC SMB SNDIO AALIB WAVPACK \ + VAAPI LIBBLURAY +OPTIONS_DEFAULT= DVB IMAGEMAGICK VAAPI +OPTIONS_DEFINE_i386= W32DLL +OPTIONS_DEFAULT_i386= W32DLL +OPTIONS_SUB= yes -OPTIONS_DEFINE= NLS CACA ESOUND JACK GNOMEVFS2 PULSEAUDIO XVMC SMB AALIB \ - IMAGEMAGICK PIXBUF WAVPACK VAAPI LIBBLURAY -OPTIONS_DEFAULT=VAAPI -OPTIONS_SUB= yes +DMX_IMAGE_DESC= DMX image plugin +DVB_DESC= DVB plugin +W32DLL_DESC= Win32 codec support -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls -CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca -CACA_CONFIGURE_OFF= --without-caca --disable-cacatest -ESOUND_USE= GNOME=esound -ESOUND_CONFIGURE_OFF= --without-esound -JACK_LIB_DEPENDS= libjack.so:audio/jack -JACK_CONFIGURE_OFF= --without-jack -GNOMEVFS2_USE= GNOME=gnomevfs2 -GNOMEVFS2_CONFIGURE_OFF=--disable-gnomevfs -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -PULSEAUDIO_CONFIGURE_OFF=--without-pulseaudio -.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_OFF= --disable-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 +AALIB_LIB_DEPENDS= libaa.so:graphics/aalib +AALIB_CONFIGURE_ENABLE= aalib +CACA_LIB_DEPENDS= libcaca.so:graphics/libcaca +CACA_CONFIGURE_WITH= caca +DVB_CONFIGURE_ENABLE= dvb +ESOUND_USE= GNOME=esound +ESOUND_CONFIGURE_WITH= esound +GNOMEVFS2_USE= GNOME=glib20,gconf2,gnomevfs2 +GNOMEVFS2_CONFIGURE_ENABLE= gnomevfs +IMAGEMAGICK_CONFIGURE_WITH= imagemagick 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 +IMAGEMAGICK_IMPLIES= DMX_IMAGE +IPV6_CONFIGURE_ENABLE= ipv6 +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_CONFIGURE_ENABLE= gdkpixbuf +PIXBUF_IMPLIES= DMX_IMAGE +PIXBUF_USE= GNOME=gdkpixbuf2,glib20 +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 +SNDIO_CONFIGURE_ENABLE= sndio +SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio +VAAPI_LIB_DEPENDS= libva.so:multimedia/libva +VAAPI_CONFIGURE_ENABLE= vaapi +W32DLL_CONFIGURE_ENABLE= w32dll +W32DLL_PLIST_FILES= ${PLUGINSDIR}/xineplug_decode_qt.so \ + ${PLUGINSDIR}/xineplug_decode_w32dll.so +WAVPACK_LIB_DEPENDS= libwavpack.so:audio/wavpack +WAVPACK_CONFIGURE_WITH= wavpack -.include - -.if ${ARCH} == "i386" -CFLAGS+= -fomit-frame-pointer -.endif - -.if ${CONFIGURE_ARGS:M*--without-imagemagick*} == "" || ${CONFIGURE_ARGS:M*-disable-gdkpixbuf*} == "" -PLIST_SUB+= WITH_DMX_IMAGE="" +.if defined(WITH_NVIDIA304_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1) +XVMC_CONFIGURE_WITH= xvmc-lib=XvMCNVIDIA +XVMC_LIB_DEPENDS= libXvMCNVIDIA.so:x11/nvidia-driver-304 .else -PLIST_SUB+= WITH_DMX_IMAGE="@comment " +XVMC_CONFIGURE_WITH= xvmc-lib=XvMCW +XVMC_LIB_DEPENDS= libXvMC.so:x11/libXvMC .endif +XVMC_CONFIGURE_ENABLE= xvmc -.if ${ARCH} == "i386" -PLIST_SUB+= WITH_VIDIX="" -.else -PLIST_SUB+= WITH_VIDIX="@comment " -CONFIGURE_ARGS+= --disable-vidix -.endif - .include post-patch: @@ -144,18 +137,9 @@ @${REINPLACE_CMD} -e 's|-ldl||' \ ${WRKSRC}/src/video_out/Makefile.in @${REINPLACE_CMD} -e "s|#define _ATOM QT_ATOM('', '', '', '')||" \ - ${WRKSRC}/src/demuxers/demux_qt.c - @${REINPLACE_CMD} -e \ - 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|' \ + ${WRKSRC}/src/demuxers/demux_qt.c \ ${WRKSRC}/configure - -# XXX older nvidia-driver versions don't support opengl 2.0 so this -# plugin might not get built: post-install: - @if ! [ -e "${STAGEDIR}${PREFIX}/${PLUGINSDIR}/xineplug_vo_out_opengl2.so" ]; then \ - ${REINPLACE_CMD} -e '/xineplug_vo_out_opengl2.so/d' \ - ${TMPPLIST}; \ - fi @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${PLUGINSDIR}/post/*.so Index: multimedia/libxine/distinfo =================================================================== --- multimedia/libxine/distinfo +++ multimedia/libxine/distinfo @@ -1,2 +1,3 @@ -SHA256 (xine-lib-1.2.6.tar.xz) = bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005 -SIZE (xine-lib-1.2.6.tar.xz) = 5020964 +TIMESTAMP = 1535162154 +SHA256 (xine-lib-1.2.9.tar.xz) = 32b34e8049feb762d75a551d5d2cdb56c396fdd83e35b9b7de5fd08e498e948d +SIZE (xine-lib-1.2.9.tar.xz) = 5180452 Index: multimedia/libxine/files/patch-configure =================================================================== --- multimedia/libxine/files/patch-configure +++ multimedia/libxine/files/patch-configure @@ -1,24 +1,24 @@ ---- configure.orig +--- configure.orig 2018-01-11 12:51:16 UTC +++ configure -@@ -20349,7 +20349,7 @@ $as_echo "#define ARCH_SPARC /**/" >>con +@@ -21288,7 +21288,7 @@ $as_echo "#define ARCH_X86_X32 /**/" >>confdefs.h ;; - x86_64-*) + x86_64-*|amd64-*) - arch_x86=64 + arch_x86=64 - $as_echo "#define ARCH_X86_64 /**/" >>confdefs.h -@@ -20685,7 +20685,7 @@ fi +@@ -21752,7 +21752,7 @@ fi + if test "$sarchopt" != "no"; then case "$host_or_hostalias" in - i386-*) archopt_val="i386" ;; -+ i386-*) ;; ++ i386-*) ;; i486-*) archopt_val="i486" ;; i586-*) archopt_val="pentium" ;; pentium-mmx-*) archopt_val="pentium-mmx" ;; -@@ -26280,7 +26280,7 @@ fi +@@ -28089,7 +28089,7 @@ fi if test x"$enable_dvb" != x"no"; then case "$host_os" in Index: multimedia/libxine/files/patch-ffmpeg3 =================================================================== --- multimedia/libxine/files/patch-ffmpeg3 +++ /dev/null @@ -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"); Index: multimedia/libxine/files/patch-ffmpeg4 =================================================================== --- multimedia/libxine/files/patch-ffmpeg4 +++ /dev/null @@ -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); Index: multimedia/libxine/files/patch-include-xine-xine_internal.h =================================================================== --- multimedia/libxine/files/patch-include-xine-xine_internal.h +++ /dev/null @@ -1,127 +0,0 @@ ---- include/xine/xine_internal.h.orig -+++ include/xine/xine_internal.h -@@ -72,6 +72,124 @@ - # include - #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 Index: multimedia/libxine/files/patch-include-xine-xineutils.h =================================================================== --- multimedia/libxine/files/patch-include-xine-xineutils.h +++ multimedia/libxine/files/patch-include-xine-xineutils.h @@ -1,3 +1,14 @@ +Unbreak build of phonon-xine + +In file included from xine/plugins.c:23: +In file included from /usr/local/include/xine/input_plugin.h:27: +/usr/local/include/xine/xineutils.h:197:8: error: unknown type name 'inline' +static inline void _x_freep(void *ptr) { + ^ +/usr/local/include/xine/xineutils.h:197:15: error: expected identifier or '(' +static inline void _x_freep(void *ptr) { + ^ + --- include/xine/xineutils.h.orig +++ include/xine/xineutils.h @@ -146,7 +146,7 @@ void *xine_xcalloc(size_t nmemb, size_t Index: multimedia/libxine/files/patch-include_config.h =================================================================== --- /dev/null +++ multimedia/libxine/files/patch-include_config.h @@ -0,0 +1,15 @@ +--- include/config.h.orig 2018-08-29 16:17:10 UTC ++++ include/config.h +@@ -24,9 +24,10 @@ + /* Ugly build time sanity guard. + * ./configure might mistake X32 mode as plain 64bit, + * but compiler itself sets __ILP32__ when in x32. +- */ ++* Even worse: clang sets this in 32 mode as well, ++*/ + #ifdef ARCH_X86 +-# if defined(__ILP32__) && !defined(ARCH_X86_X32) ++#if defined(__ILP32__) && !defined(__i386) && !defined(__i386__) && !defined(ARCH_X86_X32) + # ifdef ARCH_WARN + # warning "configure did not detect ARCH_X86_X32!" + # endif Index: multimedia/libxine/files/patch-src-audio_dec-xine_lpcm_decoder.c =================================================================== --- multimedia/libxine/files/patch-src-audio_dec-xine_lpcm_decoder.c +++ /dev/null @@ -1,12 +0,0 @@ ---- 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" Index: multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff =================================================================== --- multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff +++ /dev/null @@ -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' >$@ - Index: multimedia/libxine/files/patch-src-libw32dll-wine-registry.c =================================================================== --- multimedia/libxine/files/patch-src-libw32dll-wine-registry.c +++ /dev/null @@ -1,13 +0,0 @@ ---- src/libw32dll/wine/registry.c.orig -+++ src/libw32dll/wine/registry.c -@@ -7,6 +7,10 @@ - #include - #include - -+#ifdef __FreeBSD__ -+#include -+#endif -+ - #include "winbase.h" - #include "winreg.h" - #include "winnt.h" Index: multimedia/libxine/files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c =================================================================== --- multimedia/libxine/files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c +++ /dev/null @@ -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 */ Index: multimedia/libxine/files/patch-src-post-planar-eq2.c =================================================================== --- multimedia/libxine/files/patch-src-post-planar-eq2.c +++ /dev/null @@ -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) { Index: multimedia/libxine/files/patch-src-vdr-input_vdr.c =================================================================== --- multimedia/libxine/files/patch-src-vdr-input_vdr.c +++ /dev/null @@ -1,12 +0,0 @@ ---- src/vdr/input_vdr.c.orig -+++ src/vdr/input_vdr.c -@@ -32,6 +32,9 @@ - #include - #include - -+#ifdef __FreeBSD__ -+#include -+#endif - #include - #include - #include Index: multimedia/libxine/files/patch-src_libw32dll_wine_registry.c =================================================================== --- /dev/null +++ multimedia/libxine/files/patch-src_libw32dll_wine_registry.c @@ -0,0 +1,13 @@ +--- src/libw32dll/wine/registry.c.orig 2018-08-29 13:12:25 UTC ++++ src/libw32dll/wine/registry.c +@@ -7,6 +7,10 @@ + #include + #include + ++#ifdef __FreeBSD__ ++#include ++#endif ++ + #include "winbase.h" + #include "winreg.h" + #include "winnt.h" Index: multimedia/libxine/pkg-plist =================================================================== --- multimedia/libxine/pkg-plist +++ multimedia/libxine/pkg-plist @@ -2,8 +2,8 @@ bin/xine-list-1.2 include/xine.h include/xine/alphablend.h -include/xine/attributes.h include/xine/array.h +include/xine/attributes.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/version.h include/xine/vdr.h +include/xine/version.h include/xine/video_decoder.h include/xine/video_out.h include/xine/video_overlay.h @@ -42,46 +42,10 @@ include/xine/xmllexer.h include/xine/xmlparser.h lib/libxine.la +lib/libxine-interface.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 @@ -92,12 +56,10 @@ %%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 +%%SNDIO%%%%PLUGINSDIR%%/xineplug_ao_out_sndio.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 @@ -110,62 +72,35 @@ %%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 +%%DMX_IMAGE%%%%PLUGINSDIR%%/xineplug_dmx_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_cdda.so +%%DVB%%%%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 @@ -173,17 +108,16 @@ %%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 +%%VAAPI%%%%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 @@ -192,32 +126,31 @@ man/man1/xine-config.1.gz man/man1/xine-list-1.2.1.gz man/man5/xine.5.gz -share/aclocal/xine.m4 -%%DOCSDIR%%/COPYING -%%DOCSDIR%%/CREDITS -%%DOCSDIR%%/ChangeLog -%%DOCSDIR%%/NEWS -%%DOCSDIR%%/README -%%DOCSDIR%%/README.MINGWCROSS -%%DOCSDIR%%/README.WIN32 -%%DOCSDIR%%/README.cetus -%%DOCSDIR%%/README.dvb -%%DOCSDIR%%/README.dxr3 -%%DOCSDIR%%/README.freebsd -%%DOCSDIR%%/README.irix -%%DOCSDIR%%/README.macosx -%%DOCSDIR%%/README.network_dvd -%%DOCSDIR%%/README.opengl -%%DOCSDIR%%/README.solaris -%%DOCSDIR%%/README_xxmc.html -%%DOCSDIR%%/TODO -%%DOCSDIR%%/faq.html -%%DOCSDIR%%/faq.txt -%%DOCSDIR%%/hackersguide/architecture.png -%%DOCSDIR%%/hackersguide/hackersguide.html -%%DOCSDIR%%/hackersguide/library.png -%%DOCSDIR%%/hackersguide/overlays.png -%%DOCSDIR%%/hackersguide/post_frame.png +%%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 %%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 @@ -231,3 +164,40 @@ %%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 Index: multimedia/phonon-xine/Makefile =================================================================== --- multimedia/phonon-xine/Makefile +++ multimedia/phonon-xine/Makefile @@ -3,7 +3,7 @@ PORTNAME= phonon PORTVERSION= 4.4.4 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src PKGNAMESUFFIX= -xine Index: multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp =================================================================== --- multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp +++ multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp @@ -1,6 +1,21 @@ ---- ./xine/kequalizer_plugin.cpp.orig 2011-01-19 20:20:53.000000000 +0100 -+++ ./xine/kequalizer_plugin.cpp 2012-03-12 11:12:12.244132405 +0100 -@@ -48,6 +48,9 @@ +In file included from xine/kequalizer_plugin.cpp:51: +In file included from /usr/local/include/libavutil/mem.h:35: +In file included from /usr/local/include/libavutil/avutil.h:296: +/usr/local/include/libavutil/common.h:30:2: error: missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS +#error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS + ^ + +--- xine/kequalizer_plugin.cpp.orig 2011-01-19 19:20:53 UTC ++++ xine/kequalizer_plugin.cpp +@@ -37,6 +37,7 @@ + #include + + #define __STDC_FORMAT_MACROS ++#define __STDC_CONSTANT_MACROS + #include + + #include +@@ -48,6 +49,9 @@ extern "C" { #include #undef this @@ -10,7 +25,7 @@ #define KEQUALIZER_MAX_GAIN 12.0 #define KEQUALIZER_L 2 // Storage for filter taps #define KEQUALIZER_KM 10 // Max number of bands -@@ -281,7 +284,7 @@ +@@ -281,7 +285,7 @@ static post_plugin_t *kequalizer_open_plugin(post_clas Q_UNUSED(video_target); kequalizer_plugin_t *that; //deprecated: kequalizer_plugin_t *that = static_cast(xine_xmalloc(sizeof(kequalizer_plugin_t))); Index: multimedia/quark/Makefile =================================================================== --- multimedia/quark/Makefile +++ multimedia/quark/Makefile @@ -3,7 +3,7 @@ PORTNAME= quark PORTVERSION= 3.24 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia gnome MASTER_SITES= http://hsgg.github.com/quark/ Index: multimedia/subtitlecomposer-kde4/Makefile =================================================================== --- multimedia/subtitlecomposer-kde4/Makefile +++ multimedia/subtitlecomposer-kde4/Makefile @@ -3,7 +3,7 @@ PORTNAME= subtitlecomposer PORTVERSION= 0.5.7 DISTVERSIONPREFIX= v -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= multimedia kde MAINTAINER= ports@FreeBSD.org Index: multimedia/vdr-plugin-xineliboutput/Makefile =================================================================== --- multimedia/vdr-plugin-xineliboutput/Makefile +++ multimedia/vdr-plugin-xineliboutput/Makefile @@ -3,7 +3,7 @@ PORTNAME= vdr-plugin-xineliboutput PORTVERSION= 1.0.90s20120511 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= multimedia MASTER_SITES= SF/xineliboutput/files/xineliboutput/vdr-xineliboutput-${PORTVERSION}/:release \ LOCAL/nox:snapshot @@ -28,7 +28,7 @@ CONFIGURE_ARGS= --cc="${CC}" --cxx="${CXX}" --add-cflags=-I${VDRDIR} USE_GL= gl glu glut WRKSRC= ${WRKDIR}/vdr-${PLUGIN} -XINE_PLUGINSDIR=lib/xine/plugins/2.5 +XINE_PLUGINSDIR=lib/xine/plugins/2.7 PORTDOCS= README HISTORY PORTEXAMPLES= xine Index: multimedia/xine/Makefile =================================================================== --- multimedia/xine/Makefile +++ multimedia/xine/Makefile @@ -2,7 +2,7 @@ PORTNAME= xine PORTVERSION= 0.99.9 -PORTREVISION= 5 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION} DISTNAME= ${PORTNAME}-ui-${PORTVERSION} @@ -55,7 +55,7 @@ XFT_USE= XORG=xft XFT_CONFIGURE_ENABLE= xft -XINE_PLUGINSDIR= lib/xine/plugins/2.5 +XINE_PLUGINSDIR= lib/xine/plugins/2.7 post-patch: @${REINPLACE_CMD} -e \ Index: www/npapi-xine/Makefile =================================================================== --- www/npapi-xine/Makefile +++ www/npapi-xine/Makefile @@ -3,7 +3,7 @@ PORTNAME= xine PORTVERSION= 1.0.2 -PORTREVISION= 11 +PORTREVISION= 12 DISTVERSIONPREFIX= plugin- CATEGORIES= www multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-plugin/${PORTVERSION} Index: x11/eaglemode/Makefile =================================================================== --- x11/eaglemode/Makefile +++ x11/eaglemode/Makefile @@ -3,6 +3,7 @@ PORTNAME= eaglemode PORTVERSION= 0.93.2 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}