* Update to 1-rc3c.

* Use lthack. [1]

PR:		ports/65114 [1]
Submitted by:	michael johnson <ahze@ahze.net> [1]

10 files changed, 426 insertions, 82 deletions

diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 798a15f846f1..432a60d0dba0 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,12 +7,12 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.0.r3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	lib
-DISTNAME=	${PORTNAME}-lib-1-rc3a
+DISTNAME=	${PORTNAME}-lib-1-rc3c
 
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	Libraries for xine multimedia player
@@ -30,9 +30,9 @@ LIB_DEPENDS=	FLAC.5:${PORTSDIR}/audio/flac \
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_X_PREFIX=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 WANT_GNOME=	yes
-USE_GNOME=	gnomehack gnometarget
+USE_GNOME=	lthack gnomehack gnometarget
 USE_GMAKE=	yes
 USE_GL=		yes
 USE_SDL=	sdl
@@ -49,17 +49,12 @@ 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
-
-# FBIOVERTICAL macro is not defined
-.if ${OSVERSION} < 500023
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-src:video_out:Makefile.in
-PLIST_SUB+=	PGX64="@comment "
-.else
-PLIST_SUB+=	PGX64=""
+# PRId64, INT16_MAX macro are not defined
+.if ${OSVERSION} < 500040
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src:xine-engine:audio_out.c \
+		${PATCHDIR}/extra-patch-src:xine-engine:video_out.c \
+		${PATCHDIR}/extra-patch-src:xine-engine:metronom.c \
+		${PATCHDIR}/extra-patch-src:demuxers:demux_ogg.c
 .endif
 
 # CDIOCREADAUDIO macro is not defined
