Update to 1-beta9.

9 files changed, 12 insertions, 85 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index fff7e448aaac..b2056d6f9fe0 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,19 +6,18 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	1.0.b6
+PORTVERSION=	1.0.b9
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	lib
-DISTNAME=	${PORTNAME}-lib-1-beta6
+DISTNAME=	${PORTNAME}-lib-1-beta9
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libdjbfft.a:${PORTSDIR}/math/djbfft
-LIB_DEPENDS=	avcodec.0:${PORTSDIR}/multimedia/ffmpeg \
-		a52.0:${PORTSDIR}/audio/liba52 \
+LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
 		mad.1:${PORTSDIR}/audio/mad \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		intl.4:${PORTSDIR}/devel/gettext \
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index 5a9e49b7271e..0836b719c12c 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1 +1 @@
-MD5 (xine-lib-1-beta6.tar.gz) = d3c15dcc2f760619688d8d7a6ca8b43f
+MD5 (xine-lib-1-beta9.tar.gz) = bd921a5098443fe4f138a41fb79caf9c
diff --git a/multimedia/libxine/files/patch-src:input:libreal:real.c b/multimedia/libxine/files/patch-src:input:libreal:real.c
deleted file mode 100644
index 33b487a35922..000000000000
--- a/multimedia/libxine/files/patch-src:input:libreal:real.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/input/libreal/real.c.orig	Sat Feb  1 22:31:41 2003
-+++ src/input/libreal/real.c	Sat Feb  1 22:33:31 2003
-@@ -26,6 +26,7 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <sys/types.h>
- 
- #include "real.h"
- #include "asmrp.h"
diff --git a/multimedia/libxine/files/patch-src:input:libreal:sdpplin.c b/multimedia/libxine/files/patch-src:input:libreal:sdpplin.c
deleted file mode 100644
index 8e8d174befae..000000000000
--- a/multimedia/libxine/files/patch-src:input:libreal:sdpplin.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/input/libreal/sdpplin.c.orig	Sun Jan  5 19:28:03 2003
-+++ src/input/libreal/sdpplin.c	Sun Jan  5 19:29:02 2003
-@@ -22,7 +22,8 @@
-  * sdp/sdpplin parser.
-  *
-  */
-- 
-+
-+#include <sys/types.h> 
- #include "rmff.h"
- #include "rtsp.h"
- #include "sdpplin.h"
diff --git a/multimedia/libxine/files/patch-src:input:librtsp:rtsp.c b/multimedia/libxine/files/patch-src:input:librtsp:rtsp.c
deleted file mode 100644
index bcdf81cde1c7..000000000000
--- a/multimedia/libxine/files/patch-src:input:librtsp:rtsp.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/input/librtsp/rtsp.c.orig	Sun Jan  5 19:30:50 2003
-+++ src/input/librtsp/rtsp.c	Sun Jan  5 19:31:21 2003
-@@ -23,6 +23,7 @@
-  * *not* RFC 2326 compilant yet.
-  */
- 
-+#include <sys/types.h>
- #include <unistd.h>
- #include <stdio.h>
- #include <assert.h>
diff --git a/multimedia/libxine/files/patch-src:liba52:xine_decoder.c b/multimedia/libxine/files/patch-src:liba52:xine_decoder.c
index bd261755a741..a17a4aa11a12 100644
--- a/multimedia/libxine/files/patch-src:liba52:xine_decoder.c
+++ b/multimedia/libxine/files/patch-src:liba52:xine_decoder.c
@@ -1,5 +1,5 @@
---- src/liba52/xine_decoder.c.orig	Mon Nov 25 06:08:51 2002
-+++ src/liba52/xine_decoder.c	Sat Nov 30 11:38:41 2002
+--- src/liba52/xine_decoder.c.orig	Tue Feb 18 07:15:22 2003
++++ src/liba52/xine_decoder.c	Tue Mar 25 00:39:52 2003
 @@ -37,8 +37,8 @@
  
  #include "xine_internal.h"
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:Makefile.in b/multimedia/libxine/files/patch-src:libffmpeg:Makefile.in
deleted file mode 100644
index 3e608305fbc7..000000000000
--- a/multimedia/libxine/files/patch-src:libffmpeg:Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/libffmpeg/Makefile.in.orig	Thu Jan 16 23:08:15 2003
-+++ src/libffmpeg/Makefile.in	Fri Jan 17 00:50:59 2003
-@@ -204,8 +204,6 @@
- install_sh = @install_sh@
- w32_path = @w32_path@
- 
--SUBDIRS = libavcodec 
--
- # I don't think this should include internal docs that are not interesting
- # for end users at all... -siggi
- EXTRA_DIST = 
-@@ -217,8 +215,7 @@
- 
- xineplug_decode_ff_la_SOURCES = xine_decoder.c
- xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
--xineplug_decode_ff_la_LIBADD = $(XINE_LIB) \
--	$(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la
-+xineplug_decode_ff_la_LIBADD = $(XINE_LIB) -lavcodec
- 
- subdir = src/libffmpeg
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -226,9 +223,7 @@
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(lib_LTLIBRARIES)
- 
--xineplug_decode_ff_la_DEPENDENCIES = \
--	$(top_builddir)/src/xine-engine/libxine.la \
--	$(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la
-+xineplug_decode_ff_la_DEPENDENCIES = $(top_builddir)/src/xine-engine/libxine.la
- am_xineplug_decode_ff_la_OBJECTS = xine_decoder.lo
- xineplug_decode_ff_la_OBJECTS = $(am_xineplug_decode_ff_la_OBJECTS)
- 
diff --git a/multimedia/libxine/files/patch-src:libffmpeg:xine_decoder.c b/multimedia/libxine/files/patch-src:libffmpeg:xine_decoder.c
deleted file mode 100644
index 27282f779bbb..000000000000
--- a/multimedia/libxine/files/patch-src:libffmpeg:xine_decoder.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/libffmpeg/xine_decoder.c.orig	Thu Jan 30 23:25:11 2003
-+++ src/libffmpeg/xine_decoder.c	Thu Jan 30 23:25:14 2003
-@@ -40,8 +40,8 @@
- #include "xineutils.h"
- #include "math.h"
- 
--#include "libavcodec/avcodec.h"
--#include "libavcodec/dsputil.h"
-+#include <ffmpeg/avcodec.h>
-+#include <ffmpeg/dsputil.h>
- 
- /*
- #define LOG
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 1365383a3e78..0786216d5ee5 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -7,6 +7,8 @@ include/xine/buffer.h
 include/xine/compat.h
 include/xine/configfile.h
 include/xine/demux.h
+include/xine/dvd_reader.h
+include/xine/ifo_types.h
 include/xine/input_plugin.h
 include/xine/lrb.h
 include/xine/metronom.h
@@ -32,9 +34,11 @@ include/xine/xineutils.h
 include/xine/xmllexer.h
 include/xine/xmlparser.h
 lib/libxine.so
-lib/libxine.so.4
+lib/libxine.so.5
 lib/xine/plugins/1.0.0/post/xineplug_post_goom.so
 lib/xine/plugins/1.0.0/post/xineplug_post_invert.so
+lib/xine/plugins/1.0.0/post/xineplug_post_mosaico.so
+lib/xine/plugins/1.0.0/post/xineplug_post_switch.so
 lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.so
 %%HAVE_ARTS%%lib/xine/plugins/1.0.0/xineplug_ao_out_arts.so
 %%HAVE_ESOUND%%lib/xine/plugins/1.0.0/xineplug_ao_out_esd.so
@@ -103,6 +107,7 @@ lib/xine/plugins/1.0.0/xineplug_inp_http.so
 lib/xine/plugins/1.0.0/xineplug_inp_mms.so
 lib/xine/plugins/1.0.0/xineplug_inp_net.so
 lib/xine/plugins/1.0.0/xineplug_inp_pnm.so
+lib/xine/plugins/1.0.0/xineplug_inp_rtp.so
 lib/xine/plugins/1.0.0/xineplug_inp_rtsp.so
 lib/xine/plugins/1.0.0/xineplug_inp_stdin_fifo.so
 lib/xine/plugins/1.0.0/xineplug_inp_vcd.so