diff options
author | Koop Mast <kwm@FreeBSD.org> | 2005-10-22 11:59:19 +0000 |
---|---|---|
committer | Koop Mast <kwm@FreeBSD.org> | 2005-10-22 11:59:19 +0000 |
commit | 89c5539a57ac373d1880ad2f3132252578407b03 (patch) | |
tree | 98eb7943aae2ec2681317dd572b11c1a3d836502 /multimedia | |
parent | d0726c7bf8f5a02f1686ea21c688a809671dcef6 (diff) | |
download | ports-89c5539a57ac373d1880ad2f3132252578407b03.tar.gz ports-89c5539a57ac373d1880ad2f3132252578407b03.zip |
Notes
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/gstreamer-ffmpeg/Makefile | 2 | ||||
-rw-r--r-- | multimedia/gstreamer-ffmpeg/distinfo | 4 | ||||
-rw-r--r-- | multimedia/gstreamer-ffmpeg/files/patch-upstream-fixes | 61 | ||||
-rw-r--r-- | multimedia/gstreamer-ffmpeg/pkg-plist | 1 | ||||
-rw-r--r-- | multimedia/gstreamer-ffmpeg80/Makefile | 2 | ||||
-rw-r--r-- | multimedia/gstreamer-ffmpeg80/distinfo | 4 | ||||
-rw-r--r-- | multimedia/gstreamer-ffmpeg80/files/patch-upstream-fixes | 61 | ||||
-rw-r--r-- | multimedia/gstreamer-ffmpeg80/pkg-plist | 1 |
8 files changed, 130 insertions, 6 deletions
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile index 3ba054e06d10..073086c91c04 100644 --- a/multimedia/gstreamer-ffmpeg/Makefile +++ b/multimedia/gstreamer-ffmpeg/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gstreamer -PORTVERSION= 0.8.5 +PORTVERSION= 0.8.6 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/ PKGNAMESUFFIX= -ffmpeg diff --git a/multimedia/gstreamer-ffmpeg/distinfo b/multimedia/gstreamer-ffmpeg/distinfo index b0d548e05c80..0a72066f7336 100644 --- a/multimedia/gstreamer-ffmpeg/distinfo +++ b/multimedia/gstreamer-ffmpeg/distinfo @@ -1,2 +1,2 @@ -MD5 (gst-ffmpeg-0.8.5.tar.bz2) = 2f976054d21e74ef1094a6707e2367a8 -SIZE (gst-ffmpeg-0.8.5.tar.bz2) = 1882406 +MD5 (gst-ffmpeg-0.8.6.tar.bz2) = 404f1749459c0a8745c3b6fd5cb18c9e +SIZE (gst-ffmpeg-0.8.6.tar.bz2) = 2040128 diff --git a/multimedia/gstreamer-ffmpeg/files/patch-upstream-fixes b/multimedia/gstreamer-ffmpeg/files/patch-upstream-fixes new file mode 100644 index 000000000000..5c249117ea68 --- /dev/null +++ b/multimedia/gstreamer-ffmpeg/files/patch-upstream-fixes @@ -0,0 +1,61 @@ +--- 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: diff --git a/multimedia/gstreamer-ffmpeg/pkg-plist b/multimedia/gstreamer-ffmpeg/pkg-plist index 82aec7a0bbca..f3e092d0673c 100644 --- a/multimedia/gstreamer-ffmpeg/pkg-plist +++ b/multimedia/gstreamer-ffmpeg/pkg-plist @@ -1,3 +1,4 @@ @exec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true lib/gstreamer-%%VERSION%%/libgstffmpeg.so +lib/gstreamer-%%VERSION%%/libgstpostproc.so @unexec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true diff --git a/multimedia/gstreamer-ffmpeg80/Makefile b/multimedia/gstreamer-ffmpeg80/Makefile index 3ba054e06d10..073086c91c04 100644 --- a/multimedia/gstreamer-ffmpeg80/Makefile +++ b/multimedia/gstreamer-ffmpeg80/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gstreamer -PORTVERSION= 0.8.5 +PORTVERSION= 0.8.6 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/ PKGNAMESUFFIX= -ffmpeg diff --git a/multimedia/gstreamer-ffmpeg80/distinfo b/multimedia/gstreamer-ffmpeg80/distinfo index b0d548e05c80..0a72066f7336 100644 --- a/multimedia/gstreamer-ffmpeg80/distinfo +++ b/multimedia/gstreamer-ffmpeg80/distinfo @@ -1,2 +1,2 @@ -MD5 (gst-ffmpeg-0.8.5.tar.bz2) = 2f976054d21e74ef1094a6707e2367a8 -SIZE (gst-ffmpeg-0.8.5.tar.bz2) = 1882406 +MD5 (gst-ffmpeg-0.8.6.tar.bz2) = 404f1749459c0a8745c3b6fd5cb18c9e +SIZE (gst-ffmpeg-0.8.6.tar.bz2) = 2040128 diff --git a/multimedia/gstreamer-ffmpeg80/files/patch-upstream-fixes b/multimedia/gstreamer-ffmpeg80/files/patch-upstream-fixes new file mode 100644 index 000000000000..5c249117ea68 --- /dev/null +++ b/multimedia/gstreamer-ffmpeg80/files/patch-upstream-fixes @@ -0,0 +1,61 @@ +--- 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: diff --git a/multimedia/gstreamer-ffmpeg80/pkg-plist b/multimedia/gstreamer-ffmpeg80/pkg-plist index 82aec7a0bbca..f3e092d0673c 100644 --- a/multimedia/gstreamer-ffmpeg80/pkg-plist +++ b/multimedia/gstreamer-ffmpeg80/pkg-plist @@ -1,3 +1,4 @@ @exec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true lib/gstreamer-%%VERSION%%/libgstffmpeg.so +lib/gstreamer-%%VERSION%%/libgstpostproc.so @unexec %D/bin/gst-register --gst-registry=%D/share/gnome/cache/gstreamer-%%VERSION%%/registry.xml 2>/dev/null || true |