Update to 1-beta5.

8 files changed, 4 insertions, 148 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 16aba8dd6f30..d106abf1c3a9 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	1.0.b4
-PORTREVISION=	1
+PORTVERSION=	1.0.b5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	lib
-DISTNAME=	${PORTNAME}-lib-1-beta4
+DISTNAME=	${PORTNAME}-lib-1-beta5
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index 542007496147..9d47b4370ec0 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1 +1 @@
-MD5 (xine-lib-1-beta4.tar.gz) = 6524afaefe7577f0d0f4058eb3b97702
+MD5 (xine-lib-1-beta5.tar.gz) = b6fd263d5b8d55131acf7df917c42cc6
diff --git a/multimedia/libxine/files/patch-src:input:input_dvd.c b/multimedia/libxine/files/patch-src:input:input_dvd.c
deleted file mode 100644
index a57dbd5d8fa0..000000000000
--- a/multimedia/libxine/files/patch-src:input:input_dvd.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/input/input_dvd.c.orig	Sat Jan 11 23:47:08 2003
-+++ src/input/input_dvd.c	Sat Jan 11 23:48:51 2003
-@@ -41,6 +41,7 @@
- #include <stdlib.h>
- #include <stddef.h>
- #include <dirent.h>
-+#include <sys/param.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <unistd.h>
-@@ -132,6 +133,9 @@
- /* Array to hold MRLs returned by get_autoplay_list */
- #define MAX_DIR_ENTRIES 1250
- #define MAX_STR_LEN     255  
-+
-+#define off64_t off_t
-+#define lseek64 lseek
- 
- typedef struct {
-   input_plugin_t    input_plugin; /* Parent input plugin type        */
diff --git a/multimedia/libxine/files/patch-src:input:input_vcd.c b/multimedia/libxine/files/patch-src:input:input_vcd.c
deleted file mode 100644
index 26b8a1d3ca38..000000000000
--- a/multimedia/libxine/files/patch-src:input:input_vcd.c
+++ /dev/null
@@ -1,89 +0,0 @@
---- src/input/input_vcd.c.orig	Sat Jan 11 23:50:19 2003
-+++ src/input/input_vcd.c	Sat Jan 11 23:54:36 2003
-@@ -398,7 +398,7 @@
-     return 0;
- 
-   do {
--    if (lseek (this->fd, this->cur_sector * bsize, SEEK_SET) == -1) {
-+    if (lseek (this->fd, this->cls->cur_sector * bsize, SEEK_SET) == -1) {
-       printf ("input_vcd: seek error %d\n", errno);
-       return 0;
-     }
-@@ -406,7 +406,7 @@
-       printf ("input_vcd: read error %d\n", errno);
-       return 0;
-     }
--    this->cur_sector++;
-+    this->cls->cur_sector++;
-   } while ((data.subheader[2]&~0x01)==0x60);
-   memcpy (buf, data.data, VCDSECTORSIZE);
-   return VCDSECTORSIZE;
-@@ -538,7 +538,7 @@
-     return NULL;
- 
-   do {
--    if (lseek (this->fd, this->cur_sector * bsize, SEEK_SET) == -1) {
-+    if (lseek (this->fd, this->cls->cur_sector * bsize, SEEK_SET) == -1) {
-       printf ("input_vcd: seek error %d\n", errno);
-       return NULL;
-     }
-@@ -546,7 +546,7 @@
-       printf ("input_vcd: read error %d\n", errno);
-       return NULL;
-     }
--    this->cur_sector++;
-+    this->cls->cur_sector++;
-   } while ((data.subheader[2]&~0x01)==0x60);
- 
-   buf = fifo->buffer_pool_alloc (fifo);
-@@ -695,7 +695,7 @@
- 
-   start = 
-     ntohl(this->cls->tocent
--	  [this->cur_track+1 - this->tochdr.starting_track].addr.lba);
-+	  [this->cur_track+1 - this->cls->tochdr.starting_track].addr.lba);
- 
-   /*  printf("seek: start sector:%lu, origin: %d, offset:%qu\n", 
- 	 start, origin, offset);
-@@ -704,14 +704,14 @@
-   switch (origin) {
-   case SEEK_SET:
-     dist = offset / VCDSECTORSIZE;
--    this->cur_sector = start + dist;
-+    this->cls->cur_sector = start + dist;
-     break;
-   case SEEK_CUR:
- 
-     if (offset) 
-       printf ("input_vcd: SEEK_CUR not implemented for offset != 0\n");
- 
--    sector_pos = this->cur_sector;
-+    sector_pos = this->cls->cur_sector;
- 
-     return sector_pos * VCDSECTORSIZE;
- 
-@@ -761,10 +761,10 @@
-   len = 
-     ntohl(this->cls->tocent
- 	  [this->cur_track+2 
--	  - this->tochdr.starting_track].addr.lba)
-+	  - this->cls->tochdr.starting_track].addr.lba)
-     - ntohl(this->cls->tocent
- 	    [this->cur_track+1 
--	    - this->tochdr.starting_track].addr.lba);
-+	    - this->cls->tochdr.starting_track].addr.lba);
-   
-   return len * 2352; /*VCDSECTORSIZE;*/
- 
-@@ -888,9 +888,9 @@
-       return 0;
-     }
-   
--    this->cur_sector = 
-+    this->cls->cur_sector = 
-       ntohl(this->cls->tocent
--	    [this->cur_track+1 - this->tochdr.starting_track].addr.lba);
-+	    [this->cur_track+1 - this->cls->tochdr.starting_track].addr.lba);
-     
-   }
- #endif
diff --git a/multimedia/libxine/files/patch-src:input:librtsp:rtsp_session.c b/multimedia/libxine/files/patch-src:input:librtsp:rtsp_session.c
deleted file mode 100644
index 573a1b953f5c..000000000000
--- a/multimedia/libxine/files/patch-src:input:librtsp:rtsp_session.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/input/librtsp/rtsp_session.c.orig	Sun Jan  5 19:33:57 2003
-+++ src/input/librtsp/rtsp_session.c	Sun Jan  5 19:34:29 2003
-@@ -22,6 +22,7 @@
-  * high level interface to rtsp servers.
-  */
- 
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <netdb.h>
diff --git a/multimedia/libxine/files/patch-src:libspudec:spu.c b/multimedia/libxine/files/patch-src:libspudec:spu.c
deleted file mode 100644
index 6ab2abcd39b4..000000000000
--- a/multimedia/libxine/files/patch-src:libspudec:spu.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libspudec/spu.c.orig	Sat Oct 27 19:15:22 2001
-+++ src/libspudec/spu.c	Sat Oct 27 19:15:31 2001
-@@ -63,7 +63,6 @@
- #include <unistd.h>
- #include <string.h>
- #include <inttypes.h>
--#include <malloc.h>
- #include <sys/stat.h>
- #include <fcntl.h>
- 
diff --git a/multimedia/libxine/files/patch-src:video_out:video_out_sdl.c b/multimedia/libxine/files/patch-src:video_out:video_out_sdl.c
deleted file mode 100644
index b33ddbd6c25b..000000000000
--- a/multimedia/libxine/files/patch-src:video_out:video_out_sdl.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/video_out/video_out_sdl.c.orig	Sun Jan  5 19:23:55 2003
-+++ src/video_out/video_out_sdl.c	Sun Jan  5 19:24:18 2003
-@@ -47,7 +47,7 @@
- #include <string.h>
- #include <inttypes.h>
- #include <math.h>
--#include <SDL/SDL.h>
-+#include <SDL11/SDL.h>
- 
- #include "xine.h"
- #include "xine_internal.h"
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 46bc9f164824..1365383a3e78 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -32,7 +32,7 @@ include/xine/xineutils.h
 include/xine/xmllexer.h
 include/xine/xmlparser.h
 lib/libxine.so
-lib/libxine.so.3
+lib/libxine.so.4
 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_visualizations.so
@@ -44,8 +44,6 @@ lib/xine/plugins/1.0.0/xineplug_decode_adpcm.so
 lib/xine/plugins/1.0.0/xineplug_decode_cinepak.so
 lib/xine/plugins/1.0.0/xineplug_decode_cyuv.so
 lib/xine/plugins/1.0.0/xineplug_decode_dts.so
-lib/xine/plugins/1.0.0/xineplug_decode_dxr3_spu.so
-lib/xine/plugins/1.0.0/xineplug_decode_dxr3_video.so
 lib/xine/plugins/1.0.0/xineplug_decode_faad.so
 lib/xine/plugins/1.0.0/xineplug_decode_ff.so
 lib/xine/plugins/1.0.0/xineplug_decode_fli.so
@@ -109,7 +107,6 @@ 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
 lib/xine/plugins/1.0.0/xineplug_vo_out_aa.so
-lib/xine/plugins/1.0.0/xineplug_vo_out_dxr3.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_none.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_pgx64.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.so