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

* FFmpeg headers moved

Browse Source 
* FFmpeg LIB_DEPENDS/WANTLIB changes
* make PKGNAME consistent with other gstreamer packages
* bump patch level and add @conflict marker to ease updates

feedback ajacoutot@ and brad@, ok brad@
This commit is contained in:
jakemsr 2008-07-09 02:22:59 +00:00
parent f0e6e48090
commit 8d717348e0
14 changed files with 182 additions and 7 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,23 +1,21 @@
# $OpenBSD: Makefile,v 1.3 2008/06/21 21:03:55 deanna Exp $
# $OpenBSD: Makefile,v 1.4 2008/07/09 02:22:59 jakemsr Exp $
COMMENT = multimedia framework - ffmpeg plugin
V = 0.10.4
DISTNAME = gst-ffmpeg-$V
PKGNAME-main = gstreamer-ffmpeg-$Vp0
PKGNAME = gstreamer-ffmpeg-$Vp0
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::graphics/ffmpeg
postproc.>=11,avcodec.>=11,avformat.>=11,avutil.>=5,swscale.>=1::graphics/ffmpeg
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 iconv
WANTLIB += intl m pcre xml2 z oil-0.3
WANTLIB += a52 faac faad mp3lame ogg theora vorbis vorbisenc x264
WANTLIB += bz2
CONFIGURE_ARGS += --with-system-ffmpeg

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

@ -0,0 +1,14 @@
$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 Normal file
View File

@ -0,0 +1,14 @@
$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 Normal file
View File

@ -0,0 +1,12 @@
$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>

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

@ -0,0 +1,38 @@
$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 @@
#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;
+ case CODEC_ID_VORBIS:
+ caps = gst_ff_aud_caps_new (context, codec_id, "audio/x-vorbis", 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;
- 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;
}

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

@ -0,0 +1,12 @@
$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 Normal file
View File

@ -0,0 +1,12 @@
$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 Normal file
View File

@ -0,0 +1,12 @@
$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 Normal file
View File

@ -0,0 +1,12 @@
$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 Normal file
View File

@ -0,0 +1,12 @@
$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 Normal file
View File

@ -0,0 +1,12 @@
$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 Normal file
View File

@ -0,0 +1,12 @@
$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 Normal file
View File

@ -0,0 +1,14 @@
$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

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

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/05/13 15:34:02 espie Exp $
@comment $OpenBSD: PLIST,v 1.2 2008/07/09 02:22:59 jakemsr Exp $
@conflict gst-ffmpeg-*
lib/gstreamer-${VERSION}/libgstffmpeg.la
lib/gstreamer-${VERSION}/libgstffmpeg.so
lib/gstreamer-${VERSION}/libgstpostproc.la