Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Feb 2003 15:06:29 +0100 (CET)
From:      Hendrik Scholz <hendrik@scholz.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Hendrik Scholz <hendrik@scholz.net>
Subject:   ports/47785: update of graphics/libxine (0.9.13 to 1beta4)
Message-ID:  <200302011406.h11E6TE9019432@goanna.lan.raisdorf.net>

next in thread | raw e-mail | index | archive | help

>Number:         47785
>Category:       ports
>Synopsis:       update of graphics/libxine (0.9.13 to 1beta4)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 01 06:10:14 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Hendrik Scholz
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
NetUSE AG
>Environment:
System: FreeBSD goanna.lan.raisdorf.net 5.0-CURRENT FreeBSD 5.0-CURRENT #2: Fri Jan 24 01:44:03 CET 2003 hscholz@goanna.lan.raisdorf.net:/source/src/sys/i386/compile/GOANNA i386


	
>Description:
This patch updates libxine to 1.0 beta4.

Changes:

 - USE_GNOME += gnomehack so we use the right path for pkg-config
 - add almost 30kB of patches to allow compiling on FreeBSD
   The authors of xine are already informed that xine doesn't compile
   on FreeBSD right now due to several missing includes and old
   variable names (the internal structure changed)
 - add NOPORTDOCS knob
 - update pkg-plist

Notes:

 - close ports/45815
 - portlint complains about the 1-beta4 version string, perhaps change it
   and set DISTNAME
 - xine ui needs to be updated too so take care when applying this
 - I'll send a new totem patch (0.90.0) in a few minutes which
   makes use of most new features (divx playback, visualization plugins)

I've put the patch and a shar file on
http://www.raisdorf.net/files/FreeBSD/xine

	
>How-To-Repeat:
	
>Fix:

	

--- libxine-0.9.13-to-1.beta4.diff begins here ---
diff -urP libxine-0.9.13/Makefile libxine/Makefile
--- libxine-0.9.13/Makefile	Thu Jan 30 21:58:41 2003
+++ libxine/Makefile	Sat Feb  1 14:54:47 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xine
-PORTVERSION=	0.9.13
+PORTVERSION=	1-beta4
 CATEGORIES=	graphics
 MASTER_SITES=	http://xine.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -28,11 +28,11 @@
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	imlib
+USE_GNOME=	imlib gnomehack
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
 USE_MESA=	yes
 USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config" \
@@ -45,16 +45,6 @@
 INSTALLS_SHLIB=	yes
 
 MAN1=		xine-config.1
-MAN3=		ao_driver_t.3 ao_functions_t.3 autoplay_group.3 \
-		audio_cap.3 audio_group.3 audio_prop.3 \
-		browse_group.3 build_info.3 cfg_data_t.3 config_group.3 \
-		config_values_s.3 config_values_t.3 demux_strategy.3 \
-		event_group.3 loadplugins_group.3 mrl_t.3 mrl_types.3 \
-		status_group.3 ui_callbacks.3 version_group.3 video_cap.3 \
-		video_group.3 video_prop.3 video_ratio.3 visual_types.3 \
-		vo_driver_s.3 vo_driver_t.3 vo_frame_t.3 vo_overlay_t.3 \
-		xine-lib.3 xine.h.3 xine_api.3 xine_init.3 xine_management.3 \
-		xine_t.3 xine_version.3
 
 .include <bsd.port.pre.mk>
 
@@ -87,23 +77,18 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
-		 s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
-		 s|-L/usr/local/lib||g ; \
-		 s|-I/usr/local/include||g ; \
-		 s|-lgiconv|-liconv|g ; \
-		 s|-funroll-loops||g' ${WRKSRC}/configure.in
-.if ${OSVERSION} >= 500035
-	@${REINPLACE_CMD} -e \
-		 's|-malign-loops|-falign-loops|g ; \
-		  s|-malign-jumps|-falign-jumps|g ; \
-		  s|-malign-functions|-falign-functions|g' ${WRKSRC}/configure.in
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e 's|^SUBDIRS = doc m4 intl po misc include src|SUBDIRS = m4 intl po misc include src|' ${WRKSRC}/Makefile.in
 .endif
+	@${REINPLACE_CMD} -e 's|@GICONV_BSD_LIBS@|iconv|' ${WRKSRC}/src/libsputext/Makefile.in
 	@${REINPLACE_CMD} -e \
 		's|aclocal,|${ACLOCAL},|g ; \
 		 s|autoconf,|${AUTOCONF},|g ; \
 		 s|automake,|${AUTOMAKE},|g ; \
 		 s|autoheader,|${AUTOHEADER},|g' ${WRKSRC}/aclocal.m4
