Update to 0.9.13.

7 files changed, 168 insertions, 15 deletions

diff --git a/graphics/libxine/Makefile b/graphics/libxine/Makefile
index 626373e991c8..f161a665184a 100644
--- a/graphics/libxine/Makefile
+++ b/graphics/libxine/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	0.9.12
-PORTREVISION=	1
+PORTVERSION=	0.9.13
 CATEGORIES=	graphics
 MASTER_SITES=	http://xine.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/graphics/libxine/distinfo b/graphics/libxine/distinfo
index 9f81e2b9c76c..a22c1d5eeab2 100644
--- a/graphics/libxine/distinfo
+++ b/graphics/libxine/distinfo
@@ -1 +1 @@
-MD5 (xine-lib-0.9.12.tar.gz) = 8bad647e6ef9c31723129fb95e40c73c
+MD5 (xine-lib-0.9.13.tar.gz) = 2e37c40bb78732187e3375a220405063
diff --git a/graphics/libxine/files/patch-src:libffmpeg:xine_decoder.c b/graphics/libxine/files/patch-src:libffmpeg:xine_decoder.c
index 949357430d4c..448a46a44b15 100644
--- a/graphics/libxine/files/patch-src:libffmpeg:xine_decoder.c
+++ b/graphics/libxine/files/patch-src:libffmpeg:xine_decoder.c
@@ -1,13 +1,43 @@
---- src/libffmpeg/xine_decoder.c.orig	Fri Oct 19 21:17:15 2001
-+++ src/libffmpeg/xine_decoder.c	Fri Oct 19 21:17:39 2001
-@@ -38,8 +38,8 @@
- #include "buffer.h"
+--- src/libffmpeg/xine_decoder.c.orig	Fri Aug  2 00:26:53 2002
++++ src/libffmpeg/xine_decoder.c	Mon Aug  5 22:56:40 2002
+@@ -39,8 +39,8 @@
  #include "metronom.h"
+ #include "xineutils.h"
  
 -#include "libavcodec/avcodec.h"
 -#include "libavcodec/dsputil.h"
 +#include <libavcodec/avcodec.h>
 +#include <libavcodec/dsputil.h>
  
