Date: Fri, 31 Aug 2018 08:16:18 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478529 - in head: audio/atunes devel/efl graphics/gimageview graphics/opencv graphics/osg graphics/osg-devel multimedia/gxine multimedia/k9copy-kde4 multimedia/libxine multimedia/libxi... Message-ID: <201808310816.w7V8GIhm033801@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri Aug 31 08:16:18 2018 New Revision: 478529 URL: https://svnweb.freebsd.org/changeset/ports/478529 Log: multimedia/libxine: Update to 1.2.9 - Cleanup options - Enable IMAGEMAGICK by default - Make DVB support optional but leave it enabled by default - Add SNDIO option - Properly order pkg-plist - Unbreak on aarch64 - Bump revision of dependent ports [1] Changes: https://sourceforge.net/projects/xine/files/xine-lib/1.2.9/README.txt/view ABI: https://abi-laboratory.pro/tracker/timeline/xine-lib/ [1] PR: 219921 Reported by: emorrasg@yahoo.es Submitted by: w.schwarzenfeld@utanet.at (initial version), Nathan <ndowens@yahoo.com> Reviewed by: mat, tobik Differential Revision: https://reviews.freebsd.org/D16840 Added: head/multimedia/libxine/files/patch-include_config.h (contents, props changed) Deleted: head/multimedia/libxine/files/patch-ffmpeg3 head/multimedia/libxine/files/patch-ffmpeg4 head/multimedia/libxine/files/patch-include-xine-xine_internal.h head/multimedia/libxine/files/patch-src-audio_dec-xine_lpcm_decoder.c head/multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff head/multimedia/libxine/files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c head/multimedia/libxine/files/patch-src-post-planar-eq2.c head/multimedia/libxine/files/patch-src-vdr-input_vdr.c Modified: head/audio/atunes/Makefile head/devel/efl/Makefile head/graphics/gimageview/Makefile head/graphics/opencv/Makefile head/graphics/osg-devel/Makefile head/graphics/osg/Makefile head/multimedia/gxine/Makefile head/multimedia/gxine/pkg-plist head/multimedia/k9copy-kde4/Makefile head/multimedia/libxine/Makefile head/multimedia/libxine/distinfo head/multimedia/libxine/files/patch-configure head/multimedia/libxine/files/patch-include-xine-xineutils.h head/multimedia/libxine/pkg-plist head/multimedia/phonon-xine/Makefile head/multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp head/multimedia/quark/Makefile head/multimedia/subtitlecomposer-kde4/Makefile head/multimedia/vdr-plugin-xineliboutput/Makefile head/multimedia/xine/Makefile head/www/npapi-xine/Makefile head/x11/eaglemode/Makefile Modified: head/audio/atunes/Makefile ============================================================================== --- head/audio/atunes/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/audio/atunes/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -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 Modified: head/devel/efl/Makefile ============================================================================== --- head/devel/efl/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/devel/efl/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -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 Modified: head/graphics/gimageview/Makefile ============================================================================== --- head/graphics/gimageview/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/graphics/gimageview/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -3,7 +3,7 @@ PORTNAME= gimageview PORTVERSION= 0.2.27 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= graphics MASTER_SITES= SF/gtkmmviewer/${PORTNAME}/${PORTVERSION} Modified: head/graphics/opencv/Makefile ============================================================================== --- head/graphics/opencv/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/graphics/opencv/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -3,7 +3,7 @@ PORTNAME= opencv PORTVERSION= 3.4.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org Modified: head/graphics/osg-devel/Makefile ============================================================================== --- head/graphics/osg-devel/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/graphics/osg-devel/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -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/ Modified: head/graphics/osg/Makefile ============================================================================== --- head/graphics/osg/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/graphics/osg/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -4,7 +4,7 @@ PORTNAME= osg PORTVERSION= 3.4.1 DISTVERSIONPREFIX= OpenSceneGraph- -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MAINTAINER= amdmi3@FreeBSD.org Modified: head/multimedia/gxine/Makefile ============================================================================== --- head/multimedia/gxine/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/gxine/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -3,6 +3,7 @@ PORTNAME= gxine PORTVERSION= 0.5.910 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF/xine/${PORTNAME}/${PORTVERSION} Modified: head/multimedia/gxine/pkg-plist ============================================================================== --- head/multimedia/gxine/pkg-plist Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/gxine/pkg-plist Fri Aug 31 08:16:18 2018 (r478529) @@ -13,6 +13,7 @@ man/es/man1/gxine_client.1.gz 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 Modified: head/multimedia/k9copy-kde4/Makefile ============================================================================== --- head/multimedia/k9copy-kde4/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/k9copy-kde4/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -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 Modified: head/multimedia/libxine/Makefile ============================================================================== --- head/multimedia/libxine/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/libxine/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -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 @@ LIB_DEPENDS= libFLAC.so:audio/flac \ 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 <bsd.port.options.mk> - -.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 <bsd.port.pre.mk> post-patch: @@ -144,18 +137,9 @@ post-patch: @${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 Modified: head/multimedia/libxine/distinfo ============================================================================== --- head/multimedia/libxine/distinfo Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/libxine/distinfo Fri Aug 31 08:16:18 2018 (r478529) @@ -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 Modified: head/multimedia/libxine/files/patch-configure ============================================================================== --- head/multimedia/libxine/files/patch-configure Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/libxine/files/patch-configure Fri Aug 31 08:16:18 2018 (r478529) @@ -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 Modified: head/multimedia/libxine/files/patch-include-xine-xineutils.h ============================================================================== --- head/multimedia/libxine/files/patch-include-xine-xineutils.h Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/libxine/files/patch-include-xine-xineutils.h Fri Aug 31 08:16:18 2018 (r478529) @@ -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 Added: head/multimedia/libxine/files/patch-include_config.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/libxine/files/patch-include_config.h Fri Aug 31 08:16:18 2018 (r478529) @@ -0,0 +1,18 @@ +$OpenBSD: patch-include_config_h,v 1.1 2018/02/16 14:27:53 sthen Exp $ + +Index: include/config.h +--- include/config.h.orig ++++ include/config.h +@@ -24,9 +24,11 @@ + /* 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, ++ * so also test __i386__ here. + */ + #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 Modified: head/multimedia/libxine/pkg-plist ============================================================================== --- head/multimedia/libxine/pkg-plist Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/libxine/pkg-plist Fri Aug 31 08:16:18 2018 (r478529) @@ -2,8 +2,8 @@ bin/xine-config 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/scratch.h 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/xineutils.h 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 @@ share/xine-lib/fonts/serif-64.xinefont.gz %%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 @@ share/xine-lib/fonts/serif-64.xinefont.gz %%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 @@ share/xine-lib/fonts/serif-64.xinefont.gz %%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 @@ libdata/pkgconfig/libxine.pc 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 @@ share/aclocal/xine.m4 %%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 Modified: head/multimedia/phonon-xine/Makefile ============================================================================== --- head/multimedia/phonon-xine/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/phonon-xine/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -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 Modified: head/multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp ============================================================================== --- head/multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp Fri Aug 31 08:16:18 2018 (r478529) @@ -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 <cmath> + + #define __STDC_FORMAT_MACROS ++#define __STDC_CONSTANT_MACROS + #include <inttypes.h> + + #include <xine.h> +@@ -48,6 +49,9 @@ extern "C" { #include <xine/xineutils.h> #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<kequalizer_plugin_t *>(xine_xmalloc(sizeof(kequalizer_plugin_t))); Modified: head/multimedia/quark/Makefile ============================================================================== --- head/multimedia/quark/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/quark/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -3,7 +3,7 @@ PORTNAME= quark PORTVERSION= 3.24 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= multimedia gnome MASTER_SITES= http://hsgg.github.com/quark/ Modified: head/multimedia/subtitlecomposer-kde4/Makefile ============================================================================== --- head/multimedia/subtitlecomposer-kde4/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/subtitlecomposer-kde4/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -3,7 +3,7 @@ PORTNAME= subtitlecomposer PORTVERSION= 0.5.7 DISTVERSIONPREFIX= v -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= multimedia kde MAINTAINER= ports@FreeBSD.org Modified: head/multimedia/vdr-plugin-xineliboutput/Makefile ============================================================================== --- head/multimedia/vdr-plugin-xineliboutput/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/vdr-plugin-xineliboutput/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -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 @@ HAS_CONFIGURE= yes 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 Modified: head/multimedia/xine/Makefile ============================================================================== --- head/multimedia/xine/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/multimedia/xine/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -2,7 +2,7 @@ PORTNAME= xine PORTVERSION= 0.99.9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-ui/${PORTVERSION} DISTNAME= ${PORTNAME}-ui-${PORTVERSION} @@ -55,7 +55,7 @@ WIN32_CODECS_RUN_DEPENDS=\ 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 \ Modified: head/www/npapi-xine/Makefile ============================================================================== --- head/www/npapi-xine/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/www/npapi-xine/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -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} Modified: head/x11/eaglemode/Makefile ============================================================================== --- head/x11/eaglemode/Makefile Fri Aug 31 08:08:22 2018 (r478528) +++ head/x11/eaglemode/Makefile Fri Aug 31 08:16:18 2018 (r478529) @@ -3,6 +3,7 @@ PORTNAME= eaglemode PORTVERSION= 0.93.2 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808310816.w7V8GIhm033801>