diff options
| author | dholland <dholland> | 2011-09-12 05:08:53 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2011-09-12 05:08:53 +0000 |
| commit | 3763a022daefea01db580841b5be95499edbc12b (patch) | |
| tree | 2f7c750d9551095aa4623417f712cf748d24041d /audio | |
| parent | fa09de16ee912c431feaea5752fdf1a0f01981fc (diff) | |
| download | pkgsrc-3763a022daefea01db580841b5be95499edbc12b.tar.gz | |
Patch up some inline issues for clang.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/adplug/distinfo | 3 | ||||
| -rw-r--r-- | audio/adplug/patches/patch-src_fmopl_c | 34 |
2 files changed, 36 insertions, 1 deletions
diff --git a/audio/adplug/distinfo b/audio/adplug/distinfo index 206ab7b7f0b..2a6d862a5a4 100644 --- a/audio/adplug/distinfo +++ b/audio/adplug/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.2 2011/09/03 23:40:47 dholland Exp $ +$NetBSD: distinfo,v 1.3 2011/09/12 05:08:53 dholland Exp $ SHA1 (adplug-2.1.tar.bz2) = 49dd798467f194ece1863f18019912f8089cb9df RMD160 (adplug-2.1.tar.bz2) = 8788c174507fe39d3415f36e1ac60df6b84c889f Size (adplug-2.1.tar.bz2) = 730686 bytes SHA1 (patch-adplugdb_adplugdb_cpp) = 06471351d5b263e515b115960ec0e3d3564dbd16 +SHA1 (patch-src_fmopl_c) = 39001c766492684323fb6b7f1f87b519ee084943 diff --git a/audio/adplug/patches/patch-src_fmopl_c b/audio/adplug/patches/patch-src_fmopl_c new file mode 100644 index 00000000000..6cf3abedc45 --- /dev/null +++ b/audio/adplug/patches/patch-src_fmopl_c @@ -0,0 +1,34 @@ +$NetBSD: patch-src_fmopl_c,v 1.1 2011/09/12 05:08:53 dholland Exp $ + +- sprinkle static on inline functions not used outside this file, to +fix clang build. + +--- src/fmopl.c~ 2006-05-13 05:36:42.000000000 +0000 ++++ src/fmopl.c +@@ -388,7 +388,7 @@ INLINE void CALC_FCSLOT(OPL_CH *CH,OPL_S + } + + /* set multi,am,vib,EG-TYP,KSR,mul */ +-INLINE void set_mul(FM_OPL *OPL,int slot,int v) ++static INLINE void set_mul(FM_OPL *OPL,int slot,int v) + { + OPL_CH *CH = &OPL->P_CH[slot/2]; + OPL_SLOT *SLOT = &CH->SLOT[slot&1]; +@@ -452,7 +452,7 @@ INLINE void set_sl_rr(FM_OPL *OPL,int sl + /* operator output calcrator */ + #define OP_OUT(slot,env,con) slot->wavetable[((slot->Cnt+con)/(0x1000000/SIN_ENT))&(SIN_ENT-1)][env] + /* ---------- calcrate one of channel ---------- */ +-INLINE void OPL_CALC_CH( OPL_CH *CH ) ++static INLINE void OPL_CALC_CH( OPL_CH *CH ) + { + UINT32 env_out; + OPL_SLOT *SLOT; +@@ -497,7 +497,7 @@ INLINE void OPL_CALC_CH( OPL_CH *CH ) + + /* ---------- calcrate rythm block ---------- */ + #define WHITE_NOISE_db 6.0 +-INLINE void OPL_CALC_RH( OPL_CH *CH ) ++static INLINE void OPL_CALC_RH( OPL_CH *CH ) + { + UINT32 env_tam,env_sd,env_top,env_hh; + int whitenoise = (rand()&1)*(WHITE_NOISE_db/EG_STEP); |