Update to 0.9.13.

4 files changed, 51 insertions, 12 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 626373e991c8..f161a665184a 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/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/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index 9f81e2b9c76c..a22c1d5eeab2 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/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/multimedia/libxine/files/patch-src:libffmpeg:xine_decoder.c b/multimedia/libxine/files/patch-src:libffmpeg:xine_decoder.c
index 949357430d4c..448a46a44b15 100644
--- a/multimedia/libxine/files/patch-src:libffmpeg:xine_decoder.c
+++ b/multimedia/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/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 5ce2ff123d20..5b0aaa93fc1e 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/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