diff options
| -rw-r--r-- | multimedia/gstreamer0.10/Makefile | 14 | ||||
| -rw-r--r-- | multimedia/gstreamer0.10/PLIST | 7 | ||||
| -rw-r--r-- | multimedia/gstreamer0.10/buildlink3.mk | 12 | ||||
| -rw-r--r-- | multimedia/gstreamer0.10/distinfo | 3 | ||||
| -rw-r--r-- | multimedia/gstreamer0.10/patches/patch-ad | 15 |
5 files changed, 47 insertions, 4 deletions
diff --git a/multimedia/gstreamer0.10/Makefile b/multimedia/gstreamer0.10/Makefile index 8581d3c40e0..8ab3106ffe3 100644 --- a/multimedia/gstreamer0.10/Makefile +++ b/multimedia/gstreamer0.10/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2007/01/15 02:35:28 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2007/02/08 21:27:14 drochner Exp $ # DISTNAME= gstreamer-0.10.11 @@ -46,6 +46,18 @@ BUILDLINK_API_DEPENDS.glib2+= glib2>=2.4.0nb1 .endif .undef f +PKG_OPTIONS_VAR= PKG_OPTIONS.gstreamer +PKG_SUPPORTED_OPTIONS= gstcheck +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mgstcheck) +.include "../../devel/check/buildlink3.mk" +PLIST_SUBST+= GSTCHECK="" +TEST_TARGET= check-torture +.else +PLIST_SUBST+= GSTCHECK="@comment " +.endif + .include "../../devel/glib2/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/multimedia/gstreamer0.10/PLIST b/multimedia/gstreamer0.10/PLIST index 9d690e102c1..458f54d4808 100644 --- a/multimedia/gstreamer0.10/PLIST +++ b/multimedia/gstreamer0.10/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2006/12/11 12:38:18 drochner Exp $ +@comment $NetBSD: PLIST,v 1.6 2007/02/08 21:27:14 drochner Exp $ bin/gst-feedback-0.10 bin/gst-inspect-0.10 bin/gst-launch-0.10 @@ -13,6 +13,8 @@ include/gstreamer-0.10/gst/base/gstcollectpads.h include/gstreamer-0.10/gst/base/gstdataqueue.h include/gstreamer-0.10/gst/base/gstpushsrc.h include/gstreamer-0.10/gst/base/gsttypefindhelper.h +${GSTCHECK}include/gstreamer-0.10/gst/check/gstbufferstraw.h +${GSTCHECK}include/gstreamer-0.10/gst/check/gstcheck.h include/gstreamer-0.10/gst/controller/gstcontroller.h include/gstreamer-0.10/gst/dataprotocol/dataprotocol.h include/gstreamer-0.10/gst/glib-compat.h @@ -72,12 +74,14 @@ include/gstreamer-0.10/gst/net/gstnettimeprovider.h lib/gstreamer-0.10/libgstcoreelements.la lib/gstreamer-0.10/libgstcoreindexers.la lib/libgstbase-0.10.la +${GSTCHECK}lib/libgstcheck-0.10.la lib/libgstcontroller-0.10.la lib/libgstdataprotocol-0.10.la lib/libgstnet-0.10.la lib/libgstreamer-0.10.la lib/pkgconfig/gstreamer-0.10.pc lib/pkgconfig/gstreamer-base-0.10.pc +${GSTCHECK}lib/pkgconfig/gstreamer-check-0.10.pc lib/pkgconfig/gstreamer-controller-0.10.pc lib/pkgconfig/gstreamer-dataprotocol-0.10.pc lib/pkgconfig/gstreamer-net-0.10.pc @@ -112,6 +116,7 @@ share/locale/zh_TW/LC_MESSAGES/gstreamer-0.10.mo @dirrm include/gstreamer-0.10/gst/net @dirrm include/gstreamer-0.10/gst/dataprotocol @dirrm include/gstreamer-0.10/gst/controller +${GSTCHECK}@dirrm include/gstreamer-0.10/gst/check @dirrm include/gstreamer-0.10/gst/base @dirrm include/gstreamer-0.10/gst @dirrm include/gstreamer-0.10 diff --git a/multimedia/gstreamer0.10/buildlink3.mk b/multimedia/gstreamer0.10/buildlink3.mk index 4582826f2d8..f7898b59e80 100644 --- a/multimedia/gstreamer0.10/buildlink3.mk +++ b/multimedia/gstreamer0.10/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:01 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2007/02/08 21:27:14 drochner Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ GSTREAMER0.10_BUILDLINK3_MK:= ${GSTREAMER0.10_BUILDLINK3_MK}+ @@ -20,6 +20,16 @@ PRINT_PLIST_AWK+= /^@dirrm (include|lib)\/gstreamer-0.10(\/gst)?$$/ \ { print "@comment in gstreamer0.10: " $$0; next; } .endif # GSTREAMER0.10_BUILDLINK3_MK +.if !defined(PKG_BUILD_OPTIONS.gstreamer) +PKG_BUILD_OPTIONS.gstreamer!= \ + cd ${BUILDLINK_PKGSRCDIR.gstreamer0.10} && \ + ${MAKE} show-var ${MAKEFLAGS} VARNAME=PKG_OPTIONS +.endif + +.if !empty(PKG_BUILD_OPTIONS.gstreamer:Mgstcheck) +.include "../../devel/check/buildlink3.mk" +.endif + .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/multimedia/gstreamer0.10/distinfo b/multimedia/gstreamer0.10/distinfo index 8be77dc494a..c36879ef310 100644 --- a/multimedia/gstreamer0.10/distinfo +++ b/multimedia/gstreamer0.10/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.8 2006/12/11 12:38:18 drochner Exp $ +$NetBSD: distinfo,v 1.9 2007/02/08 21:27:14 drochner Exp $ SHA1 (gstreamer-0.10.11.tar.bz2) = 0ad518272788f07cade85f8076c34a1fdae3175f RMD160 (gstreamer-0.10.11.tar.bz2) = d6e50900f8d4e32591ceb725edb460643a29c5c7 Size (gstreamer-0.10.11.tar.bz2) = 1869307 bytes SHA1 (patch-aa) = bc10562292a005ec43d64401964eddf50d9aa1d5 SHA1 (patch-ac) = 824b878164af5b4e824a4340dc97bd85e9454560 +SHA1 (patch-ad) = e3ddd868f95cb12e9e04e0fa967d11ece363947a diff --git a/multimedia/gstreamer0.10/patches/patch-ad b/multimedia/gstreamer0.10/patches/patch-ad new file mode 100644 index 00000000000..4168a309451 --- /dev/null +++ b/multimedia/gstreamer0.10/patches/patch-ad @@ -0,0 +1,15 @@ +$NetBSD: patch-ad,v 1.1 2007/02/08 21:27:14 drochner Exp $ + +--- tests/check/Makefile.in.orig 2007-02-06 20:08:21.000000000 +0100 ++++ tests/check/Makefile.in +@@ -89,8 +89,8 @@ CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = + @GST_DISABLE_LOADSAVE_FALSE@am__EXEEXT_1 = gst/gstxml$(EXEEXT) + @GST_DISABLE_PARSE_FALSE@am__EXEEXT_2 = pipelines/simple-launch-lines$(EXEEXT) \ +-@GST_DISABLE_PARSE_FALSE@ pipelines/cleanup$(EXEEXT) \ +-@GST_DISABLE_PARSE_FALSE@ pipelines/parse-launch$(EXEEXT) ++@GST_DISABLE_PARSE_FALSE@ pipelines/cleanup$(EXEEXT) ++#@GST_DISABLE_PARSE_FALSE@ pipelines/parse-launch$(EXEEXT) + @GST_DISABLE_REGISTRY_FALSE@am__EXEEXT_3 = gst/gst$(EXEEXT) \ + @GST_DISABLE_REGISTRY_FALSE@ gst/gstbin$(EXEEXT) \ + @GST_DISABLE_REGISTRY_FALSE@ gst/gstelement$(EXEEXT) \ |