cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- unbreak by updating to a more recent version

Browse Source 
ok jasper@
This commit is contained in:
ajacoutot 2009-01-24 12:39:11 +00:00
parent 477f228b72
commit 45d58e0dc9
3 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
multimedia/gstreamer-0.10/plugins-ffmpeg/Makefile
View File

@ -1,16 +1,18 @@
# $OpenBSD: Makefile,v 1.4 2008/07/09 02:22:59 jakemsr Exp $
# $OpenBSD: Makefile,v 1.5 2009/01/24 12:39:11 ajacoutot Exp $
COMMENT = multimedia framework - ffmpeg plugin
V = 0.10.4
V = 0.10.5
DISTNAME = gst-ffmpeg-$V
PKGNAME = gstreamer-ffmpeg-$Vp0
PKGNAME = gstreamer-ffmpeg-$V
MASTER_SITES = ${MASTER_SITE_GST:=gst-ffmpeg/}
LIB_DEPENDS = gstreamer-0.10,gstbase-0.10:gstreamer->=0.10:$P/core \
gstvideo-0.10::$P/plugins-base \
postproc.>=11,avcodec.>=11,avformat.>=11,avutil.>=5,swscale.>=1::graphics/ffmpeg
postproc.>=11,avcodec.>=11,avformat.>=11,avutil.>=5::graphics/ffmpeg
AUTOCONF_VERSION = 2.62
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 iconv
WANTLIB += intl m pcre xml2 z oil-0.3

10
multimedia/gstreamer-0.10/plugins-ffmpeg/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gst-ffmpeg-0.10.4.tar.bz2) = dhy7wLXwd0SQgtDqdSeUHg==
RMD160 (gst-ffmpeg-0.10.4.tar.bz2) = 786io5U8FH6r0qqn/1o2VuEHGrk=
SHA1 (gst-ffmpeg-0.10.4.tar.bz2) = QZd+dK7UgVTfLYMcZS7vG9Qsrxk=
SHA256 (gst-ffmpeg-0.10.4.tar.bz2) = hAAVtODw5ySLF46vw3R21uua6jh26zsH4qZrQwtSbaI=
SIZE (gst-ffmpeg-0.10.4.tar.bz2) = 3011048
MD5 (gst-ffmpeg-0.10.5.tar.bz2) = H/V5lF6vz92rQgtzTDoMkg==
RMD160 (gst-ffmpeg-0.10.5.tar.bz2) = rjFAR8el/qzHjf9DkvXpmJ+IqsY=
SHA1 (gst-ffmpeg-0.10.5.tar.bz2) = eVVAsid6+SL9hose5iRFJ0FQ9e4=
SHA256 (gst-ffmpeg-0.10.5.tar.bz2) = Mxa/dXOcuzbJzYWxMCbQlnX8o0nynp/dKapRcSUgwos=
SIZE (gst-ffmpeg-0.10.5.tar.bz2) = 3031714

38
multimedia/gstreamer-0.10/plugins-ffmpeg/patches/patch-ext_ffmpeg_gstffmpegcodecmap_c
View File

@ -1,38 +1,24 @@
$OpenBSD: patch-ext_ffmpeg_gstffmpegcodecmap_c,v 1.3 2008/07/09 02:22:59 jakemsr Exp $
--- ext/ffmpeg/gstffmpegcodecmap.c.orig Mon May 19 12:58:09 2008
+++ ext/ffmpeg/gstffmpegcodecmap.c Fri Jun 27 17:59:27 2008
@@ -27,8 +27,8 @@
$OpenBSD: patch-ext_ffmpeg_gstffmpegcodecmap_c,v 1.4 2009/01/24 12:39:11 ajacoutot Exp $
--- ext/ffmpeg/gstffmpegcodecmap.c.orig Sat Jan 24 12:24:37 2009
+++ ext/ffmpeg/gstffmpegcodecmap.c Sat Jan 24 12:25:50 2009
@@ -26,7 +26,8 @@
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avcodec.h>
#include <libswscale/swscale.h>
#else
-#include <ffmpeg/swscale.h>
-#include <ffmpeg/avcodec.h>
+#include <libswscale/swscale.h>
+#include <libavcodec/avcodec.h>
#endif
#include <string.h>
@@ -326,6 +326,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-dts", NULL);
break;
@@ -360,6 +361,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
+ case CODEC_ID_VORBIS:
+ caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-vorbis", NULL);
case CODEC_ID_DTS:
caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-dts", NULL);
+ break;
+
case CODEC_ID_APE:
caps =
gst_ff_aud_caps_new (context, codec_id, "audio/x-ffmpeg-parsed-ape",
@@ -3306,10 +3310,10 @@ gst_ffmpeg_img_convert (AVPicture * dst, int dst_pix_f
struct SwsContext *ctx;
int res;
+ case CODEC_ID_VORBIS:
+ caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-vorbis", NULL);
break;
- ctx = sws_getContext (src_width, src_height, src_pix_fmt, src_width, src_height, dst_pix_fmt, 2, /* flags : bicubic */
+ ctx = sws_getContext (src_width, src_height, src_pix_fmt, src_width, src_height, dst_pix_fmt, 0, /* flags : bicubic */
NULL, NULL, NULL);
res = sws_scale (ctx, (uint8_t **) src->data, (int *) src->linesize,
- 2, src_width, dst->data, dst->linesize);
+ 0, src_height, dst->data, dst->linesize);
sws_freeContext (ctx);
return res;
}
case CODEC_ID_APE: