Small fixes to make gst-plugins-ffmpeg work with the latest ffmpeg update.

From brad, OK aja@
This commit is contained in:
edd 2011-12-30 17:36:56 +00:00
parent 3d6d3fe128
commit c117a8dd52
3 changed files with 15 additions and 18 deletions

View File

@ -1,25 +1,22 @@
# $OpenBSD: Makefile,v 1.24 2011/09/16 10:31:23 espie Exp $
# $OpenBSD: Makefile,v 1.25 2011/12/30 17:36:56 edd Exp $
COMMENT = ffmpeg element for GStreamer
V = 0.10.11
V = 0.10.12
DISTNAME = gst-ffmpeg-$V
PKGNAME = gstreamer-ffmpeg-$V
REVISION = 5
MASTER_SITES = ${MASTER_SITE_GST:=gst-ffmpeg/}
LIB_DEPENDS = $P/core>=0.10 \
$P/plugins-base \
graphics/ffmpeg>=20080620p10
AUTOCONF_VERSION = 2.65
graphics/ffmpeg>=20111126
MODULES += devel/gettext
WANTLIB += avcodec avformat avutil bz2 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gsm gstaudio-0.10 gstbase-0.10 gstinterfaces-0.10
WANTLIB += gstreamer-0.10 gstvideo-0.10 gthread-2.0 m mp3lame
WANTLIB += gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10 gthread-2.0 m mp3lame
WANTLIB += ogg orc-0.4 pcre postproc schroedinger-1.0 speex swscale
WANTLIB += theoradec theoraenc vorbis vorbisenc vpx x264 xml2 z

View File

@ -1,5 +1,5 @@
MD5 (gst-ffmpeg-0.10.11.tar.bz2) = DSMZe6esBuo0+mbThGnr5Q==
RMD160 (gst-ffmpeg-0.10.11.tar.bz2) = ZCz40rSEi7i/h8Tiuadp6ei2dis=
SHA1 (gst-ffmpeg-0.10.11.tar.bz2) = duPKtGBMona8nZ+pQjbRM5tL2jM=
SHA256 (gst-ffmpeg-0.10.11.tar.bz2) = /zahOOWvTtjcxFnW1lIf5m7THsKbqakk3DZ1xnSaaS4=
SIZE (gst-ffmpeg-0.10.11.tar.bz2) = 4250699
MD5 (gst-ffmpeg-0.10.12.tar.bz2) = hQfzPFbmFVo9RQ3+beg1qQ==
RMD160 (gst-ffmpeg-0.10.12.tar.bz2) = h4zkuORBT4kVO5vJn+MVFeW1Ftg=
SHA1 (gst-ffmpeg-0.10.12.tar.bz2) = S5n4f2MXk6lWgjPuv5QQPV5SNfY=
SHA256 (gst-ffmpeg-0.10.12.tar.bz2) = sXcHECtL+l4NUJW+NgjuLUOIJo6rgiyaDOehgBG91zs=
SIZE (gst-ffmpeg-0.10.12.tar.bz2) = 4780170

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-configure_ac,v 1.2 2010/07/22 19:21:31 ajacoutot Exp $
--- configure.ac.orig Thu Jul 15 21:15:23 2010
+++ configure.ac Wed Jul 21 21:17:57 2010
@@ -296,7 +296,7 @@ else
\$(top_builddir)/gst-libs/ext/ffmpeg/libavutil/libavutil.a"
$OpenBSD: patch-configure_ac,v 1.3 2011/12/30 17:36:56 edd Exp $
--- configure.ac.orig Wed Jul 20 06:09:50 2011
+++ configure.ac Sat Sep 24 20:59:19 2011
@@ -293,7 +293,7 @@ else
\$(top_builddir)/gst-libs/ext/libav/libavutil/libavutil.a"
FFMPEG_SUBDIRS=gst-libs
- AC_DEFINE(HAVE_AVI_H)
+ AC_DEFINE(HAVE_AVI_H, [], [whether or not avi.h is installed])
AC_DEFINE([FFMPEG_SOURCE], ["local snapshot"], [Describes where the FFmpeg libraries come from.])
AC_DEFINE([FFMPEG_SOURCE], ["local snapshot"], [Describes where the Libav libraries come from.])
AC_ARG_WITH(ffmpeg-extra-configure,