diff --git a/multimedia/libxine/distinfo b/multimedia/libxine/distinfo
index bed3419d0ca6..f6d6d1a81b62 100644
--- a/multimedia/libxine/distinfo
+++ b/multimedia/libxine/distinfo
@@ -1,2 +1,2 @@
-MD5 (xine-lib-1-rc3a.tar.gz) = 6dfd0c67b5b694adb283c0f6d8d3ab03
-SIZE (xine-lib-1-rc3a.tar.gz) = 6121483
+MD5 (xine-lib-1-rc3c.tar.gz) = 7c51d35b92dc77cd1effc59394ff89de
+SIZE (xine-lib-1-rc3c.tar.gz) = 6463319
diff --git a/multimedia/libxine/files/extra-patch-src:demuxers:demux_ogg.c b/multimedia/libxine/files/extra-patch-src:demuxers:demux_ogg.c
new file mode 100644
index 000000000000..4eba14377721
--- /dev/null
+++ b/multimedia/libxine/files/extra-patch-src:demuxers:demux_ogg.c
@@ -0,0 +1,115 @@
+--- src/demuxers/demux_ogg.c.orig	Wed Apr  7 23:14:21 2004
++++ src/demuxers/demux_ogg.c	Wed Apr  7 23:15:31 2004
+@@ -321,7 +321,7 @@
+ static void check_newpts (demux_ogg_t *this, int64_t pts, int video, int preview) {
+   int64_t diff;
+ 
+-  lprintf ("new pts %" PRId64 " found in stream\n",pts);
++  lprintf ("new pts %lld found in stream\n",pts);
+ 
+   diff = pts - this->last_pts[video];
+ 
+@@ -329,7 +329,7 @@
+       (this->send_newpts || (this->last_pts[video] && abs(diff)>WRAP_THRESHOLD) ) ) {
+ 
+     xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+-             "diff=%" PRId64 " (pts=%" PRId64 ", last_pts=%" PRId64 ")\n", diff, pts, this->last_pts[video]);
++             "diff=%lld (pts=%lld, last_pts=%lld)\n", diff, pts, this->last_pts[video]);
+ 
+     if (this->buf_flag_seek) {
+       _x_demux_control_newpts(this->stream, pts, BUF_FLAG_SEEK);
+@@ -576,7 +576,7 @@
+     } else
+       pts = 0;
+ 
+-    lprintf ("audiostream %d op-gpos %" PRId64 " hdr-gpos %" PRId64 " pts %" PRId64 " \n",
++    lprintf ("audiostream %d op-gpos %lld hdr-gpos %lld pts %lld \n",
+              stream_num,
+              op->granulepos,
+              this->si[stream_num]->header_granulepos,
+@@ -611,7 +611,7 @@
+     } else
+       pts = 0;
+ 
+-    lprintf ("theorastream %d op-gpos %" PRId64 " hdr-gpos %" PRId64 " pts %" PRId64 " \n",
++    lprintf ("theorastream %d op-gpos %lld hdr-gpos %lld pts %lld \n",
+              stream_num,
+              op->granulepos,
+              this->si[stream_num]->header_granulepos,
+@@ -643,7 +643,7 @@
+       } else
+         pts = 0;
+       
+-      lprintf ("videostream %d op-gpos %" PRId64 " hdr-gpos %" PRId64 " pts %" PRId64 " \n",
++      lprintf ("videostream %d op-gpos %lld hdr-gpos %lld pts %lld \n",
+                stream_num,
+                op->granulepos,
+                this->si[stream_num]->header_granulepos,
+@@ -819,8 +819,8 @@
+   this->si[stream_num]->headers = 0; /* header is sent below */
+ 
+   lprintf ("subtype          %.4s\n", (char*)&locsubtype);
+-  lprintf ("time_unit        %" PRId64 "\n", loctime_unit);
+-  lprintf ("samples_per_unit %" PRId64 "\n", locsamples_per_unit);
++  lprintf ("time_unit        %lld\n", loctime_unit);
++  lprintf ("samples_per_unit %lld\n", locsamples_per_unit);
+   lprintf ("default_len      %d\n", locdefault_len);
+   lprintf ("buffersize       %d\n", locbuffersize);
+   lprintf ("bits_per_sample  %d\n", locbits_per_sample);
+@@ -906,8 +906,8 @@
+     }
+ 
+     lprintf ("subtype          0x%x\n", codec);
+-    lprintf ("time_unit        %" PRId64 "\n", loctime_unit);
+-    lprintf ("samples_per_unit %" PRId64 "\n", locsamples_per_unit);
++    lprintf ("time_unit        %lld\n", loctime_unit);
++    lprintf ("samples_per_unit %lld\n", locsamples_per_unit);
+     lprintf ("default_len      %d\n", locdefault_len);
+     lprintf ("buffersize       %d\n", locbuffersize);
+     lprintf ("bits_per_sample  %d\n", locbits_per_sample);
+@@ -1322,7 +1322,7 @@
+           iframe=op.granulepos>>keyframe_granule_shift;
+           pframe=op.granulepos-(iframe<<keyframe_granule_shift);
+           xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG,
+-                   "seeking keyframe i %" PRId64 " p %" PRId64 "\n", iframe, pframe);
++                   "seeking keyframe i %lld p %lld\n", iframe, pframe);
+           if (pframe!=0)
+             continue;
+         } else
+@@ -1426,7 +1426,7 @@
+   if (this->status == DEMUX_OK) {
+     _x_demux_control_start(this->stream);
+     send_header (this);
+-    lprintf ("headers sent, avg bitrate is %" PRId64 "\n", this->avg_bitrate);
++    lprintf ("headers sent, avg bitrate is %lld\n", this->avg_bitrate);
+   }
+ 
+   _x_stream_info_set(this->stream, XINE_STREAM_INFO_HAS_VIDEO,
+@@ -1489,15 +1489,15 @@
+ 	    );
+ 	}
+ 
+-	lprintf ("current_pos is %" PRId64 "\n",current_pos);
+-	lprintf ("new_pos is %" PRId64 "\n",start_pos); 
++	lprintf ("current_pos is %lld\n",current_pos);
++	lprintf ("new_pos is %lld\n",start_pos); 
+ 
+       } else {
+ 	/*seek using avg_bitrate*/
+ 	start_pos = start_time * this->avg_bitrate/8;
+       }
+ 
+-      lprintf ("seeking to %d seconds => %" PRId64 " bytes\n",
++      lprintf ("seeking to %d seconds => %lld bytes\n",
+ 	      start_time, start_pos);
+ 
+     }
+@@ -1513,7 +1513,7 @@
+     if (start_pos == 0)	 
+       this->keyframe_needed = 0;	 
+ 
+-    lprintf ("seek to %" PRId64 " called\n",start_pos);
++    lprintf ("seek to %lld called\n",start_pos);
+ 
+     this->input->seek (this->input, start_pos, SEEK_SET);
+ 
diff --git a/multimedia/libxine/files/extra-patch-src:video_out:Makefile.in b/multimedia/libxine/files/extra-patch-src:video_out:Makefile.in
deleted file mode 100644
index 7fd8073293bc..000000000000
--- a/multimedia/libxine/files/extra-patch-src:video_out:Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/video_out/Makefile.in.orig	Sun Nov  9 21:14:14 2003
-+++ src/video_out/Makefile.in	Sun Nov  9 21:14:50 2003
-@@ -273,7 +273,6 @@
- #if HAVE_OPENGL
- #opengl_module = xineplug_vo_out_opengl.la
- #endif
--@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@pgx64_module = xineplug_vo_out_pgx64.la
- 
- @HAVE_VIDIX_TRUE@vidix_module = xineplug_vo_out_vidix.la
- 
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
index ac023dc064f7..5855982f4baa 100644
--- a/multimedia/libxine/files/extra-patch-src:xine-engine:audio_out.c
+++ b/multimedia/libxine/files/extra-patch-src:xine-engine:audio_out.c
@@ -1,6 +1,16 @@
---- src/xine-engine/audio_out.c.orig	Thu Dec 25 09:24:36 2003
-+++ src/xine-engine/audio_out.c	Wed Jan  7 21:19:54 2004
-@@ -429,7 +429,7 @@
+--- src/xine-engine/audio_out.c.orig	Wed Mar 17 05:21:58 2004
++++ src/xine-engine/audio_out.c	Wed Apr  7 23:09:00 2004
+@@ -63,6 +63,9 @@
+ /* required for FNDELAY decl */
+ #define _BSD_SOURCE 1
+ 
++#define INT16_MAX 0x7fff
++#define INT16_MIN (-0x7fff-1)
++
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
+@@ -452,7 +455,7 @@
    num_frames = pts_len * this->frames_per_kpts / 1024;
  
    xprintf (this->xine, XINE_VERBOSITY_DEBUG,
@@ -9,7 +19,7 @@
  
    if ((this->output.mode == AO_CAP_MODE_A52) || (this->output.mode == AO_CAP_MODE_AC5)) {
      write_pause_burst(this,num_frames);
-@@ -792,7 +792,7 @@
+@@ -831,7 +834,7 @@
      this->resample_sync_factor = (avg_gap < 0) ? 0.995 : 1.005;
  
      llprintf (LOG_RESAMPLE_SYNC,
@@ -18,7 +28,7 @@
      return 0;
  
    } else if (info->reduce_gap && abs(avg_gap) < 50) {
-@@ -826,7 +826,7 @@
+@@ -865,7 +868,7 @@
         * this during calculation */
        num_frames = (this->do_resample) ? (buf->num_frames * this->frame_rate_factor)
          : buf->num_frames;
@@ -27,7 +37,7 @@
               avg_gap, gap_diff, num_frames * info->window * info->last_factor,
               this->resample_sync_factor);
  #endif
-@@ -981,7 +981,7 @@
+@@ -1020,7 +1023,7 @@
       */
  
      hw_vpts = cur_time;
@@ -36,7 +46,7 @@
  
      /* External A52 decoder delay correction */
      if ((this->output.mode==AO_CAP_MODE_A52) || (this->output.mode==AO_CAP_MODE_AC5)) 
-@@ -994,7 +994,7 @@
+@@ -1033,7 +1036,7 @@
       * calculate gap:
       */
      gap = in_buf->vpts - hw_vpts;
@@ -45,7 +55,7 @@
               hw_vpts, in_buf->vpts, gap);
  
      if (this->resample_sync_method) {
-@@ -1018,7 +1018,7 @@
+@@ -1057,7 +1060,7 @@
        lprintf ("loop: drop package, next fifo\n");
        fifo_append (this->free_fifo, in_buf);
  
@@ -54,7 +64,7 @@
                 in_buf->vpts, gap);
        in_buf = NULL;
  
-@@ -1252,7 +1252,7 @@
+@@ -1286,7 +1289,7 @@
    this->frames_per_kpts   = (this->output.rate * 1024) / 90000;
    this->audio_step        = ((int64_t)90000 * (int64_t)32768) / (int64_t)this->input.rate;
    
@@ -63,7 +73,7 @@
    return this->output.rate;
  }
  
