From d2332acb004a22924b74a4290f6795667e741cfe Mon Sep 17 00:00:00 2001 From: joerg Date: Tue, 20 Sep 2011 16:50:54 +0000 Subject: Don't depend on GCC optimizer considering constant address differences as ICE and depend on the corresponding xine version. Patch from Bernhard Moellemann. --- multimedia/phonon/Makefile | 4 ++- multimedia/phonon/distinfo | 4 ++- .../phonon/patches/patch-volumefader_plugin.cpp | 19 +++++++++++++ .../patches/patch-xine-kequalizer_plugin.cpp | 33 ++++++++++++++++++++++ 4 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 multimedia/phonon/patches/patch-volumefader_plugin.cpp create mode 100644 multimedia/phonon/patches/patch-xine-kequalizer_plugin.cpp diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile index be4bd7501b7..da90bd1a22f 100644 --- a/multimedia/phonon/Makefile +++ b/multimedia/phonon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2011/04/22 13:42:37 obache Exp $ +# $NetBSD: Makefile,v 1.16 2011/09/20 16:50:54 joerg Exp $ DISTNAME= phonon-4.4.2 PKGREVISION= 3 @@ -32,6 +32,8 @@ pre-configure: .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" + +BUILDLINK_API_DEPENDS.xine-lib+= xine-lib>=1.1.19nb7 BUILDLINK_ABI_DEPENDS.xine-lib?= xine-lib>=1.1.19nb1 .include "../../multimedia/xine-lib/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo index 5c7c8c18607..f46b4b1f3a3 100644 --- a/multimedia/phonon/distinfo +++ b/multimedia/phonon/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.4 2010/10/25 20:10:19 markd Exp $ +$NetBSD: distinfo,v 1.5 2011/09/20 16:50:54 joerg Exp $ SHA1 (phonon-4.4.2.tar.bz2) = c329d924fb75a89a9de8a4d799ff4dcd7ee3302e RMD160 (phonon-4.4.2.tar.bz2) = aa37903f166904dd09401541df8fc268a2858606 Size (phonon-4.4.2.tar.bz2) = 629193 bytes +SHA1 (patch-volumefader_plugin.cpp) = 3dbe051aeb5d9785fe1bd159470474f80c64c8fd +SHA1 (patch-xine-kequalizer_plugin.cpp) = f776a291aac1eb4ae3cf3439a6467bb7d2489ad9 diff --git a/multimedia/phonon/patches/patch-volumefader_plugin.cpp b/multimedia/phonon/patches/patch-volumefader_plugin.cpp new file mode 100644 index 00000000000..6f5e2d2482f --- /dev/null +++ b/multimedia/phonon/patches/patch-volumefader_plugin.cpp @@ -0,0 +1,19 @@ +$NetBSD: patch-volumefader_plugin.cpp,v 1.1 2011/09/20 16:50:54 joerg Exp $ + +--- xine/volumefader_plugin.cpp.orig 2010-06-07 14:36:25.000000000 +0000 ++++ xine/volumefader_plugin.cpp +@@ -141,10 +141,10 @@ typedef struct + static const char *enum_fadeCurve[] = { "Fade3Decibel", "Fade6Decibel", "Fade9Decibel", "Fade12Decibel", NULL }; + + START_PARAM_DESCR(kvolumefader_parameters_t) +-PARAM_ITEM(POST_PARAM_TYPE_INT, fadeCurve, const_cast(enum_fadeCurve), 0.0, 0.0, 0, const_cast( I18N_NOOP("fade curve") )) +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, currentVolume, NULL, 0.0, maxVolume, 0, const_cast( I18N_NOOP("current volume") )) +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, fadeTo, NULL, 0.0, maxVolume, 0, const_cast( I18N_NOOP("volume to fade to") )) +-PARAM_ITEM(POST_PARAM_TYPE_INT, fadeTime, NULL, 0.0, 10000.0, 0, const_cast( I18N_NOOP("fade time in milliseconds") )) ++PARAM_ITEM(kvolumefader_parameters_t, POST_PARAM_TYPE_INT, fadeCurve, const_cast(enum_fadeCurve), 0.0, 0.0, 0, const_cast( I18N_NOOP("fade curve") )) ++PARAM_ITEM(kvolumefader_parameters_t, POST_PARAM_TYPE_DOUBLE, currentVolume, NULL, 0.0, maxVolume, 0, const_cast( I18N_NOOP("current volume") )) ++PARAM_ITEM(kvolumefader_parameters_t, POST_PARAM_TYPE_DOUBLE, fadeTo, NULL, 0.0, maxVolume, 0, const_cast( I18N_NOOP("volume to fade to") )) ++PARAM_ITEM(kvolumefader_parameters_t, POST_PARAM_TYPE_INT, fadeTime, NULL, 0.0, 10000.0, 0, const_cast( I18N_NOOP("fade time in milliseconds") )) + END_PARAM_DESCR(param_descr) + + static int set_parameters (xine_post_t *this_gen, void *param_gen) diff --git a/multimedia/phonon/patches/patch-xine-kequalizer_plugin.cpp b/multimedia/phonon/patches/patch-xine-kequalizer_plugin.cpp new file mode 100644 index 00000000000..db04707ec07 --- /dev/null +++ b/multimedia/phonon/patches/patch-xine-kequalizer_plugin.cpp @@ -0,0 +1,33 @@ +$NetBSD: patch-xine-kequalizer_plugin.cpp,v 1.1 2011/09/20 16:50:54 joerg Exp $ + +--- xine/kequalizer_plugin.cpp.orig 2010-06-07 14:36:25.000000000 +0000 ++++ xine/kequalizer_plugin.cpp +@@ -107,17 +107,17 @@ typedef struct + */ + START_PARAM_DESCR(kequalizer_parameters_t) + +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, preAmp, NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Equalizer pre-amp gain")) +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[0], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 1 60Hz Gain")) +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[1], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 2 170Hz Gain")) +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[2], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 3 310Hz Gain")) +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[3], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 4 600Hz Gain")) +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[4], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 5 1000Hz Gain")) +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[5], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 6 3000Hz Gain")) +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[6], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 7 6000Hz Gain")) +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[7], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 8 12000Hz Gain")) +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[8], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 9 14000Hz Gain")) +-PARAM_ITEM(POST_PARAM_TYPE_DOUBLE, eqBands[9], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 10 16000Hz Gain")) ++PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, preAmp, NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Equalizer pre-amp gain")) ++PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[0], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 1 60Hz Gain")) ++PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[1], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 2 170Hz Gain")) ++PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[2], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 3 310Hz Gain")) ++PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[3], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 4 600Hz Gain")) ++PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[4], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 5 1000Hz Gain")) ++PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[5], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 6 3000Hz Gain")) ++PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[6], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 7 6000Hz Gain")) ++PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[7], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 8 12000Hz Gain")) ++PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[8], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 9 14000Hz Gain")) ++PARAM_ITEM(kequalizer_parameters_t, POST_PARAM_TYPE_DOUBLE, eqBands[9], NULL, -KEQUALIZER_MAX_GAIN, KEQUALIZER_MAX_GAIN, 0, I18N_NOOP("Band 10 16000Hz Gain")) + + END_PARAM_DESCR(param_descr) + -- cgit v1.2.3