pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/fuppes Update to r640, another semi-release...
details: https://anonhg.NetBSD.org/pkgsrc/rev/3802b979440b
branches: trunk
changeset: 567900:3802b979440b
user: kefren <kefren%pkgsrc.org@localhost>
date: Sat Nov 28 18:37:22 2009 +0000
description:
Update to r640, another semi-release, this time published on sf.net
The most important change is that it compiles and works.
Tested with PS3.
XXX: probably mysql functions should be optional.
diffstat:
multimedia/fuppes/Makefile | 12 ++--
multimedia/fuppes/PLIST | 11 +++-
multimedia/fuppes/distinfo | 11 ++-
multimedia/fuppes/patches/patch-ab | 12 +++++
multimedia/fuppes/patches/patch-ac | 30 ++++++++++++
multimedia/fuppes/patches/patch-ad | 90 ++++++++++++++++++++++++++++++++++++++
6 files changed, 153 insertions(+), 13 deletions(-)
diffs (226 lines):
diff -r aa2e880426a8 -r 3802b979440b multimedia/fuppes/Makefile
--- a/multimedia/fuppes/Makefile Sat Nov 28 17:46:01 2009 +0000
+++ b/multimedia/fuppes/Makefile Sat Nov 28 18:37:22 2009 +0000
@@ -1,12 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 21:20:14 sno Exp $
+# $NetBSD: Makefile,v 1.8 2009/11/28 18:37:22 kefren Exp $
#
-SVNREV= 629
-DISTNAME= fuppes-r${SVNREV}
-PKGNAME= ${DISTNAME:S/r/0./}
-PKGREVISION= 4
+DISTNAME= fuppes-0.640
CATEGORIES= multimedia
-MASTER_SITES= http://www.invisible.ca/~jmcneill/distfiles/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fuppes/}
MAINTAINER= tech-multimedia%NetBSD.org@localhost
HOMEPAGE= http://fuppes.ulrich-voelkel.de/
@@ -21,6 +18,8 @@
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --enable-video-transcoding
+CONFIGURE_ARGS+= --enable-faad
+CONFIGURE_ARGS+= --enable-mad
SUBST_CLASSES+= version
SUBST_STAGE.version= pre-patch
@@ -49,4 +48,5 @@
.include "../../graphics/simage/buildlink3.mk"
.include "../../multimedia/ffmpeg/buildlink3.mk"
.include "../../multimedia/mpeg4ip/buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r aa2e880426a8 -r 3802b979440b multimedia/fuppes/PLIST
--- a/multimedia/fuppes/PLIST Sat Nov 28 17:46:01 2009 +0000
+++ b/multimedia/fuppes/PLIST Sat Nov 28 18:37:22 2009 +0000
@@ -1,11 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:08:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/11/28 18:37:22 kefren 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
+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_twolame.la
+lib/fuppes/libencoder_pcm.la
lib/fuppes/libmetadata_dlna_profiles.la
lib/fuppes/libmetadata_exiv2.la
lib/fuppes/libmetadata_libavformat.la
@@ -14,7 +19,7 @@
lib/fuppes/libmetadata_simage.la
lib/fuppes/libmetadata_taglib.la
lib/fuppes/libtranscoder_ffmpeg.la
-lib/fuppes/libtranscoder_magickpp.la
+lib/fuppes/libtranscoder_magickwand.la
lib/libfuppes.la
share/fuppes/fuppes-small.png
share/fuppes/header-gradient-small.png
diff -r aa2e880426a8 -r 3802b979440b multimedia/fuppes/distinfo
--- a/multimedia/fuppes/distinfo Sat Nov 28 17:46:01 2009 +0000
+++ b/multimedia/fuppes/distinfo Sat Nov 28 18:37:22 2009 +0000
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/01/27 01:13:41 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2009/11/28 18:37:22 kefren Exp $
-SHA1 (fuppes-r629.tar.gz) = c567b5574aed7df287993279b8bf64d038624589
-RMD160 (fuppes-r629.tar.gz) = 770e82702a58573807c0af23482dbebe47aa9cae
-Size (fuppes-r629.tar.gz) = 373174 bytes
+SHA1 (fuppes-0.640.tar.gz) = 51d7a3491a36969d8cd3d373a20f237600ab60fd
+RMD160 (fuppes-0.640.tar.gz) = 65e76c607056c9e6c975c960cc2aeaec4d37446c
+Size (fuppes-0.640.tar.gz) = 641228 bytes
SHA1 (patch-aa) = 5042b1dd24117e44effc9bc14af9ba89902a6634
+SHA1 (patch-ab) = 884a4130fc15f31a495db69100e1769e2c5c2787
+SHA1 (patch-ac) = 8359d390b4a3d9963240bb6bb3c467382cef6272
+SHA1 (patch-ad) = 108dfcb87739c4fb5d603a1e2c1cd4152d06b35e
diff -r aa2e880426a8 -r 3802b979440b multimedia/fuppes/patches/patch-ab
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/fuppes/patches/patch-ab Sat Nov 28 18:37:22 2009 +0000
@@ -0,0 +1,12 @@
+$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 -r aa2e880426a8 -r 3802b979440b multimedia/fuppes/patches/patch-ac
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/fuppes/patches/patch-ac Sat Nov 28 18:37:22 2009 +0000
@@ -0,0 +1,30 @@
+$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 -r aa2e880426a8 -r 3802b979440b multimedia/fuppes/patches/patch-ad
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/fuppes/patches/patch-ad Sat Nov 28 18:37:22 2009 +0000
@@ -0,0 +1,90 @@
+$NetBSD: patch-ad,v 1.1 2009/11/28 18:37:22 kefren Exp $
+--- src/plugins/ffmpeg/ffmpeg.cpp.orig 2009-11-28 18:48:32.000000000 +0200
++++ src/plugins/ffmpeg/ffmpeg.cpp 2009-11-28 19:04:32.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);
+
+@@ -1020,11 +1020,11 @@
+ /* XXX: allocate the subtitles in the codec ? */
+ if (subtitle_to_free) {
+ if (subtitle_to_free->rects != NULL) {
+- for (i = 0; i < subtitle_to_free->num_rects; i++) {
++/* for (i = 0; i < subtitle_to_free->num_rects; i++) {
+ av_free(subtitle_to_free->rects[i].bitmap);
+ av_free(subtitle_to_free->rects[i].rgba_palette);
+ }
+- av_freep(&subtitle_to_free->rects);
++*/ av_freep(&subtitle_to_free->rects);
+ }
+ subtitle_to_free->num_rects = 0;
+ subtitle_to_free = NULL;
+@@ -1054,13 +1054,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;
+@@ -1309,7 +1309,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 &&
+@@ -1766,7 +1766,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
Home |
Main Index |
Thread Index |
Old Index