diff options
author | ryoon <ryoon> | 2012-09-24 10:29:35 +0000 |
---|---|---|
committer | ryoon <ryoon> | 2012-09-24 10:29:35 +0000 |
commit | 486e09193ffb80d7490e2b90e6c580e28eeeb6f7 (patch) | |
tree | 294ce98d7334f3134f6f6022df5a41b869117861 /multimedia | |
parent | 2f0ca72adb9615ed77eb853ebebf7783fbfc8f24 (diff) | |
download | pkgsrc-486e09193ffb80d7490e2b90e6c580e28eeeb6f7.tar.gz |
Update to 0.660
* Fix build with recent ffmpeg
Changelog:
Version SVN-660 2010-01-11
* fixed subscription parsing for coherence UPnP framework
* initial support for wpl playlists (Robert Massaioli)
* initial ffmpegthumbnailer plugin
* initial windows service
* WMP 11 support
* cleanup and bugfixes
* added album & genre search/sort capabilities
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/fuppes/Makefile | 7 | ||||
-rw-r--r-- | multimedia/fuppes/PLIST | 6 | ||||
-rw-r--r-- | multimedia/fuppes/distinfo | 13 | ||||
-rw-r--r-- | multimedia/fuppes/patches/patch-ab | 12 | ||||
-rw-r--r-- | multimedia/fuppes/patches/patch-ac | 30 | ||||
-rw-r--r-- | multimedia/fuppes/patches/patch-ad | 76 | ||||
-rw-r--r-- | multimedia/fuppes/patches/patch-src_lib_HTTP_HTTPParser.cpp | 15 | ||||
-rw-r--r-- | multimedia/fuppes/patches/patch-src_plugins_metadata__libavformat.c | 30 |
8 files changed, 58 insertions, 131 deletions
diff --git a/multimedia/fuppes/Makefile b/multimedia/fuppes/Makefile index b3de43716de..04ee3b51400 100644 --- a/multimedia/fuppes/Makefile +++ b/multimedia/fuppes/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.30 2012/09/22 13:48:17 ryoon Exp $ +# $NetBSD: Makefile,v 1.31 2012/09/24 10:29:35 ryoon Exp $ # -DISTNAME= fuppes-0.640 -PKGREVISION= 19 +DISTNAME= fuppes-0.660 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuppes/} @@ -13,6 +12,8 @@ LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir +MAKE_JOBS_SAFE= no + GNU_CONFIGURE= yes USE_LANGUAGES= c c++ USE_TOOLS+= gmake pkg-config diff --git a/multimedia/fuppes/PLIST b/multimedia/fuppes/PLIST index 7e613461ba9..2f0eddf4813 100644 --- a/multimedia/fuppes/PLIST +++ b/multimedia/fuppes/PLIST @@ -1,16 +1,17 @@ -@comment $NetBSD: PLIST,v 1.4 2009/11/28 19:31:29 kefren Exp $ +@comment $NetBSD: PLIST,v 1.5 2012/09/24 10:29:35 ryoon Exp $ bin/fuppes bin/fuppesd include/fuppes_db_connection_plugin.h include/fuppes_plugin.h include/fuppes_plugin_types.h -lib/fuppes/libcore_presentation.la +include/fuppes_types.h ${PLIST.mysql}lib/fuppes/libdatabase_mysql.la lib/fuppes/libdatabase_sqlite3.la lib/fuppes/libdecoder_flac.la lib/fuppes/libdecoder_musepack.la lib/fuppes/libdecoder_vorbis.la lib/fuppes/libencoder_pcm.la +lib/fuppes/libencoder_wav.la lib/fuppes/libmetadata_dlna_profiles.la lib/fuppes/libmetadata_exiv2.la lib/fuppes/libmetadata_libavformat.la @@ -18,7 +19,6 @@ lib/fuppes/libmetadata_libmp4v2.la lib/fuppes/libmetadata_magickwand.la lib/fuppes/libmetadata_simage.la lib/fuppes/libmetadata_taglib.la -lib/fuppes/libtranscoder_ffmpeg.la lib/fuppes/libtranscoder_magickwand.la lib/libfuppes.la share/fuppes/fuppes-small.png diff --git a/multimedia/fuppes/distinfo b/multimedia/fuppes/distinfo index 04f76697285..97c970d1c8d 100644 --- a/multimedia/fuppes/distinfo +++ b/multimedia/fuppes/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.4 2010/09/27 11:15:23 obache Exp $ +$NetBSD: distinfo,v 1.5 2012/09/24 10:29:35 ryoon Exp $ -SHA1 (fuppes-0.640.tar.gz) = 51d7a3491a36969d8cd3d373a20f237600ab60fd -RMD160 (fuppes-0.640.tar.gz) = 65e76c607056c9e6c975c960cc2aeaec4d37446c -Size (fuppes-0.640.tar.gz) = 641228 bytes -SHA1 (patch-ab) = 884a4130fc15f31a495db69100e1769e2c5c2787 -SHA1 (patch-ac) = 8359d390b4a3d9963240bb6bb3c467382cef6272 -SHA1 (patch-ad) = 8602a0684e2a764810fa667d11f4339adb1bef98 +SHA1 (fuppes-0.660.tar.gz) = ca729343754e0d775fb8291fda8b3ac64ef64df2 +RMD160 (fuppes-0.660.tar.gz) = 4a1f278fd4cb00d80ce2efae57201aaa73d11840 +Size (fuppes-0.660.tar.gz) = 685373 bytes +SHA1 (patch-src_lib_HTTP_HTTPParser.cpp) = ddc3feba5a0d381dd2896f18943a946b556f2812 +SHA1 (patch-src_plugins_metadata__libavformat.c) = a66c05432d6a12beca47f8f2d496b522655b2159 diff --git a/multimedia/fuppes/patches/patch-ab b/multimedia/fuppes/patches/patch-ab deleted file mode 100644 index 0108023f418..00000000000 --- a/multimedia/fuppes/patches/patch-ab +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2009/11/28 18:37:22 kefren Exp $ ---- src/lib/SSDP/UDPSocket.cpp.orig 2009-11-28 18:40:19.000000000 +0200 -+++ src/lib/SSDP/UDPSocket.cpp 2009-11-28 18:40:32.000000000 +0200 -@@ -85,7 +85,7 @@ - flag = 1; - ret = setsockopt(m_Socket, SOL_SOCKET, SO_REUSEPORT, &flag, sizeof(flag)); - if(ret == -1) { -- throw Exception(__FILE__, __LINE__, "failed to setsockopt: SO_REUSEPORT"); -+ throw fuppes::Exception(__FILE__, __LINE__, "failed to setsockopt: SO_REUSEPORT"); - } - #endif - diff --git a/multimedia/fuppes/patches/patch-ac b/multimedia/fuppes/patches/patch-ac deleted file mode 100644 index 0e5784fb125..00000000000 --- a/multimedia/fuppes/patches/patch-ac +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2009/11/28 18:37:22 kefren Exp $ ---- src/plugins/ffmpeg/ffmpeg.h.orig 2009-07-16 19:31:43.000000000 +0300 -+++ src/plugins/ffmpeg/ffmpeg.h 2009-11-28 19:03:23.000000000 +0200 -@@ -121,7 +121,7 @@ - /* audio only */ - int audio_resample; - ReSampleContext *resample; /* for audio resampling */ -- AVFifoBuffer fifo; /* for compression: one audio fifo per codec */ -+ AVFifoBuffer *fifo; /* for compression: one audio fifo per codec */ - FILE *logfile; - } AVOutputStream; - -@@ -479,7 +479,7 @@ - void opt_verbose(const char *arg) - { - verbose = atoi(arg); -- av_log_level = atoi(arg); -+ av_log_set_level(atoi(arg)); - } - - void opt_frame_rate(const char *arg) -@@ -1313,7 +1313,7 @@ - #endif - - if(avctx_opts[0]->debug) -- av_log_level = AV_LOG_DEBUG; -+ av_log_set_level(AV_LOG_DEBUG); - return 0; - } - diff --git a/multimedia/fuppes/patches/patch-ad b/multimedia/fuppes/patches/patch-ad deleted file mode 100644 index 08b8b8b3d42..00000000000 --- a/multimedia/fuppes/patches/patch-ad +++ /dev/null @@ -1,76 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2009/11/28 19:31:29 kefren Exp $ ---- src/plugins/ffmpeg/ffmpeg.cpp.orig 2009-07-18 16:08:59.000000000 +0300 -+++ src/plugins/ffmpeg/ffmpeg.cpp 2009-11-28 21:00:33.000000000 +0200 -@@ -201,7 +201,7 @@ - - if(pFFmpeg->audio_sync_method){ - double delta = get_sync_ipts(ost, pFFmpeg) * enc->sample_rate - ost->sync_opts -- - av_fifo_size(&ost->fifo)/(ost->st->codec->channels * 2); -+ - av_fifo_size(ost->fifo)/(ost->st->codec->channels * 2); - double idelta= delta*ist->st->codec->sample_rate / enc->sample_rate; - int byte_delta= ((int)idelta)*2*ist->st->codec->channels; - -@@ -238,13 +238,13 @@ - assert(ost->audio_resample); - if(pFFmpeg->verbose > 2) - fprintf(stderr, "compensating audio timestamp drift:%f compensation:%d in:%d\n", delta, comp, enc->sample_rate); --// fprintf(stderr, "drift:%f len:%d opts:%"PRId64" ipts:%"PRId64" fifo:%d\n", delta, -1, ost->sync_opts, (int64_t)(get_sync_ipts(ost) * enc->sample_rate), av_fifo_size(&ost->fifo)/(ost->st->codec->channels * 2)); -+// fprintf(stderr, "drift:%f len:%d opts:%"PRId64" ipts:%"PRId64" fifo:%d\n", delta, -1, ost->sync_opts, (int64_t)(get_sync_ipts(ost) * enc->sample_rate), av_fifo_size(ost->fifo)/(ost->st->codec->channels * 2)); - av_resample_compensate(*(struct AVResampleContext**)ost->resample, comp, enc->sample_rate); - } - } - }else - ost->sync_opts= lrintf(get_sync_ipts(ost, pFFmpeg) * enc->sample_rate) -- - av_fifo_size(&ost->fifo)/(ost->st->codec->channels * 2); //FIXME wrong -+ - av_fifo_size(ost->fifo)/(ost->st->codec->channels * 2); //FIXME wrong - - if (ost->audio_resample) { - buftmp = audio_buf; -@@ -260,11 +260,11 @@ - /* now encode as many frames as possible */ - if (enc->frame_size > 1) { - /* output resampled raw samples */ -- av_fifo_write(&ost->fifo, buftmp, size_out); -+ av_fifo_generic_write(ost->fifo, buftmp, size_out, NULL); - - frame_bytes = enc->frame_size * 2 * enc->channels; - -- while (av_fifo_read(&ost->fifo, audio_buf, frame_bytes) == 0) { -+ while (av_fifo_generic_read(ost->fifo, audio_buf, frame_bytes, NULL) == 0) { - AVPacket pkt; - av_init_packet(&pkt); - -@@ -1065,13 +1065,13 @@ - - switch(ost->st->codec->codec_type) { - case CODEC_TYPE_AUDIO: -- fifo_bytes = av_fifo_size(&ost->fifo); -+ fifo_bytes = av_fifo_size(ost->fifo); - ret = 0; - /* encode any samples remaining in fifo */ - if(fifo_bytes > 0 && enc->codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME) { - int fs_tmp = enc->frame_size; - enc->frame_size = fifo_bytes / (2 * enc->channels); -- if(av_fifo_read(&ost->fifo, (uint8_t *)samples, fifo_bytes) == 0) { -+ if(av_fifo_generic_read(ost->fifo, (uint8_t *)samples, fifo_bytes, NULL) == 0) { - ret = avcodec_encode_audio(enc, pFFmpeg->bit_buffer, pFFmpeg->bit_buffer_size, samples); - } - enc->frame_size = fs_tmp; -@@ -1320,7 +1320,7 @@ - } else { - switch(codec->codec_type) { - case CODEC_TYPE_AUDIO: -- if (av_fifo_init(&ost->fifo, 2 * MAX_AUDIO_PACKET_SIZE)) -+ if ((ost->fifo = av_fifo_alloc(2 * MAX_AUDIO_PACKET_SIZE)) == NULL) - goto fail; - - if (codec->channels == icodec->channels && -@@ -1777,7 +1777,7 @@ - fclose(ost->logfile); - ost->logfile = NULL; - } -- av_fifo_free(&ost->fifo); /* works even if fifo is not -+ av_fifo_free(ost->fifo); /* works even if fifo is not - initialized but set to zero */ - av_free(ost->pict_tmp.data[0]); - #ifdef HAVE_LIBSWSCALE diff --git a/multimedia/fuppes/patches/patch-src_lib_HTTP_HTTPParser.cpp b/multimedia/fuppes/patches/patch-src_lib_HTTP_HTTPParser.cpp new file mode 100644 index 00000000000..435296f0cd6 --- /dev/null +++ b/multimedia/fuppes/patches/patch-src_lib_HTTP_HTTPParser.cpp @@ -0,0 +1,15 @@ +$NetBSD: patch-src_lib_HTTP_HTTPParser.cpp,v 1.1 2012/09/24 10:29:36 ryoon Exp $ + +http://sourceforge.net/tracker/?func=detail&atid=751213&aid=3425300&group_id=141999 + +--- src/lib/HTTP/HTTPParser.cpp.orig 2009-12-20 20:26:29.000000000 +0000 ++++ src/lib/HTTP/HTTPParser.cpp +@@ -52,7 +52,7 @@ bool CHTTPParser::parseHeader(std::strin + else if(rxResponse.Search(header)) { + sType = rxResponse.Match(2); + nVersion = atoi(rxResponse.Match(1).c_str()); +- message->m_sRequest = rxRequest.Match(3); ++ message->m_sRequest = rxResponse.Match(3); + } + else { + return false; diff --git a/multimedia/fuppes/patches/patch-src_plugins_metadata__libavformat.c b/multimedia/fuppes/patches/patch-src_plugins_metadata__libavformat.c new file mode 100644 index 00000000000..70931d61508 --- /dev/null +++ b/multimedia/fuppes/patches/patch-src_plugins_metadata__libavformat.c @@ -0,0 +1,30 @@ +$NetBSD: patch-src_plugins_metadata__libavformat.c,v 1.1 2012/09/24 10:29:36 ryoon Exp $ + +--- src/plugins/metadata_libavformat.c.orig 2010-01-11 19:12:58.000000000 +0000 ++++ src/plugins/metadata_libavformat.c +@@ -149,21 +149,21 @@ int fuppes_metadata_read(plugin_info* pl + } */ + + switch(pStream->codec->codec_type) { +- case CODEC_TYPE_VIDEO: ++ case AVMEDIA_TYPE_VIDEO: + metadata->type = MD_VIDEO; + metadata->width = pStream->codec->width; + metadata->height = pStream->codec->height; + set_value(&metadata->video_codec, codec_name); + break; +- case CODEC_TYPE_AUDIO: ++ case AVMEDIA_TYPE_AUDIO: + set_value(&metadata->audio_codec, codec_name); + if(metadata->type == MD_NONE) { + metadata->type = MD_AUDIO; + } + break; +- case CODEC_TYPE_DATA: ++ case AVMEDIA_TYPE_DATA: + break; +- case CODEC_TYPE_SUBTITLE: ++ case AVMEDIA_TYPE_SUBTITLE: + break; + default: + break; |