Update to 1-rc0a.

16 files changed, 274 insertions, 8 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index fbe1e152e16..d5342302c77 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	1.0.b12
+PORTVERSION=	1.0.r0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	lib
-DISTNAME=	${PORTNAME}-lib-1-beta12
+DISTNAME=	${PORTNAME}-lib-1-rc0a
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
@@ -22,7 +22,6 @@ LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		intl.4:${PORTSDIR}/devel/gettext \
 		iconv.3:${PORTSDIR}/converters/libiconv \
-		SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
 		vorbis.2:${PORTSDIR}/audio/libvorbis \
 		ogg.4:${PORTSDIR}/audio/libogg \
 		mng.1:${PORTSDIR}/graphics/libmng \
@@ -34,6 +33,7 @@ WANT_GNOME=	yes
 USE_GNOME=	gnomehack
 USE_GMAKE=	yes
 USE_MESA=	yes
+USE_SDL=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/dvdread -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
@@ -49,6 +49,11 @@ MAN1=		xine-config.1
 
 .include <bsd.port.pre.mk>
 
+# PRId64 macro is not defined
+.if (${OSVERSION} < 500028)
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src:xine-engine:audio_out.c
+.endif
+
 .if ${XFREE86_VERSION} >= 4
 PLIST_SUB=	HAVE_LIBXV=""
 .else
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index 923e1898cfc..a779e211eb2 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1 +1 @@
-MD5 (xine-lib-1-beta12.tar.gz) = db00ce938944b2f3b334e7c27352eadf
+MD5 (xine-lib-1-rc0a.tar.gz) = 923015bd49902cd43cd8f191f0720e4c
diff --git a/multimedia/libxine/files/extra-patch-src:xine-engine:audio_out.c b/multimedia/libxine/files/extra-patch-src:xine-engine:audio_out.c
new file mode 100644
index 00000000000..64c3b24d76c
--- /dev/null
+++ b/multimedia/libxine/files/extra-patch-src:xine-engine:audio_out.c
@@ -0,0 +1,74 @@
+--- src/xine-engine/audio_out.c.orig	Sun Aug 10 00:32:20 2003
++++ src/xine-engine/audio_out.c	Sun Aug 10 00:43:36 2003
+@@ -425,7 +425,7 @@
+   num_frames = pts_len * this->frames_per_kpts / 1024;
+ 
+   xprintf (this->xine, XINE_VERBOSITY_LOG,
+-           "inserting %d 0-frames to fill a gap of %" PRId64 " pts\n",
++           "inserting %d 0-frames to fill a gap of %lld pts\n",
+            num_frames, pts_len);
+ 
+   if ((this->output.mode == AO_CAP_MODE_A52) || (this->output.mode == AO_CAP_MODE_AC5)) {
+@@ -790,7 +790,7 @@
+     this->resample_sync_factor = (avg_gap < 0) ? 0.995 : 1.005;
+ 
+     llprintf (LOG_RESAMPLE_SYNC,
+-              "sample rate adjusted to reduce gap: gap=%" PRId64 "\n", avg_gap);
++              "sample rate adjusted to reduce gap: gap=%lld\n", avg_gap);
+     return 0;
+ 
+   } else if (info->reduce_gap && abs(avg_gap) < 50) {
+@@ -824,7 +824,7 @@
+        * this during calculation */
+       num_frames = (this->do_resample) ? (buf->num_frames * this->frame_rate_factor)
+         : buf->num_frames;
+-      printf("audio_out: gap=%5" PRId64 ";  gap_diff=%5" PRId64 ";  frame_diff=%3.0f;  drift_factor=%f\n",
++      printf("audio_out: gap=%5lld;  gap_diff=%5lld;  frame_diff=%3.0f;  drift_factor=%f\n",
+              avg_gap, gap_diff, num_frames * info->window * info->last_factor,
+              this->resample_sync_factor);
+ #endif
+@@ -965,7 +965,7 @@
+      */
+ 
+     hw_vpts = cur_time;
+-    lprintf ("current delay is %" PRId64 ", current time is %" PRId64 "\n", delay, cur_time);
++    lprintf ("current delay is %lld, current time is %lld\n", delay, cur_time);
+ 
+     /* External A52 decoder delay correction */
+     if ((this->output.mode==AO_CAP_MODE_A52) || (this->output.mode==AO_CAP_MODE_AC5)) 
+@@ -978,7 +978,7 @@
+      * calculate gap:
+      */
+     gap = in_buf->vpts - hw_vpts;
+-    lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n",
++    lprintf ("hw_vpts : %lld buffer_vpts : %lld gap : %lld\n",
+              hw_vpts, in_buf->vpts, gap);
+ 
+     if (this->resample_sync_method) {
+@@ -1003,7 +1003,7 @@
+       lprintf ("loop: drop package, next fifo\n");
+       fifo_append (this->free_fifo, in_buf);
+ 
+-      lprintf ("audio package (vpts = %" PRId64 ", gap = %" PRId64 ") dropped\n",
++      lprintf ("audio package (vpts = %lld, gap = %lld) dropped\n",
+                in_buf->vpts, gap);
+       in_buf = NULL;
+ 
+@@ -1238,7 +1238,7 @@
+   this->frames_per_kpts   = (this->output.rate * 1024) / 90000;
+   this->audio_step        = ((int64_t)90000 * (int64_t)32768) / (int64_t)this->input.rate;
+   
+-  lprintf ("audio_step %" PRId64 " pts per 32768 frames\n", this->audio_step);
++  lprintf ("audio_step %lld pts per 32768 frames\n", this->audio_step);
+   return this->output.rate;
+ }
+ 
+@@ -1335,7 +1335,7 @@
+ 						   buf->num_frames);
+   buf->extra_info->vpts = buf->vpts;
+          
+-  lprintf ("ao_put_buffer, pts=%" PRId64 ", vpts=%" PRId64 ", flushmode=%d\n",
++  lprintf ("ao_put_buffer, pts=%lld, vpts=%lld, flushmode=%d\n",
+            pts, buf->vpts, this->discard_buffers);
+ 
+   if (!this->discard_buffers) 
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:deinterlace.h b/multimedia/libxine/files/patch-src:post:deinterlace:deinterlace.h
new file mode 100644
index 00000000000..9743b3659da
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:post:deinterlace:deinterlace.h
@@ -0,0 +1,15 @@
+--- src/post/deinterlace/deinterlace.h.orig	Sun Aug 10 01:05:01 2003
++++ src/post/deinterlace/deinterlace.h	Sun Aug 10 01:18:58 2003
+@@ -22,7 +22,11 @@
+ #if defined (__SVR4) && defined (__sun)
+ # include <sys/int_types.h>
+ #else
+-# include <stdint.h>
++# if defined(HAVE_STDINT_H)
++#  include <stdint.h>
++# else
++#  include <inttypes.h>
++# endif
+ #endif
+ 
+ #ifdef __cplusplus
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:double.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:double.c
new file mode 100644
index 00000000000..dba2af2d3c7
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:double.c
@@ -0,0 +1,15 @@
+--- src/post/deinterlace/plugins/double.c.orig	Sun Aug 10 01:03:04 2003
++++ src/post/deinterlace/plugins/double.c	Sun Aug 10 01:19:26 2003
+@@ -22,7 +22,11 @@
+ #if defined (__SVR4) && defined (__sun)
+ # include <sys/int_types.h>
+ #else
+-# include <stdint.h>
++# if defined(HAVE_STDINT_H)
++#  include <stdint.h>
++# else
++#  include <inttypes.h>
++# endif
+ #endif
+ #include "speedy.h"
+ #include "deinterlace.h"
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:greedy.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:greedy.c
new file mode 100644
index 00000000000..a2e671c4e27
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:greedy.c
@@ -0,0 +1,15 @@
+--- src/post/deinterlace/plugins/greedy.c.orig	Sun Aug 10 01:21:43 2003
++++ src/post/deinterlace/plugins/greedy.c	Sun Aug 10 01:22:25 2003
+@@ -23,7 +23,11 @@
+ #if defined (__SVR4) && defined (__sun)
+ # include <sys/int_types.h>
+ #else
+-# include <stdint.h>
++# if defined(HAVE_STDINT_H)
++#  include <stdint.h>
++# else
++#  include <inttypes.h>
++# endif
+ #endif
+ 
+ #ifdef HAVE_CONFIG_H
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:greedy2frame.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:greedy2frame.c
new file mode 100644
index 00000000000..09d2d93ac1f
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:greedy2frame.c
@@ -0,0 +1,15 @@
+--- src/post/deinterlace/plugins/greedy2frame.c.orig	Sun Aug 10 01:30:49 2003
++++ src/post/deinterlace/plugins/greedy2frame.c	Sun Aug 10 01:31:11 2003
+@@ -23,7 +23,11 @@
+ #if defined (__SVR4) && defined (__sun)
+ # include <sys/int_types.h>
+ #else
+-# include <stdint.h>
++# if defined(HAVE_STDINT_H)
++#  include <stdint.h>
++# else
++#  include <inttypes.h>
++# endif
+ #endif
+ 
+ #ifdef HAVE_CONFIG_H
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:linear.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:linear.c
new file mode 100644
index 00000000000..ed1734a5406
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:linear.c
@@ -0,0 +1,15 @@
+--- src/post/deinterlace/plugins/linear.c.orig	Sun Aug 10 01:24:14 2003
++++ src/post/deinterlace/plugins/linear.c	Sun Aug 10 01:24:45 2003
+@@ -20,7 +20,11 @@
+ #if defined (__SVR4) && defined (__sun)
+ # include <sys/int_types.h>
+ #else
+-# include <stdint.h>
++# if defined(HAVE_STDINT_H)
++#  include <stdint.h>
++# else
++#  include <inttypes.h>
++# endif
+ #endif
+ #include "speedy.h"
+ #include "deinterlace.h"
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:linearblend.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:linearblend.c
new file mode 100644
index 00000000000..cbfacddf9e5
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:linearblend.c
@@ -0,0 +1,15 @@
+--- src/post/deinterlace/plugins/linearblend.c.orig	Sun Aug 10 01:26:05 2003
++++ src/post/deinterlace/plugins/linearblend.c	Sun Aug 10 01:26:34 2003
+@@ -25,7 +25,11 @@
+ #if defined (__SVR4) && defined (__sun)
+ # include <sys/int_types.h>
+ #else
+-# include <stdint.h>
++# if defined(HAVE_STDINT_H)
++#  include <stdint.h>
++# else
++#  include <inttypes.h>
++# endif
+ #endif
+ 
+ #ifdef HAVE_CONFIG_H
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:vfir.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:vfir.c
new file mode 100644
index 00000000000..72c449785c2
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:vfir.c
@@ -0,0 +1,15 @@
+--- src/post/deinterlace/plugins/vfir.c.orig	Sun Aug 10 01:27:59 2003
++++ src/post/deinterlace/plugins/vfir.c	Sun Aug 10 01:28:18 2003
+@@ -25,7 +25,11 @@
+ #if defined (__SVR4) && defined (__sun)
+ # include <sys/int_types.h>
+ #else
+-# include <stdint.h>
++# if defined(HAVE_STDINT_H)
++#  include <stdint.h>
++# else
++#  include <inttypes.h>
++# endif
+ #endif
+ 
+ #ifdef HAVE_CONFIG_H
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:plugins:weave.c b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:weave.c
new file mode 100644
index 00000000000..d4be46dedd1
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:post:deinterlace:plugins:weave.c
@@ -0,0 +1,15 @@
+--- src/post/deinterlace/plugins/weave.c.orig	Sun Aug 10 01:29:19 2003
++++ src/post/deinterlace/plugins/weave.c	Sun Aug 10 01:29:36 2003
+@@ -22,7 +22,11 @@
+ #if defined (__SVR4) && defined (__sun)
+ # include <sys/int_types.h>
+ #else
+-# include <stdint.h>
++# if defined(HAVE_STDINT_H)
++#  include <stdint.h>
++# else
++#  include <inttypes.h>
++# endif
+ #endif
+ #include "speedy.h"
+ #include "deinterlace.h"
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:pulldown.h b/multimedia/libxine/files/patch-src:post:deinterlace:pulldown.h
new file mode 100644
index 00000000000..a9d1bce3ebb
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:post:deinterlace:pulldown.h
@@ -0,0 +1,15 @@
+--- src/post/deinterlace/pulldown.h.orig	Sun Aug 10 01:33:14 2003
++++ src/post/deinterlace/pulldown.h	Sun Aug 10 01:33:24 2003
+@@ -22,7 +22,11 @@
+ #if defined (__SVR4) && defined (__sun)
+ # include <sys/int_types.h>
+ #else
+-# include <stdint.h>
++# if defined(HAVE_STDINT_H)
++#  include <stdint.h>
++# else
++#  include <inttypes.h>
++# endif
+ #endif
+ #include "speedy.h"
+ 
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:speedy.h b/multimedia/libxine/files/patch-src:post:deinterlace:speedy.h
new file mode 100644
index 00000000000..1a50da63b78
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:post:deinterlace:speedy.h
@@ -0,0 +1,15 @@
+--- src/post/deinterlace/speedy.h.orig	Sun Aug 10 01:07:07 2003
++++ src/post/deinterlace/speedy.h	Sun Aug 10 01:20:18 2003
+@@ -22,7 +22,11 @@
+ #if defined (__SVR4) && defined (__sun)
+ # include <sys/int_types.h>
+ #else
+-# include <stdint.h>
++# if defined(HAVE_STDINT_H)
++#  include <stdint.h>
++# else
++#  include <inttypes.h>
++# endif
+ #endif
+ 
+ #ifdef __cplusplus
diff --git a/multimedia/libxine/files/patch-src:post:deinterlace:tvtime.c b/multimedia/libxine/files/patch-src:post:deinterlace:tvtime.c
new file mode 100644
index 00000000000..d312b2b750b
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:post:deinterlace:tvtime.c
@@ -0,0 +1,15 @@
+--- src/post/deinterlace/tvtime.c.orig	Sun Aug 10 01:34:07 2003
++++ src/post/deinterlace/tvtime.c	Sun Aug 10 01:34:32 2003
+@@ -25,7 +25,11 @@
+ #if defined (__SVR4) && defined (__sun)
+ # include <sys/int_types.h>
+ #else
+-# include <stdint.h>
++# if defined(HAVE_STDINT_H)
++#  include <stdint.h>
++# else
++#  include <inttypes.h>
++# endif
+ #endif
+ #include "speedy.h"
+ #include "deinterlace.h"
diff --git a/multimedia/libxine/files/patch-src:video_out:video_out_xv.c b/multimedia/libxine/files/patch-src:video_out:video_out_xv.c
new file mode 100644
index 00000000000..1ce2edca9ca
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:video_out:video_out_xv.c
@@ -0,0 +1,15 @@
+--- src/video_out/video_out_xv.c.orig	Sun Aug 10 00:46:38 2003
++++ src/video_out/video_out_xv.c	Sun Aug 10 01:19:42 2003
+@@ -45,7 +45,11 @@
+ #if defined (__SVR4) && defined (__sun)
+ # include <sys/int_types.h>
+ #else
+-# include <stdint.h>
++# if defined(HAVE_STDINT_H)
++#  include <stdint.h>
++# else
++#  include <inttypes.h>
++# endif
+ #endif
+ 
+ #if defined(__FreeBSD__)
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index 13fe0f3d4b3..c0f93376b5e 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -3,21 +3,20 @@ include/xine.h
 include/xine/attributes.h
 include/xine/audio_decoder.h
 include/xine/audio_out.h
+include/xine/broadcaster.h
 include/xine/buffer.h
 include/xine/compat.h
 include/xine/configfile.h
 include/xine/demux.h
 include/xine/input_plugin.h
-include/xine/lrb.h
+include/xine/io_helper.h
 include/xine/metronom.h
 include/xine/osd.h
 include/xine/plugin_catalog.h
 include/xine/post.h
-include/xine/ppcasm_string.h
 include/xine/resample.h
 include/xine/scratch.h
 include/xine/spu_decoder.h
-include/xine/spu_decoder_api.h
 include/xine/video_decoder.h
 include/xine/video_out.h
 include/xine/video_overlay.h
@@ -33,12 +32,14 @@ include/xine/xmlparser.h
 lib/libxine.so
 lib/libxine.so.7
 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_planar.so
 lib/xine/plugins/1.0.0/post/xineplug_post_switch.so
+lib/xine/plugins/1.0.0/post/xineplug_post_tvtime.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
+lib/xine/plugins/1.0.0/xineplug_ao_out_none.so
 lib/xine/plugins/1.0.0/xineplug_ao_out_oss.so
 lib/xine/plugins/1.0.0/xineplug_decode_28k8.so
 lib/xine/plugins/1.0.0/xineplug_decode_a52.so
@@ -51,6 +52,7 @@ lib/xine/plugins/1.0.0/xineplug_decode_ff.so
 lib/xine/plugins/1.0.0/xineplug_decode_fli.so
 lib/xine/plugins/1.0.0/xineplug_decode_gsm610.so
 lib/xine/plugins/1.0.0/xineplug_decode_idcinvideo.so
+lib/xine/plugins/1.0.0/xineplug_decode_image.so
 lib/xine/plugins/1.0.0/xineplug_decode_interplayaudio.so
 lib/xine/plugins/1.0.0/xineplug_decode_interplayvideo.so
 lib/xine/plugins/1.0.0/xineplug_decode_logpcm.so
@@ -60,6 +62,7 @@ lib/xine/plugins/1.0.0/xineplug_decode_mpeg2.so
 lib/xine/plugins/1.0.0/xineplug_decode_msrle.so
 lib/xine/plugins/1.0.0/xineplug_decode_msvc.so
 lib/xine/plugins/1.0.0/xineplug_decode_nsf.so
+lib/xine/plugins/1.0.0/xineplug_decode_pcm.so
 lib/xine/plugins/1.0.0/xineplug_decode_qt.so
 lib/xine/plugins/1.0.0/xineplug_decode_qtrle.so
 lib/xine/plugins/1.0.0/xineplug_decode_qtrpza.so
@@ -84,16 +87,20 @@ lib/xine/plugins/1.0.0/xineplug_dmx_audio.so
 lib/xine/plugins/1.0.0/xineplug_dmx_avi.so
 lib/xine/plugins/1.0.0/xineplug_dmx_fli.so
 lib/xine/plugins/1.0.0/xineplug_dmx_games.so
+lib/xine/plugins/1.0.0/xineplug_dmx_image.so
 lib/xine/plugins/1.0.0/xineplug_dmx_mng.so
 lib/xine/plugins/1.0.0/xineplug_dmx_mpeg.so
 lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_block.so
 lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_elem.so
+lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_pes.so
 lib/xine/plugins/1.0.0/xineplug_dmx_mpeg_ts.so
+lib/xine/plugins/1.0.0/xineplug_dmx_nsv.so
 lib/xine/plugins/1.0.0/xineplug_dmx_ogg.so
 lib/xine/plugins/1.0.0/xineplug_dmx_pva.so
 lib/xine/plugins/1.0.0/xineplug_dmx_qt.so
 lib/xine/plugins/1.0.0/xineplug_dmx_rawdv.so
 lib/xine/plugins/1.0.0/xineplug_dmx_real.so
+lib/xine/plugins/1.0.0/xineplug_dmx_slave.so
 lib/xine/plugins/1.0.0/xineplug_dmx_sputext.so
 lib/xine/plugins/1.0.0/xineplug_dmx_yuv4mpeg2.so
 lib/xine/plugins/1.0.0/xineplug_dmx_yuv_frames.so