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

update to gst-ffmpeg-0.10.10

Browse Source 
for compatability with newer ffmpeg
This commit is contained in:
jakemsr 2010-05-26 22:39:02 +00:00
parent d0822f515d
commit 510e7450dc
16 changed files with 28 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,24 +1,24 @@
# $OpenBSD: Makefile,v 1.12 2009/11/29 09:18:24 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.13 2010/05/26 22:39:02 jakemsr Exp $
COMMENT = ffmpeg element for GStreamer
V = 0.10.5
V = 0.10.10
DISTNAME = gst-ffmpeg-$V
PKGNAME = gstreamer-ffmpeg-$Vp6
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 \
avcodec.>=13.1,avformat.>=12,avutil.>=6,postproc.>=12:ffmpeg->=20080620p10:graphics/ffmpeg
gstaudio-0.10,gstvideo-0.10,gstinterfaces-0.10::$P/plugins-base \
avcodec.>=14,avformat.>=13,avutil.>=7,postproc.>=13,swscale.>=2:ffmpeg->=20080620p10:graphics/ffmpeg
AUTOCONF_VERSION = 2.62
AUTOCONF_VERSION = 2.65
MODULES += devel/gettext
WANTLIB += a52 bz2 faac faad glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += bz2 faac faad glib-2.0 gmodule-2.0 gobject-2.0 gsm
WANTLIB += gthread-2.0 m mp3lame ogg oil-0.3 pcre schroedinger-1.0
WANTLIB += theora vorbis vorbisenc x264 xml2 z
WANTLIB += speex theora vorbis vorbisenc x264 xml2 z
CONFIGURE_ARGS += --with-system-ffmpeg

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

@ -1,5 +1,5 @@
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
MD5 (gst-ffmpeg-0.10.10.tar.bz2) = RHKS3v9fN0hETmpfukHaKQ==
RMD160 (gst-ffmpeg-0.10.10.tar.bz2) = AEOGcXfrw+hsE0Rif7cx9tbBoP4=
SHA1 (gst-ffmpeg-0.10.10.tar.bz2) = lmRQw1DAWO0F1zuyJCNOFx3VT34=
SHA256 (gst-ffmpeg-0.10.10.tar.bz2) = aXEUSDREoKRpAohXodWBRcmeb10s1+3YywTNw/xyrZQ=
SIZE (gst-ffmpeg-0.10.10.tar.bz2) = 3806004