-@@ -1355,7 +1355,7 @@
+@@ -1395,7 +1398,7 @@
  
    buf->extra_info->vpts = buf->vpts;
           
diff --git a/multimedia/libxine/files/extra-patch-src:xine-engine:metronom.c b/multimedia/libxine/files/extra-patch-src:xine-engine:metronom.c
new file mode 100644
index 000000000000..560e460de291
--- /dev/null
+++ b/multimedia/libxine/files/extra-patch-src:xine-engine:metronom.c
@@ -0,0 +1,172 @@
+--- src/xine-engine/metronom.c.orig	Tue Apr  6 23:41:38 2004
++++ src/xine-engine/metronom.c	Tue Apr  6 23:44:02 2004
+@@ -204,7 +204,7 @@
+ static void metronom_start_clock (metronom_clock_t *this, int64_t pts) {
+   scr_plugin_t** scr;
+ 
+-  lprintf("start_clock (at %" PRId64 ")\n", pts);
++  lprintf("start_clock (at %lld)\n", pts);
+ 
+   for (scr = this->scr_list; scr < this->scr_list+MAX_SCR_PROVIDERS; scr++)
+     if (*scr) (*scr)->start(*scr, pts);
+@@ -260,7 +260,7 @@
+ 
+   pthread_mutex_unlock (&this->lock);
+ 
+-  lprintf("%" PRId64 " pts per %d samples\n", pts_per_smpls, AUDIO_SAMPLE_NUM);
++  lprintf("%lld pts per %d samples\n", pts_per_smpls, AUDIO_SAMPLE_NUM);
+ }
+ 
+ static int64_t metronom_got_spu_packet (metronom_t *this, int64_t pts) {
+@@ -314,7 +314,7 @@
+       this->force_video_jump = 1;
+       this->video_drift = 0;
+       xprintf(this->xine, XINE_VERBOSITY_DEBUG,
+-	      "vpts adjusted with prebuffer to %" PRId64 "\n", this->video_vpts);
++	      "vpts adjusted with prebuffer to %lld\n", this->video_vpts);
+       break;
+ 
+     case DISC_ABSOLUTE:
+@@ -332,7 +332,7 @@
+           this->force_video_jump = 1;
+           this->force_audio_jump = 1;
+           this->video_drift = 0;
+-          xprintf(this->xine, XINE_VERBOSITY_DEBUG, "vpts adjusted with prebuffer to %" PRId64 "\n",
++          xprintf(this->xine, XINE_VERBOSITY_DEBUG, "vpts adjusted with prebuffer to %lld\n",
+ 	    this->video_vpts);
+         }
+       } else {
+@@ -348,7 +348,7 @@
+       break;
+   }
+ 
+-  lprintf("video_vpts: %" PRId64 ", audio_vpts: %" PRId64 "\n", this->video_vpts, this->audio_vpts);
++  lprintf("video_vpts: %lld, audio_vpts: %lld\n", this->video_vpts, this->audio_vpts);
+ 
+   /* vpts_offset adjustements */
+   switch (type) {
+@@ -388,7 +388,7 @@
+   this->video_discontinuity_count++;
+   pthread_cond_signal (&this->video_discontinuity_reached);
+   
+-  xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video discontinuity #%d, type is %d, disc_off %" PRId64 "\n",
++  xprintf(this->xine, XINE_VERBOSITY_DEBUG, "video discontinuity #%d, type is %d, disc_off %lld\n",
+     this->video_discontinuity_count, type, disc_off);
+   
+   if (this->have_audio) {
+@@ -449,7 +449,7 @@
+     return;
+   }
+ 
+-  lprintf("got_video_frame pts = %" PRId64 ", duration = %d\n", pts, img->duration);
++  lprintf("got_video_frame pts = %lld, duration = %d\n", pts, img->duration);
+ 
+   this->img_cpt++;
+ 
+@@ -462,7 +462,7 @@
+     if (!img->duration) {
+       if (this->last_video_pts && this->img_cpt) {
+         this->img_duration = (pts - this->last_video_pts) / this->img_cpt;
+-        lprintf("computed frame_duration = %" PRId64 "\n", this->img_duration );
++        lprintf("computed frame_duration = %lld\n", this->img_duration );
+       }
+       img->duration = this->img_duration;
+     } else {
+@@ -483,7 +483,7 @@
+ 
+     diff = this->video_vpts - vpts;
+ 
+-    lprintf("video diff is %" PRId64 " (predicted %" PRId64 ", given %" PRId64 ")\n", diff, this->video_vpts, vpts);
++    lprintf("video diff is %lld (predicted %lld, given %lld)\n", diff, this->video_vpts, vpts);
+ 
+     if ((abs (diff) > VIDEO_DRIFT_TOLERANCE) || (this->force_video_jump)) {
+       this->force_video_jump = 0;
+@@ -499,7 +499,7 @@
+       /* this will fix video drift with a constant compensation each
+ 	 frame for about 1 second of video.  */
+ 
+-      if (diff) lprintf("video drift, drift is %" PRId64 "\n", this->video_drift);
++      if (diff) lprintf("video drift, drift is %lld\n", this->video_drift);
+     }
+   } else {
+     if (!img->duration) {
+@@ -512,7 +512,7 @@
+   
+   img->vpts = this->video_vpts + this->av_offset;
+ 
+-  lprintf("video vpts for %10lld : %10lld (duration:%d drift:%" PRId64 " step:%" PRId64 ")\n", 
++  lprintf("video vpts for %10lld : %10lld (duration:%d drift:%lld step:%lld)\n", 
+ 	  pts, this->video_vpts, img->duration, this->video_drift, this->video_drift_step );
+   
+   if( this->video_drift * this->video_drift_step > 0 )
+@@ -541,7 +541,7 @@
+   this->audio_discontinuity_count++;
+   pthread_cond_signal (&this->audio_discontinuity_reached);
+   
+-  xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio discontinuity #%d, type is %d, disc_off %" PRId64 "\n",
++  xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio discontinuity #%d, type is %d, disc_off %lld\n",
+ 	  this->audio_discontinuity_count, type, disc_off);
+ 
+   if (this->have_video) {
+@@ -571,8 +571,8 @@
+   int64_t vpts;
+   int64_t diff;
+ 
+-  lprintf("got %d audio samples, pts is %" PRId64 ", last pts = %" PRId64 "\n", nsamples, pts, this->last_audio_pts);
+-  lprintf("AUDIO pts from last= %" PRId64 "\n", pts-this->last_audio_pts);
++  lprintf("got %d audio samples, pts is %lld, last pts = %lld\n", nsamples, pts, this->last_audio_pts);
++  lprintf("AUDIO pts from last= %lld\n", pts-this->last_audio_pts);
+ 
+   pthread_mutex_lock (&this->lock);
+   
+@@ -616,11 +616,11 @@
+       this->force_audio_jump = 0;
+       this->audio_vpts       = vpts;
+       this->audio_drift_step = 0;
+-      xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio jump, diff=%" PRId64 "\n", diff);
++      xprintf(this->xine, XINE_VERBOSITY_DEBUG, "audio jump, diff=%lld\n", diff);
+     } else {
+       if( this->audio_samples ) {
+         /* calculate drift_step to recover vpts errors */
+-        lprintf("audio diff = %" PRId64 " \n", diff );
++        lprintf("audio diff = %lld \n", diff );
+ 
+         diff *= AUDIO_SAMPLE_NUM;
+         diff /= this->audio_samples * 4;
+@@ -633,7 +633,7 @@
+         
+         this->audio_drift_step = diff;
+                 
+-        lprintf("audio_drift = %" PRId64 ", pts_per_smpls = %" PRId64 "\n", diff, this->pts_per_smpls);
++        lprintf("audio_drift = %lld, pts_per_smpls = %lld\n", diff, this->pts_per_smpls);
+       }
+     }
+     this->audio_samples = 0;
+@@ -671,11 +671,11 @@
+   switch (option) {
+   case METRONOM_AV_OFFSET:
+     this->av_offset = value;
+-    xprintf(this->xine, XINE_VERBOSITY_LOG, "av_offset=%" PRId64 " pts\n", this->av_offset);
++    xprintf(this->xine, XINE_VERBOSITY_LOG, "av_offset=%lld pts\n", this->av_offset);
+     break;
+   case METRONOM_SPU_OFFSET:
+     this->spu_offset = value;
+-    xprintf(this->xine, XINE_VERBOSITY_LOG, "spu_offset=%" PRId64 " pts\n", this->spu_offset);
++    xprintf(this->xine, XINE_VERBOSITY_LOG, "spu_offset=%lld pts\n", this->spu_offset);
+     break;
+   case METRONOM_ADJ_VPTS_OFFSET:
+     this->audio_vpts += value;
+@@ -685,11 +685,11 @@
+      * once in a while means a small sound card drift (or system
+      * clock drift -- who knows?). nothing to worry about.
+      */
+-    xprintf(this->xine, XINE_VERBOSITY_LOG, "fixing sound card drift by %" PRId64 " pts\n", value);
++    xprintf(this->xine, XINE_VERBOSITY_LOG, "fixing sound card drift by %lld pts\n", value);
+     break;
+   case METRONOM_PREBUFFER:
+     this->prebuffer = value;
+-    xprintf(this->xine, XINE_VERBOSITY_LOG, "prebuffer=%" PRId64 " pts\n", this->prebuffer);
++    xprintf(this->xine, XINE_VERBOSITY_LOG, "prebuffer=%lld pts\n", this->prebuffer);
+     break;
+   default:
+     xprintf(this->xine, XINE_VERBOSITY_NONE, "unknown option in set_option: %d\n", option);
diff --git a/multimedia/libxine/files/extra-patch-src:xine-engine:video_out.c b/multimedia/libxine/files/extra-patch-src:xine-engine:video_out.c
new file mode 100644
index 000000000000..343b92006ada
--- /dev/null
+++ b/multimedia/libxine/files/extra-patch-src:xine-engine:video_out.c
@@ -0,0 +1,88 @@
+--- src/xine-engine/video_out.c.orig	Tue Apr  6 23:51:13 2004
++++ src/xine-engine/video_out.c	Tue Apr  6 23:51:43 2004
+@@ -367,7 +367,7 @@
+     cur_vpts = this->clock->get_current_time(this->clock);
+     this->last_delivery_pts = cur_vpts;
+ 
+-    lprintf ("got image oat master vpts %" PRId64 ". vpts for picture is %" PRId64 " (pts was %" PRId64 ")\n",
++    lprintf ("got image oat master vpts %lld. vpts for picture is %lld (pts was %lld)\n",
+ 	     cur_vpts, pic_vpts, img->pts);
+ 
+     this->num_frames_delivered++;
+@@ -408,7 +408,7 @@
+   }
+ 
+ 
+-  lprintf ("delivery diff : %" PRId64 ", current vpts is %" PRId64 ", %d frames to skip\n",
++  lprintf ("delivery diff : %lld, current vpts is %lld, %d frames to skip\n",
+ 	   diff, cur_vpts, frames_to_skip);
+ 
+   if (!img->bad_frame) {
+@@ -652,7 +652,7 @@
+   
+       if( !this->discard_frames ) {
+         xine_log(this->xine, XINE_LOG_MSG,
+-	         _("video_out: throwing away image with pts %" PRId64 " because it's too old (diff : %" PRId64 ").\n"), pts, diff);
++	         _("video_out: throwing away image with pts %lld because it's too old (diff : %lld).\n"), pts, diff);
+ 
+         this->num_frames_discarded++;
+       }
+@@ -728,7 +728,7 @@
+ 
+     if (this->img_backup && (this->redraw_needed==1)) {
+ 
+-      lprintf("generating still frame (cur_vpts = %" PRId64 ") \n", cur_vpts);
++      lprintf("generating still frame (cur_vpts = %lld) \n", cur_vpts);
+ 
+       /* keep playing still frames */
+       pthread_mutex_lock( &this->free_img_buf_queue->mutex );
+@@ -761,7 +761,7 @@
+      * time to display frame "img" ?
+      */
+ 
+-    lprintf ("diff %" PRId64 "\n", diff);
++    lprintf ("diff %lld\n", diff);
+ 
+     if (diff < 0) {
+       pthread_mutex_unlock(&this->display_img_buf_queue->mutex);
+@@ -807,7 +807,7 @@
+ 				       vo_frame_t *img, int64_t vpts) {
+   xine_stream_t *stream;
+ 
+-  lprintf ("displaying image with vpts = %" PRId64 "\n", img->vpts);
++  lprintf ("displaying image with vpts = %lld\n", img->vpts);
+ 
+   /* no, this is not were proc_*() is usually called.
+    * it's just to catch special cases like late or duplicated frames.
+@@ -962,7 +962,7 @@
+ 
+     vpts = this->clock->get_current_time (this->clock);
+ 
+-    lprintf ("loop iteration at %" PRId64 "\n", vpts);
++    lprintf ("loop iteration at %lld\n", vpts);
+ 
+     expire_frames (this, vpts);
+     img = get_next_frame (this, vpts);
+@@ -1026,7 +1026,7 @@
+       next_frame_vpts += 1000;
+     }
+     
+-    lprintf ("next_frame_vpts is %" PRId64 "\n", next_frame_vpts);
++    lprintf ("next_frame_vpts is %lld\n", next_frame_vpts);
+  
+     do {
+       vpts = this->clock->get_current_time (this->clock);
+@@ -1036,11 +1036,11 @@
+ 
+       usec_to_sleep = (next_frame_vpts - vpts) * 100 / 9;
+ 
+-      lprintf ("%" PRId64 " usec to sleep at master vpts %" PRId64 "\n", usec_to_sleep, vpts);
++      lprintf ("%lld usec to sleep at master vpts %lld\n", usec_to_sleep, vpts);
+       
+       if ( (next_frame_vpts - vpts) > 2*90000 )
+         xprintf(this->xine, XINE_VERBOSITY_DEBUG,
+-		"video_out: vpts/clock error, next_vpts=%" PRId64 " cur_vpts=%" PRId64 "\n", next_frame_vpts,vpts);
++		"video_out: vpts/clock error, next_vpts=%lld cur_vpts=%lld\n", next_frame_vpts,vpts);
+                
+       if (usec_to_sleep>0) 
+ 	xine_usec_sleep (usec_to_sleep);
diff --git a/multimedia/libxine/files/patch-src:audio_out:audio_arts_out.c b/multimedia/libxine/files/patch-src:audio_out:audio_arts_out.c
deleted file mode 100644
index 2ee59d270443..000000000000
--- a/multimedia/libxine/files/patch-src:audio_out:audio_arts_out.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/audio_out/audio_arts_out.c	2003/12/20 19:51:48	1.24
-+++ src/audio_out/audio_arts_out.c	2004/02/15 19:29:47	1.25
-@@ -17,7 +17,7 @@
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
-  *
-- * $Id: audio_arts_out.c,v 1.24 2003/12/20 19:51:48 manfredtremmel Exp $
-+ * $Id: audio_arts_out.c,v 1.25 2004/02/15 19:29:47 mroi Exp $
-  */
- 
- #ifndef __sun			/* _XOPEN_SOURCE causes build prob's on sunos */
-@@ -227,7 +227,10 @@
-   arts_driver_t *this = (arts_driver_t *) this_gen;
-   
-   ao_arts_close(this_gen);
-+  /* FIXME: arts_free() freezes on BSD, so don't use it there */
-+#if !defined(__OpenBSD__) && !defined (__FreeBSD__) && !defined(__NetBSD__)
-   arts_free();
-+#endif
- 
-   free (this);
- }
diff --git a/multimedia/libxine/files/patch-src:video_out:Makefile.in b/multimedia/libxine/files/patch-src:video_out:Makefile.in
new file mode 100644
index 000000000000..d4427b53e18c
--- /dev/null
+++ b/multimedia/libxine/files/patch-src:video_out:Makefile.in
@@ -0,0 +1,11 @@
+--- src/video_out/Makefile.in.orig	Tue Apr  6 21:57:52 2004
++++ src/video_out/Makefile.in	Tue Apr  6 21:58:35 2004
+@@ -280,8 +280,6 @@
+ #opengl_module = xineplug_vo_out_opengl.la
+ #endif
+ @HAVE_SYNCFB_TRUE@@HAVE_X11_TRUE@syncfb_module = xineplug_vo_out_syncfb.la
+-@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@pgx64_module = xineplug_vo_out_pgx64.la
+-@HAVE_SUNFB_TRUE@@HAVE_X11_TRUE@pgx32_module = xineplug_vo_out_pgx32.la
+ 
+ @HAVE_VIDIX_TRUE@vidix_module = xineplug_vo_out_vidix.la
+ 
diff --git a/multimedia/libxine/pkg-plist b/multimedia/libxine/pkg-plist
index df3f4565d086..4646ab489e50 100644
--- a/multimedia/libxine/pkg-plist
+++ b/multimedia/libxine/pkg-plist
@@ -45,57 +45,44 @@ lib/xine/plugins/1.0.0/post/xineplug_post_visualizations.so
 %%VIDIX%%lib/xine/plugins/1.0.0/vidix/pm3_vid.so
 %%VIDIX%%lib/xine/plugins/1.0.0/vidix/radeon_vid.so
 %%VIDIX%%lib/xine/plugins/1.0.0/vidix/rage128_vid.so
+%%VIDIX%%lib/xine/plugins/1.0.0/vidix/sis_vid.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_file.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
-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_bitplane.so
 lib/xine/plugins/1.0.0/xineplug_decode_dts.so
+lib/xine/plugins/1.0.0/xineplug_decode_dvaudio.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
 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
 lib/xine/plugins/1.0.0/xineplug_decode_lpcm.so
 lib/xine/plugins/1.0.0/xineplug_decode_mad.so
 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
-lib/xine/plugins/1.0.0/xineplug_decode_qtsmc.so
 lib/xine/plugins/1.0.0/xineplug_decode_real.so
 lib/xine/plugins/1.0.0/xineplug_decode_real_audio.so
 lib/xine/plugins/1.0.0/xineplug_decode_rgb.so
-lib/xine/plugins/1.0.0/xineplug_decode_roqaudio.so
-lib/xine/plugins/1.0.0/xineplug_decode_roqvideo.so
 lib/xine/plugins/1.0.0/xineplug_decode_speex.so
 lib/xine/plugins/1.0.0/xineplug_decode_spu.so
 lib/xine/plugins/1.0.0/xineplug_decode_spucc.so
 lib/xine/plugins/1.0.0/xineplug_decode_sputext.so
-lib/xine/plugins/1.0.0/xineplug_decode_svq1.so
-lib/xine/plugins/1.0.0/xineplug_decode_yuv_frames.so
 lib/xine/plugins/1.0.0/xineplug_decode_vorbis.so
 lib/xine/plugins/1.0.0/xineplug_decode_w32dll.so
-lib/xine/plugins/1.0.0/xineplug_decode_wc3video.so
 lib/xine/plugins/1.0.0/xineplug_decode_yuv.so
 lib/xine/plugins/1.0.0/xineplug_dmx_asf.so
 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_flv.so
 lib/xine/plugins/1.0.0/xineplug_dmx_games.so
+lib/xine/plugins/1.0.0/xineplug_dmx_iff.so
 lib/xine/plugins/1.0.0/xineplug_dmx_image.so
+lib/xine/plugins/1.0.0/xineplug_dmx_matroska.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
@@ -129,9 +116,7 @@ lib/xine/plugins/1.0.0/xineplug_inp_vcd.so
 lib/xine/plugins/1.0.0/xineplug_inp_vcdo.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_aa.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_none.so
-%%PGX64%%lib/xine/plugins/1.0.0/xineplug_vo_out_pgx64.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_sdl.so
-lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.so
 %%VIDIX%%lib/xine/plugins/1.0.0/xineplug_vo_out_vidix.so
 lib/xine/plugins/1.0.0/xineplug_vo_out_xshm.so
 %%HAVE_LIBXV%%lib/xine/plugins/1.0.0/xineplug_vo_out_xv.so
@@ -159,7 +144,7 @@ share/locale/de/LC_MESSAGES/libxine1.mo
 share/locale/es/LC_MESSAGES/libxine1.mo
 share/locale/fr/LC_MESSAGES/libxine1.mo
 share/locale/it/LC_MESSAGES/libxine1.mo
-share/locale/pl_PL/LC_MESSAGES/libxine1.mo
+share/locale/pl/LC_MESSAGES/libxine1.mo
 share/locale/pt_BR/LC_MESSAGES/libxine1.mo
 share/locale/sk/LC_MESSAGES/libxine1.mo
 share/xine/libxine1/fonts/cc-16.xinefont.gz