diff options
| author | joerg <joerg> | 2014-09-10 12:21:12 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2014-09-10 12:21:12 +0000 |
| commit | f4c48c9fd73c84ca0aa7ccbb5933134075a48f40 (patch) | |
| tree | 8c347a06b39a1d16b9f907f2d62372fa6d098ad4 /multimedia | |
| parent | 720dcf48bf66224c7f9ceb70a38b5410bcf863b9 (diff) | |
| download | pkgsrc-f4c48c9fd73c84ca0aa7ccbb5933134075a48f40.tar.gz | |
Don't create explicit specialisation after implicit one. Fixes build
with clang.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mediatomb/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/mediatomb/patches/patch-src_timer.cc | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/multimedia/mediatomb/distinfo b/multimedia/mediatomb/distinfo index 5e6d37cd041..35bfbef7ef6 100644 --- a/multimedia/mediatomb/distinfo +++ b/multimedia/mediatomb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2014/02/07 14:25:15 wiedi Exp $ +$NetBSD: distinfo,v 1.16 2014/09/10 12:21:12 joerg Exp $ SHA1 (mediatomb-0.12.1.tar.gz) = 86e880584cc9c8aaf3926d56048510d1d06e76b4 RMD160 (mediatomb-0.12.1.tar.gz) = ecb61ca2483f76421beef1036ac442b8f805fa96 @@ -18,6 +18,7 @@ SHA1 (patch-src_hash_dso_hash.h) = c229373ea25b4c49708cb2d8555a9e13f5d8bb4f SHA1 (patch-src_io__handler__buffer__helper.cc) = f1c88fab9379c322492ebf27840c20689bd8ac76 SHA1 (patch-src_main.cc) = 2fc7fffd67ccd9739512d2eaa2bc12e5baca5f2d SHA1 (patch-src_metadata_ffmpeg__handler.cc) = 7bee7b6b8f4a8d5c55475c2e342b724d14d8c55d +SHA1 (patch-src_timer.cc) = dd090e2f866ac88a06e1239a420477a0f759f310 SHA1 (patch-src_tools.cc) = dddb50c51786cbb6a7c77ff5e60c22c3a57dc0fa SHA1 (patch-src_transcoding_transcode__ext__handler.cc) = 6fe899f6b40de69561f568e1f976f6994e029260 SHA1 (patch-src_upnp__xml.cc) = 843e92c3a186c83920512ff6b7f37ba006defc21 diff --git a/multimedia/mediatomb/patches/patch-src_timer.cc b/multimedia/mediatomb/patches/patch-src_timer.cc new file mode 100644 index 00000000000..b97c483913e --- /dev/null +++ b/multimedia/mediatomb/patches/patch-src_timer.cc @@ -0,0 +1,22 @@ +$NetBSD: patch-src_timer.cc,v 1.1 2014/09/10 12:21:12 joerg Exp $ + +--- src/timer.cc.orig 2014-09-09 20:00:11.000000000 +0000 ++++ src/timer.cc +@@ -33,12 +33,15 @@ + #include "autoconfig.h" + #endif + ++#include "singleton.h" ++ ++class Timer; ++SINGLETON_MUTEX(Timer, true); ++ + #include "timer.h" + + using namespace zmm; + +-SINGLETON_MUTEX(Timer, true); +- + template <> + Ref<Array<Timer::TimerSubscriberElement<TimerSubscriberSingleton<Object> > > > Timer::getAppropriateSubscribers<TimerSubscriberSingleton<Object> >() + { |