summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--multimedia/gstreamer-ffmpeg/Makefile14
-rw-r--r--multimedia/gstreamer-ffmpeg/distinfo4
-rw-r--r--multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_ffmpeg_Makefile.in36
-rw-r--r--multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_ffmpeg_patch_funcion.patch25
4 files changed, 11 insertions, 68 deletions
diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
index 4a1af044e..5df361547 100644
--- a/multimedia/gstreamer-ffmpeg/Makefile
+++ b/multimedia/gstreamer-ffmpeg/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= gstreamer
-PORTVERSION= 0.7.1
+PORTVERSION= 0.8.0
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-ffmpeg/
PKGNAMESUFFIX= -ffmpeg
@@ -15,11 +15,12 @@ DISTNAME= gst-ffmpeg-${PORTVERSION}
MAINTAINER= kwm@rainbow-runner.nl
COMMENT= GStreamer plug-in for manipulating MPEG video streams
-LIB_DEPENDS= gstreamer-0.7.7:${PORTSDIR}/multimedia/gstreamer
+LIB_DEPENDS= gstreamer-0.8.1:${PORTSDIR}/multimedia/gstreamer
USE_X_PREFIX= yes
USE_BZIP2= yes
USE_REINPLACE= yes
+USE_GMAKE= yes
USE_GNOME= gnomehack \
gnomeprefix
GNU_CONFIGURE= yes
@@ -33,16 +34,19 @@ INSTALLS_SHLIB= yes
PKG_CONFIG?="${LOCALBASE}/bin/pkg-config"
GST_VERSION=${PORTVERSION:C/..$//}
-BROKEN= "Needs an update for gst-0.7.6"
-
.include <bsd.port.pre.mk>
.if ${ARCH} == "ia64" || ${ARCH} == "amd64"
EXTRA_PATCHES+= ${FILESDIR}/ia64-patch-ffmpeg::configure
.endif
+post-patch:
+ @${REINPLACE_CMD} -E -e \
+ 's|make|${GMAKE}|' \
+ ${WRKSRC}/gst-libs/ext/Makefile.in
+
post-install:
# register plugins
- -@${PREFIX}/bin/gst-register-${GST_VERSION} 2>/dev/null
+ -@${X11BASE}/bin/gst-register-${GST_VERSION} 2>/dev/null
.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer-ffmpeg/distinfo b/multimedia/gstreamer-ffmpeg/distinfo
index c69525831..a31890d57 100644
--- a/multimedia/gstreamer-ffmpeg/distinfo
+++ b/multimedia/gstreamer-ffmpeg/distinfo
@@ -1,2 +1,2 @@
-MD5 (gst-ffmpeg-0.7.1.tar.bz2) = dd3675d4f40671376f2aad4bbe35ded1
-SIZE (gst-ffmpeg-0.7.1.tar.bz2) = 1033074
+MD5 (gst-ffmpeg-0.8.0.tar.bz2) = 26dd962c37e886cbc3be167680a44ee4
+SIZE (gst-ffmpeg-0.8.0.tar.bz2) = 1558194
diff --git a/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_ffmpeg_Makefile.in b/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_ffmpeg_Makefile.in
deleted file mode 100644
index 3b293cd85..000000000
--- a/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_ffmpeg_Makefile.in
+++ /dev/null
@@ -1,36 +0,0 @@
---- gst-libs/ext/ffmpeg/Makefile.in.orig Sat Feb 21 18:56:31 2004
-+++ gst-libs/ext/ffmpeg/Makefile.in Sat Feb 21 19:04:32 2004
-@@ -532,15 +532,12 @@
- $(defs_powerpc) \
- -DTUNECPU=generic \
- -DHAVE_STRPTIME=1 \
-- -DHAVE_LRINTF=1 \
- -DCONFIG_ENCODERS=1 \
- -DCONFIG_DECODERS=1 \
- -DCONFIG_PP=1 \
- -DCONFIG_MPEGAUDIO_HP=1 \
- -DCONFIG_HAVE_DLOPEN=1 \
- -DCONFIG_HAVE_DLFCN=1 \
-- -DHAVE_MALLOC_H=1 \
-- -DHAVE_MEMALIGN=1 \
- -DSIMPLE_IDCT=1 \
- -DCONFIG_RISKY=1
-
-@@ -904,7 +901,7 @@
- libavformat_la-file.lo libavformat_la-flvdec.lo \
- libavformat_la-flvenc.lo libavformat_la-framehook.lo \
- libavformat_la-gif.lo libavformat_la-gifdec.lo \
-- libavformat_la-grab.lo libavformat_la-idcin.lo \
-+ libavformat_la-idcin.lo \
- libavformat_la-idroq.lo libavformat_la-img.lo \
- libavformat_la-ipmovie.lo libavformat_la-jpeg.lo \
- libavformat_la-mov.lo libavformat_la-movenc.lo \
-@@ -5697,7 +5694,7 @@
-
- patches:
- @echo -n Patching ffmpeg if necessary ...
-- @patch -p0 -N -r rejects <$(srcdir)/patch/function.patch > /dev/null || true
-+# @patch -p0 -N -r rejects <$(srcdir)/patch/function.patch > /dev/null || true
- @rm -f rejects || true
- @echo done.
-
diff --git a/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_ffmpeg_patch_funcion.patch b/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_ffmpeg_patch_funcion.patch
deleted file mode 100644
index 535c73896..000000000
--- a/multimedia/gstreamer-ffmpeg/files/patch-gst-libs_ext_ffmpeg_patch_funcion.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- gst-libs/ext/ffmpeg/patch/function.patch.orig Fri Feb 13 15:25:08 2004
-+++ gst-libs/ext/ffmpeg/patch/function.patch Thu Feb 26 20:36:58 2004
-@@ -36,22 +36,6 @@
- +#endif
- }
- }
--Index: ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c
--===================================================================
--RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c,v
--retrieving revision 1.17
--diff -u -u -r1.17 mpegvideo_mmx_template.c
----- ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c 13 May 2003 08:21:35 -0000 1.17
--+++ ffmpeg/libavcodec/i386/mpegvideo_mmx_template.c 11 Sep 2003 19:34:47 -0000
--@@ -122,7 +122,7 @@
-- "movd %%mm3, %%eax \n\t"
-- "movzbl %%al, %%eax \n\t" // last_non_zero_p1
-- : "+a" (last_non_zero_p1)
--- : "r" (block+64), "r" (qmat), "r" (bias),
--+ : "b" (block+64), "r" (qmat), "r" (bias),
-- "r" (inv_zigzag_direct16+64), "r" (temp_block+64)
-- );
-- // note the asm is split cuz gcc doesnt like that many operands ...
- Index: ffmpeg/libavformat/avformat.h
- ===================================================================
- RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/avformat.h,v