diff options
author | jperkin <jperkin@pkgsrc.org> | 2014-07-10 17:00:21 +0000 |
---|---|---|
committer | jperkin <jperkin@pkgsrc.org> | 2014-07-10 17:00:21 +0000 |
commit | 1e1fa5273c8a4b174c125b1782ebb97bfb42befd (patch) | |
tree | 6fd05ad603f24bad7961ede5fc80a2881f1b9563 /multimedia | |
parent | f2c424b7fd7f8fc68c3d17f7a1f55d877e8cdec1 (diff) | |
download | pkgsrc-1e1fa5273c8a4b174c125b1782ebb97bfb42befd.tar.gz |
Various fixes for SunOS support.
Diffstat (limited to 'multimedia')
5 files changed, 58 insertions, 5 deletions
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index ed5292d0cda..9bb8f790a45 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.41 2012/04/06 11:17:53 markd Exp $ +$NetBSD: distinfo,v 1.42 2014/07/10 17:00:21 jperkin Exp $ SHA1 (kdemultimedia-3.5.10.tar.bz2) = c85337b959882ec9f3bb51f5e1ee4ec74a988518 RMD160 (kdemultimedia-3.5.10.tar.bz2) = b03b5363f29e1e75dcb3f13fddb7a01d17e337b5 @@ -12,7 +12,7 @@ SHA1 (patch-af) = 0336b3def99c649a635e6f5eb0cc962944e890b2 SHA1 (patch-ag) = c9d1d9d3cf8f18ed9bc8c2054dc641af961d8fb1 SHA1 (patch-ah) = 78c85113db99f386145cf701db4723d8534342f6 SHA1 (patch-ai) = 8f724e5e96996913906dfd2034f577fee66d0db2 -SHA1 (patch-aj) = f142ee5df76460d5e8c32b6b8279c4ad5ec19919 +SHA1 (patch-aj) = 753f39af0f4350ed5b2b9f2da9e9b650d763f754 SHA1 (patch-am) = d08ebf77d69d8c9527728eccaa430b28664a74dd SHA1 (patch-an) = 79b26912aeeacb881664cd1557417bd99b96451e SHA1 (patch-ap) = 66368931f92a83e03b879e98440756620e65ddeb @@ -20,4 +20,7 @@ SHA1 (patch-aq) = 2c804af0ff952e50e909002a4b4c53422b1ba59c SHA1 (patch-ar) = 820defab2ffe3868b237b2264bace82c6aa298ad SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5 SHA1 (patch-cu) = 778e1d00bf485c55ddec7cebb47406f87b9e4ec8 +SHA1 (patch-mpeglib_lib_util_audio_audioIO__SunOS.cpp) = 35d27ef4a2c562c7b75dc3097b3ed9888f5f2d58 +SHA1 (patch-noatun_modules_voiceprint_voiceprint.cpp) = 6f1e67aac69ce7ad91c462579db844ccda220515 +SHA1 (patch-noatun_modules_winskin_vis_winSkinFFT__impl.cpp) = d400bb285d0dab571443f3bb898f923ac23bcbb3 SHA1 (patch-xine_artsplugin_xinePlayObject_impl.cpp) = f0cdaf7193d94a3262aed25254f4b4f150c620be diff --git a/multimedia/kdemultimedia3/patches/patch-aj b/multimedia/kdemultimedia3/patches/patch-aj index 998402174ad..66c724cf3c9 100644 --- a/multimedia/kdemultimedia3/patches/patch-aj +++ b/multimedia/kdemultimedia3/patches/patch-aj @@ -1,8 +1,10 @@ -$NetBSD: patch-aj,v 1.4 2007/10/20 10:41:21 markd Exp $ +$NetBSD: patch-aj,v 1.5 2014/07/10 17:00:21 jperkin Exp $ ---- kioslave/audiocd/plugins/lame/encoderlame.cpp.orig 2007-10-08 22:48:54.000000000 +1300 +Use GCC's endian macros on SunOS. + +--- kioslave/audiocd/plugins/lame/encoderlame.cpp.orig 2007-10-08 09:48:54.000000000 +0000 +++ kioslave/audiocd/plugins/lame/encoderlame.cpp -@@ -17,7 +17,13 @@ +@@ -17,7 +17,16 @@ */ #include <config.h> @@ -10,6 +12,9 @@ $NetBSD: patch-aj,v 1.4 2007/10/20 10:41:21 markd Exp $ +#include <machine/endian.h> +#define __BYTE_ORDER _BYTE_ORDER +#define __LITTLE_ENDIAN _LITTLE_ENDIAN ++#elif defined(__sun) ++#define __BYTE_ORDER __BYTE_ORDER__ ++#define __LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__ +#else #include <endian.h> +#endif diff --git a/multimedia/kdemultimedia3/patches/patch-mpeglib_lib_util_audio_audioIO__SunOS.cpp b/multimedia/kdemultimedia3/patches/patch-mpeglib_lib_util_audio_audioIO__SunOS.cpp new file mode 100644 index 00000000000..323908af6bc --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-mpeglib_lib_util_audio_audioIO__SunOS.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-mpeglib_lib_util_audio_audioIO__SunOS.cpp,v 1.1 2014/07/10 17:00:21 jperkin Exp $ + +Fix include name. + +--- mpeglib/lib/util/audio/audioIO_SunOS.cpp.orig 2005-09-10 08:19:53.000000000 +0000 ++++ mpeglib/lib/util/audio/audioIO_SunOS.cpp +@@ -14,7 +14,7 @@ + #include <stdio.h> + #include <sys/audioio.h> + #include "audioIO.h" +-#include <iostream.h> ++#include <iostream> + + /* declare these static to effectively isolate the audio device */ + diff --git a/multimedia/kdemultimedia3/patches/patch-noatun_modules_voiceprint_voiceprint.cpp b/multimedia/kdemultimedia3/patches/patch-noatun_modules_voiceprint_voiceprint.cpp new file mode 100644 index 00000000000..594a561f21a --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-noatun_modules_voiceprint_voiceprint.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-noatun_modules_voiceprint_voiceprint.cpp,v 1.1 2014/07/10 17:00:21 jperkin Exp $ + +Avoid ambiguous function call. + +--- noatun/modules/voiceprint/voiceprint.cpp.orig 2005-09-10 08:19:35.000000000 +0000 ++++ noatun/modules/voiceprint/voiceprint.cpp +@@ -95,7 +95,7 @@ void VoicePrint::scopeEvent(float *data, + { + float b=data[bands-i-1]+1.0; + // the more bands there are, the dimmer each becomes +- b=log10(b)/log(2) * 16 * brightness; ++ b=log10(b)/log(2.0) * 16 * brightness; + int band=int(b); + if (band>255) band=255; + else if (band<0) band=0; diff --git a/multimedia/kdemultimedia3/patches/patch-noatun_modules_winskin_vis_winSkinFFT__impl.cpp b/multimedia/kdemultimedia3/patches/patch-noatun_modules_winskin_vis_winSkinFFT__impl.cpp new file mode 100644 index 00000000000..1c115803b0e --- /dev/null +++ b/multimedia/kdemultimedia3/patches/patch-noatun_modules_winskin_vis_winSkinFFT__impl.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-noatun_modules_winskin_vis_winSkinFFT__impl.cpp,v 1.1 2014/07/10 17:00:21 jperkin Exp $ + +Avoid ambiguous function call. + +--- noatun/modules/winskin/vis/winSkinFFT_impl.cpp.orig 2007-10-08 09:48:52.000000000 +0000 ++++ noatun/modules/winskin/vis/winSkinFFT_impl.cpp +@@ -97,7 +97,7 @@ void WinSkinFFT_impl::calculateBlock(uns + tmp=re*re+im*im; + // Here I check a new idea. We remove all low values + // and all values over xyz to xyz. +- fftArray[pos]=(int)(::sqrt(::sqrt(tmp))); ++ fftArray[pos]=(int)(::sqrt(::sqrt((float)tmp))); + + if (fftArray[pos]<=15) { + max+=fftArray[pos]; |