Reimport graphics/transcode as multimedia/transcode.

15 files changed, 350 insertions, 0 deletions

diff --git a/multimedia/transcode/patches/patch-ad b/multimedia/transcode/patches/patch-ad
new file mode 100644
index 00000000000..3414245e3ec
--- /dev/null
+++ b/multimedia/transcode/patches/patch-ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+diff -rcp filter/yuvdenoise/mjpeg_types.h filter/yuvdenoise/mjpeg_types.h
+*** filter/yuvdenoise/mjpeg_types.h	Fri Mar 14 22:12:41 2003
+--- filter/yuvdenoise/mjpeg_types.h	Mon Jun  9 17:48:25 2003
+*************** typedef u_int64_t uint64_t;
+*** 58,64 ****
+  /* fixme */
+  #endif /* HAVE_STDINT_H */
+  
+! #if defined(__FreeBSD__)
+  #include <sys/types.h> /* FreeBSD - ssize_t */
+  #endif
+  
+--- 58,64 ----
+  /* fixme */
+  #endif /* HAVE_STDINT_H */
+  
+! #if defined(__FreeBSD__)|| defined(__NetBSD__)
+  #include <sys/types.h> /* FreeBSD - ssize_t */
+  #endif
+  
diff --git a/multimedia/transcode/patches/patch-ae b/multimedia/transcode/patches/patch-ae
new file mode 100644
index 00000000000..23bfd21d4f4
--- /dev/null
+++ b/multimedia/transcode/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+diff -rcp import/import_divx.c import/import_divx.c
+*** import/import_divx.c	Mon May 12 16:46:50 2003
+--- import/import_divx.c	Mon Jun  9 17:46:50 2003
+*************** static unsigned char *bufalloc(size_t si
+*** 158,164 ****
+  }
+  
+  static int divx_init(char *path) {
+! #ifdef __FreeBSD__
+      const
+  #endif    
+      char *error;
+--- 158,164 ----
+  }
+  
+  static int divx_init(char *path) {
+! #if defined(__FreeBSD__) || defined(__NetBSD__)
+      const
+  #endif    
+      char *error;
diff --git a/multimedia/transcode/patches/patch-af b/multimedia/transcode/patches/patch-af
new file mode 100644
index 00000000000..3559faba71d
--- /dev/null
+++ b/multimedia/transcode/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+--- import/import_xvid.c	2004-03-26 19:12:32.000000000 +0000
++++ import/import_xvid.c	2004-03-26 19:12:42.000000000 +0000
+@@ -67,7 +67,7 @@
+ #define XVID_SHARED_LIB_NAME "libxvidcore.so"
+ 
+ static int xvid2_init(char *path) {
+-#if defined(__FreeBSD__) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
+ 	const
+ #endif    
+ 		char *error;
diff --git a/multimedia/transcode/patches/patch-ag b/multimedia/transcode/patches/patch-ag
new file mode 100644
index 00000000000..b98c3c2bd3e
--- /dev/null
+++ b/multimedia/transcode/patches/patch-ag
@@ -0,0 +1,22 @@
+$NetBSD: patch-ag,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+diff -rcp import/iodump.c import/iodump.c
+*** import/iodump.c	Wed Apr  2 19:03:05 2003
+--- import/iodump.c	Mon Jun  9 17:47:23 2003
+***************
+*** 37,43 ****
+  #include "dvd_reader.h"
+  #endif
+  
+! #if defined(__bsdi__) || defined(__FreeBSD__) || defined(__APPLE__)
+  typedef	off_t off64_t;
+  #define	lseek64 lseek
+  #endif
+--- 37,43 ----
+  #include "dvd_reader.h"
+  #endif
+  
+! #if defined(__bsdi__) || defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
+  typedef	off_t off64_t;
+  #define	lseek64 lseek
+  #endif
diff --git a/multimedia/transcode/patches/patch-ah b/multimedia/transcode/patches/patch-ah
new file mode 100644
index 00000000000..d2bd34b95a7
--- /dev/null
+++ b/multimedia/transcode/patches/patch-ah
@@ -0,0 +1,22 @@
+$NetBSD: patch-ah,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+diff -rcp import/nuv/rtjpeg_aud_plugin.c import/nuv/rtjpeg_aud_plugin.c
+*** import/nuv/rtjpeg_aud_plugin.c	Tue Apr  8 20:50:11 2003
+--- import/nuv/rtjpeg_aud_plugin.c	Mon Jun  9 17:47:33 2003
+*************** int rtjpeg_aud_open(char *tplorg)
+*** 108,114 ****
+      regions[0].end   = -1;
+    }
+  
+! #if defined(__FreeBSD__) || defined(__APPLE__) 
+    rtjpeg_aud_file=open(tplorg, O_RDONLY);
+  #else 
+    rtjpeg_aud_file=open(tplorg, O_RDONLY|O_LARGEFILE);
+--- 108,114 ----
+      regions[0].end   = -1;
+    }
+  
+! #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
+    rtjpeg_aud_file=open(tplorg, O_RDONLY);
+  #else 
+    rtjpeg_aud_file=open(tplorg, O_RDONLY|O_LARGEFILE);
diff --git a/multimedia/transcode/patches/patch-ai b/multimedia/transcode/patches/patch-ai
new file mode 100644
index 00000000000..31835b3ec34
--- /dev/null
+++ b/multimedia/transcode/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+diff -rcp import/nuv/rtjpeg_vid_plugin.c import/nuv/rtjpeg_vid_plugin.c
+*** import/nuv/rtjpeg_vid_plugin.c	Tue Apr  8 20:50:11 2003
+--- import/nuv/rtjpeg_vid_plugin.c	Mon Jun  9 17:47:40 2003
+*************** int rtjpeg_vid_open(char *tplorg)
+*** 108,114 ****
+      regions[0].end   = -1;
+    }
+  
+! #if defined(__FreeBSD__) || defined(__APPLE__) 
+    rtjpeg_vid_file=open(tplorg, O_RDONLY);
+  #else 
+    rtjpeg_vid_file=open(tplorg, O_RDONLY|O_LARGEFILE);
+--- 108,114 ----
+      regions[0].end   = -1;
+    }
+  
+! #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
+    rtjpeg_vid_file=open(tplorg, O_RDONLY);
+  #else 
+    rtjpeg_vid_file=open(tplorg, O_RDONLY|O_LARGEFILE);
diff --git a/multimedia/transcode/patches/patch-aj b/multimedia/transcode/patches/patch-aj
new file mode 100644
index 00000000000..99152d60581
--- /dev/null
+++ b/multimedia/transcode/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+diff -rcp src/dl_loader.c src/dl_loader.c
+*** src/dl_loader.c	Wed Apr 30 18:14:28 2003
+--- src/dl_loader.c	Mon Jun  9 17:45:34 2003
+*************** int tca_import(int opt, void *para1, voi
+*** 128,134 ****
+  
+  void *load_module(char *mod_name, int mode)
+  {
+! #if defined(__FreeBSD__) || defined (__APPLE__)
+    const
+  #endif  
+    char *error;
+--- 128,134 ----
+  
+  void *load_module(char *mod_name, int mode)
+  {
+! #if defined(__FreeBSD__) || defined (__APPLE__) || defined(__NetBSD__)
+    const
+  #endif  
+    char *error;
diff --git a/multimedia/transcode/patches/patch-ak b/multimedia/transcode/patches/patch-ak
new file mode 100644
index 00000000000..a6eb4f54924
--- /dev/null
+++ b/multimedia/transcode/patches/patch-ak
@@ -0,0 +1,22 @@
+$NetBSD: patch-ak,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+diff -rcp src/filter.c src/filter.c
+*** src/filter.c	Mon May 12 05:03:00 2003
+--- src/filter.c	Mon Jun  9 17:45:39 2003
+*************** int filter_unquote_options(char *options
+*** 127,133 ****
+  }
+  
+  int load_plugin(char *path) {
+! #if defined(__FreeBSD__) || defined (__APPLE__)
+    const
+  #endif    
+    char *error;
+--- 127,133 ----
+  }
+  
+  int load_plugin(char *path) {
+! #if defined(__FreeBSD__) || defined (__APPLE__) || defined(__NetBSD__)
+    const
+  #endif    
+    char *error;
diff --git a/multimedia/transcode/patches/patch-al b/multimedia/transcode/patches/patch-al
new file mode 100644
index 00000000000..926f66304db
--- /dev/null
+++ b/multimedia/transcode/patches/patch-al
@@ -0,0 +1,22 @@
+$NetBSD: patch-al,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+diff -rcp src/iodir.c src/iodir.c
+*** src/iodir.c	Sun Mar  9 00:42:49 2003
+--- src/iodir.c	Mon Jun  9 17:45:31 2003
+***************
+*** 25,31 ****
+  #include <dirent.h>
+  #include "ioaux.h"
+  
+! #if defined(__bsdi__) || defined(__FreeBSD__)
+  typedef	off_t off64_t;
+  #define	lseek64 lseek
+  #endif
+--- 25,31 ----
+  #include <dirent.h>
+  #include "ioaux.h"
+  
+! #if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__)
+  typedef	off_t off64_t;
+  #define	lseek64 lseek
+  #endif
diff --git a/multimedia/transcode/patches/patch-an b/multimedia/transcode/patches/patch-an
new file mode 100644
index 00000000000..01df579f652
--- /dev/null
+++ b/multimedia/transcode/patches/patch-an
@@ -0,0 +1,39 @@
+$NetBSD: patch-an,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+diff -rcp tools/tcmodinfo.c tools/tcmodinfo.c
+*** tools/tcmodinfo.c	Mon May 12 19:44:12 2003
+--- tools/tcmodinfo.c	Mon Jun  9 17:48:49 2003
+*************** void tc_error(char *string)
+*** 102,108 ****
+  
+  void *load_module(char *mod_name, char *mod_path, int mode)
+  {
+! #if defined(__FreeBSD__) || defined (__APPLE__)
+    const
+  #endif  
+    char *error;
+--- 102,108 ----
+  
+  void *load_module(char *mod_name, char *mod_path, int mode)
+  {
+! #if defined(__FreeBSD__) || defined (__APPLE__) || defined(__NetBSD__)
+    const
+  #endif  
+    char *error;
+*************** void *load_module(char *mod_name, char *
+*** 186,192 ****
+  
+  
+  int load_plugin(char *path, int id) {
+! #if defined(__FreeBSD__) || defined(__APPLE__)
+    const
+  #endif    
+    char *error;
+--- 186,192 ----
+  
+  
+  int load_plugin(char *path, int id) {
+! #if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__)
+    const
+  #endif    
+    char *error;
diff --git a/multimedia/transcode/patches/patch-ao b/multimedia/transcode/patches/patch-ao
new file mode 100644
index 00000000000..94e7bbb718c
--- /dev/null
+++ b/multimedia/transcode/patches/patch-ao
@@ -0,0 +1,19 @@
+$NetBSD: patch-ao,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+--- avilib/Makefile.am	2004-03-26 19:14:20.000000000 +0000
++++ avilib/Makefile.am	2004-03-26 19:14:30.000000000 +0000
+@@ -3,12 +3,12 @@
+ AUTOMAKE_OPTIONS = 1.3 foreign
+ DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
+ 
+-noinst_LIBRARIES = libavi.a
++noinst_LTLIBRARIES = libavi.la
+ 
+ INCLUDES = -I./
+ 
+ CFLAGS=-funroll-loops -ffast-math -DLINUX -Wall @CFLAGS@
+-libavi_a_SOURCES = avilib.c avidump.c avimisc.c
++libavi_la_SOURCES = avilib.c avidump.c avimisc.c
+ 
+ EXTRA_DIST = avilib.h README.avilib os.h
+ 
diff --git a/multimedia/transcode/patches/patch-ap b/multimedia/transcode/patches/patch-ap
new file mode 100644
index 00000000000..62b884e9049
--- /dev/null
+++ b/multimedia/transcode/patches/patch-ap
@@ -0,0 +1,16 @@
+$NetBSD: patch-ap,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+--- ffmpeg/libavcodec/Makefile.am	2004-03-26 19:15:46.000000000 +0000
++++ ffmpeg/libavcodec/Makefile.am	2004-03-26 19:15:58.000000000 +0000
+@@ -34,9 +34,9 @@
+ 
+ AM_CFLAGS = -O2 -g -Wall -ffast-math $(ALTIVEC) $(X86) $(MMX) -DHAVE_AV_CONFIG_H -D_GNU_SOURCE --include=$(top_srcdir)/ffmpeg/av_config.h
+ 
+-noinst_LIBRARIES = libtcavcodec.a
++noinst_LTLIBRARIES = libtcavcodec.la
+ 
+-libtcavcodec_a_SOURCES = \
++libtcavcodec_la_SOURCES = \
+       common.c utils.c mem.c allcodecs.c \
+       mpegvideo.c jrevdct.c jfdctfst.c jfdctint.c \
+       mpegaudio.c ac3enc.c mjpeg.c resample.c dsputil.c \
diff --git a/multimedia/transcode/patches/patch-aq b/multimedia/transcode/patches/patch-aq
new file mode 100644
index 00000000000..ae401638cf8
--- /dev/null
+++ b/multimedia/transcode/patches/patch-aq
@@ -0,0 +1,16 @@
+$NetBSD: patch-aq,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+--- libac3/Makefile.am	2004-03-26 19:16:37.000000000 +0000
++++ libac3/Makefile.am	2004-03-26 19:16:44.000000000 +0000
+@@ -4,9 +4,9 @@
+ 
+ CFLAGS = -O3 -funroll-loops -ffast-math -DLINUX -fPIC -DPIC @CFLAGS@
+ 
+-noinst_LIBRARIES = libac3_tc.a
++noinst_LTLIBRARIES = libac3_tc.la
+ 
+-libac3_tc_a_SOURCES = bitstream.c decode.c imdct.c coeff.c exponent.c stats.c\
++libac3_tc_la_SOURCES = bitstream.c decode.c imdct.c coeff.c exponent.c stats.c\
+ 	bit_allocate.c  parse.c crc.c debug.c rematrix.c downmix.c dither.c \
+ 	sanity_check.c
+ 
diff --git a/multimedia/transcode/patches/patch-ar b/multimedia/transcode/patches/patch-ar
new file mode 100644
index 00000000000..73453e9a63c
--- /dev/null
+++ b/multimedia/transcode/patches/patch-ar
@@ -0,0 +1,16 @@
+$NetBSD: patch-ar,v 1.1.1.1 2004/05/10 13:47:08 wiz Exp $
+
+--- libvo/Makefile.am	2004-03-26 19:17:33.000000000 +0000
++++ libvo/Makefile.am	2004-03-26 19:17:40.000000000 +0000
+@@ -3,9 +3,9 @@
+ DEFAULT_INCLUDES = -I$(top_srcdir) -I$(srcdir) -I$(top_builddir) -I.
+ 
+ CFLAGS = -Wall -fPIC -DPIC @CFLAGS@ -I../libmpeg2 -I$(srcdir)/../libmpeg2
+-noinst_LIBRARIES = libvout.a
++noinst_LTLIBRARIES = libvout.la
+ 
+-libvout_a_SOURCES = video_out.c video_out_ppm.c video_out_yuv.c yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c cpu_accel.c rgb2yuv.c
++libvout_la_SOURCES = video_out.c video_out_ppm.c video_out_yuv.c yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c cpu_accel.c rgb2yuv.c
+ 
+ noinst_HEADERS = yuv2rgb.h video_out_internal.h video_out.h rgb2yuv.h mmx.h mm_accel.h 
+ EXTRA_DIST = COPYING AUTHORS README
diff --git a/multimedia/transcode/patches/patch-as b/multimedia/transcode/patches/patch-as
new file mode 100644
index 00000000000..45a67428be4
--- /dev/null
+++ b/multimedia/transcode/patches/patch-as
@@ -0,0 +1,55 @@
+$NetBSD: patch-as,v 1.1.1.1 2004/05/10 13:47:09 wiz Exp $
+
+--- src/decoder.c.orig	2003-12-20 11:49:22.000000000 +0000
++++ src/decoder.c	2004-03-28 09:16:35.000000000 +0000
+@@ -119,16 +119,12 @@
+   }
+ 
+   //wait for threads to terminate
+-#ifdef BROKEN_PTHREADS // Used to be MacOSX specific; kernel 2.6 as well?
+   pthread_cond_signal(&vframe_list_full_cv);
+-#endif
+   cc1=pthread_join(vthread, &status);
+   
+   if(verbose & TC_DEBUG) fprintf(stderr, "(%s) video thread exit (ret_code=%d) (status_code=%d)\n", __FILE__, cc1, (int) status);
+   
+-#ifdef BROKEN_PTHREADS // Used to be MacOSX specific; kernel 2.6 as well?
+   pthread_cond_signal(&aframe_list_full_cv);
+-#endif
+   cc2=pthread_join(athread, &status);
+   
+   if(verbose & TC_DEBUG) fprintf(stderr, "(%s) audio thread exit (ret_code=%d) (status_code=%d)\n", __FILE__, cc2, (int) status);
+@@ -467,6 +463,7 @@
+     pthread_testcancel();
+ 
+     //check buffer fill level
++    pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
+     pthread_mutex_lock(&vframe_list_lock);
+     
+     while(vframe_fill_level(TC_BUFFER_FULL)) {
+@@ -481,7 +478,9 @@
+ 	  pthread_exit( (int *) 11);
+ 	}
+     }
++
+     pthread_mutex_unlock(&vframe_list_lock);
++    pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+     
+     // get a frame buffer or wait
+     while((ptr = vframe_register(i))==NULL) {
+@@ -655,6 +654,7 @@
+     pthread_testcancel();
+     
+     //check buffer fill level
++    pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
+     pthread_mutex_lock(&aframe_list_lock);
+     
+     while(aframe_fill_level(TC_BUFFER_FULL)) {
+@@ -671,6 +671,7 @@
+     }
+     
+     pthread_mutex_unlock(&aframe_list_lock);
++    pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+     
+     // get a frame buffer or wait
+     while((ptr = aframe_register(i))==NULL) {