- /* now this is ripped of wine's vfw.h */
- typedef struct {
+ /*
+ #define LOG
+@@ -379,29 +379,6 @@
+ 
+ static char *ff_get_id(void) {
+   return "ffmpeg video decoder";
+-}
+-
+-void avcodec_register_all(void)
+-{
+-    static int inited = 0;
+-    
+-    if (inited != 0)
+-	return;
+-    inited = 1;
+-
+-    /* decoders */
+-    register_avcodec(&h263_decoder);
+-    register_avcodec(&mpeg4_decoder);
+-    register_avcodec(&msmpeg4v1_decoder);
+-    register_avcodec(&msmpeg4v2_decoder);
+-    register_avcodec(&msmpeg4v3_decoder);
+-    register_avcodec(&wmv1_decoder);
+-    register_avcodec(&wmv2_decoder);
+-    register_avcodec(&mpeg_decoder);
+-    register_avcodec(&h263i_decoder);
+-    register_avcodec(&rv10_decoder);
+-    register_avcodec(&svq1_decoder);
+-    register_avcodec(&mjpeg_decoder);
+ }
+ 
+ static void init_routine(void) {
diff --git a/graphics/libxine/pkg-plist b/graphics/libxine/pkg-plist
index 5ce2ff123d20..5b0aaa93fc1e 100644
--- a/graphics/libxine/pkg-plist
+++ b/graphics/libxine/pkg-plist
@@ -11,6 +11,7 @@ include/xine/lrb.h
 include/xine/metronom.h
 include/xine/osd.h
 include/xine/ppcasm_string.h
+include/xine/qtpalette.h
 include/xine/resample.h
 include/xine/scratch.h
 include/xine/spu_decoder.h
@@ -25,9 +26,9 @@ include/xine/xmllexer.h
 include/xine/xmlparser.h
 include/xine.h
 lib/libxine.so
-lib/libxine.so.1
+lib/libxine.so.2
 lib/libxineutils.so
-lib/libxineutils.so.1
+lib/libxineutils.so.2
 %%HAVE_ARTS%%lib/xine/plugins/xineplug_ao_out_arts.so
 lib/xine/plugins/xineplug_ao_out_esd.so
 lib/xine/plugins/xineplug_ao_out_oss.so
@@ -37,11 +38,15 @@ lib/xine/plugins/xineplug_decode_cinepak.so
 lib/xine/plugins/xineplug_decode_cyuv.so
 lib/xine/plugins/xineplug_decode_divx4.so
 lib/xine/plugins/xineplug_decode_dts.so
+lib/xine/plugins/xineplug_decode_faad.so
 lib/xine/plugins/xineplug_decode_ff.so
+lib/xine/plugins/xineplug_decode_fli.so
 lib/xine/plugins/xineplug_decode_lpcm.so
 lib/xine/plugins/xineplug_decode_mad.so
 lib/xine/plugins/xineplug_decode_mpeg2.so
+lib/xine/plugins/xineplug_decode_msrle.so
 lib/xine/plugins/xineplug_decode_msvc.so
+lib/xine/plugins/xineplug_decode_rgb.so
 lib/xine/plugins/xineplug_decode_roqaudio.so
 lib/xine/plugins/xineplug_decode_roqvideo.so
 lib/xine/plugins/xineplug_decode_spu.so
@@ -49,19 +54,24 @@ lib/xine/plugins/xineplug_decode_spucc.so
 lib/xine/plugins/xineplug_decode_sputext.so
 lib/xine/plugins/xineplug_decode_svq1.so
 %%HAVE_VORBIS%%lib/xine/plugins/xineplug_decode_vorbis.so
+lib/xine/plugins/xineplug_decode_yuv.so
 lib/xine/plugins/xineplug_decode_w32dll.so
 lib/xine/plugins/xineplug_dmx_asf.so
 lib/xine/plugins/xineplug_dmx_avi.so
 lib/xine/plugins/xineplug_dmx_cda.so
 lib/xine/plugins/xineplug_dmx_film.so
+lib/xine/plugins/xineplug_dmx_fli.so
+lib/xine/plugins/xineplug_dmx_idcin.so
 lib/xine/plugins/xineplug_dmx_mpeg.so
 lib/xine/plugins/xineplug_dmx_mpeg_audio.so
 lib/xine/plugins/xineplug_dmx_mpeg_block.so
 lib/xine/plugins/xineplug_dmx_mpeg_elem.so
 lib/xine/plugins/xineplug_dmx_mpeg_pes.so
 lib/xine/plugins/xineplug_dmx_mpeg_ts.so
-lib/xine/plugins/xineplug_dmx_roq.so
 %%HAVE_OGG%%lib/xine/plugins/xineplug_dmx_ogg.so
+lib/xine/plugins/xineplug_dmx_roq.so
+lib/xine/plugins/xineplug_dmx_smjpeg.so
+lib/xine/plugins/xineplug_dmx_wav.so
 lib/xine/plugins/xineplug_dmx_qt.so
 lib/xine/plugins/xineplug_inp_dvd.so
 lib/xine/plugins/xineplug_inp_file.so
diff --git a/graphics/xine/Makefile b/graphics/xine/Makefile
index 65f34245a9c9..ee559aec5b19 100644
--- a/graphics/xine/Makefile
+++ b/graphics/xine/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	0.9.12
+PORTVERSION=	0.9.13
 CATEGORIES=	graphics
 MASTER_SITES=	http://xine.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -15,7 +15,7 @@ DISTNAME=	${PORTNAME}-ui-${PORTVERSION}
 
 MAINTAINER=	nobutaka@FreeBSD.org
 
-LIB_DEPENDS=	xine.1:${PORTSDIR}/graphics/libxine \
+LIB_DEPENDS=	xine.2:${PORTSDIR}/graphics/libxine \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		png.5:${PORTSDIR}/graphics/png \
 		intl.4:${PORTSDIR}/devel/gettext
diff --git a/graphics/xine/distinfo b/graphics/xine/distinfo
index e8b2dd45852e..ccf1bca61be8 100644
--- a/graphics/xine/distinfo
+++ b/graphics/xine/distinfo
@@ -1 +1 @@
-MD5 (xine-ui-0.9.12.tar.gz) = 10c596e45a4c2d44d80155df2c08ad92
+MD5 (xine-ui-0.9.13.tar.gz) = 7f7838f90b830ec25b905c8eb0215321
diff --git a/graphics/xine/pkg-plist b/graphics/xine/pkg-plist
index 0f9fb861bbbd..d7b7e99d730f 100644
--- a/graphics/xine/pkg-plist
+++ b/graphics/xine/pkg-plist
@@ -113,6 +113,118 @@ share/xine/skins/CelomaChrome/SliderVBg.png
 share/xine/skins/CelomaChrome/SliderVPad.png
 share/xine/skins/CelomaChrome/SnapBtn.png
 share/xine/skins/CelomaChrome/skinconfig
+share/xine/skins/cloudy/ComBox.png
+share/xine/skins/cloudy/ComDismiss.png
+share/xine/skins/cloudy/ComLetters.png
+share/xine/skins/cloudy/ComScrollArrowDown.png
+share/xine/skins/cloudy/ComScrollArrowUp.png
+share/xine/skins/cloudy/ComScrollBg.png
+share/xine/skins/cloudy/ComScrollPad.png
+share/xine/skins/cloudy/CtlBg.png
+share/xine/skins/cloudy/CtlSkinItem.png
+share/xine/skins/cloudy/CtlSkinScrollBg.png
+share/xine/skins/cloudy/CtlSliderBg.png
+share/xine/skins/cloudy/CtlSliderPad.png
+share/xine/skins/cloudy/MainAutoButton.png
+share/xine/skins/cloudy/MainBg.png
+share/xine/skins/cloudy/MainClose.png
+share/xine/skins/cloudy/MainCtlBtn.png
+share/xine/skins/cloudy/MainEject.png
+share/xine/skins/cloudy/MainFullScreen.png
+share/xine/skins/cloudy/MainMrlBtn.png
+share/xine/skins/cloudy/MainMute.png
+share/xine/skins/cloudy/MainNext.png
+share/xine/skins/cloudy/MainPause.png
+share/xine/skins/cloudy/MainPlBtn.png
+share/xine/skins/cloudy/MainPlay.png
+share/xine/skins/cloudy/MainPlayFast.png
+share/xine/skins/cloudy/MainPlaySlow.png
+share/xine/skins/cloudy/MainPower.png
+share/xine/skins/cloudy/MainPrev.png
+share/xine/skins/cloudy/MainSetup.png
+share/xine/skins/cloudy/MainSliderBg.png
+share/xine/skins/cloudy/MainSliderPad.png
+share/xine/skins/cloudy/MainSmallArrowDown.png
+share/xine/skins/cloudy/MainSmallArrowUp.png
+share/xine/skins/cloudy/MainSnapshot.png
+share/xine/skins/cloudy/MainStop.png
+share/xine/skins/cloudy/MainVolumeBg.png
+share/xine/skins/cloudy/MainVolumePad.png
+share/xine/skins/cloudy/MrlBg.png
+share/xine/skins/cloudy/MrlItem.png
+share/xine/skins/cloudy/MrlPlay.png
+share/xine/skins/cloudy/MrlSelect.png
+share/xine/skins/cloudy/PlAdd.png
+share/xine/skins/cloudy/PlBg.png
+share/xine/skins/cloudy/PlDelete.png
+share/xine/skins/cloudy/PlDeleteAll.png
+share/xine/skins/cloudy/PlInputText.png
+share/xine/skins/cloudy/PlItem.png
+share/xine/skins/cloudy/PlMoveDown.png
+share/xine/skins/cloudy/PlMoveUp.png
+share/xine/skins/cloudy/PlPlay.png
+share/xine/skins/cloudy/fatsolid.pcf.gz
+share/xine/skins/cloudy/fonts.dir
+share/xine/skins/cloudy/skinconfig
+share/xine/skins/cloudy/smooth.pcf.gz
+share/xine/skins/xinetic/ArrowDown.png
+share/xine/skins/xinetic/ArrowUp.png
+share/xine/skins/xinetic/BigArrowDown.png
+share/xine/skins/xinetic/BigArrowUp.png
+share/xine/skins/xinetic/CtlBg.png
+share/xine/skins/xinetic/CtlBtn.png
+share/xine/skins/xinetic/CtlDismiss.png
+share/xine/skins/xinetic/CtlDummy.png
+share/xine/skins/xinetic/CtlReset.png
+share/xine/skins/xinetic/CtlSave.png
+share/xine/skins/xinetic/Letters.png
+share/xine/skins/xinetic/MainAutoButton.png
+share/xine/skins/xinetic/MainBg.png
+share/xine/skins/xinetic/MainCam.png
+share/xine/skins/xinetic/MainClose.png
+share/xine/skins/xinetic/MainDown.png
+share/xine/skins/xinetic/MainEject.png
+share/xine/skins/xinetic/MainFastB.png
+share/xine/skins/xinetic/MainFastF.png
+share/xine/skins/xinetic/MainFullScreen.png
+share/xine/skins/xinetic/MainMute.png
+share/xine/skins/xinetic/MainNext.png
+share/xine/skins/xinetic/MainPause.png
+share/xine/skins/xinetic/MainPlay.png
+share/xine/skins/xinetic/MainPower.png
+share/xine/skins/xinetic/MainPrev.png
+share/xine/skins/xinetic/MainSetup.png
+share/xine/skins/xinetic/MainStop.png
+share/xine/skins/xinetic/MainUp.png
+share/xine/skins/xinetic/MainVolumeBg.png
+share/xine/skins/xinetic/MainVolumePad.png
+share/xine/skins/xinetic/MrlBg.png
+share/xine/skins/xinetic/MrlBtn.png
+share/xine/skins/xinetic/MrlDismiss.png
+share/xine/skins/xinetic/MrlSelect.png
+share/xine/skins/xinetic/Onglet.png
+share/xine/skins/xinetic/PlBg.png
+share/xine/skins/xinetic/PlBtn.png
+share/xine/skins/xinetic/PlDelete.png
+share/xine/skins/xinetic/PlDeleteAll.png
+share/xine/skins/xinetic/PlDismiss.png
+share/xine/skins/xinetic/PlInputTxt.png
+share/xine/skins/xinetic/PlItemBtn.png
+share/xine/skins/xinetic/PlMoveDn.png
+share/xine/skins/xinetic/PlMoveUp.png
+share/xine/skins/xinetic/PlPlay.png
+share/xine/skins/xinetic/SkArrowDown.png
+share/xine/skins/xinetic/SkArrowUp.png
+share/xine/skins/xinetic/SkItemBtn.png
+share/xine/skins/xinetic/SkSlidBG.png
+share/xine/skins/xinetic/SkSlidPad.png
+share/xine/skins/xinetic/SliderHBg.png
+share/xine/skins/xinetic/SliderHPad.png
+share/xine/skins/xinetic/SliderVBg.png
+share/xine/skins/xinetic/SliderVPad.png
+share/xine/skins/xinetic/SmallArrowDown.png
+share/xine/skins/xinetic/SmallArrowUp.png
+share/xine/skins/xinetic/skinconfig
 @dirrm man/es/man1
 @dirrm man/es
 @dirrm man/fr/man1
@@ -120,6 +232,8 @@ share/xine/skins/CelomaChrome/skinconfig
 @dirrm man/pl/man1
 @dirrm man/pl
 @dirrm share/xine/skins/CelomaChrome
+@dirrm share/xine/skins/cloudy
+@dirrm share/xine/skins/xinetic
 @dirrm share/xine/desktop
 @unexec rmdir %D/share/idl 2>/dev/null || true
 @unexec rmdir %D/share/xine/skins 2>/dev/null || true