diff options
author | Koop Mast <kwm@FreeBSD.org> | 2005-10-25 16:39:00 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2005-10-25 16:39:00 +0000 |
commit | 83bc46861a1c2824c0da318e923ec52e5418d6f0 (patch) | |
tree | 20fa9dc1765e66f55e0d7bbdbc12f380184c2c99 /multimedia/gstreamer-ffmpeg | |
parent | b850306cce5a15a62792e8d08138b4c7f22540ef (diff) | |
download | ports-83bc46861a1c2824c0da318e923ec52e5418d6f0.tar.gz ports-83bc46861a1c2824c0da318e923ec52e5418d6f0.zip |
Notes
Diffstat (limited to 'multimedia/gstreamer-ffmpeg')
-rw-r--r-- | multimedia/gstreamer-ffmpeg/Makefile | 6 | ||||
-rw-r--r-- | multimedia/gstreamer-ffmpeg/distinfo | 4 | ||||
-rw-r--r-- | multimedia/gstreamer-ffmpeg/files/patch-upstream-fixes | 61 |
3 files changed, 4 insertions, 67 deletions
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile index 073086c91c04..f6f8b56a35dd 100644 --- a/multimedia/gstreamer-ffmpeg/Makefile +++ b/multimedia/gstreamer-ffmpeg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gstreamer -PORTVERSION= 0.8.6 +PORTVERSION= 0.8.7 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/ PKGNAMESUFFIX= -ffmpeg @@ -19,9 +19,7 @@ USE_X_PREFIX= yes USE_BZIP2= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomehack \ - gnometarget \ - gnomeprefix +USE_GNOME= gnometarget USE_GSTREAMER= yes USE_LIBTOOL_VER=15 CONFIGURE_ENV= PKG_CONFIG=${PKG_CONFIG} \ diff --git a/multimedia/gstreamer-ffmpeg/distinfo b/multimedia/gstreamer-ffmpeg/distinfo index 0a72066f7336..abb70b9ecd2b 100644 --- a/multimedia/gstreamer-ffmpeg/distinfo +++ b/multimedia/gstreamer-ffmpeg/distinfo @@ -1,2 +1,2 @@ -MD5 (gst-ffmpeg-0.8.6.tar.bz2) = 404f1749459c0a8745c3b6fd5cb18c9e -SIZE (gst-ffmpeg-0.8.6.tar.bz2) = 2040128 +MD5 (gst-ffmpeg-0.8.7.tar.bz2) = 6435ef3954ee05de79829e262f86187a +SIZE (gst-ffmpeg-0.8.7.tar.bz2) = 2110685 diff --git a/multimedia/gstreamer-ffmpeg/files/patch-upstream-fixes b/multimedia/gstreamer-ffmpeg/files/patch-upstream-fixes deleted file mode 100644 index 5c249117ea68..000000000000 --- a/multimedia/gstreamer-ffmpeg/files/patch-upstream-fixes +++ /dev/null @@ -1,61 +0,0 @@ ---- ext/ffmpeg/gstffmpegdec.c 2005/07/27 16:03:51 1.110 -+++ ext/ffmpeg/gstffmpegdec.c 2005/08/16 22:02:57 1.110.2.1 -@@ -453,7 +453,8 @@ - /* get size and so */ - gst_ffmpeg_caps_with_codecid (oclass->in_plugin->id, - oclass->in_plugin->type, caps, ffmpegdec->context); -- if (!ffmpegdec->context->time_base.den) { -+ if (!ffmpegdec->context->time_base.den || -+ !ffmpegdec->context->time_base.num) { - ffmpegdec->context->time_base.num = 1; - ffmpegdec->context->time_base.den = 25; - } ---- ext/ffmpeg/gstffmpegenc.c 2005/07/27 16:03:51 1.70 -+++ ext/ffmpeg/gstffmpegenc.c 2005/08/16 22:02:57 1.70.2.1 -@@ -385,7 +385,8 @@ - /* fetch pix_fmt and so on */ - gst_ffmpeg_caps_with_codectype (oclass->in_plugin->type, - caps, ffmpegenc->context); -- if (!ffmpegenc->context->time_base.den) { -+ if (!ffmpegenc->context->time_base.den || -+ !ffmpegenc->context->time_base.num) { - ffmpegenc->context->time_base.den = 25; - ffmpegenc->context->time_base.num = 1; - } ---- ext/ffmpeg/gstffmpegcodecmap.c 2005/07/23 22:10:29 1.89 -+++ ext/ffmpeg/gstffmpegcodecmap.c 2005/08/14 16:42:57 1.89.2.2 -@@ -94,7 +94,7 @@ - gst_caps_new_simple (mimetype, \ - "width", GST_TYPE_INT_RANGE, 16, 4096, \ - "height", GST_TYPE_INT_RANGE, 16, 4096, \ -- "framerate", GST_TYPE_DOUBLE_RANGE, (double) 0., \ -+ "framerate", GST_TYPE_DOUBLE_RANGE, (double) 1., \ - G_MAXDOUBLE, \ - __VA_ARGS__, NULL) - -@@ -462,6 +462,17 @@ - } - break; - -+ case CODEC_ID_QTRLE: -+ caps = GST_FF_VID_CAPS_NEW ("video/x-rle", -+ "layout", G_TYPE_STRING, "quicktime", NULL); -+ if (context) { -+ gst_caps_set_simple (caps, -+ "depth", G_TYPE_INT, (gint) context->bits_per_sample, NULL); -+ } else { -+ gst_caps_set_simple (caps, "depth", GST_TYPE_INT_RANGE, 1, 64, NULL); -+ } -+ break; -+ - case CODEC_ID_MSVIDEO1: - caps = GST_FF_VID_CAPS_NEW ("video/x-msvideocodec", - "msvideoversion", G_TYPE_INT, 1, NULL); -@@ -483,7 +494,6 @@ - case CODEC_ID_VMDAUDIO: - case CODEC_ID_MSZH: - case CODEC_ID_ZLIB: -- case CODEC_ID_QTRLE: - case CODEC_ID_SONIC: - case CODEC_ID_SONIC_LS: - case CODEC_ID_SNOW: |