diff options
author | joerg <joerg@pkgsrc.org> | 2011-09-04 14:34:52 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2011-09-04 14:34:52 +0000 |
commit | 7bcca84e53e2dd7aa871326db9462438f27288b4 (patch) | |
tree | 1cfb466beb150680b373fa083ea7e9996ac4ab70 /multimedia | |
parent | 88a5838c59df81dd8c6a0c29230b1973021df361 (diff) | |
download | pkgsrc-7bcca84e53e2dd7aa871326db9462438f27288b4.tar.gz |
Address computations are not ICE, even if GCC accepts them as such. Fix
that and use the same emms constraint as found in other places.
Diffstat (limited to 'multimedia')
19 files changed, 431 insertions, 1 deletions
diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo index b790f132507..573f779b9a6 100644 --- a/multimedia/xine-lib/distinfo +++ b/multimedia/xine-lib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.72 2011/08/15 07:35:18 wiz Exp $ +$NetBSD: distinfo,v 1.73 2011/09/04 14:34:52 joerg Exp $ SHA1 (xine-lib-1.1.19.tar.bz2) = 5afcc28c5cf2bdaab99d951960f6587797e1e5a0 RMD160 (xine-lib-1.1.19.tar.bz2) = 84999c43d3cc115c3bda4b2e06089dc827c646cc @@ -21,3 +21,21 @@ SHA1 (patch-fa) = 9312a3bab4ae8482a208948277f1d11fb7eaaf8c SHA1 (patch-ga) = c4770b6be12bbc4dd72f8299f3b0bbf92546cc68 SHA1 (patch-gb) = 569539c868711a004740f40d1c48d30eb9e0399f SHA1 (patch-input_dvb.c) = 37aa191dca0df058dc09477624ff76dbc3a2f9b9 +SHA1 (patch-src-demuxers-demux_qt.c) = 2942911c09c0580c6017474af2a14f5b1f193c1d +SHA1 (patch-src-post-audio-stretch.c) = bc083541c410e8b8c2b5c23bc7b2b0ae312272a5 +SHA1 (patch-src-post-audio-upmix.c) = ab01e157b42b8dd99622a17b5a8ecdb464ee694e +SHA1 (patch-src-post-audio-upmix_mono.c) = 182a73985d6158c5ab2409bc372b302d3385320e +SHA1 (patch-src-post-audio-volnorm.c) = 49d9bd437d240ddf2a14275d518469313cb29a0c +SHA1 (patch-src-post-deinterlace-xine_plugin.c) = 132554aa9bdc43fbe9e7dc42fee5916cb60be806 +SHA1 (patch-src-post-goom-mmx.h) = 09b82b9e1fae57afb385daa1cd3bb265fd680a1d +SHA1 (patch-src-post-mosaico-mosaico.c) = f26e6ccc60c78a499d2bd0fd8f3d4c2f4efffde8 +SHA1 (patch-src-post-mosaico-switch.c) = 11dd1ec387c298693fc82feba1f16a316648e580 +SHA1 (patch-src-post-planar-boxblur.c) = 1bcaec011aaf581394ad42c9ff324ec0a3d28ecb +SHA1 (patch-src-post-planar-denoise3d.c) = 05059a1864278f749a5796661075db522c2e202c +SHA1 (patch-src-post-planar-eq.c) = 85f6f72bc5fbc52f0ae48751b20fb100d5d6f27b +SHA1 (patch-src-post-planar-eq2.c) = 7d2bab3cfc0d7d03c84e48985c2c55ebf1582126 +SHA1 (patch-src-post-planar-expand.c) = 7c532feeae4078f40d6f9a28dfa207e5cbee60a1 +SHA1 (patch-src-post-planar-noise.c) = b3baf82e150ca9a27e73753398c18839066748f1 +SHA1 (patch-src-post-planar-pp.c) = 147dc05a09ff851af99c488112c6a77926ae5afb +SHA1 (patch-src-post-planar-unsharp.c) = 964ec33c8c3cfcc8783b5fae1093c8fba76ff2a9 +SHA1 (patch-src-xine-engine-post.h) = 9a768aa3558bcde6f382f6945758a969f669338c diff --git a/multimedia/xine-lib/patches/patch-src-demuxers-demux_qt.c b/multimedia/xine-lib/patches/patch-src-demuxers-demux_qt.c new file mode 100644 index 00000000000..b2d6cc9f894 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-demuxers-demux_qt.c @@ -0,0 +1,13 @@ +$NetBSD: patch-src-demuxers-demux_qt.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/demuxers/demux_qt.c.orig 2011-08-30 10:17:53.000000000 +0000 ++++ src/demuxers/demux_qt.c +@@ -126,7 +126,7 @@ typedef unsigned int qt_atom; + #define QTIM_ATOM QT_ATOM('q', 't', 'i', 'm') + + /* placeholder for cutting and pasting */ +-#define _ATOM QT_ATOM('', '', '', '') ++//#define _ATOM QT_ATOM('', '', '', '') + + #define ATOM_PREAMBLE_SIZE 8 + #define PALETTE_COUNT 256 diff --git a/multimedia/xine-lib/patches/patch-src-post-audio-stretch.c b/multimedia/xine-lib/patches/patch-src-post-audio-stretch.c new file mode 100644 index 00000000000..3c8e55b914b --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-audio-stretch.c @@ -0,0 +1,18 @@ +$NetBSD: patch-src-post-audio-stretch.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/audio/stretch.c.orig 2011-08-30 13:13:24.000000000 +0000 ++++ src/post/audio/stretch.c +@@ -200,9 +200,11 @@ typedef struct stretch_parameters_s { + * description of params struct + */ + START_PARAM_DESCR( stretch_parameters_t ) +-PARAM_ITEM( POST_PARAM_TYPE_BOOL, preserve_pitch, NULL, 0, 1, 0, ++PARAM_ITEM( stretch_parameters_t, ++ POST_PARAM_TYPE_BOOL, preserve_pitch, NULL, 0, 1, 0, + "Preserve pitch" ) +-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, factor, NULL, 0.5, 1.5, 0, ++PARAM_ITEM( stretch_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, factor, NULL, 0.5, 1.5, 0, + "Time stretch factor (<1.0 shorten duration)" ) + END_PARAM_DESCR( param_descr ) + diff --git a/multimedia/xine-lib/patches/patch-src-post-audio-upmix.c b/multimedia/xine-lib/patches/patch-src-post-audio-upmix.c new file mode 100644 index 00000000000..82b338ff779 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-audio-upmix.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src-post-audio-upmix.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/audio/upmix.c.orig 2011-08-30 13:13:28.000000000 +0000 ++++ src/post/audio/upmix.c +@@ -89,7 +89,8 @@ typedef struct upmix_parameters_s { + * description of params struct + */ + START_PARAM_DESCR( upmix_parameters_t ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, cut_off_freq, NULL, 0, 500, 0, ++PARAM_ITEM( upmix_parameters_t, ++ POST_PARAM_TYPE_INT, cut_off_freq, NULL, 0, 500, 0, + "cut_off_freq" ) + END_PARAM_DESCR( param_descr ) + diff --git a/multimedia/xine-lib/patches/patch-src-post-audio-upmix_mono.c b/multimedia/xine-lib/patches/patch-src-post-audio-upmix_mono.c new file mode 100644 index 00000000000..4f8d46268b7 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-audio-upmix_mono.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src-post-audio-upmix_mono.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/audio/upmix_mono.c.orig 2011-08-30 13:13:31.000000000 +0000 ++++ src/post/audio/upmix_mono.c +@@ -48,7 +48,8 @@ typedef struct upmix_mono_parameters_s { + * description of params struct + */ + START_PARAM_DESCR( upmix_mono_parameters_t ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, channel, NULL, -1, 5, 0, ++PARAM_ITEM( upmix_mono_parameters_t, ++ POST_PARAM_TYPE_INT, channel, NULL, -1, 5, 0, + "Select channel to upmix (duplicate) to stereo" ) + END_PARAM_DESCR( param_descr ) + diff --git a/multimedia/xine-lib/patches/patch-src-post-audio-volnorm.c b/multimedia/xine-lib/patches/patch-src-post-audio-volnorm.c new file mode 100644 index 00000000000..2cdbdbc7505 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-audio-volnorm.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src-post-audio-volnorm.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/audio/volnorm.c.orig 2011-08-30 13:13:33.000000000 +0000 ++++ src/post/audio/volnorm.c +@@ -90,7 +90,8 @@ typedef struct volnorm_parameters_s { + * description of params struct + */ + START_PARAM_DESCR( volnorm_parameters_t ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, method, NULL, 0, 2, 0, "Normalization method" ) ++PARAM_ITEM( volnorm_parameters_t, ++ POST_PARAM_TYPE_INT, method, NULL, 0, 2, 0, "Normalization method" ) + END_PARAM_DESCR( param_descr ) + + struct post_plugin_volnorm_s { diff --git a/multimedia/xine-lib/patches/patch-src-post-deinterlace-xine_plugin.c b/multimedia/xine-lib/patches/patch-src-post-deinterlace-xine_plugin.c new file mode 100644 index 00000000000..3ffe848a322 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-deinterlace-xine_plugin.c @@ -0,0 +1,46 @@ +$NetBSD: patch-src-post-deinterlace-xine_plugin.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/deinterlace/xine_plugin.c.orig 2011-08-30 13:13:35.000000000 +0000 ++++ src/post/deinterlace/xine_plugin.c +@@ -86,23 +86,32 @@ typedef struct deinterlace_parameters_s + * description of params struct + */ + START_PARAM_DESCR( deinterlace_parameters_t ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, method, enum_methods, 0, 0, 0, ++PARAM_ITEM( deinterlace_parameters_t, ++ POST_PARAM_TYPE_INT, method, enum_methods, 0, 0, 0, + "deinterlace method" ) +-PARAM_ITEM( POST_PARAM_TYPE_BOOL, enabled, NULL, 0, 1, 0, ++PARAM_ITEM( deinterlace_parameters_t, ++ POST_PARAM_TYPE_BOOL, enabled, NULL, 0, 1, 0, + "enable/disable" ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, pulldown, enum_pulldown, 0, 0, 0, ++PARAM_ITEM( deinterlace_parameters_t, ++ POST_PARAM_TYPE_INT, pulldown, enum_pulldown, 0, 0, 0, + "pulldown algorithm" ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, pulldown_error_wait, NULL, 0, 0, 0, ++PARAM_ITEM( deinterlace_parameters_t, ++ POST_PARAM_TYPE_INT, pulldown_error_wait, NULL, 0, 0, 0, + "number of frames of telecine pattern sync required before mode change" ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, framerate_mode, enum_framerate, 0, 0, 0, ++PARAM_ITEM( deinterlace_parameters_t, ++ POST_PARAM_TYPE_INT, framerate_mode, enum_framerate, 0, 0, 0, + "framerate output mode" ) +-PARAM_ITEM( POST_PARAM_TYPE_BOOL, judder_correction, NULL, 0, 1, 0, ++PARAM_ITEM( deinterlace_parameters_t, ++ POST_PARAM_TYPE_BOOL, judder_correction, NULL, 0, 1, 0, + "make frames evenly spaced for film mode (24 fps)" ) +-PARAM_ITEM( POST_PARAM_TYPE_BOOL, use_progressive_frame_flag, NULL, 0, 1, 0, ++PARAM_ITEM( deinterlace_parameters_t, ++ POST_PARAM_TYPE_BOOL, use_progressive_frame_flag, NULL, 0, 1, 0, + "disable deinterlacing when progressive_frame flag is set" ) +-PARAM_ITEM( POST_PARAM_TYPE_BOOL, chroma_filter, NULL, 0, 1, 0, ++PARAM_ITEM( deinterlace_parameters_t, ++ POST_PARAM_TYPE_BOOL, chroma_filter, NULL, 0, 1, 0, + "apply chroma filter after deinterlacing" ) +-PARAM_ITEM( POST_PARAM_TYPE_BOOL, cheap_mode, NULL, 0, 1, 0, ++PARAM_ITEM( deinterlace_parameters_t, ++ POST_PARAM_TYPE_BOOL, cheap_mode, NULL, 0, 1, 0, + "skip image format conversion - cheaper but not 100% correct" ) + END_PARAM_DESCR( param_descr ) + diff --git a/multimedia/xine-lib/patches/patch-src-post-goom-mmx.h b/multimedia/xine-lib/patches/patch-src-post-goom-mmx.h new file mode 100644 index 00000000000..33d68150d2d --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-goom-mmx.h @@ -0,0 +1,14 @@ +$NetBSD: patch-src-post-goom-mmx.h,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/goom/mmx.h.orig 2011-08-30 13:41:26.000000000 +0000 ++++ src/post/goom/mmx.h +@@ -728,8 +728,7 @@ void zoom_filter_xmmx (int prevX, int pr + + #else + +-#define emms() __asm__ __volatile__ ("emms"::: \ +- "st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)") ++#define emms() __asm__ volatile ("emms" ::: "memory"); + + #endif + diff --git a/multimedia/xine-lib/patches/patch-src-post-mosaico-mosaico.c b/multimedia/xine-lib/patches/patch-src-post-mosaico-mosaico.c new file mode 100644 index 00000000000..c81e8348192 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-mosaico-mosaico.c @@ -0,0 +1,30 @@ +$NetBSD: patch-src-post-mosaico-mosaico.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/mosaico/mosaico.c.orig 2011-08-30 13:13:38.000000000 +0000 ++++ src/post/mosaico/mosaico.c +@@ -55,15 +55,20 @@ typedef struct mosaico_parameters_s { + } mosaico_parameters_t; + + START_PARAM_DESCR(mosaico_parameters_t) +-PARAM_ITEM(POST_PARAM_TYPE_INT, pip_num, NULL, 1, INT_MAX, 1, ++PARAM_ITEM(mosaico_parameters_t, ++ POST_PARAM_TYPE_INT, pip_num, NULL, 1, INT_MAX, 1, + "which picture slots settings are being edited") +-PARAM_ITEM(POST_PARAM_TYPE_INT, x, NULL, 0, INT_MAX, 50, ++PARAM_ITEM(mosaico_parameters_t, ++ POST_PARAM_TYPE_INT, x, NULL, 0, INT_MAX, 50, + "x coordinate of the pasted picture") +-PARAM_ITEM(POST_PARAM_TYPE_INT, y, NULL, 0, INT_MAX, 50, ++PARAM_ITEM(mosaico_parameters_t, ++ POST_PARAM_TYPE_INT, y, NULL, 0, INT_MAX, 50, + "y coordinate of the pasted picture") +-PARAM_ITEM(POST_PARAM_TYPE_INT, w, NULL, 0, INT_MAX, 150, ++PARAM_ITEM(mosaico_parameters_t, ++ POST_PARAM_TYPE_INT, w, NULL, 0, INT_MAX, 150, + "width of the pasted picture") +-PARAM_ITEM(POST_PARAM_TYPE_INT, h, NULL, 0, INT_MAX, 150, ++PARAM_ITEM(mosaico_parameters_t, ++ POST_PARAM_TYPE_INT, h, NULL, 0, INT_MAX, 150, + "height of the pasted picture") + END_PARAM_DESCR(mosaico_param_descr) + diff --git a/multimedia/xine-lib/patches/patch-src-post-mosaico-switch.c b/multimedia/xine-lib/patches/patch-src-post-mosaico-switch.c new file mode 100644 index 00000000000..66524231e21 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-mosaico-switch.c @@ -0,0 +1,14 @@ +$NetBSD: patch-src-post-mosaico-switch.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/mosaico/switch.c.orig 2011-08-30 13:13:40.000000000 +0000 ++++ src/post/mosaico/switch.c +@@ -51,7 +51,8 @@ typedef struct switch_parameter_s { + + + START_PARAM_DESCR(switch_parameter_t) +-PARAM_ITEM(POST_PARAM_TYPE_INT, select, NULL, 1, INT_MAX, 1, ++PARAM_ITEM(switch_parameter_t, ++ POST_PARAM_TYPE_INT, select, NULL, 1, INT_MAX, 1, + "the input source which will be passed through to the output") + END_PARAM_DESCR(switch_param_descr) + diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-boxblur.c b/multimedia/xine-lib/patches/patch-src-post-planar-boxblur.c new file mode 100644 index 00000000000..41157cdd2dd --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-planar-boxblur.c @@ -0,0 +1,26 @@ +$NetBSD: patch-src-post-planar-boxblur.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/planar/boxblur.c.orig 2011-08-30 13:13:42.000000000 +0000 ++++ src/post/planar/boxblur.c +@@ -51,13 +51,17 @@ typedef struct boxblur_parameters_s { + * description of params struct + */ + START_PARAM_DESCR( boxblur_parameters_t ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, luma_radius, NULL, 0, 10, 0, ++PARAM_ITEM( boxblur_parameters_t, ++ POST_PARAM_TYPE_INT, luma_radius, NULL, 0, 10, 0, + "radius of luma blur" ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, luma_power, NULL, 0, 10, 0, ++PARAM_ITEM( boxblur_parameters_t, ++ POST_PARAM_TYPE_INT, luma_power, NULL, 0, 10, 0, + "power of luma blur" ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, chroma_radius, NULL, -1, 10, 0, ++PARAM_ITEM( boxblur_parameters_t, ++ POST_PARAM_TYPE_INT, chroma_radius, NULL, -1, 10, 0, + "radius of chroma blur (-1 = same as luma)" ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, chroma_power, NULL, -1, 10, 0, ++PARAM_ITEM( boxblur_parameters_t, ++ POST_PARAM_TYPE_INT, chroma_power, NULL, -1, 10, 0, + "power of chroma blur (-1 = same as luma)" ) + END_PARAM_DESCR( param_descr ) + diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-denoise3d.c b/multimedia/xine-lib/patches/patch-src-post-planar-denoise3d.c new file mode 100644 index 00000000000..87bb5d177a0 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-planar-denoise3d.c @@ -0,0 +1,22 @@ +$NetBSD: patch-src-post-planar-denoise3d.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/planar/denoise3d.c.orig 2011-08-30 13:13:44.000000000 +0000 ++++ src/post/planar/denoise3d.c +@@ -58,11 +58,14 @@ typedef struct denoise3d_parameters_s { + * description of params struct + */ + START_PARAM_DESCR( denoise3d_parameters_t ) +-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, luma, NULL, 0, 10, 0, ++PARAM_ITEM( denoise3d_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, luma, NULL, 0, 10, 0, + "spatial luma strength" ) +-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, chroma, NULL, 0, 10, 0, ++PARAM_ITEM( denoise3d_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, chroma, NULL, 0, 10, 0, + "spatial chroma strength" ) +-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, time, NULL, 0, 10, 0, ++PARAM_ITEM( denoise3d_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, time, NULL, 0, 10, 0, + "temporal strength" ) + END_PARAM_DESCR( param_descr ) + diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-eq.c b/multimedia/xine-lib/patches/patch-src-post-planar-eq.c new file mode 100644 index 00000000000..2eea3d131b9 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-planar-eq.c @@ -0,0 +1,18 @@ +$NetBSD: patch-src-post-planar-eq.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/planar/eq.c.orig 2011-08-30 13:13:46.000000000 +0000 ++++ src/post/planar/eq.c +@@ -138,9 +138,11 @@ typedef struct eq_parameters_s { + * description of params struct + */ + START_PARAM_DESCR( eq_parameters_t ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, brightness, NULL, -100, 100, 0, ++PARAM_ITEM( eq_parameters_t, ++ POST_PARAM_TYPE_INT, brightness, NULL, -100, 100, 0, + "brightness" ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, contrast, NULL, -100, 100, 0, ++PARAM_ITEM( eq_parameters_t, ++ POST_PARAM_TYPE_INT, contrast, NULL, -100, 100, 0, + "contrast" ) + END_PARAM_DESCR( param_descr ) + diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c b/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c new file mode 100644 index 00000000000..dfe50106e23 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-planar-eq2.c @@ -0,0 +1,38 @@ +$NetBSD: patch-src-post-planar-eq2.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/planar/eq2.c.orig 2011-08-30 13:13:49.000000000 +0000 ++++ src/post/planar/eq2.c +@@ -288,19 +288,26 @@ typedef struct eq2_parameters_s { + * description of params struct + */ + START_PARAM_DESCR( eq2_parameters_t ) +-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, gamma, NULL, 0, 5, 0, ++PARAM_ITEM( eq2_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, gamma, NULL, 0, 5, 0, + "gamma" ) +-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, brightness, NULL, -1, 1, 0, ++PARAM_ITEM( eq2_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, brightness, NULL, -1, 1, 0, + "brightness" ) +-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, contrast, NULL, 0, 2, 0, ++PARAM_ITEM( eq2_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, contrast, NULL, 0, 2, 0, + "contrast" ) +-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, saturation, NULL, 0, 2, 0, ++PARAM_ITEM( eq2_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, saturation, NULL, 0, 2, 0, + "saturation" ) +-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, rgamma, NULL, 0, 5, 0, ++PARAM_ITEM( eq2_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, rgamma, NULL, 0, 5, 0, + "rgamma" ) +-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, ggamma, NULL, 0, 5, 0, ++PARAM_ITEM( eq2_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, ggamma, NULL, 0, 5, 0, + "ggamma" ) +-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, bgamma, NULL, 0, 5, 0, ++PARAM_ITEM( eq2_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, bgamma, NULL, 0, 5, 0, + "bgamma" ) + END_PARAM_DESCR( param_descr ) + diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-expand.c b/multimedia/xine-lib/patches/patch-src-post-planar-expand.c new file mode 100644 index 00000000000..43fe4a95c5e --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-planar-expand.c @@ -0,0 +1,26 @@ +$NetBSD: patch-src-post-planar-expand.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/planar/expand.c.orig 2011-08-30 13:13:51.000000000 +0000 ++++ src/post/planar/expand.c +@@ -73,13 +73,17 @@ typedef struct expand_parameters_s { + } expand_parameters_t; + + START_PARAM_DESCR(expand_parameters_t) +-PARAM_ITEM(POST_PARAM_TYPE_BOOL, enable_automatic_shift, NULL, 0, 1, 0, ++PARAM_ITEM(expand_parameters_t, ++ POST_PARAM_TYPE_BOOL, enable_automatic_shift, NULL, 0, 1, 0, + "enable automatic overlay shifting") +-PARAM_ITEM(POST_PARAM_TYPE_INT, overlay_y_offset, NULL, -500, 500, 0, ++PARAM_ITEM(expand_parameters_t, ++ POST_PARAM_TYPE_INT, overlay_y_offset, NULL, -500, 500, 0, + "manually shift the overlay vertically") +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, aspect, NULL, 1.0, 3.5, 0, ++PARAM_ITEM(expand_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, aspect, NULL, 1.0, 3.5, 0, + "target aspect ratio") +-PARAM_ITEM(POST_PARAM_TYPE_BOOL, centre_cut_out_mode, NULL, 0, 1, 0, ++PARAM_ITEM(expand_parameters_t, ++ POST_PARAM_TYPE_BOOL, centre_cut_out_mode, NULL, 0, 1, 0, + "cut out centred 4:3 image contained in 16:9 frame") + END_PARAM_DESCR(expand_param_descr) + diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-noise.c b/multimedia/xine-lib/patches/patch-src-post-planar-noise.c new file mode 100644 index 00000000000..7013a7badec --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-planar-noise.c @@ -0,0 +1,30 @@ +$NetBSD: patch-src-post-planar-noise.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/planar/noise.c.orig 2011-08-30 13:13:53.000000000 +0000 ++++ src/post/planar/noise.c +@@ -329,15 +329,20 @@ static char *enum_quality[] = {"fixed", + * description of params struct + */ + START_PARAM_DESCR( noise_parameters_t ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, luma_strength, NULL, 0, 100, 0, ++PARAM_ITEM( noise_parameters_t, ++ POST_PARAM_TYPE_INT, luma_strength, NULL, 0, 100, 0, + "Amount of noise to add to luma channel" ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, chroma_strength, NULL, 0, 100, 0, ++PARAM_ITEM( noise_parameters_t, ++ POST_PARAM_TYPE_INT, chroma_strength, NULL, 0, 100, 0, + "Amount of noise to add to chroma channel" ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, quality, enum_quality, 0, 0, 0, ++PARAM_ITEM( noise_parameters_t, ++ POST_PARAM_TYPE_INT, quality, enum_quality, 0, 0, 0, + "Quality level of noise" ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, type, enum_types, 0, 0, 0, ++PARAM_ITEM( noise_parameters_t, ++ POST_PARAM_TYPE_INT, type, enum_types, 0, 0, 0, + "Type of noise" ) +-PARAM_ITEM( POST_PARAM_TYPE_BOOL, pattern, NULL, 0, 1, 0, ++PARAM_ITEM( noise_parameters_t, ++ POST_PARAM_TYPE_BOOL, pattern, NULL, 0, 1, 0, + "Mix random noise with a (semi)regular pattern" ) + END_PARAM_DESCR( param_descr ) + diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-pp.c b/multimedia/xine-lib/patches/patch-src-post-planar-pp.c new file mode 100644 index 00000000000..219cc6d2513 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-planar-pp.c @@ -0,0 +1,18 @@ +$NetBSD: patch-src-post-planar-pp.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/planar/pp.c.orig 2011-08-30 13:13:55.000000000 +0000 ++++ src/post/planar/pp.c +@@ -56,9 +56,11 @@ typedef struct pp_parameters_s { + * description of params struct + */ + START_PARAM_DESCR( pp_parameters_t ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, quality, NULL, 0, PP_QUALITY_MAX, 0, ++PARAM_ITEM( pp_parameters_t, ++ POST_PARAM_TYPE_INT, quality, NULL, 0, PP_QUALITY_MAX, 0, + "postprocessing quality" ) +-PARAM_ITEM( POST_PARAM_TYPE_CHAR, mode, NULL, 0, 0, 0, ++PARAM_ITEM( pp_parameters_t, ++ POST_PARAM_TYPE_CHAR, mode, NULL, 0, 0, 0, + "mode string (overwrites all other options except quality)" ) + END_PARAM_DESCR( param_descr ) + diff --git a/multimedia/xine-lib/patches/patch-src-post-planar-unsharp.c b/multimedia/xine-lib/patches/patch-src-post-planar-unsharp.c new file mode 100644 index 00000000000..aa72d478650 --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-post-planar-unsharp.c @@ -0,0 +1,34 @@ +$NetBSD: patch-src-post-planar-unsharp.c,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/post/planar/unsharp.c.orig 2011-08-30 13:13:58.000000000 +0000 ++++ src/post/planar/unsharp.c +@@ -141,17 +141,23 @@ typedef struct unsharp_parameters_s { + * description of params struct + */ + START_PARAM_DESCR( unsharp_parameters_t ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, luma_matrix_width, NULL, 3, 11, 0, ++PARAM_ITEM( unsharp_parameters_t, ++ POST_PARAM_TYPE_INT, luma_matrix_width, NULL, 3, 11, 0, + "width of the matrix (must be odd)" ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, luma_matrix_height, NULL, 3, 11, 0, ++PARAM_ITEM( unsharp_parameters_t, ++ POST_PARAM_TYPE_INT, luma_matrix_height, NULL, 3, 11, 0, + "height of the matrix (must be odd)" ) +-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, luma_amount, NULL, -2, 2, 0, ++PARAM_ITEM( unsharp_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, luma_amount, NULL, -2, 2, 0, + "relative amount of sharpness/blur (=0 disable, <0 blur, >0 sharpen)" ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, chroma_matrix_width, NULL, 3, 11, 0, ++PARAM_ITEM( unsharp_parameters_t, ++ POST_PARAM_TYPE_INT, chroma_matrix_width, NULL, 3, 11, 0, + "width of the matrix (must be odd)" ) +-PARAM_ITEM( POST_PARAM_TYPE_INT, chroma_matrix_height, NULL, 3, 11, 0, ++PARAM_ITEM( unsharp_parameters_t, ++ POST_PARAM_TYPE_INT, chroma_matrix_height, NULL, 3, 11, 0, + "height of the matrix (must be odd)" ) +-PARAM_ITEM( POST_PARAM_TYPE_DOUBLE, chroma_amount, NULL, -2, 2, 0, ++PARAM_ITEM( unsharp_parameters_t, ++ POST_PARAM_TYPE_DOUBLE, chroma_amount, NULL, -2, 2, 0, + "relative amount of sharpness/blur (=0 disable, <0 blur, >0 sharpen)" ) + END_PARAM_DESCR( param_descr ) + diff --git a/multimedia/xine-lib/patches/patch-src-xine-engine-post.h b/multimedia/xine-lib/patches/patch-src-xine-engine-post.h new file mode 100644 index 00000000000..d34bd19eb4d --- /dev/null +++ b/multimedia/xine-lib/patches/patch-src-xine-engine-post.h @@ -0,0 +1,23 @@ +$NetBSD: patch-src-xine-engine-post.h,v 1.1 2011/09/04 14:34:52 joerg Exp $ + +--- src/xine-engine/post.h.orig 2010-03-09 22:17:05.000000000 +0000 ++++ src/xine-engine/post.h +@@ -370,14 +370,15 @@ do { + + + /* macros to create parameter descriptors */ ++#include <stddef.h> + + #define START_PARAM_DESCR( param_t ) \ + static param_t temp_s; \ + static xine_post_api_parameter_t temp_p[] = { + +-#define PARAM_ITEM( param_type, var, enumv, min, max, readonly, descr ) \ +-{ param_type, #var, sizeof(temp_s.var), \ +- (char*)&temp_s.var-(char*)&temp_s, enumv, min, max, readonly, descr }, ++#define PARAM_ITEM( param_t, param_type, var, enumv, min, max, readonly, descr ) \ ++{ param_type, #var, sizeof(temp_s.var), offsetof(param_t, var), \ ++ enumv, min, max, readonly, descr }, + + #define END_PARAM_DESCR( name ) \ + { POST_PARAM_TYPE_LAST, NULL, 0, 0, NULL, 0, 0, 1, NULL } \ |