diff options
author | wiz <wiz> | 2006-06-26 17:13:11 +0000 |
---|---|---|
committer | wiz <wiz> | 2006-06-26 17:13:11 +0000 |
commit | bdf3a54813e1e10bf8197ef1ce0d36048245520b (patch) | |
tree | 98836cf09ee96b722b704456af22996d16bf9486 /multimedia/xine-lib/patches | |
parent | 7270dafec12eeb490cc39d7c63f91083c1cfb90a (diff) | |
download | pkgsrc-bdf3a54813e1e10bf8197ef1ce0d36048245520b.tar.gz |
regen (with correct offsets)
Diffstat (limited to 'multimedia/xine-lib/patches')
-rw-r--r-- | multimedia/xine-lib/patches/patch-ae | 16 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-ah | 6 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-al | 6 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-as | 6 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-av | 10 | ||||
-rw-r--r-- | multimedia/xine-lib/patches/patch-bg | 8 |
6 files changed, 26 insertions, 26 deletions
diff --git a/multimedia/xine-lib/patches/patch-ae b/multimedia/xine-lib/patches/patch-ae index 7710b9c7768..84808918f03 100644 --- a/multimedia/xine-lib/patches/patch-ae +++ b/multimedia/xine-lib/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ +$NetBSD: patch-ae,v 1.2 2006/06/26 17:13:11 wiz Exp $ ---- src/input/input_vcd.c.orig 2003-04-07 02:17:07.000000000 +1000 +--- src/input/input_vcd.c.orig 2005-04-20 17:21:08.000000000 +0000 +++ src/input/input_vcd.c @@ -32,6 +32,7 @@ #include <errno.h> @@ -28,7 +28,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ uint8_t cur_min, cur_sec, cur_frame; #endif -@@ -176,7 +177,7 @@ static int input_vcd_read_toc (vcd_input +@@ -179,7 +180,7 @@ static int input_vcd_read_toc (vcd_input return 0; } @@ -37,7 +37,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ static int input_vcd_read_toc (vcd_input_class_t *this, int fd) { struct ioc_read_toc_entry te; -@@ -388,7 +389,7 @@ static off_t vcd_plugin_read (input_plug +@@ -395,7 +396,7 @@ static off_t vcd_plugin_read (input_plug memcpy (buf, data.data, VCDSECTORSIZE); /* FIXME */ return VCDSECTORSIZE; } @@ -46,7 +46,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ static off_t vcd_plugin_read (input_plugin_t *this_gen, char *buf, off_t nlen) { vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; -@@ -526,7 +527,7 @@ static buf_element_t *vcd_plugin_read_bl +@@ -533,7 +534,7 @@ static buf_element_t *vcd_plugin_read_bl memcpy (buf->mem, data.data, VCDSECTORSIZE); /* FIXME */ return buf; } @@ -55,7 +55,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ static buf_element_t *vcd_plugin_read_block (input_plugin_t *this_gen, fifo_buffer_t *fifo, off_t nlen) { -@@ -684,7 +685,7 @@ static off_t vcd_plugin_seek (input_plug +@@ -692,7 +693,7 @@ static off_t vcd_plugin_seek (input_plug return offset ; /* FIXME */ } @@ -64,7 +64,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ static off_t vcd_plugin_seek (input_plugin_t *this_gen, off_t offset, int origin) { -@@ -758,7 +759,7 @@ static off_t vcd_plugin_get_length (inpu +@@ -766,7 +767,7 @@ static off_t vcd_plugin_get_length (inpu return (off_t) 0; } @@ -73,7 +73,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ static off_t vcd_plugin_get_length (input_plugin_t *this_gen) { vcd_input_plugin_t *this = (vcd_input_plugin_t *) this_gen; off_t len ; -@@ -886,6 +887,10 @@ static input_plugin_t *open_plugin (inpu +@@ -861,6 +862,10 @@ static int vcd_plugin_open (input_plugin this->cur_min = this->cls->tocent[this->cur_track].cdte_addr.msf.minute; this->cur_sec = this->cls->tocent[this->cur_track].cdte_addr.msf.second; this->cur_frame = this->cls->tocent[this->cur_track].cdte_addr.msf.frame; diff --git a/multimedia/xine-lib/patches/patch-ah b/multimedia/xine-lib/patches/patch-ah index 10a2528c1cf..c6500d99aab 100644 --- a/multimedia/xine-lib/patches/patch-ah +++ b/multimedia/xine-lib/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $ +$NetBSD: patch-ah,v 1.2 2006/06/26 17:13:11 wiz Exp $ ---- src/xine-engine/video_out.c.orig 2003-04-06 10:23:10.000000000 +1000 +--- src/xine-engine/video_out.c.orig 2005-04-20 17:21:17.000000000 +0000 +++ src/xine-engine/video_out.c -@@ -1443,7 +1443,9 @@ xine_video_port_t *vo_new_port (xine_t * +@@ -1769,7 +1769,9 @@ xine_video_port_t *_x_vo_new_port (xine_ this->grab_only = 0; pthread_attr_init(&pth_attrs); diff --git a/multimedia/xine-lib/patches/patch-al b/multimedia/xine-lib/patches/patch-al index a2f36db5954..351a0137568 100644 --- a/multimedia/xine-lib/patches/patch-al +++ b/multimedia/xine-lib/patches/patch-al @@ -1,8 +1,8 @@ -$NetBSD: patch-al,v 1.5 2005/09/20 12:10:53 dmcmahill Exp $ +$NetBSD: patch-al,v 1.6 2006/06/26 17:13:11 wiz Exp $ ---- src/xine-utils/xineutils.h.orig 2004-12-12 08:51:30.000000000 -0500 +--- src/xine-utils/xineutils.h.orig 2005-10-08 13:57:49.000000000 +0000 +++ src/xine-utils/xineutils.h -@@ -666,7 +666,13 @@ void xine_strdupa(char *dest, char *src) +@@ -679,7 +679,13 @@ void xine_strdupa(char *dest, char *src) /* compatibility macros */ #define xine_strpbrk(S, ACCEPT) strpbrk((S), (ACCEPT)) diff --git a/multimedia/xine-lib/patches/patch-as b/multimedia/xine-lib/patches/patch-as index 034689a6808..98592e701c1 100644 --- a/multimedia/xine-lib/patches/patch-as +++ b/multimedia/xine-lib/patches/patch-as @@ -1,8 +1,8 @@ -$NetBSD: patch-as,v 1.2 2004/03/11 17:26:02 jmmv Exp $ +$NetBSD: patch-as,v 1.3 2006/06/26 17:13:11 wiz Exp $ ---- src/video_out/video_out_none.c.orig 2003-12-14 23:13:25.000000000 +0100 +--- src/video_out/video_out_none.c.orig 2004-09-22 20:29:15.000000000 +0000 +++ src/video_out/video_out_none.c -@@ -65,6 +65,8 @@ typedef struct { +@@ -64,6 +64,8 @@ typedef struct { static void free_framedata(none_frame_t* frame) { diff --git a/multimedia/xine-lib/patches/patch-av b/multimedia/xine-lib/patches/patch-av index 74a9b4bf4a5..0e516d5fcbf 100644 --- a/multimedia/xine-lib/patches/patch-av +++ b/multimedia/xine-lib/patches/patch-av @@ -1,8 +1,8 @@ -$NetBSD: patch-av,v 1.1 2004/03/28 20:14:22 mycroft Exp $ +$NetBSD: patch-av,v 1.2 2006/06/26 17:13:11 wiz Exp $ ---- src/libreal/xine_decoder.c.orig 2004-03-16 20:21:33.000000000 +0000 -+++ src/libreal/xine_decoder.c 2004-03-28 05:20:49.000000000 +0000 -@@ -99,6 +99,15 @@ +--- src/libreal/xine_decoder.c.orig 2004-12-16 13:59:10.000000000 +0000 ++++ src/libreal/xine_decoder.c +@@ -102,6 +102,15 @@ typedef struct { } rv_init_t; @@ -18,7 +18,7 @@ $NetBSD: patch-av,v 1.1 2004/03/28 20:14:22 mycroft Exp $ void *__builtin_vec_new(uint32_t size); void __builtin_vec_delete(void *mem); void __pure_virtual(void); -@@ -574,8 +583,7 @@ +@@ -627,8 +636,7 @@ static void *init_class (xine_t *xine, v * exported plugin catalog entry */ diff --git a/multimedia/xine-lib/patches/patch-bg b/multimedia/xine-lib/patches/patch-bg index f780fd10faa..0b766e15276 100644 --- a/multimedia/xine-lib/patches/patch-bg +++ b/multimedia/xine-lib/patches/patch-bg @@ -1,11 +1,11 @@ -$NetBSD: patch-bg,v 1.1 2005/04/13 16:54:03 rillig Exp $ +$NetBSD: patch-bg,v 1.2 2006/06/26 17:13:11 wiz Exp $ All files in $(DESTDIR) may be marked read-only, so better use the INSTALL_HEADER tools to overwrite them correctly. ---- include/Makefile.in.orig Sat Dec 25 23:34:48 2004 -+++ include/Makefile.in Tue Apr 12 11:04:43 2005 -@@ -727,7 +727,8 @@ maintainer-clean-generic: +--- include/Makefile.in.orig 2005-10-09 11:27:58.000000000 +0000 ++++ include/Makefile.in +@@ -475,7 +475,8 @@ maintainer-clean-generic: -rm -f Makefile.in install-data-local: install-includeHEADERS |