+post-install:
+.if defined(NOPORTDOCS)
+	@${INSTALL_DATA} ${WRKSRC}/doc/man/en/xine-config.1 ${PREFIX}/man/man1
+.endif
 
 .include <bsd.port.post.mk>
diff -urP libxine-0.9.13/distinfo libxine/distinfo
--- libxine-0.9.13/distinfo	Thu Jan 30 21:58:41 2003
+++ libxine/distinfo	Sat Feb  1 14:54:50 2003
@@ -1 +1 @@
-MD5 (xine-lib-0.9.13.tar.gz) = 2e37c40bb78732187e3375a220405063
+MD5 (xine-lib-1-beta4.tar.gz) = 6524afaefe7577f0d0f4058eb3b97702
diff -urP libxine-0.9.13/files/patch-misc:Makefile.in libxine/files/patch-misc:Makefile.in
--- libxine-0.9.13/files/patch-misc:Makefile.in	Thu Jan  1 01:00:00 1970
+++ libxine/files/patch-misc:Makefile.in	Sat Feb  1 14:08:21 2003
@@ -0,0 +1,11 @@
+--- misc/Makefile.in.orig	Sat Feb  1 14:07:21 2003
++++ misc/Makefile.in	Sat Feb  1 14:07:33 2003
+@@ -268,7 +268,7 @@
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  if test -f $$d$$p; then \
+-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
++	    f=`echo "$$p"`; \
+ 	    echo " $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f"; \
+ 	    $(binSCRIPT_INSTALL) $$d$$p $(DESTDIR)$(bindir)/$$f; \
+ 	  else :; fi; \
Only in libxine-0.9.13/files: patch-src:input:Makefile.am
diff -urP libxine-0.9.13/files/patch-src:input:input_dvd.c libxine/files/patch-src:input:input_dvd.c
--- libxine-0.9.13/files/patch-src:input:input_dvd.c	Thu Jan  1 01:00:00 1970
+++ libxine/files/patch-src:input:input_dvd.c	Thu Jan 30 22:35:55 2003
@@ -0,0 +1,44 @@
+--- src/input/input_dvd.c.orig	Thu Jan 30 22:33:21 2003
++++ src/input/input_dvd.c	Thu Jan 30 22:35:13 2003
+@@ -43,6 +43,7 @@
+ #include <dirent.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/param.h>
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <time.h>
+@@ -338,7 +339,7 @@
+ 
+ 
+ static void dvd_build_mrl_list(dvd_input_plugin_t *this) {
+-  int num_titles, *num_parts;
++//  int num_titles, *num_parts;
+ /* FIXME */
+   return;
+ #if 0
+@@ -1303,13 +1304,13 @@
+   }
+   if (1) {
+     int fd, i;
+-    off64_t off;
++    off_t off;
+     uint8_t data[DVD_VIDEO_LB_LEN];
+ 
+     /* Read DVD name */
+     fd=open(intended_dvd_device, O_RDONLY);
+     if (fd > 0) { 
+-      off = lseek64( fd, 32 * (int64_t) DVD_VIDEO_LB_LEN, SEEK_SET );
++      off = lseek( fd, 32 * (int64_t) DVD_VIDEO_LB_LEN, SEEK_SET );
+       if( off == ( 32 * (int64_t) DVD_VIDEO_LB_LEN ) ) {
+         off = read( fd, data, DVD_VIDEO_LB_LEN ); 
+         close(fd);
+@@ -1483,7 +1484,7 @@
+ 
+ static int dvd_class_eject_media (input_class_t *this_gen) {
+   dvd_input_class_t *this = (dvd_input_class_t *) this_gen;
+-  int   ret, status;
++  int   ret;
+   int   fd;
+ 
+   /* printf("input_dvd: Eject Device %s current device %s opened=%d handle=%p trying...\n",this->dvd_device, this->current_dvd_device, this->opened, this->dvdnav); */
diff -urP libxine-0.9.13/files/patch-src:input:input_vcd.c libxine/files/patch-src:input:input_vcd.c
--- libxine-0.9.13/files/patch-src:input:input_vcd.c	Thu Jan  1 01:00:00 1970
+++ libxine/files/patch-src:input:input_vcd.c	Thu Jan 30 22:46:37 2003
@@ -0,0 +1,115 @@
+--- src/input/input_vcd.c.orig	Thu Jan 30 22:36:07 2003
++++ src/input/input_vcd.c	Thu Jan 30 22:45:45 2003
+@@ -33,6 +33,7 @@
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+ #include <string.h>
++#include <arpa/inet.h>
+ #ifdef HAVE_LINUX_CDROM_H
+ # include <linux/cdrom.h>
+ #endif
+@@ -96,7 +97,7 @@
+ #elif defined (__FreeBSD__)
+   struct ioc_toc_header  tochdr;
+   struct cd_toc_entry    *tocent;
+-  off_t                  cur_sector;
++  off_t                  cur_sec;
+ #endif
+ 
+   int                    total_tracks;
+@@ -118,7 +119,7 @@
+ 
+   int                    cur_track;
+ 
+-#if defined (__linux__) || defined(__sun)
++#if defined (__linux__) || defined(__sun) || defined(__FreeBSD__)
+   uint8_t                cur_min, cur_sec, cur_frame;
+ #endif
+ 
+@@ -398,7 +399,7 @@
+     return 0;
+ 
+   do {
+-    if (lseek (this->fd, this->cur_sector * bsize, SEEK_SET) == -1) {
++    if (lseek (this->fd, this->cur_sec * bsize, SEEK_SET) == -1) {
+       printf ("input_vcd: seek error %d\n", errno);
+       return 0;
+     }
+@@ -406,7 +407,7 @@
+       printf ("input_vcd: read error %d\n", errno);
+       return 0;
+     }
+-    this->cur_sector++;
++    this->cur_sec++;
+   } while ((data.subheader[2]&~0x01)==0x60);
+   memcpy (buf, data.data, VCDSECTORSIZE);
+   return VCDSECTORSIZE;
+@@ -538,7 +539,7 @@
+     return NULL;
+ 
+   do {
+-    if (lseek (this->fd, this->cur_sector * bsize, SEEK_SET) == -1) {
++    if (lseek (this->fd, this->cur_sec * bsize, SEEK_SET) == -1) {
+       printf ("input_vcd: seek error %d\n", errno);
+       return NULL;
+     }
+@@ -546,7 +547,7 @@
+       printf ("input_vcd: read error %d\n", errno);
+       return NULL;
+     }
+-    this->cur_sector++;
++    this->cur_sec++;
+   } while ((data.subheader[2]&~0x01)==0x60);
+ 
+   buf = fifo->buffer_pool_alloc (fifo);
+@@ -695,7 +696,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 +705,14 @@
+   switch (origin) {
+   case SEEK_SET:
+     dist = offset / VCDSECTORSIZE;
+-    this->cur_sector = start + dist;
++    this->cur_sec = 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->cur_sec;
+ 
+     return sector_pos * VCDSECTORSIZE;
+ 
+@@ -766,10 +767,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;*/
+ 
+@@ -893,9 +894,9 @@
+       return 0;
+     }
+   
+-    this->cur_sector = 
++    this->cur_sec = 
+       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 -urP libxine-0.9.13/files/patch-src:input:libdvdnav:vm.c libxine/files/patch-src:input:libdvdnav:vm.c
--- libxine-0.9.13/files/patch-src:input:libdvdnav:vm.c	Thu Jan  1 01:00:00 1970
+++ libxine/files/patch-src:input:libdvdnav:vm.c	Thu Jan 30 22:32:29 2003
@@ -0,0 +1,11 @@
+--- src/input/libdvdnav/vm.c.orig	Thu Jan 30 22:29:30 2003
++++ src/input/libdvdnav/vm.c	Thu Jan 30 22:31:57 2003
+@@ -178,7 +178,7 @@
+ 
+ void dvd_read_name( vm_t *this, char *devname) {
+     int fd, i;
+-    off64_t off;
++    off_t off;
+     uint8_t data[DVD_VIDEO_LB_LEN];
+ 
+     /* Read DVD name */
diff -urP libxine-0.9.13/files/patch-src:input:libreal:rmff.h libxine/files/patch-src:input:libreal:rmff.h
--- libxine-0.9.13/files/patch-src:input:libreal:rmff.h	Thu Jan  1 01:00:00 1970
+++ libxine/files/patch-src:input:libreal:rmff.h	Thu Jan 30 22:26:54 2003
@@ -0,0 +1,10 @@
+--- src/input/libreal/rmff.h.orig	Thu Jan 30 22:26:00 2003
++++ src/input/libreal/rmff.h	Thu Jan 30 22:26:14 2003
+@@ -23,6 +23,7 @@
+  * adopted from joschkas real tools
+  */
+ 
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
diff -urP libxine-0.9.13/files/patch-src:input:librtsp:rtsp_session.c libxine/files/patch-src:input:librtsp:rtsp_session.c
--- libxine-0.9.13/files/patch-src:input:librtsp:rtsp_session.c	Thu Jan  1 01:00:00 1970
+++ libxine/files/patch-src:input:librtsp:rtsp_session.c	Thu Jan 30 22:28:54 2003
@@ -0,0 +1,10 @@
+--- src/input/librtsp/rtsp_session.c.orig	Thu Jan 30 22:28:03 2003
++++ src/input/librtsp/rtsp_session.c	Thu Jan 30 22:28:15 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 -urP libxine-0.9.13/files/patch-src:liba52:Makefile.am libxine/files/patch-src:liba52:Makefile.am
--- libxine-0.9.13/files/patch-src:liba52:Makefile.am	Thu Jan 30 21:58:41 2003
+++ libxine/files/patch-src:liba52:Makefile.am	Thu Jan 30 22:04:31 2003
@@ -1,18 +1,18 @@
---- src/liba52/Makefile.am.orig	Tue Mar 26 08:07:16 2002
-+++ src/liba52/Makefile.am	Sat May 25 11:03:48 2002
-@@ -8,13 +8,9 @@
+--- src/liba52/Makefile.am.orig	Fri Nov 22 06:25:15 2002
++++ src/liba52/Makefile.am	Thu Jan 30 22:04:01 2003
+@@ -15,14 +15,8 @@
+ 	parse.c \
+ 	xine_decoder.c
  
- lib_LTLIBRARIES = xineplug_decode_a52.la
- 
--xineplug_decode_a52_la_SOURCES =  bitstream.c bit_allocate.c \
--	parse.c downmix.c imdct.c imdct_mlib.c \
--	xine_decoder.c
-+xineplug_decode_a52_la_SOURCES = xine_decoder.c
-+xineplug_decode_a52_la_LIBADD = -la52 -ldjbfft
- xineplug_decode_a52_la_LDFLAGS = -avoid-version -module
+-xineplug_decode_a52_la_LIBADD = $(XINE_LIB)
++xineplug_decode_a52_la_LIBADD = $(XINE_LIB) -la52 -ldjbfft
+ xineplug_decode_a52_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 -
--noinst_HEADERS = a52.h a52_internal.h \
--	bitstream.h tables.h
+-noinst_HEADERS = \
+-	a52.h \
+-	a52_internal.h \
+-	bitstream.h \
+-	tables.h
  
- ##
- ## Install header files (default=$includedir/xine)
+ $(XINE_LIB):
+ 	@cd $(top_builddir)/src/xine-engine && $(MAKE)
diff -urP libxine-0.9.13/files/patch-src:liba52:xine_decoder.c libxine/files/patch-src:liba52:xine_decoder.c
--- libxine-0.9.13/files/patch-src:liba52:xine_decoder.c	Thu Jan 30 21:58:41 2003
+++ libxine/files/patch-src:liba52:xine_decoder.c	Thu Jan 30 22:09:53 2003
@@ -1,63 +1,13 @@
---- src/liba52/xine_decoder.c.orig	Sun Apr 28 22:57:28 2002
-+++ src/liba52/xine_decoder.c	Thu May 16 22:16:31 2002
-@@ -36,8 +36,8 @@
- #include <fcntl.h>
+--- src/liba52/xine_decoder.c.orig	Tue Jan 28 10:45:09 2003
++++ src/liba52/xine_decoder.c	Thu Jan 30 22:07:06 2003
+@@ -37,8 +37,8 @@
  
+ #include "xine_internal.h"
  #include "audio_out.h"
 -#include "a52.h"
 -#include "a52_internal.h"
 +#include <a52dec/a52.h>
 +#include <a52dec/a52_internal.h>
  #include "buffer.h"
- #include "xine_internal.h"
  #include "xineutils.h"
-@@ -58,7 +58,7 @@
-   int              frame_length, frame_todo;
-   uint16_t         syncword;
- 
--  a52_state_t      a52_state;
-+  a52_state_t      *a52_state;
-   int              a52_flags;
-   int              a52_bit_rate;
-   int              a52_sample_rate;
-@@ -154,8 +154,11 @@
-   this->output_open   = 0;
-   this->pts           = 0;
- 
--  if( !this->samples )
--    this->samples = a52_init (xine_mm_accel(), &this->samples_base);
-+  this->a52_state = a52_init (xine_mm_accel());
-+
-+  if( (this->a52_state) != NULL )
-+    if( !this->samples )
-+      this->samples = a52_samples (this->a52_state);
- 
-   /*
-    * find out if this driver supports a52 output
-@@ -284,7 +287,7 @@
-     
-     a52_output_flags = this->a52_flags_map[this->a52_flags & A52_CHANNEL_MASK];
-     
--    if (a52_frame (&this->a52_state, 
-+    if (a52_frame (this->a52_state, 
- 		   this->frame_buffer, 
- 		   &a52_output_flags,
- 		   &level, 384)) {
-@@ -293,7 +296,7 @@
-     }
-     
-     if (this->disable_dynrng)
--      a52_dynrng (&this->a52_state, NULL, NULL);
-+      a52_dynrng (this->a52_state, NULL, NULL);
- 
-     this->have_lfe = a52_output_flags & A52_LFE;
-     if (this->have_lfe)
-@@ -334,7 +337,7 @@
-     buf->num_frames = 256*6;
  
-     for (i = 0; i < 6; i++) {
--      if (a52_block (&this->a52_state, this->samples)) {
-+      if (a52_block (this->a52_state)) {
- 	printf ("liba52: a52_block error\n");
- 	buf->num_frames = 0;
- 	break; 
diff -urP libxine-0.9.13/files/patch-src:libffmpeg:Makefile.am libxine/files/patch-src:libffmpeg:Makefile.am
--- libxine-0.9.13/files/patch-src:libffmpeg:Makefile.am	Thu Jan 30 21:58:41 2003
+++ libxine/files/patch-src:libffmpeg:Makefile.am	Thu Jan 30 22:13:08 2003
@@ -1,22 +1,20 @@
---- src/libffmpeg/Makefile.am.orig	Tue Nov 27 03:34:06 2001
-+++ src/libffmpeg/Makefile.am	Thu Nov 29 17:26:16 2001
+--- src/libffmpeg/Makefile.am.orig	Fri Nov 22 06:25:16 2002
++++ src/libffmpeg/Makefile.am	Thu Jan 30 22:12:32 2003
 @@ -2,7 +2,6 @@
  ## Process this file with automake to produce Makefile.in
  ##
  
 -SUBDIRS = libavcodec 
  
- CFLAGS = @GLOBAL_CFLAGS@
- 
-@@ -13,9 +12,8 @@
- lib_LTLIBRARIES = xineplug_decode_ff.la
- 
+ # I don't think this should include internal docs that are not interesting
+ # for end users at all... -siggi
+@@ -19,7 +18,8 @@
  xineplug_decode_ff_la_SOURCES = xine_decoder.c
--xineplug_decode_ff_la_LDFLAGS = \
--		$(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \
--		-avoid-version -module
-+xineplug_decode_ff_la_LIBADD = -lavcodec
-+xineplug_decode_ff_la_LDFLAGS = -avoid-version -module
+ 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
++	$(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \
++	-lavcodec
  
  debug:
  	@list='$(SUBDIRS)'; for subdir in $$list; do \
Only in libxine-0.9.13/files: patch-src:libffmpeg:xine_decoder.c
diff -urP libxine-0.9.13/files/patch-src:libw32dll:wine:Makefile.am libxine/files/patch-src:libw32dll:wine:Makefile.am
--- libxine-0.9.13/files/patch-src:libw32dll:wine:Makefile.am	Thu Jan 30 21:58:41 2003
+++ libxine/files/patch-src:libw32dll:wine:Makefile.am	Thu Jan 30 22:16:04 2003
@@ -1,11 +1,11 @@
---- src/libw32dll/wine/Makefile.am.orig	Tue Mar 26 08:07:17 2002
-+++ src/libw32dll/wine/Makefile.am	Sat May 25 10:25:26 2002
-@@ -4,6 +4,8 @@
+--- src/libw32dll/wine/Makefile.am.orig	Tue Dec 24 18:05:05 2002
++++ src/libw32dll/wine/Makefile.am	Thu Jan 30 22:15:35 2003
+@@ -14,6 +14,8 @@
+ 	-DWIN32_PATH=\\\"@w32_path@\\\" -I$(srcdir)/.. -D__WINE__ \
+ 	-Ddbg_printf=__vprintf -DTRACE=__vprintf -fno-omit-frame-pointer
  
- ##
- ##
 +INCLUDES = @INCLUDES@ -I$(srcdir)/..
 +
- CFLAGS = @CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \
- 	-Wmissing-prototypes -Wimplicit-function-declaration \
- 	-DWIN32_PATH=\"@w32_path@\" -I$(srcdir)/.. -D__WINE__ \
+ if HAVE_W32DLL
+ wine_lib = libwine.la
+ endif
diff -urP libxine-0.9.13/pkg-plist libxine/pkg-plist
--- libxine-0.9.13/pkg-plist	Thu Jan 30 21:58:41 2003
+++ libxine/pkg-plist	Sat Feb  1 12:59:09 2003
@@ -1,180 +1,177 @@
 bin/xine-config
-include/xine/compat.h
+include/xine.h
 include/xine/attributes.h
-include/xine/audio_out.h
+include/xine/compat.h
+include/xine/ppcasm_string.h
+include/xine/xineutils.h
+include/xine/xine_check.h
+include/xine/xmllexer.h
+include/xine/xmlparser.h
+include/xine/xine_buffer.h
 include/xine/buffer.h
-include/xine/configfile.h
-include/xine/demux.h
-include/xine/events.h
-include/xine/input_plugin.h
-include/xine/lrb.h
 include/xine/metronom.h
-include/xine/osd.h
-include/xine/ppcasm_string.h
-include/xine/qtpalette.h
+include/xine/configfile.h
+include/xine/vo_scale.h
+include/xine/audio_out.h
 include/xine/resample.h
-include/xine/scratch.h
-include/xine/spu_decoder.h
-include/xine/spu_decoder_api.h
 include/xine/video_out.h
-include/xine/video_out_x11.h
-include/xine/video_overlay.h
 include/xine/xine_internal.h
+include/xine/spu_decoder.h
+include/xine/lrb.h
+include/xine/video_overlay.h
+include/xine/osd.h
+include/xine/scratch.h
+include/xine/xine_plugin.h
 include/xine/xineintl.h
-include/xine/xineutils.h
-include/xine/xmllexer.h
-include/xine/xmlparser.h
-include/xine.h
+include/xine/plugin_catalog.h
+include/xine/audio_decoder.h
+include/xine/video_decoder.h
+include/xine/post.h
+include/xine/input_plugin.h
+include/xine/demux.h
+include/xine/spu_decoder_api.h
+include/xine/nav_types.h
 lib/libxine.so
-lib/libxine.so.2
-lib/libxineutils.so
-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
-lib/xine/plugins/xineplug_decode_a52.so
-lib/xine/plugins/xineplug_decode_adpcm.so
-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
-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
-%%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
-lib/xine/plugins/xineplug_inp_http.so
-lib/xine/plugins/xineplug_inp_mms.so
-lib/xine/plugins/xineplug_inp_net.so
-lib/xine/plugins/xineplug_inp_rtp.so
-lib/xine/plugins/xineplug_inp_stdin_fifo.so
-lib/xine/plugins/xineplug_inp_vcd.so
-lib/xine/plugins/xineplug_vo_out_aa.so
-lib/xine/plugins/xineplug_vo_out_opengl.so
-lib/xine/plugins/xineplug_vo_out_sdl.so
-lib/xine/plugins/xineplug_vo_out_syncfb.so
-lib/xine/plugins/xineplug_vo_out_xshm.so
-%%HAVE_LIBXV%%lib/xine/plugins/xineplug_vo_out_xv.so
-share/doc/xine/xine-lib-API/html/annotated.html
-share/doc/xine/xine-lib-API/html/doxygen.css
-share/doc/xine/xine-lib-API/html/doxygen.gif
-share/doc/xine/xine-lib-API/html/files.html
-share/doc/xine/xine-lib-API/html/functions.html
-share/doc/xine/xine-lib-API/html/globals.html
-share/doc/xine/xine-lib-API/html/group__audio__cap.html
-share/doc/xine/xine-lib-API/html/group__audio__group.html
-share/doc/xine/xine-lib-API/html/group__audio__prop.html
-share/doc/xine/xine-lib-API/html/group__autoplay__group.html
-share/doc/xine/xine-lib-API/html/group__browse__group.html
-share/doc/xine/xine-lib-API/html/group__build__info.html
-share/doc/xine/xine-lib-API/html/group__config__group.html
-share/doc/xine/xine-lib-API/html/group__demux__strategy.html
-share/doc/xine/xine-lib-API/html/group__event__group.html
-share/doc/xine/xine-lib-API/html/group__loadplugins__group.html
-share/doc/xine/xine-lib-API/html/group__mrl__types.html
-share/doc/xine/xine-lib-API/html/group__status__group.html
-share/doc/xine/xine-lib-API/html/group__ui__callbacks.html
-share/doc/xine/xine-lib-API/html/group__version__group.html
-share/doc/xine/xine-lib-API/html/group__video__cap.html
-share/doc/xine/xine-lib-API/html/group__video__group.html
-share/doc/xine/xine-lib-API/html/group__video__prop.html
-share/doc/xine/xine-lib-API/html/group__video__ratio.html
-share/doc/xine/xine-lib-API/html/group__visual__types.html
-share/doc/xine/xine-lib-API/html/group__xine__api.html
-share/doc/xine/xine-lib-API/html/group__xine__init.html
-share/doc/xine/xine-lib-API/html/group__xine__management.html
-share/doc/xine/xine-lib-API/html/group__xine__version.html
-share/doc/xine/xine-lib-API/html/index.html
-share/doc/xine/xine-lib-API/html/modules.html
-share/doc/xine/xine-lib-API/html/structao__driver__t.html
-share/doc/xine/xine-lib-API/html/structao__functions__t.html
-share/doc/xine/xine-lib-API/html/structcfg__data__t.html
-share/doc/xine/xine-lib-API/html/structconfig__values__s.html
-share/doc/xine/xine-lib-API/html/structconfig__values__t.html
-share/doc/xine/xine-lib-API/html/structmrl__t.html
-share/doc/xine/xine-lib-API/html/structvo__driver__s.html
-share/doc/xine/xine-lib-API/html/structvo__driver__t.html
-share/doc/xine/xine-lib-API/html/structvo__frame__t.html
-share/doc/xine/xine-lib-API/html/structvo__overlay__t.html
-share/doc/xine/xine-lib-API/html/structxine__t.html
-share/doc/xine/xine-lib-API/html/xine_8h-source.html
-share/doc/xine/xine-lib-API/html/xine_8h.html
-share/doc/xine/xine-lib-API/html/xine_logo.png
-share/locale/cs/LC_MESSAGES/xine-lib.mo
-share/locale/de/LC_MESSAGES/xine-lib.mo
-share/locale/es/LC_MESSAGES/xine-lib.mo
-share/locale/fr/LC_MESSAGES/xine-lib.mo
-share/locale/pl_PL/LC_MESSAGES/xine-lib.mo
-share/locale/pt_BR/LC_MESSAGES/xine-lib.mo
-share/locale/sk/LC_MESSAGES/xine-lib.mo
-share/xine/fonts/cc-16.xinefont.gz
-share/xine/fonts/cc-20.xinefont.gz
-share/xine/fonts/cc-24.xinefont.gz
-share/xine/fonts/cc-32.xinefont.gz
-share/xine/fonts/cci-16.xinefont.gz
-share/xine/fonts/cci-20.xinefont.gz
-share/xine/fonts/cci-24.xinefont.gz
-share/xine/fonts/cci-32.xinefont.gz
-share/xine/fonts/cetus-16.xinefont.gz
-share/xine/fonts/cetus-20.xinefont.gz
-share/xine/fonts/cetus-24.xinefont.gz
-share/xine/fonts/cetus-32.xinefont.gz
-share/xine/fonts/mono-16.xinefont.gz
-share/xine/fonts/mono-20.xinefont.gz
-share/xine/fonts/mono-24.xinefont.gz
-share/xine/fonts/mono-32.xinefont.gz
-share/xine/fonts/sans-16.xinefont.gz
-share/xine/fonts/sans-20.xinefont.gz
-share/xine/fonts/sans-24.xinefont.gz
-share/xine/fonts/sans-32.xinefont.gz
-share/xine/fonts/sanshu-16.xinefont.gz
-share/xine/fonts/sanshu-20.xinefont.gz
-share/xine/fonts/sanshu-24.xinefont.gz
-share/xine/fonts/sanshu-32.xinefont.gz
-share/xine/fonts/serif-16.xinefont.gz
-share/xine/fonts/serif-20.xinefont.gz
-share/xine/fonts/serif-24.xinefont.gz
-share/xine/fonts/serif-32.xinefont.gz
-share/xine/skins/xine_logo.mpv
+lib/libxine.so.3
+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
+%%HAVE_ARTS%%lib/xine/plugins/1.0.0/xineplug_ao_out_arts.so
+lib/xine/plugins/1.0.0/xineplug_ao_out_esd.so
+lib/xine/plugins/1.0.0/xineplug_ao_out_oss.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_dts.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_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_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_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
+%%HAVE_VORBIS%%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_decode_yuv_frames.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_games.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_ts.so
+%%HAVE_OGG%%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_sputext.so
+lib/xine/plugins/1.0.0/xineplug_dmx_yuv4mpeg2.so
+lib/xine/plugins/1.0.0/xineplug_dmx_yuv_frames.so
+lib/xine/plugins/1.0.0/xineplug_inp_cdda.so
+lib/xine/plugins/1.0.0/xineplug_inp_dvb.so
+lib/xine/plugins/1.0.0/xineplug_inp_dvd.so
+lib/xine/plugins/1.0.0/xineplug_inp_file.so
+lib/xine/plugins/1.0.0/xineplug_inp_gnome_vfs.so
+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_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_none.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_pgx64.so
+lib/xine/plugins/1.0.0/xineplug_vo_out_syncfb.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
+libdata/pkgconfig/libxine.pc
+share/aclocal/xine.m4
+%%PORTDOCS%%share/doc/xine/faq/faq.html
+%%PORTDOCS%%share/doc/xine/faq/faq.txt
+%%PORTDOCS%%share/doc/xine/README
+%%PORTDOCS%%share/doc/xine/README.plugins
+%%PORTDOCS%%share/doc/xine/dataflow.dia
+%%PORTDOCS%%share/doc/xine/README.dvb
+%%PORTDOCS%%share/doc/xine/README.config_en
+%%PORTDOCS%%share/doc/xine/README.dxr3
+%%PORTDOCS%%share/doc/xine/README.dxr3_pl
+%%PORTDOCS%%share/doc/xine/README.freebsd
+%%PORTDOCS%%share/doc/xine/README.irix
+%%PORTDOCS%%share/doc/xine/README.mrl
+%%PORTDOCS%%share/doc/xine/README.opengl
+%%PORTDOCS%%share/doc/xine/README.solaris
+%%PORTDOCS%%share/doc/xine/README.syncfb
+%%PORTDOCS%%share/doc/xine/README.tvmode
+share/locale/fr/LC_MESSAGES/libxine1.mo
+share/locale/pt_BR/LC_MESSAGES/libxine1.mo
+share/locale/de/LC_MESSAGES/libxine1.mo
+share/locale/sk/LC_MESSAGES/libxine1.mo
+share/locale/es/LC_MESSAGES/libxine1.mo
+share/locale/pl_PL/LC_MESSAGES/libxine1.mo
+share/locale/cs/LC_MESSAGES/libxine1.mo
+share/xine/libxine1/fonts/cc-16.xinefont.gz
+share/xine/libxine1/fonts/cc-20.xinefont.gz
+share/xine/libxine1/fonts/cc-24.xinefont.gz
+share/xine/libxine1/fonts/cc-32.xinefont.gz
+share/xine/libxine1/fonts/cci-16.xinefont.gz
+share/xine/libxine1/fonts/cci-20.xinefont.gz
+share/xine/libxine1/fonts/cci-24.xinefont.gz
+share/xine/libxine1/fonts/cci-32.xinefont.gz
+share/xine/libxine1/fonts/cetus-16.xinefont.gz
+share/xine/libxine1/fonts/cetus-20.xinefont.gz
+share/xine/libxine1/fonts/cetus-24.xinefont.gz
+share/xine/libxine1/fonts/cetus-32.xinefont.gz
+share/xine/libxine1/fonts/mono-16.xinefont.gz
+share/xine/libxine1/fonts/mono-20.xinefont.gz
+share/xine/libxine1/fonts/mono-24.xinefont.gz
+share/xine/libxine1/fonts/mono-32.xinefont.gz
+share/xine/libxine1/fonts/sans-16.xinefont.gz
+share/xine/libxine1/fonts/sans-20.xinefont.gz
+share/xine/libxine1/fonts/sans-24.xinefont.gz
+share/xine/libxine1/fonts/sans-32.xinefont.gz
+share/xine/libxine1/fonts/sanshu-16.xinefont.gz
+share/xine/libxine1/fonts/sanshu-20.xinefont.gz
+share/xine/libxine1/fonts/sanshu-24.xinefont.gz
+share/xine/libxine1/fonts/sanshu-32.xinefont.gz
+share/xine/libxine1/fonts/serif-16.xinefont.gz
+share/xine/libxine1/fonts/serif-20.xinefont.gz
+share/xine/libxine1/fonts/serif-24.xinefont.gz
+share/xine/libxine1/fonts/serif-32.xinefont.gz
 @dirrm include/xine
-@dirrm lib/xine/plugins/vidix
+@dirrm lib/xine/plugins/1.0.0/post
+@dirrm lib/xine/plugins/1.0.0/vidix
+@dirrm lib/xine/plugins/1.0.0
 @dirrm lib/xine/plugins
 @dirrm lib/xine
-@dirrm share/doc/xine/xine-lib-API/html
-@dirrm share/doc/xine/xine-lib-API
-@dirrm share/doc/xine
-@dirrm share/xine/fonts
-@dirrm share/xine/skins
+%%PORTDOCS%% @dirrm share/doc/xine
+@dirrm share/xine/libxine1/fonts
+@dirrm share/xine/libxine1
 @dirrm share/xine
--- libxine-0.9.13-to-1.beta4.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302011406.h11E6TE9019432>