12
multimedia/gstreamer-0.10/plugins-ffmpeg/patches/patch-configure_ac Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure_ac,v 1.1 2010/05/26 22:39:02 jakemsr Exp $
--- configure.ac.orig Sat Mar 6 04:49:35 2010
+++ configure.ac Tue May 18 15:19:49 2010
@@ -298,7 +298,7 @@ else
\$(top_builddir)/gst-libs/ext/ffmpeg/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_ARG_WITH(ffmpeg-extra-configure,

14
multimedia/gstreamer-0.10/plugins-ffmpeg/patches/patch-ext_ffmpeg_gstffmpeg_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-ext_ffmpeg_gstffmpeg_c,v 1.1 2008/07/09 02:22:59 jakemsr Exp $
--- ext/ffmpeg/gstffmpeg.c.orig Sat Jun 21 18:41:14 2008
+++ ext/ffmpeg/gstffmpeg.c Sat Jun 21 18:38:29 2008
@@ -31,8 +31,8 @@
#include <avcodec.h>
#include <avformat.h>
#else
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
#endif
#include "gstffmpeg.h"

14
multimedia/gstreamer-0.10/plugins-ffmpeg/patches/patch-ext_ffmpeg_gstffmpeg_h
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-ext_ffmpeg_gstffmpeg_h,v 1.1 2008/07/09 02:22:59 jakemsr Exp $
--- ext/ffmpeg/gstffmpeg.h.orig Sat Jun 21 18:39:46 2008
+++ ext/ffmpeg/gstffmpeg.h Sat Jun 21 18:40:32 2008
@@ -28,8 +28,8 @@
#include <avcodec.h>
#include <avformat.h>
#else
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
#endif
#include <gst/gst.h>

12
multimedia/gstreamer-0.10/plugins-ffmpeg/patches/patch-ext_ffmpeg_gstffmpegaudioresample_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_ffmpeg_gstffmpegaudioresample_c,v 1.1 2008/07/09 02:22:59 jakemsr Exp $
--- ext/ffmpeg/gstffmpegaudioresample.c.orig Sat Jun 21 18:39:00 2008
+++ ext/ffmpeg/gstffmpegaudioresample.c Sat Jun 21 18:39:14 2008
@@ -27,7 +27,7 @@
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avcodec.h>
#else
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#endif
#include <gst/gst.h>

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

@ -1,24 +0,0 @@
$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>
#else
-#include <ffmpeg/avcodec.h>
+#include <libswscale/swscale.h>
+#include <libavcodec/avcodec.h>
#endif
#include <string.h>
@@ -360,6 +361,10 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
case CODEC_ID_DTS:
caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-dts", NULL);
+ break;
+
+ case CODEC_ID_VORBIS:
+ caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-vorbis", NULL);
break;
case CODEC_ID_APE:

12
multimedia/gstreamer-0.10/plugins-ffmpeg/patches/patch-ext_ffmpeg_gstffmpegcodecmap_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_ffmpeg_gstffmpegcodecmap_h,v 1.1 2008/07/09 02:22:59 jakemsr Exp $
--- ext/ffmpeg/gstffmpegcodecmap.h.orig Sat Jun 21 18:42:18 2008
+++ ext/ffmpeg/gstffmpegcodecmap.h Sat Jun 21 18:43:09 2008
@@ -23,7 +23,7 @@
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avcodec.h>
#else
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#endif
#include <gst/gst.h>

12
multimedia/gstreamer-0.10/plugins-ffmpeg/patches/patch-ext_ffmpeg_gstffmpegdec_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_ffmpeg_gstffmpegdec_c,v 1.1 2008/07/09 02:22:59 jakemsr Exp $
--- ext/ffmpeg/gstffmpegdec.c.orig Sat Jun 21 18:43:36 2008
+++ ext/ffmpeg/gstffmpegdec.c Sat Jun 21 18:43:52 2008
@@ -27,7 +27,7 @@
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avcodec.h>
#else
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#endif
#include <gst/gst.h>

12
multimedia/gstreamer-0.10/plugins-ffmpeg/patches/patch-ext_ffmpeg_gstffmpegdeinterlace_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_ffmpeg_gstffmpegdeinterlace_c,v 1.1 2008/07/09 02:22:59 jakemsr Exp $
--- ext/ffmpeg/gstffmpegdeinterlace.c.orig Sat Jun 21 18:44:11 2008
+++ ext/ffmpeg/gstffmpegdeinterlace.c Sat Jun 21 18:44:27 2008
@@ -27,7 +27,7 @@
#ifdef HAVE_FFMPEG_UNINSTALLED
# include <avcodec.h>
#else
-# include <ffmpeg/avcodec.h>
+# include <libavcodec/avcodec.h>
#endif
#include <gst/gst.h>

12
multimedia/gstreamer-0.10/plugins-ffmpeg/patches/patch-ext_ffmpeg_gstffmpegdemux_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_ffmpeg_gstffmpegdemux_c,v 1.3 2008/07/09 02:22:59 jakemsr Exp $
--- ext/ffmpeg/gstffmpegdemux.c.orig Sat Jun 21 18:46:06 2008
+++ ext/ffmpeg/gstffmpegdemux.c Sat Jun 21 18:46:35 2008
@@ -30,7 +30,7 @@
#include <avi.h>
#endif
#else
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
#ifdef HAVE_AVI_H
#include <ffmpeg/avi.h>
#endif

12
multimedia/gstreamer-0.10/plugins-ffmpeg/patches/patch-ext_ffmpeg_gstffmpegenc_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_ffmpeg_gstffmpegenc_c,v 1.1 2008/07/09 02:22:59 jakemsr Exp $
--- ext/ffmpeg/gstffmpegenc.c.orig Sat Jun 21 18:44:55 2008
+++ ext/ffmpeg/gstffmpegenc.c Sat Jun 21 18:45:09 2008
@@ -31,7 +31,7 @@
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avcodec.h>
#else
-#include <ffmpeg/avcodec.h>
+#include <libavcodec/avcodec.h>
#endif
#include <gst/gst.h>

12
multimedia/gstreamer-0.10/plugins-ffmpeg/patches/patch-ext_ffmpeg_gstffmpegmux_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_ffmpeg_gstffmpegmux_c,v 1.1 2008/07/09 02:22:59 jakemsr Exp $
--- ext/ffmpeg/gstffmpegmux.c.orig Sat Jun 21 18:47:50 2008
+++ ext/ffmpeg/gstffmpegmux.c Sat Jun 21 18:48:05 2008
@@ -25,7 +25,7 @@
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avformat.h>
#else
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
#endif
#include <gst/gst.h>

12
multimedia/gstreamer-0.10/plugins-ffmpeg/patches/patch-ext_ffmpeg_gstffmpegprotocol_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ext_ffmpeg_gstffmpegprotocol_c,v 1.1 2008/07/09 02:22:59 jakemsr Exp $
--- ext/ffmpeg/gstffmpegprotocol.c.orig Sat Jun 21 18:46:53 2008
+++ ext/ffmpeg/gstffmpegprotocol.c Sat Jun 21 18:47:07 2008
@@ -26,7 +26,7 @@
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avformat.h>
#else
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
#endif
#include <gst/gst.h>

14
multimedia/gstreamer-0.10/plugins-ffmpeg/patches/patch-ext_libpostproc_gstpostproc_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-ext_libpostproc_gstpostproc_c,v 1.1 2008/07/09 02:22:59 jakemsr Exp $
--- ext/libpostproc/gstpostproc.c.orig Sat Jun 21 18:48:39 2008
+++ ext/libpostproc/gstpostproc.c Sat Jun 21 18:49:13 2008
@@ -32,8 +32,8 @@
#include <avcodec.h>
#include <postprocess.h>
#else
-#include <ffmpeg/avcodec.h>
-#include <postproc/postprocess.h>
+#include <libavcodec/avcodec.h>
+#include <libpostproc/postprocess.h>
#endif

4
multimedia/gstreamer-0.10/plugins-ffmpeg/pkg/PLIST
View File

@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.3 2009/11/29 09:18:25 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2010/05/26 22:39:02 jakemsr Exp $
@conflict gst-ffmpeg-*
@comment lib/gstreamer-${VERSION}/libgstffmpeg.la
lib/gstreamer-${VERSION}/libgstffmpeg.so
@comment lib/gstreamer-${VERSION}/libgstffmpegscale.la
lib/gstreamer-${VERSION}/libgstffmpegscale.so
@comment lib/gstreamer-${VERSION}/libgstpostproc.la
lib/gstreamer-${VERSION}/libgstpostproc.so