[Midnightbsd-cvs] mports [21580] trunk/multimedia/libxine/pkg-plist: xine-lib 1.2.6
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 13 09:10:39 EDT 2016
Revision: 21580
http://svnweb.midnightbsd.org/mports/?rev=21580
Author: laffer1
Date: 2016-08-13 09:10:38 -0400 (Sat, 13 Aug 2016)
Log Message:
-----------
xine-lib 1.2.6
Modified Paths:
--------------
trunk/multimedia/libxine/Makefile
trunk/multimedia/libxine/distinfo
trunk/multimedia/libxine/files/patch-configure
trunk/multimedia/libxine/pkg-descr
trunk/multimedia/libxine/pkg-plist
Added Paths:
-----------
trunk/multimedia/libxine/files/patch-include-xine-xine_internal.h
trunk/multimedia/libxine/files/patch-include-xine-xineutils.h
trunk/multimedia/libxine/files/patch-src-audio_dec-xine_lpcm_decoder.c
trunk/multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff
trunk/multimedia/libxine/files/patch-src-libw32dll-wine-registry.c
trunk/multimedia/libxine/files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c
trunk/multimedia/libxine/files/patch-src-post-planar-eq2.c
trunk/multimedia/libxine/files/patch-src-vdr-input_vdr.c
Removed Paths:
-------------
trunk/multimedia/libxine/files/extrapatch-vdpau-configure.ac
trunk/multimedia/libxine/files/extrapatch-vdpau-src-vdr-input_vdr.c
trunk/multimedia/libxine/files/extrapatch-vdpau-src-video_out-video_out_vdpau.c
trunk/multimedia/libxine/files/ffmpeg-vaapi_xine-lib-1.1.19-initerrorhack.diff
trunk/multimedia/libxine/files/patch-config.rpath
trunk/multimedia/libxine/files/patch-libav-0.7
trunk/multimedia/libxine/files/patch-misc_Makefile.in
trunk/multimedia/libxine/files/patch-misc_libxine.pc.in
trunk/multimedia/libxine/files/patch-src-video_out-xxmc.h
trunk/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c
trunk/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c
trunk/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c
trunk/multimedia/libxine/files/patch-src:xine-engine:post.h
trunk/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h
trunk/multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c
trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_dsputil.c
trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_huffyuv.c
trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_mpegvideo.c
trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_vorbis.c
trunk/multimedia/libxine/files/patch-src_libreal_real_common.c
trunk/multimedia/libxine/files/patch-src_libreal_xine_real_audio_decoder.c
trunk/multimedia/libxine/files/patch-src_video_out_libdha_sysdep_pci_freebsd.c
Property Changed:
----------------
trunk/multimedia/libxine/files/patch-configure
trunk/multimedia/libxine/pkg-descr
Modified: trunk/multimedia/libxine/Makefile
===================================================================
--- trunk/multimedia/libxine/Makefile 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/Makefile 2016-08-13 13:10:38 UTC (rev 21580)
@@ -2,7 +2,7 @@
# $FreeBSD: ports/multimedia/libxine/Makefile,v 1.178 2012/02/16 15:57:16 ashish Exp $
PORTNAME= xine
-PORTVERSION= 1.1.19
+PORTVERSION= 1.2.6
PORTREVISION= 0
CATEGORIES= multimedia ipv6
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION}
@@ -9,51 +9,47 @@
PKGNAMEPREFIX= lib
DISTNAME= ${PORTNAME}-lib-${PORTVERSION}
-PATCH_SITES= ${MASTER_SITE_FREEBSD_LOCAL}
-PATCH_SITE_SUBDIR= makc
-
MAINTAINER= ports at MidnightBSD.org
COMMENT= Libraries for xine multimedia player
+
LICENSE= gpl2
+LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/flac \
- vorbis.4:${PORTSDIR}/audio/libvorbis \
- speex.1:${PORTSDIR}/audio/speex \
- mng.1:${PORTSDIR}/graphics/libmng \
+BUILD_DEPENDS= v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac \
+ liba52.so:${PORTSDIR}/audio/liba52 \
+ libvorbis.so:${PORTSDIR}/audio/libvorbis \
+ libspeex.so:${PORTSDIR}/audio/speex \
+ libmng.so:${PORTSDIR}/graphics/libmng \
libpng.so:${PORTSDIR}/graphics/png \
- dvdread.4:${PORTSDIR}/multimedia/libdvdread \
- freetype.9:${PORTSDIR}/print/freetype2 \
- fame-0.9.1:${PORTSDIR}/multimedia/libfame \
- cdio.13:${PORTSDIR}/sysutils/libcdio \
- modplug.1:${PORTSDIR}/audio/libmodplug \
- vcdinfo.2:${PORTSDIR}/multimedia/vcdimager \
- theora.0:${PORTSDIR}/multimedia/libtheora \
- mad.2:${PORTSDIR}/audio/libmad \
- dca.0:${PORTSDIR}/multimedia/libdca \
- avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
- faad.2:${PORTSDIR}/audio/faad
-
+ libdvdread.so:${PORTSDIR}/multimedia/libdvdread \
+ libfreetype.so:${PORTSDIR}/print/freetype2 \
+ libfame.so:${PORTSDIR}/multimedia/libfame \
+ libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia \
+ libmodplug.so:${PORTSDIR}/audio/libmodplug \
+ libvcdinfo.so:${PORTSDIR}/multimedia/vcdimager \
+ libtheora.so:${PORTSDIR}/multimedia/libtheora \
+ libmad.so:${PORTSDIR}/audio/libmad \
+ libdca.so:${PORTSDIR}/multimedia/libdca \
+ libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \
+ libfaad.so:${PORTSDIR}/audio/faad \
+ libvdpau.so:${PORTSDIR}/multimedia/libvdpau
.if !defined(PACKAGE_BUILDING)
-LIB_DEPENDS+= dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
+# 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:${PORTSDIR}/multimedia/libdvdcss
.endif
-GNU_CONFIGURE= yes
USES= compiler cpe execinfo gmake iconv libtool:keepla \
localbase pathfix perl5 pkgconfig tar:xz
CPE_PRODUCT= xine-lib
CPE_VENDOR= xine
-WANT_GNOME= yes
-USE_XORG= x11 xv xinerama
+GNU_CONFIGURE= yes
+USE_XORG= x11 xv xinerama xext sm ice
USE_GL= gl glu
-USE_PERL5_BUILD=yes
+USE_PERL5= build
USE_SDL= sdl
USE_LDCONFIG= yes
-CONFIGURE_ENV= THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- THREAD_LIBS="${PTHREAD_LIBS}" \
- EXTRA_X_LIBS="-lGL -lGLU -lXext -lX11 -lm"
-CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/ffmpeg
-LDFLAGS+= -L${LOCALBASE}/lib
-CFLAGS+= -fno-force-addr -I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${LOCALBASE}/include/ffmeg
CONFIGURE_ARGS= --with-w32-path=${LOCALBASE}/lib/win32 \
--enable-ipv6 \
--with-external-libmad \
@@ -61,175 +57,65 @@
--with-libflac \
--with-external-ffmpeg \
--with-external-libfaad \
+ --disable-real-codecs \
--disable-v4l \
- --without-alsa
-MAKE_JOBS_SAFE= yes
+ --without-alsa \
+ --disable-musepack \
+ --enable-dvb
-OPTIONS= ARTS "Enable aRts support" off \
- CACA "Enable libcaca support" off \
- ESOUND "Enable EsounD support" off \
- JACK "Enable JACK support" off \
- GNOMEVFS2 "Enable GnomeVFS2 support" off \
- PULSEAUDIO "Enable PulseAudio support" off \
- XVMC "Enable XvMC support" off \
- SMB "Enable SMB protocol support" off \
- AALIB "Enable aalib support" off \
- IMAGEMAGICK "Enable ImageMagick support" off \
- GTK2 "Enable gdkpixbuf support" off \
- WAVPACK "Enable WavPack support" off \
- VAAPI "Enable VAAPI support" off \
- VDPAU "Enable VDPAU support" on
-
-MAN1= xine-config.1 xine-list-1.1.1
-MAN5= xine.5
-
DOCSDIR= ${PREFIX}/share/doc/xine-lib
-PLIST_SUB= PLUGINSDIR="lib/xine/plugins/1.29"
+# Please sync with XINE_PLUGINSDIR in multimedia/xine
+# and multimedia/vdr-plugin-xineliboutput
+PLUGINSDIR= lib/xine/plugins/2.5
+PLIST_SUB= PLUGINSDIR="${PLUGINSDIR}"
-# DVDCSS version hardcoded in src/input/input_dvd.c misc/cdda_server.c
-# and src/input/libdvdnav/dvd_input.c (dlopen'ed)
-DVDCSS_LIBVERSION= 3
+OPTIONS_DEFINE= NLS CACA ESOUND JACK GNOMEVFS2 PULSEAUDIO XVMC SMB AALIB \
+ IMAGEMAGICK PIXBUF WAVPACK VAAPI LIBBLURAY
+OPTIONS_SUB= yes
-PATCH_DIST_ARGS= -d ${WRKSRC} -p1 --forward --quiet
-
-.include <bsd.mport.options.mk>
-
-# Fix build WITH_DEBUG
-.if defined(WITH_DEBUG)
-DEBUG_FLAGS= -g -O1
-.endif
-
-# Check for forced -O0 (or no -O)
-.if ${CFLAGS:M-O0} == "-O0" || (${CFLAGS:M-O} == "" && \
- ${CFLAGS:M-O[1-9a-z]*} == "")
-IGNORE= only builds with -O1 or higher, check CFLAGS
-.endif
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-PLIST_SUB+= NLS=""
+NLS_USES= gettext
+NLS_CONFIGURE_ENABLE= nls
+CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca
+CACA_CONFIGURE_OFF= --without-caca --disable-cacatest
+ESOUND_USE= GNOME=esound
+ESOUND_CONFIGURE_OFF= --without-esound
+JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
+JACK_CONFIGURE_OFF= --without-jack
+GNOMEVFS2_USE= GNOME=gnomevfs2
+GNOMEVFS2_CONFIGURE_OFF=--disable-gnomevfs
+PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/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:${PORTSDIR}/x11/nvidia-driver-304
.else
-PLIST_SUB+= NLS="@comment "
-CONFIGURE_ARGS+= --disable-nls
+XVMC_CONFIGURE_ON= --with-xvmc-lib=XvMCW
+XVMC_LIB_DEPENDS= libXvMC.so:${PORTSDIR}/x11/libXvMC
.endif
+XVMC_CONFIGURE_OFF= --disable-xvmc
+SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
+SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${LOCALBASE}/lib -lsmbclient" \
+ LIBSMBCLIENT_CFLAGS="-I${LOCALBASE}/include"
+SMB_CONFIGURE_ENABLE= samba
+AALIB_LIB_DEPENDS= libaa.so:${PORTSDIR}/graphics/aalib
+AALIB_CONFIGURE_OFF= --disable-aalib --disable-aalibtest
+IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick
+IMAGEMAGICK_CONFIGURE_OFF= --without-imagemagick
+PIXBUF_USE= GNOME=gdkpixbuf2
+PIXBUF_CONFIGURE_OFF= --disable-gdkpixbuf
+WAVPACK_LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack
+WAVPACK_CONFIGURE_WITH= wavpack
+VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva
+VAAPI_CONFIGURE_ON= --enable-vaapi
+LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray
+LIBBLURAY_CONFIGURE_ENABLE= bluray
-.if defined(WITH_ARTS)
-LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
-PLIST_SUB+= WITH_ARTS=""
-CONFIGURE_ARGS+= --with-arts --enable-artstest
-.else
-PLIST_SUB+= WITH_ARTS="@comment "
-CONFIGURE_ARGS+= --disable-arts --disable-artstest
-.endif
+.include <bsd.mport.options.mk>
-.if defined(WITH_CACA)
-LIB_DEPENDS+= caca.0:${PORTSDIR}/graphics/libcaca
-PLIST_SUB+= WITH_CACA=""
-.else
-PLIST_SUB+= WITH_CACA="@comment "
-CONFIGURE_ARGS+= --without-caca --disable-cacatest
+.if ${ARCH} == "i386"
+CFLAGS+= -fomit-frame-pointer
.endif
-.if defined(WITH_ESOUND)
-USE_GNOME+= esound
-PLIST_SUB+= WITH_ESOUND=""
-.else
-PLIST_SUB+= WITH_ESOUND="@comment "
-CONFIGURE_ARGS+= --without-esound
-.endif
-
-.if defined(WITH_JACK)
-LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
-PLIST_SUB+= WITH_JACK=""
-.else
-PLIST_SUB+= WITH_JACK="@comment "
-CONFIGURE_ARGS+= --without-jack
-.endif
-
-.if defined(WITH_GNOMEVFS2)
-USE_GNOME+= gnomevfs2
-PLIST_SUB+= WITH_GNOMEVFS2=""
-.else
-PLIST_SUB+= WITH_GNOMEVFS2="@comment "
-CONFIGURE_ARGS+= --disable-gnomevfs
-.endif
-
-.if defined(WITH_PULSEAUDIO)
-LIB_DEPENDS+= pulse.0:${PORTSDIR}/audio/pulseaudio
-PLIST_SUB+= WITH_PULSEAUDIO=""
-.else
-PLIST_SUB+= WITH_PULSEAUDIO="@comment "
-CONFIGURE_ARGS+= --without-pulseaudio
-.endif
-
-.if defined(WITH_XVMC)
-.if defined(WITH_NVIDIA_GL) || exists(${LOCALBASE}/lib/libXvMCNVIDIA.so.1)
-CONFIGURE_ARGS+= --with-xvmc-lib=XvMCNVIDIA
-LIB_DEPENDS+= XvMCNVIDIA.1:${PORTSDIR}/x11/nvidia-driver
-.else
-CONFIGURE_ARGS+= --with-xvmc-lib=XvMCW
-LIB_DEPENDS+= XvMC.1:${PORTSDIR}/x11/libXvMC
-.endif
-PLIST_SUB+= WITH_XVMC=""
-.else
-CONFIGURE_ARGS+= --disable-xvmc
-PLIST_SUB+= WITH_XVMC="@comment "
-.endif
-
-.if defined(WITH_SMB)
-LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient
-PLIST_SUB+= WITH_SMB=""
-.else
-PLIST_SUB+= WITH_SMB="@comment "
-CONFIGURE_ARGS+= --disable-samba
-.endif
-
-.if defined(WITH_AALIB)
-LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
-PLIST_SUB+= WITH_AALIB=""
-.else
-PLIST_SUB+= WITH_AALIB="@comment "
-CONFIGURE_ARGS+= --disable-aalib --disable-aalibtest
-.endif
-
-.if defined(WITH_IMAGEMAGICK)
-LIB_DEPENDS+= MagickWand.5:${PORTSDIR}/graphics/ImageMagick
-PLIST_SUB+= WITH_IMAGEMAGICK=""
-.else
-PLIST_SUB+= WITH_IMAGEMAGICK="@comment "
-CONFIGURE_ARGS+= --without-imagemagick
-.endif
-
-.if defined(WITH_GTK2)
-USE_GNOME+= gtk20
-PLIST_SUB+= WITH_GTK2=""
-.else
-PLIST_SUB+= WITH_GTK2="@comment "
-CONFIGURE_ARGS+= --disable-gdkpixbuf
-.endif
-
-.if defined(WITH_WAVPACK)
-LIB_DEPENDS+= wavpack.2:${PORTSDIR}/audio/wavpack
-PLIST_SUB+= WITH_WAVPACK=""
-CONFIGURE_ARGS+= --with-wavpack
-.else
-PLIST_SUB+= WITH_WAVPACK="@comment "
-CONFIGURE_ARGS+= --without-wavpack
-.endif
-
-.if defined(WITH_VAAPI)
-LIB_DEPENDS+= va.1:${PORTSDIR}/multimedia/libva
-.endif
-
-.if defined(WITH_VDPAU)
-PATCHFILES+= xine-vdpau.bz2
-USE_AUTOTOOLS= autoconf
-LIB_DEPENDS+= vdpau.1:${PORTSDIR}/multimedia/libvdpau
-PLIST_SUB+= VDPAU=""
-.else
-PLIST_SUB+= VDPAU="@comment "
-.endif
-
.if ${CONFIGURE_ARGS:M*--without-imagemagick*} == "" || ${CONFIGURE_ARGS:M*-disable-gdkpixbuf*} == ""
PLIST_SUB+= WITH_DMX_IMAGE=""
.else
@@ -243,46 +129,30 @@
CONFIGURE_ARGS+= --disable-vidix
.endif
+.include <bsd.port.pre.mk>
+
post-patch:
-.if defined(WITH_VAAPI)
- ${PATCH} ${PATCH_DIST_ARGS} <${FILESDIR}/ffmpeg-vaapi_xine-lib-1.1.19-initerrorhack.diff
+.if ${COMPILER_TYPE} == "clang"
+ @${REINPLACE_CMD} -e 's|-fno-rename-registers||' \
+ ${WRKSRC}/src/libw32dll/wine/Makefile.in
.endif
-.if defined(WITH_VDPAU)
- for i in `${LS} ${FILESDIR}/extrapatch-vdpau*`; do \
- ${PATCH} ${PATCH_DIST_ARGS} <$$i ;\
- done
-.endif
-.for f in libtool ltmain.sh
- @${REINPLACE_CMD} -e \
- '/freebsd-elf)/,/;;/ s|major="\.$$current"|major=.`expr $$current - $$age`|; \
- /freebsd-elf)/,/;;/ s|versuffix="\.$$current"|versuffix="$$major"|' \
- ${WRKSRC}/${f}
-.endfor
- @${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
- ${WRKSRC}/src/input/input_dvd.c
- @${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
- ${WRKSRC}/misc/cdda_server.c
- @${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
- ${WRKSRC}/src/input/libdvdnav/dvd_input.c
+ @${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
-
-pre-configure:
@${REINPLACE_CMD} -e \
- 's|THREAD_LIBS=".*"|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
- s|THREAD_CFLAGS=".*"|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
- s|-L/usr/local/lib||g ; \
- s|-I/usr/local/include||g ; \
- s|-lgiconv|-liconv|g ; \
- s|-funroll-loops||g ; \
- s|LIBFFMPEG_CFLAGS|LIBFFMPEG_CPPFLAGS|g ; \
- s|echo aout|echo elf|g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e \
- 's|-malign-loops|-falign-loops|g ; \
- s|-malign-jumps|-falign-jumps|g ; \
- s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure
+ 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|' \
+ ${WRKSRC}/configure
-pre-build:
- @${CP} -p ${LOCALBASE}/include/dts.h ${WRKSRC}/src/libdts/
+# 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
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: trunk/multimedia/libxine/distinfo
===================================================================
--- trunk/multimedia/libxine/distinfo 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/distinfo 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,3 +1,2 @@
-SHA256 (xine-lib-1.1.19.tar.xz) = f834f646880bb44186018d12280ac27c8314447de9335b6fe390157b26df9cd9
-RMD160 (xine-lib-1.1.19.tar.xz) = 7b8c2a4e5bcd0984414360d8d589aa533a9040f3
-SIZE (xine-lib-1.1.19.tar.xz) = 5782580
+SHA256 (xine-lib-1.2.6.tar.xz) = bd041d738817c7c0c6392a3c0e5bda5a664a47e035135b5a449364f8c9b6a005
+SIZE (xine-lib-1.2.6.tar.xz) = 5020964
Deleted: trunk/multimedia/libxine/files/extrapatch-vdpau-configure.ac
===================================================================
--- trunk/multimedia/libxine/files/extrapatch-vdpau-configure.ac 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/extrapatch-vdpau-configure.ac 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -2528,7 +2528,7 @@ makeexpand () {
-
- xinelibdir='${libdir}/xine'
- xinedatadir='${datadir}/xine'
--pkgconfigdir='${libdir}/pkgconfig'
-+pkgconfigdir='${prefix}/libdata/pkgconfig'
- AC_SUBST(xinelibdir)
- AC_SUBST(xinedatadir)
- AC_SUBST(pkgconfigdir)
Deleted: trunk/multimedia/libxine/files/extrapatch-vdpau-src-vdr-input_vdr.c
===================================================================
--- trunk/multimedia/libxine/files/extrapatch-vdpau-src-vdr-input_vdr.c 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/extrapatch-vdpau-src-vdr-input_vdr.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,12 +0,0 @@
---- a/src/vdr/input_vdr.c
-+++ b/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>
Deleted: trunk/multimedia/libxine/files/extrapatch-vdpau-src-video_out-video_out_vdpau.c
===================================================================
--- trunk/multimedia/libxine/files/extrapatch-vdpau-src-video_out-video_out_vdpau.c 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/extrapatch-vdpau-src-video_out-video_out_vdpau.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,91 +0,0 @@
---- a/src/video_out/video_out_vdpau.c
-+++ b/src/video_out/video_out_vdpau.c
-@@ -53,6 +53,8 @@
-
- #define NUM_FRAMES_BACK 1
-
-+#define LOCKDISPLAY /*define this if you have a buggy libX11/xcb*/
-+
- #define DEINT_BOB 1
- #define DEINT_HALF_TEMPORAL 2
- #define DEINT_HALF_TEMPORAL_SPATIAL 3
-@@ -167,12 +169,30 @@ static void vdpau_reinit( vo_driver_t *t
- static VdpVideoSurfaceCreate *orig_vdp_video_surface_create;
- static VdpVideoSurfaceDestroy *orig_vdp_video_surface_destroy;
-
-+static VdpVideoSurfaceCreate *orig_vdp_output_surface_create;
-+static VdpVideoSurfaceDestroy *orig_vdp_output_surface_destroy;
-+
-+static VdpVideoSurfacePutBitsYCbCr *orig_vdp_video_surface_putbits_ycbcr;
-+
- static VdpDecoderCreate *orig_vdp_decoder_create;
- static VdpDecoderDestroy *orig_vdp_decoder_destroy;
- static VdpDecoderRender *orig_vdp_decoder_render;
-
- static Display *guarded_display;
-
-+static VdpStatus guarded_vdp_video_surface_putbits_ycbcr(VdpVideoSurface surface, VdpYCbCrFormat source_ycbcr_format, void const *const *source_data, uint32_t const *source_pitches)
-+{
-+ VdpStatus r;
-+#ifdef LOCKDISPLAY
-+ XLockDisplay(guarded_display);
-+#endif
-+ r = orig_vdp_video_surface_putbits_ycbcr(surface, source_ycbcr_format, source_data, source_pitches);
-+#ifdef LOCKDISPLAY
-+ XUnlockDisplay(guarded_display);
-+#endif
-+ return r;
-+}
-+
- static VdpStatus guarded_vdp_video_surface_create(VdpDevice device, VdpChromaType chroma_type, uint32_t width, uint32_t height,VdpVideoSurface *surface)
- {
- VdpStatus r;
-@@ -195,6 +215,28 @@ static VdpStatus guarded_vdp_video_surfa
- return r;
- }
-
-+static VdpStatus guarded_vdp_output_surface_create(VdpDevice device, VdpChromaType chroma_type, uint32_t width, uint32_t height,VdpVideoSurface *surface)
-+{
-+ VdpStatus r;
-+#ifdef LOCKDISPLAY
-+ XLockDisplay(guarded_display);
-+#endif
-+ r = orig_vdp_output_surface_create(device, chroma_type, width, height, surface);
-+#ifdef LOCKDISPLAY
-+ XUnlockDisplay(guarded_display);
-+#endif
-+ return r;
-+}
-+
-+static VdpStatus guarded_vdp_output_surface_destroy(VdpVideoSurface surface)
-+{
-+ VdpStatus r;
-+ XLockDisplay(guarded_display);
-+ r = orig_vdp_output_surface_destroy(surface);
-+ XUnlockDisplay(guarded_display);
-+ return r;
-+}
-+
- static VdpStatus guarded_vdp_decoder_create(VdpDevice device, VdpDecoderProfile profile, uint32_t width, uint32_t height, uint32_t max_references, VdpDecoder *decoder)
- {
- VdpStatus r;
-@@ -2324,16 +2366,16 @@ static vo_driver_t *vdpau_open_plugin (v
- st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_VIDEO_SURFACE_DESTROY , (void*)&orig_vdp_video_surface_destroy ); vdp_video_surface_destroy = guarded_vdp_video_surface_destroy;
- if ( vdpau_init_error( st, "Can't get VIDEO_SURFACE_DESTROY proc address !!", &this->vo_driver, 1 ) )
- return NULL;
-- st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_VIDEO_SURFACE_PUT_BITS_Y_CB_CR , (void*)&vdp_video_surface_putbits_ycbcr );
-+ st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_VIDEO_SURFACE_PUT_BITS_Y_CB_CR , (void*)&orig_vdp_video_surface_putbits_ycbcr ); vdp_video_surface_putbits_ycbcr = guarded_vdp_video_surface_putbits_ycbcr;
- if ( vdpau_init_error( st, "Can't get VIDEO_SURFACE_PUT_BITS_Y_CB_CR proc address !!", &this->vo_driver, 1 ) )
- return NULL;
- st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_VIDEO_SURFACE_GET_BITS_Y_CB_CR , (void*)&vdp_video_surface_getbits_ycbcr );
- if ( vdpau_init_error( st, "Can't get VIDEO_SURFACE_GET_BITS_Y_CB_CR proc address !!", &this->vo_driver, 1 ) )
- return NULL;
-- st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_OUTPUT_SURFACE_CREATE , (void*)&vdp_output_surface_create );
-+ st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_OUTPUT_SURFACE_CREATE , (void*)&orig_vdp_output_surface_create ); vdp_output_surface_create = guarded_vdp_output_surface_create;
- if ( vdpau_init_error( st, "Can't get OUTPUT_SURFACE_CREATE proc address !!", &this->vo_driver, 1 ) )
- return NULL;
-- st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_OUTPUT_SURFACE_DESTROY , (void*)&vdp_output_surface_destroy );
-+ st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_OUTPUT_SURFACE_DESTROY , (void*)&orig_vdp_output_surface_destroy ); vdp_output_surface_destroy = guarded_vdp_output_surface_destroy;
- if ( vdpau_init_error( st, "Can't get OUTPUT_SURFACE_DESTROY proc address !!", &this->vo_driver, 1 ) )
- return NULL;
- st = vdp_get_proc_address( vdp_device, VDP_FUNC_ID_OUTPUT_SURFACE_RENDER_BITMAP_SURFACE , (void*)&vdp_output_surface_render_bitmap_surface );
Deleted: trunk/multimedia/libxine/files/ffmpeg-vaapi_xine-lib-1.1.19-initerrorhack.diff
===================================================================
--- trunk/multimedia/libxine/files/ffmpeg-vaapi_xine-lib-1.1.19-initerrorhack.diff 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/ffmpeg-vaapi_xine-lib-1.1.19-initerrorhack.diff 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,851 +0,0 @@
-diff -Naur xine-lib-1.1.19.orig/src/combined/ffmpeg/ff_video_decoder.c xine-lib-1.1.19/src/combined/ffmpeg/ff_video_decoder.c
---- xine-lib-1.1.19.orig/src/combined/ffmpeg/ff_video_decoder.c
-+++ xine-lib-1.1.19/src/combined/ffmpeg/ff_video_decoder.c
-@@ -51,6 +51,21 @@
- # include <libpostproc/postprocess.h>
- #endif
-
-+#include <va/va_x11.h>
-+#include <libavcodec/vaapi.h>
-+//#include <X11/Xutil.h>
-+
-+typedef struct ff_va_surfaces_s ff_va_surfaces_t;
-+
-+struct ff_va_surfaces_s
-+{
-+ int count;
-+ VASurfaceID **free;
-+ VASurfaceID **used;
-+};
-+
-+#define NUM_SURFACES 21
-+
- #define VIDEOBUFSIZE (128*1024)
- #define SLICE_BUFFER_SIZE (1194*1024)
-
-@@ -89,6 +104,7 @@ typedef struct ff_video_class_s {
- int thread_count;
- int8_t skip_loop_filter_enum;
- int8_t choose_speed_over_accuracy;
-+ int enable_vaapi;
-
- xine_t *xine;
- } ff_video_class_t;
-@@ -127,6 +143,7 @@ struct ff_video_decoder_s {
- int slice_offset_size;
-
- AVFrame *av_frame;
-+ //AVPacket av_pkt;
- AVCodecContext *context;
- AVCodec *codec;
-
-@@ -154,8 +171,31 @@ struct ff_video_decoder_s {
- #ifdef LOG
- enum PixelFormat debug_fmt;
- #endif
-+
-+};
-+
-+typedef struct ff_vaapi_context_s ff_vaapi_context_t;
-+
-+struct ff_vaapi_context_s {
-+ VAImage va_image;
-+ Display *display;
-+ VADisplay *va_display;
-+ VAImageFormat *va_ifmts;
-+ uint8_t *va_image_data;
-+ VAContextID va_context_id;
-+ VAConfigID va_config_id;
-+ VASurfaceID *va_surface_id;
-+ struct ff_va_surfaces_s va_surfaces;
-+ int width;
-+ int height;
-+ int va_profile;
-+ struct vaapi_context *vaapi_context;
-+ int use_vaapi;
- };
-
-+static struct ff_vaapi_context_s *va_context;
-+
-+static VAStatus init_vaapi(struct ff_vaapi_context_s *va_context, int va_profile, int width, int height);
-
- static void set_stream_info(ff_video_decoder_t *this) {
- _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_WIDTH, this->bih.biWidth);
-@@ -163,7 +203,70 @@ static void set_stream_info(ff_video_dec
- _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_RATIO, this->aspect_ratio * 10000);
- }
-
-+/*
-+ * XXX Error on init_vaapi() didn't cause fall back to standard rendering,
-+ * so do a crude test on plugin open.
-+ */
-+#define INIT_ERROR_HACK
-+
- #ifdef ENABLE_DIRECT_RENDERING
-+
-+static void draw_slice(struct AVCodecContext *context, const AVFrame *src, int offset[4], int y, int type, int height) {
-+ uint8_t *source[4]= {src->data[0] + offset[0], src->data[1] + offset[1], src->data[2] + offset[2], src->data[3] + offset[3]};
-+ int strides[4] = {src->linesize[0], src->linesize[1], src->linesize[2]};
-+
-+ if (height < 0) {
-+ int i;
-+ height = -height;
-+ y -= height;
-+ for (i = 0; i < 4; i++) {
-+ strides[i] = -strides[i];
-+ source[i] -= strides[i];
-+ }
-+ }
-+}
-+
-+static VAProfile* find_profile(VAProfile* p, int np, int codec)
-+{
-+ int i;
-+
-+ for(i = 0; i < np; i++)
-+ {
-+ if(p[i] == codec)
-+ return &p[i];
-+ }
-+
-+ return NULL;
-+}
-+
-+int get_profile(int codec_id) {
-+ int profile;
-+
-+ switch (codec_id) {
-+ case CODEC_ID_MPEG2VIDEO:
-+ profile = VAProfileMPEG2Main;
-+ break;
-+ case CODEC_ID_MPEG4:
-+ case CODEC_ID_H263:
-+ profile = VAProfileMPEG4AdvancedSimple;
-+ break;
-+ case CODEC_ID_H264:
-+ profile = VAProfileH264High;
-+ break;
-+ case CODEC_ID_WMV3:
-+ profile = VAProfileVC1Main;
-+ break;
-+ case CODEC_ID_VC1:
-+ profile = VAProfileVC1Advanced;
-+ break;
-+ default:
-+ profile = -1;
-+ break;
-+ }
-+
-+ return profile;
-+}
-+
- /* called from ffmpeg to do direct rendering method 1 */
- static int get_buffer(AVCodecContext *context, AVFrame *av_frame){
- ff_video_decoder_t *this = (ff_video_decoder_t *)context->opaque;
-@@ -185,6 +288,43 @@ static int get_buffer(AVCodecContext *co
-
- avcodec_align_dimensions(context, &width, &height);
-
-+ if( va_context->use_vaapi ) {
-+ int i = 0;
-+ struct ff_va_surfaces_s *va_surfaces = &va_context->va_surfaces;
-+
-+ for(i = 0; i < va_surfaces->count; i++)
-+ {
-+ //printf("srfc #%d %p\n",i,va_srfcs->srfc_free[i]);
-+ if(va_surfaces->free[i])
-+ {
-+ va_surfaces->used[i] = va_surfaces->free[i];
-+ va_surfaces->free[i] = NULL;
-+ break;
-+ }
-+ }
-+ if(i == va_surfaces->count)
-+ {
-+ printf("ERROR get surface\n");
-+ return -1;
-+ }
-+
-+
-+ av_frame->type = FF_BUFFER_TYPE_USER;
-+ av_frame->age = 256*256*256*64; // FIXME FIXME from ffmpeg
-+ av_frame->data[0] = (void*)va_surfaces->used[i];
-+ av_frame->data[1] = NULL;
-+ av_frame->data[2] = NULL;
-+ av_frame->data[3] = (void*)(size_t)*va_surfaces->used[i];
-+ av_frame->linesize[0] = 0;
-+ av_frame->linesize[1] = 0;
-+ av_frame->linesize[2] = 0;
-+ av_frame->linesize[3] = 0;
-+
-+ this->is_direct_rendering_disabled = 1;
-+
-+ return 0;
-+ }
-+
- if( this->context->pix_fmt != PIX_FMT_YUV420P && this->context->pix_fmt != PIX_FMT_YUVJ420P ) {
- if (!this->is_direct_rendering_disabled) {
- xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
-@@ -254,10 +394,33 @@ static int get_buffer(AVCodecContext *co
- static void release_buffer(struct AVCodecContext *context, AVFrame *av_frame){
- ff_video_decoder_t *this = (ff_video_decoder_t *)context->opaque;
-
-+ if( va_context->use_vaapi ) {
-+ struct ff_va_surfaces_s *va_surfaces = &va_context->va_surfaces;
-+ VASurfaceID va_surface_id = (VASurfaceID)(size_t)av_frame->data[3];
-+ int i = 0;
-+
-+ for(i = 0; i < va_surfaces->count; i++)
-+ {
-+ //printf("srfc #%d %p 0x%08X\n",i,va_srfcs->srfc_used[i], va_srfcs->srfc_used[i] ? *va_srfcs->srfc_used[i] : -1);
-+ if(va_surfaces->used[i] && (*va_surfaces->used[i] == va_surface_id))
-+ {
-+ va_surfaces->free[i] = va_surfaces->used[i];
-+ va_surfaces->used[i] = NULL;
-+ break;
-+ }
-+ }
-+
-+ av_frame->data[0] = NULL;
-+ av_frame->data[1] = NULL;
-+ av_frame->data[2] = NULL;
-+ av_frame->data[3] = NULL;
-+ return;
-+ }
-+
- if (av_frame->type == FF_BUFFER_TYPE_USER) {
- if ( av_frame->opaque ) {
-- vo_frame_t *img = (vo_frame_t *)av_frame->opaque;
--
-+ vo_frame_t *img = (vo_frame_t *)av_frame->opaque;
-+
- img->free(img);
- }
-
-@@ -299,13 +462,272 @@ static const int skip_loop_filter_enum_v
- AVDISCARD_ALL
- };
-
-+static const char *VAProfile2string(VAProfile profile)
-+{
-+ switch(profile) {
-+#define PROFILE(profile) \
-+ case VAProfile##profile: return "VAProfile" #profile
-+ PROFILE(MPEG2Simple);
-+ PROFILE(MPEG2Main);
-+ PROFILE(MPEG4Simple);
-+ PROFILE(MPEG4AdvancedSimple);
-+ PROFILE(MPEG4Main);
-+ PROFILE(H264Baseline);
-+ PROFILE(H264Main);
-+ PROFILE(H264High);
-+ PROFILE(VC1Simple);
-+ PROFILE(VC1Main);
-+ PROFILE(VC1Advanced);
-+#undef PROFILE
-+ default: break;
-+ }
-+ return "<unknown>";
-+}
-+
-+static const char *VAEntrypoint2string(VAEntrypoint entrypoint)
-+{
-+ switch(entrypoint)
-+ {
-+#define ENTRYPOINT(entrypoint) \
-+ case VAEntrypoint##entrypoint: return "VAEntrypoint" #entrypoint
-+ ENTRYPOINT(VLD);
-+ ENTRYPOINT(IZZ);
-+ ENTRYPOINT(IDCT);
-+ ENTRYPOINT(MoComp);
-+ ENTRYPOINT(Deblocking);
-+#undef ENTRYPOINT
-+ default: break;
-+ }
-+ return "<unknown>";
-+}
-+
-+static enum PixelFormat get_format(struct AVCodecContext *context, const enum PixelFormat *fmt)
-+{
-+ int i, profile;
-+
-+ for (i = 0; fmt[i] != PIX_FMT_NONE; i++) {
-+ if (fmt[i] != PIX_FMT_VAAPI_VLD)
-+ continue;
-+
-+ profile = get_profile(context->codec_id);
-+
-+ if (profile >= 0) {
-+ VAStatus status;
-+
-+ status = init_vaapi(va_context, profile, context->width, context->height);
-+
-+ if( status == VA_STATUS_SUCCESS ) {
-+
-+ //context->draw_horiz_band = draw_slice;
-+ context->draw_horiz_band = NULL;
-+ context->slice_flags = SLICE_FLAG_CODED_ORDER | SLICE_FLAG_ALLOW_FIELD;
-+ context->dsp_mask = AV_CPU_FLAG_FORCE | AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMX2 | AV_CPU_FLAG_SSE;
-+
-+ va_context->vaapi_context->config_id = va_context->va_config_id;
-+ va_context->vaapi_context->context_id = va_context->va_context_id;
-+ context->hwaccel_context = va_context->vaapi_context;
-+ printf("init vaapi successfully\n");
-+ va_context->use_vaapi = 1;
-+ return fmt[i];
-+ } else {
-+ va_context->use_vaapi = 0;
-+ printf("vaapi init error\n");
-+ }
-+ } else {
-+ va_context->use_vaapi = 0;
-+ }
-+ }
-+ return PIX_FMT_NONE;
-+}
-+
-+static void close_vaapi(ff_vaapi_context_t *va_context) {
-+ if (va_context->use_vaapi == 0);
-+ return;
-+
-+ if(va_context->va_context_id) {
-+ if(va_context->va_image.image_id != VA_INVALID_ID ) {
-+ vaDestroyImage(va_context->va_display, va_context->va_image.image_id );
-+ }
-+ if(va_context->va_context_id != VA_INVALID_ID) {
-+ vaDestroyContext(va_context->va_display, va_context->va_context_id);
-+ }
-+
-+ int i = 0;
-+ for( i = 0; i < va_context->va_surfaces.count; i++ ) {
-+ if( va_context->va_surface_id[i] != VA_INVALID_SURFACE) {
-+ vaDestroySurfaces(va_context->va_display, &va_context->va_surface_id[i], 1);
-+ }
-+ }
-+
-+ if(va_context->va_config_id)
-+ vaDestroyConfig(va_context->va_display, va_context->va_config_id);
-+
-+ vaTerminate(va_context->va_display);
-+ XCloseDisplay(va_context->display);
-+
-+ free(va_context->va_surfaces.free);
-+ free(va_context->va_surfaces.used);
-+ free(va_context->va_surface_id);
-+ free(va_context->vaapi_context);
-+ free(va_context);
-+
-+ va_context = NULL;
-+ }
-+}
-+
-+static VAStatus create_vaapi_image(struct ff_vaapi_context_s *va_context) {
-+ int i;
-+ int fmt_count = vaMaxNumImageFormats( va_context->va_display );
-+ VAImageFormat *va_p_fmt = calloc( fmt_count, sizeof(*va_p_fmt) );
-+ VAImageFormat va_fmt;
-+
-+ if( vaQueryImageFormats( va_context->va_display , va_p_fmt, &fmt_count ) ) {
-+ free(va_p_fmt);
-+ goto error;
-+ }
-+
-+ for( i = 0; i < fmt_count; i++ ) {
-+ if ( va_p_fmt[i].fourcc == VA_FOURCC( 'Y', 'V', '1', '2' ) ||
-+ va_p_fmt[i].fourcc == VA_FOURCC( 'I', '4', '2', '0' ) ||
-+ va_p_fmt[i].fourcc == VA_FOURCC( 'N', 'V', '1', '2' ) ) {
-+
-+ if( vaCreateImage( va_context->va_display, &va_p_fmt[i], va_context->width, va_context->height, &va_context->va_image) ) {
-+ va_context->va_image.image_id = VA_INVALID_ID;
-+ continue;
-+ }
-+ if( vaGetImage(va_context->va_display, va_context->va_surface_id[0], 0, 0,
-+ va_context->width, va_context->height, va_context->va_image.image_id) ) {
-+ vaDestroyImage( va_context->va_display, va_context->va_image.image_id );
-+ va_context->va_image.image_id = VA_INVALID_ID;
-+ continue;
-+ }
-+ printf("found valid image format\n");
-+ va_fmt = va_p_fmt[i];
-+ break;
-+ }
-+ }
-+ free(va_p_fmt);
-+
-+ if(va_context->va_image.image_id == VA_INVALID_ID)
-+ goto error;
-+
-+ return VA_STATUS_SUCCESS;
-+
-+error:
-+ return VA_STATUS_ERROR_UNKNOWN;
-+}
-+
-+static VAStatus init_vaapi(struct ff_vaapi_context_s *va_context, int va_profile, int width, int height) {
-+ size_t i;
-+ VAStatus status = VA_STATUS_ERROR_UNKNOWN;
-+ int surface_count = NUM_SURFACES;
-+ VAConfigAttrib va_attrib;
-+ int maj, min;
-+ VAProfile *va_profiles = NULL;
-+ VAProfile *va_profile_search = NULL;
-+ int number_profiles;
-+
-+ va_context->width = width;
-+ va_context->height = height;
-+ va_context->va_profile = va_profile;
-+
-+ va_context->va_surfaces.free = NULL;
-+ va_context->va_surfaces.used = NULL;
-+
-+ va_context->va_display = NULL;
-+ va_context->va_config_id = VA_INVALID_ID;
-+ va_context->va_context_id = VA_INVALID_ID;
-+ va_context->va_image.image_id = VA_INVALID_ID;
-+
-+ va_context->display = XOpenDisplay(NULL);
-+ if(!va_context->display)
-+ goto error;
-+
-+ va_context->va_display = vaGetDisplay(va_context->display);
-+ va_context->vaapi_context->display = va_context->va_display;
-+
-+ if(!va_context->va_display)
-+ goto error;
-+
-+ if(vaInitialize(va_context->va_display, &maj, &min))
-+ goto error;
-+
-+ printf("libva: %d.%d\n", maj, min);
-+
-+ printf("AvCodecContext w %d h %d\n", va_context->width, va_context->height);
-+
-+ memset( &va_attrib, 0, sizeof(va_attrib) );
-+ va_attrib.type = VAConfigAttribRTFormat;
-+
-+ va_profiles = malloc(vaMaxNumProfiles(va_context->va_display) * sizeof(VAProfile));
-+
-+ if(vaQueryConfigProfiles(va_context->va_display, va_profiles, &number_profiles)) {
-+ free(va_profiles);
-+ goto error;
-+ }
-+
-+ free(va_profiles);
-+
-+
-+ va_profile_search = find_profile(va_profiles, number_profiles, va_profile);
-+
-+ if(!va_profile_search)
-+ goto error;
-+
-+ printf("Profile: %d (%s) Entrypoint %d (%s)\n", va_context->va_profile, VAProfile2string(va_context->va_profile), VAEntrypointVLD, VAEntrypoint2string(VAEntrypointVLD));
-+
-+ if( vaGetConfigAttributes(va_context->va_display, va_context->va_profile, VAEntrypointVLD, &va_attrib, 1) )
-+ goto error;
-+
-+ if( (va_attrib.value & VA_RT_FORMAT_YUV420) == 0 )
-+ goto error;
-+
-+ if( vaCreateConfig(va_context->va_display, va_context->va_profile, VAEntrypointVLD, &va_attrib, 1, &va_context->va_config_id) ) {
-+ va_context->va_config_id = VA_INVALID_ID;
-+ goto error;
-+ }
-+
-+ if(va_context->va_surface_id == NULL) {
-+ va_context->va_surface_id = malloc(sizeof(VASurfaceID) * surface_count);
-+ va_context->va_surfaces.free = malloc(sizeof(VASurfaceID*) * surface_count);
-+ va_context->va_surfaces.used = malloc(sizeof(VASurfaceID*) * surface_count);
-+ }
-+
-+ if( vaCreateSurfaces(va_context->va_display, va_context->width, va_context->height, VA_RT_FORMAT_YUV420, surface_count, va_context->va_surface_id) )
-+ goto error;
-+
-+ for(i = 0; i < surface_count; i++) {
-+ va_context->va_surfaces.free[i] = &va_context->va_surface_id[i];
-+ va_context->va_surfaces.used[i] = NULL;
-+ }
-+
-+ va_context->va_surfaces.count = surface_count;
-+
-+ if(vaCreateContext(va_context->va_display, va_context->va_config_id, va_context->width, va_context->height,
-+ VA_PROGRESSIVE, va_context->va_surface_id, surface_count, &va_context->va_context_id) ) {
-+ va_context->va_context_id = VA_INVALID_ID;
-+ goto error;
-+ }
-+
-+ status = create_vaapi_image(va_context);
-+ if(status != VA_STATUS_SUCCESS)
-+ goto error;
-+
-+ va_context->use_vaapi = 1;
-+ return VA_STATUS_SUCCESS;
-+
-+error:
-+ va_context->use_vaapi = 0;
-+ return VA_STATUS_ERROR_UNKNOWN;
-+}
-+
- static void init_video_codec (ff_video_decoder_t *this, unsigned int codec_type) {
- size_t i;
-
- /* find the decoder */
- this->codec = NULL;
-
-- for(i = 0; i < sizeof(ff_video_lookup)/sizeof(ff_codec_t); i++)
-+ for(i = 0; i < sizeof(ff_video_lookup)/sizeof(ff_codec_t); i++) {
- if(ff_video_lookup[i].type == codec_type) {
- pthread_mutex_lock(&ffmpeg_lock);
- this->codec = avcodec_find_decoder(ff_video_lookup[i].id);
-@@ -314,6 +736,8 @@ static void init_video_codec (ff_video_d
- ff_video_lookup[i].name);
- break;
- }
-+ }
-+
-
- if (!this->codec) {
- xprintf (this->stream->xine, XINE_VERBOSITY_LOG,
-@@ -327,9 +751,11 @@ static void init_video_codec (ff_video_d
-
- this->context->width = this->bih.biWidth;
- this->context->height = this->bih.biHeight;
-+
- this->context->stream_codec_tag = this->context->codec_tag =
- _x_stream_info_get(this->stream, XINE_STREAM_INFO_VIDEO_FOURCC);
-
-+ //av_init_packet(&this->av_pkt);
-
- /* 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 */
-@@ -339,7 +765,6 @@ static void init_video_codec (ff_video_d
-
- if (this->class->choose_speed_over_accuracy)
- this->context->flags2 |= CODEC_FLAG2_FAST;
--
- pthread_mutex_lock(&ffmpeg_lock);
- if (avcodec_open (this->context, this->codec) < 0) {
- pthread_mutex_unlock(&ffmpeg_lock);
-@@ -353,7 +778,6 @@ static void init_video_codec (ff_video_d
-
- if (this->codec->id == CODEC_ID_VC1 &&
- (!this->bih.biWidth || !this->bih.biHeight)) {
-- /* VC1 codec must be re-opened with correct width and height. */
- avcodec_close(this->context);
-
- if (avcodec_open (this->context, this->codec) < 0) {
-@@ -406,6 +830,13 @@ static void init_video_codec (ff_video_d
- xprintf(this->stream->xine, XINE_VERBOSITY_LOG,
- _("ffmpeg_video_dec: direct rendering enabled\n"));
- }
-+ if( this->class->enable_vaapi && !this->is_mpeg12) {
-+ this->context->get_buffer = get_buffer;
-+ this->context->reget_buffer = get_buffer;
-+ this->context->release_buffer = release_buffer;
-+ this->context->get_format = get_format;
-+ this->context->thread_count = 1;
-+ }
- #endif
-
- /* flag for interlaced streams */
-@@ -429,7 +860,13 @@ static void init_video_codec (ff_video_d
- this->frame_flags |= VO_INTERLACED_FLAG;
- break;
- }
-+}
-+
-
-+static void enable_vaapi(void *user_data, xine_cfg_entry_t *entry) {
-+ ff_video_class_t *class = (ff_video_class_t *) user_data;
-+
-+ class->enable_vaapi = entry->num_value;
- }
-
- static void choose_speed_over_accuracy_cb(void *user_data, xine_cfg_entry_t *entry) {
-@@ -558,6 +995,36 @@ static int ff_handle_mpeg_sequence(ff_vi
- return 1;
- }
-
-+/*
-+*/
-+
-+static int nv12_to_yv12(ff_video_decoder_t *this, uint8_t *data, int len, vo_frame_t *img) {
-+ unsigned int Y_size = img->width * this->bih.biHeight;
-+ unsigned int UV_size = img->width * this->bih.biHeight / 4;
-+ unsigned int idx;
-+ unsigned char *dst_Y = img->base[0];
-+ unsigned char *dst_U = img->base[1];
-+ unsigned char *dst_V = img->base[2];
-+ unsigned char *src = data + Y_size;
-+
-+ // sanity check raw stream
-+ if ( (len != (Y_size + (UV_size<<1))) ) {
-+ printf("hmblck: Image size inconsistent with data size.\n");
-+ return 0;
-+ }
-+
-+ // luma data is easy, just copy it
-+ xine_fast_memcpy(dst_Y, data, Y_size);
-+
-+ // chroma data is interlaced UVUV... so deinterlace it
-+ for(idx=0; idx<UV_size; idx++ ) {
-+ *(dst_U + idx) = *(src + (idx<<1) + 0);
-+ *(dst_V + idx) = *(src + (idx<<1) + 1);
-+ }
-+
-+ return 1;
-+}
-+
- static void ff_convert_frame(ff_video_decoder_t *this, vo_frame_t *img) {
- int y;
- uint8_t *dy, *du, *dv, *sy, *su, *sv;
-@@ -567,6 +1034,49 @@ static void ff_convert_frame(ff_video_de
- printf ("frame format == %08x\n", this->debug_fmt = this->context->pix_fmt);
- #endif
-
-+ if(this->context->pix_fmt == PIX_FMT_VAAPI_VLD && va_context->va_image.image_id != VA_INVALID_ID) {
-+ void *p_base;
-+ const uint32_t fourcc = va_context->va_image.format.fourcc;
-+ VAStatus status;
-+
-+ if( !vaGetImage( va_context->va_display, (VASurfaceID)(size_t)this->av_frame->data[3],
-+ 0, 0, img->width, this->bih.biHeight, va_context->va_image.image_id) ) {
-+
-+ status = vaMapBuffer( va_context->va_display, va_context->va_image.buf, &p_base ) ;
-+ if ( status == VA_STATUS_SUCCESS ) {
-+ if( fourcc == VA_FOURCC('Y','V','1','2') ||
-+ fourcc == VA_FOURCC('I','4','2','0') ) {
-+
-+ lprintf("VAAPI YV12 image\n");
-+
-+ yv12_to_yv12(
-+ /* Y */
-+ (uint8_t*)p_base, img->width,
-+ img->base[0], img->pitches[0],
-+ /* U */
-+ (uint8_t*)p_base + (img->width * img->height * 5/4), img->width/2,
-+ img->base[1], img->pitches[1],
-+ /* V */
-+ (uint8_t*)p_base + (img->width * img->height), img->width/2,
-+ img->base[2], img->pitches[2],
-+ /* width x height */
-+ img->width, img->height);
-+
-+ }
-+ if( fourcc == VA_FOURCC('N','V','1','2') ) {
-+
-+ lprintf("VAAPI NV12 image\n");
-+
-+ nv12_to_yv12(this, (uint8_t*)p_base, va_context->va_image.data_size, img);
-+
-+ }
-+
-+ status = vaUnmapBuffer( va_context->va_display, va_context->va_image.buf );
-+ }
-+ }
-+ return;
-+ }
-+
- dy = img->base[0];
- du = img->base[1];
- dv = img->base[2];
-@@ -1038,6 +1548,11 @@ static void ff_handle_mpeg12_buffer (ff_
-
- lprintf("handle_mpeg12_buffer\n");
-
-+ if (buf->decoder_flags & BUF_FLAG_FRAME_START) {
-+ lprintf("BUF_FLAG_FRAME_START\n");
-+ this->size = 0;
-+ }
-+
- while ((size > 0) || (flush == 1)) {
-
- uint8_t *current;
-@@ -1403,47 +1918,48 @@ static void ff_handle_buffer (ff_video_d
-
- /* aspect ratio provided by ffmpeg, override previous setting */
- if ((this->aspect_ratio_prio < 2) &&
-- av_cmp_q(this->context->sample_aspect_ratio, avr00)) {
-+ av_cmp_q(this->context->sample_aspect_ratio, avr00)) {
-
- if (!this->bih.biWidth || !this->bih.biHeight) {
- this->bih.biWidth = this->context->width;
- this->bih.biHeight = this->context->height;
- }
-
-- this->aspect_ratio = av_q2d(this->context->sample_aspect_ratio) *
-- (double)this->bih.biWidth / (double)this->bih.biHeight;
-- this->aspect_ratio_prio = 2;
-- lprintf("ffmpeg aspect ratio: %f\n", this->aspect_ratio);
-- set_stream_info(this);
-+ this->aspect_ratio = av_q2d(this->context->sample_aspect_ratio) *
-+ (double)this->bih.biWidth / (double)this->bih.biHeight;
-+ this->aspect_ratio_prio = 2;
-+ lprintf("ffmpeg aspect ratio: %f\n", this->aspect_ratio);
-+ set_stream_info(this);
- }
-
- if (got_picture && this->av_frame->data[0]) {
- /* got a picture, draw it */
- got_one_picture = 1;
-+
- if(!this->av_frame->opaque) {
-- /* indirect rendering */
-+ /* indirect rendering */
-
-- /* initialize the colorspace converter */
-- if (!this->cs_convert_init) {
-- if ((this->context->pix_fmt == PIX_FMT_RGB32) ||
-- (this->context->pix_fmt == PIX_FMT_RGB565) ||
-- (this->context->pix_fmt == PIX_FMT_RGB555) ||
-- (this->context->pix_fmt == PIX_FMT_BGR24) ||
-- (this->context->pix_fmt == PIX_FMT_RGB24) ||
-- (this->context->pix_fmt == PIX_FMT_PAL8)) {
-- this->output_format = XINE_IMGFMT_YUY2;
-- init_yuv_planes(&this->yuv, (this->bih.biWidth + 15) & ~15, this->bih.biHeight);
-- this->yuv_init = 1;
-- }
-- this->cs_convert_init = 1;
-- }
--
-- if (this->aspect_ratio_prio == 0) {
-- this->aspect_ratio = (double)this->bih.biWidth / (double)this->bih.biHeight;
-- this->aspect_ratio_prio = 1;
-- lprintf("default aspect ratio: %f\n", this->aspect_ratio);
-- set_stream_info(this);
-- }
-+ /* initialize the colorspace converter */
-+ if (!this->cs_convert_init) {
-+ if ((this->context->pix_fmt == PIX_FMT_RGB32) ||
-+ (this->context->pix_fmt == PIX_FMT_RGB565) ||
-+ (this->context->pix_fmt == PIX_FMT_RGB555) ||
-+ (this->context->pix_fmt == PIX_FMT_BGR24) ||
-+ (this->context->pix_fmt == PIX_FMT_RGB24) ||
-+ (this->context->pix_fmt == PIX_FMT_PAL8)) {
-+ this->output_format = XINE_IMGFMT_YUY2;
-+ init_yuv_planes(&this->yuv, (this->bih.biWidth + 15) & ~15, this->bih.biHeight);
-+ this->yuv_init = 1;
-+ }
-+ this->cs_convert_init = 1;
-+ }
-+
-+ if (this->aspect_ratio_prio == 0) {
-+ this->aspect_ratio = (double)this->bih.biWidth / (double)this->bih.biHeight;
-+ this->aspect_ratio_prio = 1;
-+ lprintf("default aspect ratio: %f\n", this->aspect_ratio);
-+ set_stream_info(this);
-+ }
-
- /* xine-lib expects the framesize to be a multiple of 16x16 (macroblock) */
- img = this->stream->video_out->get_frame (this->stream->video_out,
-@@ -1484,7 +2000,7 @@ static void ff_handle_buffer (ff_video_d
- this->av_frame->pict_type);
-
- } else if (!this->av_frame->opaque) {
-- /* colorspace conversion or copy */
-+ /* colorspace conversion or copy */
- ff_convert_frame(this, img);
- }
-
-@@ -1572,6 +2088,15 @@ static void ff_decode_data (video_decode
- _x_stream_info_set(this->stream, XINE_STREAM_INFO_FRAME_DURATION, (this->reported_video_step = this->video_step));
- }
-
-+ int codec_type = buf->type & 0xFFFF0000;
-+ if (codec_type == BUF_VIDEO_MPEG) {
-+ this->is_mpeg12 = 1;
-+ if ( this->mpeg_parser == NULL ) {
-+ this->mpeg_parser = calloc(1, sizeof(mpeg_parser_t));
-+ mpeg_parser_init(this->mpeg_parser);
-+ }
-+ }
-+
- if (buf->decoder_flags & BUF_FLAG_PREVIEW) {
-
- ff_handle_preview_buffer(this, buf);
-@@ -1589,24 +2114,24 @@ static void ff_decode_data (video_decode
- ff_handle_header_buffer(this, buf);
-
- if (buf->decoder_flags & BUF_FLAG_ASPECT) {
-- if (this->aspect_ratio_prio < 3) {
-- this->aspect_ratio = (double)buf->decoder_info[1] / (double)buf->decoder_info[2];
-- this->aspect_ratio_prio = 3;
-- lprintf("aspect ratio: %f\n", this->aspect_ratio);
-- set_stream_info(this);
-- }
-+ if (this->aspect_ratio_prio < 3) {
-+ this->aspect_ratio = (double)buf->decoder_info[1] / (double)buf->decoder_info[2];
-+ this->aspect_ratio_prio = 3;
-+ lprintf("aspect ratio: %f\n", this->aspect_ratio);
-+ set_stream_info(this);
-+ }
- }
-
- } else {
-
- /* decode */
- if (buf->pts)
-- this->pts = buf->pts;
-+ this->pts = buf->pts;
-
- if (this->is_mpeg12) {
-- ff_handle_mpeg12_buffer(this, buf);
-+ ff_handle_mpeg12_buffer(this, buf);
- } else {
-- ff_handle_buffer(this, buf);
-+ ff_handle_buffer(this, buf);
- }
-
- }
-@@ -1685,6 +2210,8 @@ static void ff_dispose (video_decoder_t
-
- lprintf ("ff_dispose\n");
-
-+ close_vaapi(va_context);
-+
- if (this->decoder_ok) {
- xine_list_iterator_t it;
- AVFrame *av_frame;
-@@ -1776,10 +2303,31 @@ static video_decoder_t *ff_video_open_pl
-
- this->dr1_frames = xine_list_new();
-
-+ va_context = calloc(1, sizeof(ff_vaapi_context_t));
-+ va_context->vaapi_context = calloc(1, sizeof(struct vaapi_context));
-+
- #ifdef LOG
- this->debug_fmt = -1;
- #endif
-
-+ this->class->enable_vaapi = this->class->xine->config->register_bool(this->class->xine->config, "video.processing.ffmpeg_enable_vaapi", 1,
-+ _("Enable usage of VAAPI"),
-+ _("Let you enable the usage of VAAPI.\n"),
-+ 10, enable_vaapi, this->class);
-+
-+#ifdef INIT_ERROR_HACK
-+ if ((init_vaapi(va_context, VAProfileH264High, 1280, 720) == VA_STATUS_SUCCESS )) {
-+ close_vaapi(va_context);
-+ } else {
-+ this->class->enable_vaapi = 0;
-+ xprintf(this->class->xine, XINE_VERBOSITY_LOG, _("ffmpeg_video_dec: VAAPI Enabled in config, but output video out driver does not support vaapi.\n"));
-+ }
-+ free(va_context->vaapi_context);
-+ free(va_context);
-+ va_context = calloc(1, sizeof(ff_vaapi_context_t));
-+ va_context->vaapi_context = calloc(1, sizeof(struct vaapi_context));
-+#endif
-+
- return &this->video_decoder;
- }
-
-diff -Naur xine-lib-1.1.19.orig/src/combined/ffmpeg/Makefile.am xine-lib-1.1.19/src/combined/ffmpeg/Makefile.am
---- xine-lib-1.1.19.orig/src/combined/ffmpeg/Makefile.am 2010-03-09 23:17:05.000000000 +0100
-+++ xine-lib-1.1.19/src/combined/ffmpeg/Makefile.am 2010-10-14 14:49:01.000000000 +0200
-@@ -43,7 +43,7 @@
-
- xineplug_decode_ff_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
- xineplug_decode_ff_la_LDFLAGS = $(xineplug_ldflags) $(IMPURE_TEXT_LDFLAGS)
--xineplug_decode_ff_la_LIBADD = $(XINE_LIB) $(MLIB_LIBS) -lm $(ZLIB_LIBS) \
-+xineplug_decode_ff_la_LIBADD = $(XINE_LIB) $(MLIB_LIBS) -lm -lva-x11 -lva -lX11 $(ZLIB_LIBS) \
- $(link_ffmpeg) $(PTHREAD_LIBS) $(LTLIBINTL)
-
- xineplug_decode_dvaudio_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS)
Deleted: trunk/multimedia/libxine/files/patch-config.rpath
===================================================================
--- trunk/multimedia/libxine/files/patch-config.rpath 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-config.rpath 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,12 +0,0 @@
---- config.rpath.orig Thu Dec 7 01:15:04 2006
-+++ config.rpath Thu Dec 7 01:16:03 2006
-@@ -162,6 +162,9 @@
- ld_shlibs=no
- fi
- ;;
-+ freebsd*)
-+ hardcode_minus_L=yes
-+ ;;
- netbsd*)
- ;;
- solaris* | sysv5*)
Modified: trunk/multimedia/libxine/files/patch-configure
===================================================================
--- trunk/multimedia/libxine/files/patch-configure 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-configure 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,30 +1,29 @@
---- ./configure.orig 2010-03-06 22:36:24.000000000 +0300
-+++ ./configure 2010-06-19 02:21:36.862142625 +0400
-@@ -17061,9 +17061,6 @@
+--- configure.orig
++++ configure
+@@ -20349,7 +20349,7 @@ $as_echo "#define ARCH_SPARC /**/" >>con
- done
+ ;;
-- if test "$ac_cv_header_ffmpeg_avutil_h" = "yes" && test "$ac_cv_header_libavutil_avutil_h" = "yes"; then
-- as_fn_error "old & new ffmpeg headers found - you need to clean up!" "$LINENO" 5
-- fi
+- x86_64-*)
++ x86_64-*|amd64-*)
+ arch_x86=64
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: using external ffmpeg" >&5
- $as_echo "using external ffmpeg" >&6; }
-@@ -23234,6 +23231,8 @@
- fi
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
-+else
-+no_theora=yes
- fi
+ $as_echo "#define ARCH_X86_64 /**/" >>confdefs.h
+@@ -20685,7 +20685,7 @@ fi
- if test "x$no_libFLAC" = "x" ; then
-@@ -29752,7 +29751,7 @@
+ 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
- xinelibdir='${libdir}/xine'
- xinedatadir='${datadir}/xine'
--pkgconfigdir='${libdir}/pkgconfig'
-+pkgconfigdir='${prefix}/libdata/pkgconfig'
-
-
-
+ 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
Property changes on: trunk/multimedia/libxine/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Added: trunk/multimedia/libxine/files/patch-include-xine-xine_internal.h
===================================================================
--- trunk/multimedia/libxine/files/patch-include-xine-xine_internal.h (rev 0)
+++ trunk/multimedia/libxine/files/patch-include-xine-xine_internal.h 2016-08-13 13:10:38 UTC (rev 21580)
@@ -0,0 +1,127 @@
+--- 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
Property changes on: trunk/multimedia/libxine/files/patch-include-xine-xine_internal.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/libxine/files/patch-include-xine-xineutils.h
===================================================================
--- trunk/multimedia/libxine/files/patch-include-xine-xineutils.h (rev 0)
+++ trunk/multimedia/libxine/files/patch-include-xine-xineutils.h 2016-08-13 13:10:38 UTC (rev 21580)
@@ -0,0 +1,11 @@
+--- include/xine/xineutils.h.orig
++++ include/xine/xineutils.h
+@@ -146,7 +146,7 @@ void *xine_xcalloc(size_t nmemb, size_t
+ * Free allocated memory and set pointer to NULL
+ * @param ptr Pointer to the pointer to the memory block which should be freed.
+ */
+-static inline void _x_freep(void *ptr) {
++static void _x_freep(void *ptr) {
+ void **p = (void **)ptr;
+ free (*p);
+ *p = NULL;
Property changes on: trunk/multimedia/libxine/files/patch-include-xine-xineutils.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/multimedia/libxine/files/patch-libav-0.7
===================================================================
--- trunk/multimedia/libxine/files/patch-libav-0.7 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-libav-0.7 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,237 +0,0 @@
-From: Reinhard Tartler <siretart at tauware.de>
-Subject: unbreak compilation with Libav 0.7
-
-Index: src/combined/ffmpeg/ff_video_decoder.c
-===================================================================
---- xine-lib.orig/src/combined/ffmpeg/ff_video_decoder.c 2011-05-27 19:46:33.550935020 +0200
-+++ xine-lib/src/combined/ffmpeg/ff_video_decoder.c 2011-05-27 19:58:40.030934613 +0200
-@@ -58,12 +58,28 @@
-
- #define ENABLE_DIRECT_RENDERING
-
-+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
-+# define AVVIDEO 2
-+#else
-+# define AVVIDEO 1
-+# define pp_context pp_context_t
-+# define pp_mode pp_mode_t
-+#endif
-+
- /* reordered_opaque appeared in libavcodec 51.68.0 */
- #define AVCODEC_HAS_REORDERED_OPAQUE
- #if LIBAVCODEC_VERSION_INT < 0x334400
- # undef AVCODEC_HAS_REORDERED_OPAQUE
- #endif
-
-+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
-+# define AVVIDEO 2
-+#else
-+# define AVVIDEO 1
-+# define pp_context pp_context_t
-+# define pp_mode pp_mode_t
-+#endif
-+
- typedef struct ff_video_decoder_s ff_video_decoder_t;
-
- typedef struct ff_video_class_s {
-@@ -116,8 +132,8 @@
-
- int pp_quality;
- int pp_flags;
-- pp_context_t *pp_context;
-- pp_mode_t *pp_mode;
-+ pp_context *pp_context;
-+ pp_mode *pp_mode;
-
- /* mpeg-es parsing */
- mpeg_parser_t *mpeg_parser;
-@@ -1055,12 +1071,26 @@
- }
-
- /* skip decoding b frames if too late */
-+#if AVVIDEO > 1
-+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
-+#else
- this->context->hurry_up = (this->skipframes > 0);
-+#endif
-
- lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size);
-+#if AVVIDEO > 1
-+ AVPacket avpkt;
-+ av_init_packet(&avpkt);
-+ avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer;
-+ avpkt.size = this->mpeg_parser->buffer_size;
-+ avpkt.flags = AV_PKT_FLAG_KEY;
-+ len = avcodec_decode_video2 (this->context, this->av_frame,
-+ &got_picture, &avpkt);
-+#else
- len = avcodec_decode_video (this->context, this->av_frame,
- &got_picture, this->mpeg_parser->chunk_buffer,
- this->mpeg_parser->buffer_size);
-+#endif
- lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n",
- len, got_picture);
- len = current - buf->content - offset;
-@@ -1112,7 +1142,13 @@
-
- } else {
-
-- if (this->context->hurry_up) {
-+ if (
-+#if AVVIDEO > 1
-+ this->context->skip_frame != AVDISCARD_DEFAULT
-+#else
-+ this->context->hurry_up
-+#endif
-+ ) {
- /* skipped frame, output a bad frame */
- img = this->stream->video_out->get_frame (this->stream->video_out,
- this->bih.biWidth,
-@@ -1304,13 +1340,25 @@
- got_picture = 0;
- } else {
- /* skip decoding b frames if too late */
-+#if AVVIDEO > 1
-+ this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT;
-+#else
- this->context->hurry_up = (this->skipframes > 0);
--
-+#endif
- lprintf("buffer size: %d\n", this->size);
-+#if AVVIDEO > 1
-+ AVPacket avpkt;
-+ av_init_packet(&avpkt);
-+ avpkt.data = (uint8_t *)&chunk_buf[offset];
-+ avpkt.size = this->size;
-+ avpkt.flags = AV_PKT_FLAG_KEY;
-+ len = avcodec_decode_video2 (this->context, this->av_frame,
-+ &got_picture, &avpkt);
-+#else
- len = avcodec_decode_video (this->context, this->av_frame,
- &got_picture, &chunk_buf[offset],
- this->size);
--
-+#endif
- #ifdef AVCODEC_HAS_REORDERED_OPAQUE
- /* reset consumed pts value */
- this->context->reordered_opaque = ff_tag_pts(this, 0);
-Index: src/input/input_cdda.c
-===================================================================
---- xine-lib.orig/src/input/input_cdda.c 2011-05-27 19:46:33.570934872 +0200
-+++ xine-lib/src/input/input_cdda.c 2011-05-27 19:46:38.340934964 +0200
-@@ -89,6 +89,14 @@
- #define CD_LEADOUT_TRACK 0xAA
- #define CD_BLOCK_OFFSET 150
-
-+#ifdef HAVE_LIBAVUTIL_SHA1_H
-+/* old libavutil/sha1.h was found... */
-+#define AVSHA AVSHA1
-+# define av_sha_init(c,b) av_sha1_init(c)
-+# define av_sha_update av_sha1_update
-+# define av_sha_final av_sha1_final
-+#endif
-+
- typedef struct _cdrom_toc_entry {
- int track_mode;
- int first_frame;
-Index: src/post/planar/pp.c
-===================================================================
---- xine-lib.orig/src/post/planar/pp.c 2011-05-27 19:46:33.540935109 +0200
-+++ xine-lib/src/post/planar/pp.c 2011-05-27 19:51:21.830934917 +0200
-@@ -35,6 +35,12 @@
- # include <libpostproc/postprocess.h>
- #endif
-
-+#if LIBPOSTPROC_VERSION_MAJOR < 52
-+# define pp_context pp_context_t
-+# define pp_mode pp_mode_t
-+# define PP_PARAMETERS_T
-+#endif
-+
- #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */
-
- /* plugin class initialization function */
-@@ -76,8 +82,8 @@
-
- /* libpostproc specific stuff */
- int pp_flags;
-- pp_context_t *pp_context;
-- pp_mode_t *pp_mode;
-+ pp_context *pp_context;
-+ pp_mode *pp_mode;
-
- pthread_mutex_t lock;
- };
-Index: src/combined/ffmpeg/ff_audio_decoder.c
-===================================================================
---- xine-lib.orig/src/combined/ffmpeg/ff_audio_decoder.c 2011-05-27 19:53:22.700933869 +0200
-+++ xine-lib/src/combined/ffmpeg/ff_audio_decoder.c 2011-05-27 19:55:40.820939483 +0200
-@@ -46,6 +46,13 @@
-
- #define AUDIOBUFSIZE (64 * 1024)
-
-+#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
-+# define AVAUDIO 3
-+#else
-+# define AVAUDIO 2
-+#endif
-+
-+
- typedef struct {
- audio_decoder_class_t decoder_class;
- } ff_audio_class_t;
-@@ -255,6 +262,9 @@
- buf->decoder_info[2]);
-
- } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) {
-+#if AVAUDIO > 2
-+ AVPacket avpkt;
-+#endif
-
- if( !this->decoder_ok ) {
- if ( ! this->context || ! this->codec ) {
-@@ -286,11 +296,21 @@
- if (!this->output_open) {
- if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) {
- decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+#if AVAUDIO > 2
-+ av_init_packet (&avpkt);
-+ avpkt.data = (uint8_t *)&this->buf[0];
-+ avpkt.size = this->size;
-+ avpkt.flags = AV_PKT_FLAG_KEY;
-+ avcodec_decode_audio3 (this->context,
-+ (int16_t *)this->decode_buffer,
-+ &decode_buffer_size, &avpkt);
-+#else
- avcodec_decode_audio2 (this->context,
- (int16_t *)this->decode_buffer,
- &decode_buffer_size,
- &this->buf[0],
- this->size);
-+#endif
- this->audio_bits = this->context->bits_per_sample;
- this->audio_sample_rate = this->context->sample_rate;
- this->audio_channels = this->context->channels;
-@@ -311,12 +331,21 @@
- offset = 0;
- while (this->size>0) {
- decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-+#if AVAUDIO > 2
-+ av_init_packet (&avpkt);
-+ avpkt.data = (uint8_t *)&this->buf[offset];
-+ avpkt.size = this->size;
-+ avpkt.flags = AV_PKT_FLAG_KEY;
-+ bytes_consumed = avcodec_decode_audio3 (this->context,
-+ (int16_t *)this->decode_buffer,
-+ &decode_buffer_size, &avpkt);
-+#else
- bytes_consumed = avcodec_decode_audio2 (this->context,
- (int16_t *)this->decode_buffer,
- &decode_buffer_size,
- &this->buf[offset],
- this->size);
--
-+#endif
- if (bytes_consumed<0) {
- xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
- "ffmpeg_audio_dec: error decompressing audio frame\n");
Deleted: trunk/multimedia/libxine/files/patch-misc_Makefile.in
===================================================================
--- trunk/multimedia/libxine/files/patch-misc_Makefile.in 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-misc_Makefile.in 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,11 +0,0 @@
---- misc/Makefile.in.orig 2009-02-11 03:34:49.000000000 +0900
-+++ misc/Makefile.in 2009-02-22 09:05:26.000000000 +0900
-@@ -212,7 +212,7 @@
- JACK_LIBS = @JACK_LIBS@
- KSTAT_LIBS = @KSTAT_LIBS@
- LD = @LD@
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ @PTHREAD_LIBS@
- LDFLAGS_NOUNDEFINED = @LDFLAGS_NOUNDEFINED@
- LIBCDIO_CFLAGS = @LIBCDIO_CFLAGS@
- LIBCDIO_LIBS = @LIBCDIO_LIBS@
Deleted: trunk/multimedia/libxine/files/patch-misc_libxine.pc.in
===================================================================
--- trunk/multimedia/libxine/files/patch-misc_libxine.pc.in 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-misc_libxine.pc.in 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,14 +0,0 @@
---- misc/libxine.pc.in.orig 2008-02-03 22:02:31.000000000 +0900
-+++ misc/libxine.pc.in 2008-02-03 22:03:24.000000000 +0900
-@@ -19,7 +19,7 @@
- Description: The xine engine library
- Version: @XINE_MAJOR at .@XINE_MINOR at .@XINE_SUB@@XINE_PATCH@
- Requires:
--Libs: -L${libdir} -lxine
--Libs.private: @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
--Cflags: -I${includedir}
--Cflags.private: @PTHREAD_CFLAGS@
-+Libs: -L${libdir} -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@
-+Libs.private:
-+Cflags: -I${includedir} @PTHREAD_CFLAGS@
-+Cflags.private:
Added: trunk/multimedia/libxine/files/patch-src-audio_dec-xine_lpcm_decoder.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src-audio_dec-xine_lpcm_decoder.c (rev 0)
+++ trunk/multimedia/libxine/files/patch-src-audio_dec-xine_lpcm_decoder.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -0,0 +1,12 @@
+--- 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"
Property changes on: trunk/multimedia/libxine/files/patch-src-audio_dec-xine_lpcm_decoder.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff
===================================================================
--- trunk/multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff (rev 0)
+++ trunk/multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff 2016-08-13 13:10:38 UTC (rev 21580)
@@ -0,0 +1,13 @@
+--- src/combined/ffmpeg/Makefile.in.orig 2013-09-23 15:58:14.000000000 -0500
++++ src/combined/ffmpeg/Makefile.in 2013-09-25 03:25:33.000000000 -0500
+@@ -1037,9 +1037,7 @@ avcodec_audio.list: AV_CODECS:=/CODEC_ID
+ avcodec_video.list: AV_CODECS:=/CODEC_ID_MPEG1VIDEO/,/CODEC_ID_PCM_S16LE/
+
+ # that weird shell call just yields full path of the avcodec.h file
+-avcodec_audio.list avcodec_video.list: $(shell \
+- echo '#include "$(srcdir)/ffmpeg_decoder.h"' | $(AV_CPP) -M - |\
+- sed -e '/avcodec\.h/! d; s%^.* \([^ ]*/avcodec\.h\) .*%\1%')
++avcodec_audio.list avcodec_video.list:
+ $(AM_V_GEN)echo '#include "$(srcdir)/ffmpeg_decoder.h"' | $(AV_CPP) - |\
+ sed -e $(AV_CODECS)'! d; s/^[ \t]*//; s/[=,].*//; /^$$/ d' >$@
+
Property changes on: trunk/multimedia/libxine/files/patch-src-combined-ffmpeg-Makefile.in.diff
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/libxine/files/patch-src-libw32dll-wine-registry.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src-libw32dll-wine-registry.c (rev 0)
+++ trunk/multimedia/libxine/files/patch-src-libw32dll-wine-registry.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -0,0 +1,13 @@
+--- 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"
Property changes on: trunk/multimedia/libxine/files/patch-src-libw32dll-wine-registry.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/libxine/files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c (rev 0)
+++ trunk/multimedia/libxine/files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -0,0 +1,28 @@
+--- src/post/deinterlace/plugins/greedy2frame_template_sse2.c.orig
++++ src/post/deinterlace/plugins/greedy2frame_template_sse2.c
+@@ -174,8 +174,8 @@ static void DeinterlaceGreedy2Frame_SSE2
+ */
+ "movdqa (%2), %%xmm1 \n\t" /* xmm1 = T1 */
+ "movdqa (%3), %%xmm0 \n\t" /* xmm0 = T0 */
+- "movdqa (%q4,%2), %%xmm3 \n\t" /* xmm3 = B1 */
+- "movdqa (%q4,%3), %%xmm2 \n\t" /* xmm2 = B0 */
++ "movdqa (%2,%4), %%xmm3 \n\t" /* xmm3 = B1 */
++ "movdqa (%3,%4), %%xmm2 \n\t" /* xmm2 = B0 */
+
+ /* calculate |T1-T0| keep T1 put result in xmm5 */
+ "movdqa %%xmm1, %%xmm5 \n\t"
+@@ -192,11 +192,11 @@ static void DeinterlaceGreedy2Frame_SSE2
+ "pcmpgtb %0, %%xmm5 \n\t"
+ "pcmpeqd %%xmm7, %%xmm5 \n\t"
+
+- "prefetcht0 64(%q4,%2) \n\t"
+- "prefetcht0 64(%q4,%3) \n\t"
++ "prefetcht0 64(%2,%4) \n\t"
++ "prefetcht0 64(%3,%4) \n\t"
+ :
+ : "m" (GreedyTwoFrameThreshold128),
+- "m" (*Destc), "r" (T1), "r" (T0), "r" (Pitch) );
++ "m" (*Destc), "r" (T1), "r" (T0), "r" ((register_t)Pitch) );
+
+ asm volatile (
+ /* calculate |B1-B0| keep B1 put result in xmm4 */
Property changes on: trunk/multimedia/libxine/files/patch-src-post-deinterlace-plugins-greedy2frame_template_sse2.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/libxine/files/patch-src-post-planar-eq2.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src-post-planar-eq2.c (rev 0)
+++ trunk/multimedia/libxine/files/patch-src-post-planar-eq2.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -0,0 +1,11 @@
+--- src/post/planar/eq2.c.orig
++++ src/post/planar/eq2.c
+@@ -129,7 +129,7 @@ void affine_1d_MMX (eq2_param_t *par, un
+ "movq (%1), %%mm4 \n\t"
+ "pxor %%mm0, %%mm0 \n\t"
+ :
+- : "g" (brvec), "g" (contvec)
++ : "r" (brvec), "r" (contvec)
+ );
+
+ while (h-- > 0) {
Property changes on: trunk/multimedia/libxine/files/patch-src-post-planar-eq2.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/libxine/files/patch-src-vdr-input_vdr.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src-vdr-input_vdr.c (rev 0)
+++ trunk/multimedia/libxine/files/patch-src-vdr-input_vdr.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -0,0 +1,12 @@
+--- 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>
Property changes on: trunk/multimedia/libxine/files/patch-src-vdr-input_vdr.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/multimedia/libxine/files/patch-src-video_out-xxmc.h
===================================================================
--- trunk/multimedia/libxine/files/patch-src-video_out-xxmc.h 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src-video_out-xxmc.h 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,10 +0,0 @@
---- src/video_out/xxmc.h.orig
-+++ src/video_out/xxmc.h
-@@ -79,6 +79,7 @@
- #include <X11/extensions/Xvlib.h>
- #ifdef HAVE_VLDXVMC
- #include <X11/extensions/vldXvMC.h>
-+ #include <X11/extensions/XvMClib.h>
- #else
- #include <X11/extensions/XvMClib.h>
- #include <X11/extensions/XvMC.h>
Deleted: trunk/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,39 +0,0 @@
---- src/libffmpeg/libavcodec/h263.c.orig Sun Jul 9 16:38:11 2006
-+++ src/libffmpeg/libavcodec/h263.c Thu Sep 28 12:53:39 2006
-@@ -38,6 +38,7 @@
- #include "mpegvideo.h"
- #include "h263data.h"
- #include "mpeg4data.h"
-+#include "xine_internal.h"
-
- //#undef NDEBUG
- //#include <assert.h>
-@@ -66,8 +67,8 @@
- static int h263p_decode_umotion(MpegEncContext * s, int pred);
- static int h263_decode_block(MpegEncContext * s, DCTELEM * block,
- int n, int coded);
--static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
--static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-+static int __inline mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
-+static int __inline mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
- int n, int coded, int intra, int rvlc);
- static int mpeg4_get_block_length(MpegEncContext * s, DCTELEM * block, int n, int intra_dc,
- uint8_t *scan_table);
-@@ -4684,7 +4685,7 @@
- * @param dir_ptr the prediction direction will be stored here
- * @return the quantized dc
- */
--static inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
-+static __inline int mpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr)
- {
- int level, code;
-
-@@ -4729,7 +4730,7 @@
- * decodes a block.
- * @return <0 if an error occured
- */
--static inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-+static __inline int mpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
- int n, int coded, int intra, int rvlc)
- {
- int level, i, last, run;
Deleted: trunk/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,94 +0,0 @@
---- src/libffmpeg/libavcodec/mpeg12.c.orig Sun Jul 9 23:38:32 2006
-+++ src/libffmpeg/libavcodec/mpeg12.c Wed Aug 2 01:25:48 2006
-@@ -65,21 +65,21 @@
- int component);
- static void mpeg1_encode_motion(MpegEncContext *s, int val, int f_or_b_code); // RAL: f_code parameter added
- #endif //CONFIG_ENCODERS
--static inline int mpeg1_decode_block_inter(MpegEncContext *s,
-+static __inline int mpeg1_decode_block_inter(MpegEncContext *s,
- DCTELEM *block,
- int n);
--static inline int mpeg1_decode_block_intra(MpegEncContext *s,
-+static __inline int mpeg1_decode_block_intra(MpegEncContext *s,
- DCTELEM *block,
- int n);
--static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n);
--static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
-+static __inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n);
-+static __inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
- DCTELEM *block,
- int n);
--static inline int mpeg2_decode_block_intra(MpegEncContext *s,
-+static __inline int mpeg2_decode_block_intra(MpegEncContext *s,
- DCTELEM *block,
- int n);
--static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n);
--static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
-+static __inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s, DCTELEM *block, int n);
-+static __inline int mpeg2_fast_decode_block_intra(MpegEncContext *s, DCTELEM *block, int n);
- static int mpeg_decode_motion(MpegEncContext *s, int fcode, int pred);
- static void exchange_uv(MpegEncContext *s);
-
-@@ -1505,7 +1505,7 @@
- return diff;
- }
-
--static inline int mpeg1_decode_block_intra(MpegEncContext *s,
-+static __inline int mpeg1_decode_block_intra(MpegEncContext *s,
- DCTELEM *block,
- int n)
- {
-@@ -1578,7 +1578,7 @@
- return 0;
- }
-
--static inline int mpeg1_decode_block_inter(MpegEncContext *s,
-+static __inline int mpeg1_decode_block_inter(MpegEncContext *s,
- DCTELEM *block,
- int n)
- {
-@@ -1656,7 +1656,7 @@
- return 0;
- }
-
--static inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n)
-+static __inline int mpeg1_fast_decode_block_inter(MpegEncContext *s, DCTELEM *block, int n)
- {
- int level, i, j, run;
- RLTable *rl = &rl_mpeg1;
-@@ -1728,7 +1728,7 @@
- }
-
-
--static inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
-+static __inline int mpeg2_decode_block_non_intra(MpegEncContext *s,
- DCTELEM *block,
- int n)
- {
-@@ -1809,7 +1809,7 @@
- return 0;
- }
-
--static inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s,
-+static __inline int mpeg2_fast_decode_block_non_intra(MpegEncContext *s,
- DCTELEM *block,
- int n)
- {
-@@ -1872,7 +1872,7 @@
- }
-
-
--static inline int mpeg2_decode_block_intra(MpegEncContext *s,
-+static __inline int mpeg2_decode_block_intra(MpegEncContext *s,
- DCTELEM *block,
- int n)
- {
-@@ -1952,7 +1952,7 @@
- return 0;
- }
-
--static inline int mpeg2_fast_decode_block_intra(MpegEncContext *s,
-+static __inline int mpeg2_fast_decode_block_intra(MpegEncContext *s,
- DCTELEM *block,
- int n)
- {
Deleted: trunk/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,20 +0,0 @@
---- src/libffmpeg/libavcodec/msmpeg4.c.orig Sun Jul 9 23:38:34 2006
-+++ src/libffmpeg/libavcodec/msmpeg4.c Wed Aug 2 01:27:48 2006
-@@ -60,7 +60,7 @@
- static uint32_t v2_dc_chroma_table[512][2];
-
- static inline void msmpeg4_encode_block(MpegEncContext * s, DCTELEM * block, int n);
--static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-+static __inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
- int n, int coded, const uint8_t *scantable);
- static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr);
- static int msmpeg4_decode_motion(MpegEncContext * s,
-@@ -1659,7 +1659,7 @@
- return 0;
- }
- //#define ERROR_DETAILS
--static inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
-+static __inline int msmpeg4_decode_block(MpegEncContext * s, DCTELEM * block,
- int n, int coded, const uint8_t *scan_table)
- {
- int level, i, last, run, run_diff;
Deleted: trunk/multimedia/libxine/files/patch-src:xine-engine:post.h
===================================================================
--- trunk/multimedia/libxine/files/patch-src:xine-engine:post.h 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src:xine-engine:post.h 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,11 +0,0 @@
---- src/xine-engine/post.h.orig 2010-06-03 15:54:12.000000000 +0200
-+++ src/xine-engine/post.h 2010-06-03 15:59:20.000000000 +0200
-@@ -377,7 +377,7 @@ static xine_post_api_parameter_t temp_p[
-
- #define PARAM_ITEM( param_type, var, enumv, min, max, readonly, descr ) \
- { param_type, #var, sizeof(temp_s.var), \
-- (char*)&temp_s.var-(char*)&temp_s, enumv, min, max, readonly, descr },
-+ offsetof(__typeof__(temp_s), var), enumv, min, max, readonly, descr },
-
- #define END_PARAM_DESCR( name ) \
- { POST_PARAM_TYPE_LAST, NULL, 0, 0, NULL, 0, 0, 1, NULL } \
Deleted: trunk/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h
===================================================================
--- trunk/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,127 +0,0 @@
---- src/xine-engine/xine_internal.h.orig Sat Apr 22 00:46:33 2006
-+++ src/xine-engine/xine_internal.h Thu Sep 28 16:13:27 2006
-@@ -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
Deleted: trunk/multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,113 +0,0 @@
---- ./src/audio_out/audio_oss_out.c.orig 2010-01-15 01:17:54.000000000 +0300
-+++ ./src/audio_out/audio_oss_out.c 2010-06-19 01:49:48.446683938 +0400
-@@ -160,7 +160,7 @@
- uint32_t bits, uint32_t rate, int mode) {
-
- oss_driver_t *this = (oss_driver_t *) this_gen;
-- int tmp;
-+ long tmp;
-
- xprintf(this->xine, XINE_VERBOSITY_DEBUG,
- "audio_oss_out: ao_open rate=%d, mode=%d, dev=%s\n", rate, mode, this->audio_dev);
-@@ -292,14 +292,14 @@
- if (bits==8) {
- xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: SNDCTL_DSP_SETFMT failed for AFMT_U8.\n");
- if (tmp != AFMT_U8)
-- xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: ioctl succeeded but set format to 0x%x.\n",tmp);
-+ xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: ioctl succeeded but set format to 0x%lx.\n",tmp);
- else
- xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: The AFMT_U8 ioctl failed.\n");
- return 0;
- } else {
- xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: SNDCTL_DSP_SETFMT failed for AFMT_S16_NE.\n");
- if (tmp != AFMT_S16_NE)
-- xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: ioctl succeeded but set format to 0x%x.\n",tmp);
-+ xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: ioctl succeeded but set format to 0x%lx.\n",tmp);
- else
- xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio_oss_out: The AFMT_S16_NE ioctl failed.\n");
- return 0;
-@@ -318,7 +318,7 @@
- tmp = AFMT_AC3;
- if (ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp) < 0 || tmp != AFMT_AC3) {
- xprintf(this->xine, XINE_VERBOSITY_DEBUG,
-- "audio_oss_out: AC3 SNDCTL_DSP_SETFMT failed. %d. Using alternative.\n",tmp);
-+ "audio_oss_out: AC3 SNDCTL_DSP_SETFMT failed. %ld. Using alternative.\n",tmp);
- tmp = AFMT_S16_LE;
- ioctl(this->audio_fd, SNDCTL_DSP_SETFMT, &tmp);
- }
-@@ -374,7 +374,7 @@
-
- count_info info;
- oss_driver_t *this = (oss_driver_t *) this_gen;
-- int bytes_left;
-+ long bytes_left;
- int frames;
- struct timeval tv;
-
-@@ -514,7 +514,7 @@
- static int ao_oss_get_property (ao_driver_t *this_gen, int property) {
-
- oss_driver_t *this = (oss_driver_t *) this_gen;
-- int audio_devs;
-+ long audio_devs;
-
- switch(property) {
- case AO_PROP_PCM_VOL:
-@@ -523,7 +523,7 @@
-
- if(this->mixer.fd != -1) {
- IOCTL_REQUEST_TYPE cmd = 0;
-- int v;
-+ long v;
-
- ioctl(this->mixer.fd, SOUND_MIXER_READ_DEVMASK, &audio_devs);
-
-@@ -553,7 +553,7 @@
- static int ao_oss_set_property (ao_driver_t *this_gen, int property, int value) {
-
- oss_driver_t *this = (oss_driver_t *) this_gen;
-- int audio_devs;
-+ long audio_devs;
-
- switch(property) {
- case AO_PROP_PCM_VOL:
-@@ -562,7 +562,7 @@
-
- if(this->mixer.fd != -1) {
- IOCTL_REQUEST_TYPE cmd = 0;
-- int v;
-+ long v;
-
- ioctl(this->mixer.fd, SOUND_MIXER_READ_DEVMASK, &audio_devs);
-
-@@ -591,7 +591,7 @@
-
- if(this->mixer.fd != -1) {
- IOCTL_REQUEST_TYPE cmd = 0;
-- int v = 0;
-+ long v = 0;
-
- ioctl(this->mixer.fd, SOUND_MIXER_READ_DEVMASK, &audio_devs);
-
-@@ -664,7 +664,7 @@
- static int probe_audio_devices(oss_driver_t *this) {
- const char *base_names[2] = {"/dev/dsp", "/dev/sound/dsp"};
- int base_num, i;
-- int audio_fd, rate;
-+ long audio_fd, rate;
- int best_rate;
- char devname[30];
-
-@@ -703,9 +703,9 @@
- oss_class_t *class = (oss_class_t *) class_gen;
- config_values_t *config = class->config;
- oss_driver_t *this;
-- int caps;
-- int audio_fd;
-- int num_channels, status, arg;
-+ long caps;
-+ long audio_fd;
-+ long num_channels, status, arg;
- static char *sync_methods[] = {"auto", "getodelay", "getoptr", "softsync", "probebuffer", NULL};
- static char *devname_opts[] = {"auto", "/dev/dsp", "/dev/sound/dsp", NULL};
- int devname_val, devname_num;
Deleted: trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_dsputil.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_dsputil.c 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_dsputil.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,11 +0,0 @@
---- src/libffmpeg/libavcodec/dsputil.c.orig Sun Feb 18 22:17:14 2007
-+++ src/libffmpeg/libavcodec/dsputil.c Sun Feb 18 22:15:46 2007
-@@ -3810,7 +3810,7 @@
- static int did_fail=0;
- DECLARE_ALIGNED_16(int, aligned);
-
-- if((int)&aligned & 15){
-+ if((intptr_t)&aligned & 15){
- if(!did_fail){
- #if defined(HAVE_MMX) || defined(HAVE_ALTIVEC)
- av_log(NULL, AV_LOG_ERROR,
Deleted: trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_huffyuv.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_huffyuv.c 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_huffyuv.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,10 +0,0 @@
---- src/libffmpeg/libavcodec/huffyuv.c.orig Thu Sep 28 13:25:07 2006
-+++ src/libffmpeg/libavcodec/huffyuv.c Thu Sep 28 13:25:32 2006
-@@ -30,6 +30,7 @@
- #include "bitstream.h"
- #include "avcodec.h"
- #include "dsputil.h"
-+#include "xine_internal.h"
-
- #define VLC_BITS 11
-
Deleted: trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_mpegvideo.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_mpegvideo.c 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_mpegvideo.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,10 +0,0 @@
---- src/libffmpeg/libavcodec/mpegvideo.c.orig Thu Sep 28 13:27:10 2006
-+++ src/libffmpeg/libavcodec/mpegvideo.c Thu Sep 28 13:27:35 2006
-@@ -30,6 +30,7 @@
- #include "mpegvideo.h"
- #include "faandct.h"
- #include <limits.h>
-+#include "xine_internal.h"
-
- #ifdef USE_FASTMEMCPY
- #include "fastmemcpy.h"
Deleted: trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_vorbis.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_vorbis.c 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_vorbis.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,11 +0,0 @@
---- src/libffmpeg/libavcodec/vorbis.c.orig Thu Sep 28 13:27:16 2006
-+++ src/libffmpeg/libavcodec/vorbis.c Thu Sep 28 13:27:41 2006
-@@ -29,6 +29,8 @@
- #include "dsputil.h"
-
- #include "vorbis.h"
-+#include "xine_internal.h"
-+
-
- #define V_NB_BITS 8
- #define V_NB_BITS2 11
Deleted: trunk/multimedia/libxine/files/patch-src_libreal_real_common.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src_libreal_real_common.c 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src_libreal_real_common.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,10 +0,0 @@
---- src/libreal/real_common.c.orig 2008-01-01 22:30:08.000000000 +0900
-+++ src/libreal/real_common.c 2008-01-13 04:05:14.000000000 +0900
-@@ -97,6 +97,7 @@
- { O | UL, "codecs" },
- { O | UL | UL64, "real" },
- { O, "real/RealPlayer/codecs" },
-+ { OL | OL64 | UL | UL64, "RealPlayer/codecs" },
- { OL | OL64 | UL | UL64, "RealPlayer10GOLD/codecs" },
- { OL | OL64 | UL | UL64, "RealPlayer10/codecs" },
- { OL | OL64 | UL | UL64, "RealPlayer9/users/Real/Codecs" },
Deleted: trunk/multimedia/libxine/files/patch-src_libreal_xine_real_audio_decoder.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src_libreal_xine_real_audio_decoder.c 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src_libreal_xine_real_audio_decoder.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,22 +0,0 @@
---- src/libreal/xine_real_audio_decoder.c.orig 2008-01-01 22:30:08.000000000 +0900
-+++ src/libreal/xine_real_audio_decoder.c 2008-01-20 01:44:15.000000000 +0900
-@@ -45,6 +45,19 @@
-
- #include "real_common.h"
-
-+#if defined(__FreeBSD__)
-+void ___brk_addr(void) {exit(0);}
-+void __ctype_b(void) {exit(0);}
-+void __strtod_internal(void) {exit(0);}
-+void __strtold_internal(void) {exit(0);}
-+void __strtof_internal(void) {exit(0);}
-+void __errno_location(void) {exit(0);}
-+void dl_iterate_phdr(void) {exit(0);}
-+char **__environ={NULL};
-+#undef stderr
-+FILE *stderr=NULL;
-+#endif
-+
- typedef struct {
- audio_decoder_class_t decoder_class;
-
Deleted: trunk/multimedia/libxine/files/patch-src_video_out_libdha_sysdep_pci_freebsd.c
===================================================================
--- trunk/multimedia/libxine/files/patch-src_video_out_libdha_sysdep_pci_freebsd.c 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/files/patch-src_video_out_libdha_sysdep_pci_freebsd.c 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,11 +0,0 @@
---- src/video_out/libdha/sysdep/pci_freebsd.c.orig Sun May 28 22:49:02 2006
-+++ src/video_out/libdha/sysdep/pci_freebsd.c Sun May 28 22:50:59 2006
-@@ -8,7 +8,7 @@
- /* machine/console.h seems to be outdated by recent FreeBSD *
- * however pcvt_ioctl.h seems to exist for very long time */
- /* #include <machine/console.h>*/
--#include <machine/pcvt_ioctl.h>
-+#include <sys/kbio.h>
- #ifndef GCCUSESGAS
- #define GCCUSESGAS
- #endif
Modified: trunk/multimedia/libxine/pkg-descr
===================================================================
--- trunk/multimedia/libxine/pkg-descr 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/pkg-descr 2016-08-13 13:10:38 UTC (rev 21580)
@@ -5,4 +5,4 @@
These are the libraries for the xine.
-WWW: http://www.xine-project.org
+WWW: http://www.xine-project.org
Property changes on: trunk/multimedia/libxine/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/multimedia/libxine/pkg-plist
===================================================================
--- trunk/multimedia/libxine/pkg-plist 2016-08-13 13:08:47 UTC (rev 21579)
+++ trunk/multimedia/libxine/pkg-plist 2016-08-13 13:10:38 UTC (rev 21580)
@@ -1,5 +1,5 @@
bin/xine-config
-bin/xine-list-1.1
+bin/xine-list-1.2
include/xine.h
include/xine/alphablend.h
include/xine/attributes.h
@@ -26,7 +26,10 @@
include/xine/ring_buffer.h
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/video_decoder.h
include/xine/video_out.h
include/xine/video_overlay.h
@@ -33,7 +36,6 @@
include/xine/vo_scale.h
include/xine/xine_buffer.h
include/xine/xine_internal.h
-include/xine/xine_mmx.h
include/xine/xine_plugin.h
include/xine/xineintl.h
include/xine/xineutils.h
@@ -41,7 +43,45 @@
include/xine/xmlparser.h
lib/libxine.la
lib/libxine.so
-lib/libxine.so.1
+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
%%PLUGINSDIR%%/mime.types
%%PLUGINSDIR%%/post/xineplug_post_audio_filters.so
%%PLUGINSDIR%%/post/xineplug_post_goom.so
@@ -50,26 +90,12 @@
%%PLUGINSDIR%%/post/xineplug_post_switch.so
%%PLUGINSDIR%%/post/xineplug_post_tvtime.so
%%PLUGINSDIR%%/post/xineplug_post_visualizations.so
- at exec mkdir -p %D/%%PLUGINSDIR%%/vidix
-%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/cyberblade_vid.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/mach64_vid.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/mga_crtc2_vid.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/mga_vid.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/nvidia_vid.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/pm2_vid.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/pm3_vid.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/radeon_vid.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/rage128_vid.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/savage_vid.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/sis_vid.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/vidix/unichrome_vid.so
-%%WITH_ARTS%%%%PLUGINSDIR%%/xineplug_ao_out_arts.so
-%%WITH_ESOUND%%%%PLUGINSDIR%%/xineplug_ao_out_esd.so
-%%WITH_JACK%%%%PLUGINSDIR%%/xineplug_ao_out_jack.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
-%%WITH_PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so
+%%PULSEAUDIO%%%%PLUGINSDIR%%/xineplug_ao_out_pulseaudio.so
%%PLUGINSDIR%%/xineplug_decode_a52.so
%%PLUGINSDIR%%/xineplug_decode_bitplane.so
%%PLUGINSDIR%%/xineplug_decode_dts.so
@@ -76,26 +102,26 @@
%%PLUGINSDIR%%/xineplug_decode_dvaudio.so
%%PLUGINSDIR%%/xineplug_decode_faad.so
%%PLUGINSDIR%%/xineplug_decode_ff.so
-%%WITH_GTK2%%%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so
+%%PIXBUF%%%%PLUGINSDIR%%/xineplug_decode_gdk_pixbuf.so
%%PLUGINSDIR%%/xineplug_decode_gsm610.so
-%%WITH_IMAGEMAGICK%%%%PLUGINSDIR%%/xineplug_decode_image.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_mpc.so
%%PLUGINSDIR%%/xineplug_decode_mpeg2.so
-%%PLUGINSDIR%%/xineplug_decode_nsf.so
%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_decode_qt.so
-%%PLUGINSDIR%%/xineplug_decode_real.so
%%PLUGINSDIR%%/xineplug_decode_rgb.so
-%%PLUGINSDIR%%/xineplug_decode_speex.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_sputext.so
-%%PLUGINSDIR%%/xineplug_decode_theora.so
-%%PLUGINSDIR%%/xineplug_decode_vorbis.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_dmx_asf.so
@@ -108,6 +134,7 @@
%%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
@@ -114,21 +141,22 @@
%%PLUGINSDIR%%/xineplug_dmx_mpeg_pes.so
%%PLUGINSDIR%%/xineplug_dmx_mpeg_ts.so
%%PLUGINSDIR%%/xineplug_dmx_nsv.so
-%%PLUGINSDIR%%/xineplug_dmx_ogg.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_sputext.so
+%%PLUGINSDIR%%/xineplug_dmx_vc1_es.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
-%%WITH_GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so
+%%GNOMEVFS2%%%%PLUGINSDIR%%/xineplug_inp_gnome_vfs.so
%%PLUGINSDIR%%/xineplug_inp_http.so
%%PLUGINSDIR%%/xineplug_inp_mms.so
%%PLUGINSDIR%%/xineplug_inp_net.so
@@ -135,25 +163,35 @@
%%PLUGINSDIR%%/xineplug_inp_pnm.so
%%PLUGINSDIR%%/xineplug_inp_rtp.so
%%PLUGINSDIR%%/xineplug_inp_rtsp.so
-%%WITH_SMB%%%%PLUGINSDIR%%/xineplug_inp_smb.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
-%%WITH_AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so
-%%WITH_CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so
+%%PLUGINSDIR%%/xineplug_nsf.so
+%%PLUGINSDIR%%/xineplug_sputext.so
+%%PLUGINSDIR%%/xineplug_vdr.so
+%%AALIB%%%%PLUGINSDIR%%/xineplug_vo_out_aa.so
+%%CACA%%%%PLUGINSDIR%%/xineplug_vo_out_caca.so
%%PLUGINSDIR%%/xineplug_vo_out_none.so
%%PLUGINSDIR%%/xineplug_vo_out_opengl.so
+%%PLUGINSDIR%%/xineplug_vo_out_opengl2.so
%%PLUGINSDIR%%/xineplug_vo_out_raw.so
%%PLUGINSDIR%%/xineplug_vo_out_sdl.so
-%%WITH_VIDIX%%%%PLUGINSDIR%%/xineplug_vo_out_vidix.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
-%%WITH_XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xvmc.so
-%%WITH_XVMC%%%%PLUGINSDIR%%/xineplug_vo_out_xxmc.so
-%%WITH_WAVPACK%%%%PLUGINSDIR%%/xineplug_wavpack.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
share/aclocal/xine.m4
%%DOCSDIR%%/COPYING
%%DOCSDIR%%/CREDITS
@@ -162,14 +200,15 @@
%%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.syncfb
%%DOCSDIR%%/README_xxmc.html
%%DOCSDIR%%/TODO
%%DOCSDIR%%/faq.html
@@ -179,73 +218,16 @@
%%DOCSDIR%%/hackersguide/library.png
%%DOCSDIR%%/hackersguide/overlays.png
%%DOCSDIR%%/hackersguide/post_frame.png
-%%NLS%%share/locale/cs/LC_MESSAGES/libxine1.mo
-%%NLS%%share/locale/de/LC_MESSAGES/libxine1.mo
-%%NLS%%share/locale/en_US/LC_MESSAGES/libxine1.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/libxine1.mo
-%%NLS%%share/locale/es/LC_MESSAGES/libxine1.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/libxine1.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/libxine1.mo
-%%NLS%%share/locale/it/LC_MESSAGES/libxine1.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/libxine1.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/libxine1.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/libxine1.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/libxine1.mo
-%%DATADIR%%/libxine1/fonts/cc-16.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cc-20.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cc-24.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cc-32.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cc-48.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cc-64.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cci-16.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cci-20.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cci-24.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cci-32.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cci-48.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cci-64.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cetus-16.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cetus-20.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cetus-24.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cetus-32.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cetus-48.xinefont.gz
-%%DATADIR%%/libxine1/fonts/cetus-64.xinefont.gz
-%%DATADIR%%/libxine1/fonts/mono-16.xinefont.gz
-%%DATADIR%%/libxine1/fonts/mono-20.xinefont.gz
-%%DATADIR%%/libxine1/fonts/mono-24.xinefont.gz
-%%DATADIR%%/libxine1/fonts/mono-32.xinefont.gz
-%%DATADIR%%/libxine1/fonts/mono-48.xinefont.gz
-%%DATADIR%%/libxine1/fonts/mono-64.xinefont.gz
-%%DATADIR%%/libxine1/fonts/sans-16.xinefont.gz
-%%DATADIR%%/libxine1/fonts/sans-20.xinefont.gz
-%%DATADIR%%/libxine1/fonts/sans-24.xinefont.gz
-%%DATADIR%%/libxine1/fonts/sans-32.xinefont.gz
-%%DATADIR%%/libxine1/fonts/sans-48.xinefont.gz
-%%DATADIR%%/libxine1/fonts/sans-64.xinefont.gz
-%%DATADIR%%/libxine1/fonts/serif-16.xinefont.gz
-%%DATADIR%%/libxine1/fonts/serif-20.xinefont.gz
-%%DATADIR%%/libxine1/fonts/serif-24.xinefont.gz
-%%DATADIR%%/libxine1/fonts/serif-32.xinefont.gz
-%%DATADIR%%/libxine1/fonts/serif-48.xinefont.gz
-%%DATADIR%%/libxine1/fonts/serif-64.xinefont.gz
-%%VDPAU%%include/xine/vdr.h
-%%VDPAU%%%%PLUGINSDIR%%/xineplug_vo_out_vdpau.so
-%%VDPAU%%%%PLUGINSDIR%%/xineplug_dmx_vc1_es.so
-%%VDPAU%%%%PLUGINSDIR%%/xineplug_decode_vdpau_h264.so
-%%VDPAU%%%%PLUGINSDIR%%/xineplug_decode_vdpau_mpeg12.so
-%%VDPAU%%%%PLUGINSDIR%%/xineplug_decode_vdpau_vc1.so
-%%VDPAU%%%%PLUGINSDIR%%/xineplug_vdr.so
- at dirrm include/xine
- at dirrm %%PLUGINSDIR%%/vidix
- at dirrm %%PLUGINSDIR%%/post
- at dirrmtry %%PLUGINSDIR%%
- at dirrmtry lib/xine/plugins
- at dirrmtry lib/xine
- at dirrm %%DOCSDIR%%/hackersguide
- at dirrm %%DOCSDIR%%
-%%NLS%%@dirrmtry share/locale/pl_PL/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/pl_PL
-%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/en_US
- at dirrm %%DATADIR%%/libxine1/fonts
- at dirrm %%DATADIR%%/libxine1
- at dirrmtry %%DATADIR%%
+%%NLS%%share/locale/cs/LC_MESSAGES/libxine2.mo
+%%NLS%%share/locale/de/LC_MESSAGES/libxine2.mo
+%%NLS%%share/locale/en_US/LC_MESSAGES/libxine2.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/libxine2.mo
+%%NLS%%share/locale/es/LC_MESSAGES/libxine2.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/libxine2.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/libxine2.mo
+%%NLS%%share/locale/it/LC_MESSAGES/libxine2.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/libxine2.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/libxine2.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/libxine2.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/libxine2.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/libxine2.mo
More information about the Midnightbsd-cvs
mailing list