Update clutter-gst to 2.0.4.

while here, add introspectin option (disabled by default).

clutter-gst 2.0.4 (24/05/2013)
===============================================================================

List of changes since 2.0.2

 o Reenabled HW decoder support

clutter-gst 2.0.2 (26/02/2013)
===============================================================================

List of changes since 2.0.0

 o Remove usage of ClutterStage/ClutterContainer deprecated APIs

 o Depend on Cogl 1.10 for shaders boilerplate

 o Improve video-player player example on enter/leave event handling

clutter-gst 2.0.0 (22/01/2013)
===============================================================================

List of changes since 1.9.92

 o Fix a bug a autocluttersink that would lead to playbin not considering it as
   a sink any more when removing the actual sink from the bin

 o Small build and deprecation fixes

Many Thanks to:

    Nuno Araujo
    Hans-Christian Ebke
    Javier Jardón
    Nirbheek Chauhan

clutter-gst 1.9.92 (26/09/2012)
===============================================================================

List of changes since 1.9.90

 o Updated Gstreamer 1.0 port to work with the released GStreamer 1.0.0

 o Fix uploading of some videos with odd widths

 o Disable HW decoder support until it is stabilized in GStreamer 1.0

 o autocluttersink now exposes the ts-offset property of the underlying sink

Many Thanks to:

   Edward Hervey
   Andre Moreira Magalhaes (andrunko)
   Josep Torra
   Tim-Philipp Müller

clutter-gst 1.9.90 (22/08/2012)
===============================================================================

List of changes since 1.6.0

 o Port to GStreamer 1.0

 o Fix navigation support in the standalone plugin

Many Thanks to:

    Edward Hervey
    Tim-Philipp Müller
    Bastien Nocera
    Nicolas Dufresne
    Sjoerd Simons

clutter-gst 1.6.0 (25/06/2012)
===============================================================================

List of changes since 1.5.6

 o None. This stable release is the same as 1.5.6.

clutter-gst 1.5.6 (25/05/2012)
===============================================================================

List of changes since 1.5.4

 o Fix play/pause of autocluttersink,

 o Add a "in-seek" property to the player to be notified when the pipeline
   is seeking,

 o Various build and smaller fixes.

Many Thanks to:

    Josep Torra
    Tomas Frydrych
    Adrian Bunk
    Lionel Landwerlin
    Michael Wood

clutter-gst 1.5.4 (23/02/2012)
===============================================================================

List of changes since 1.5.2

 o Fix compilation with cogl 1.9.x

clutter-gst 1.5.2 (25/01/2012)
===============================================================================

List of changes since 1.4.2

 o Add a standalone gstreamer plugin. Clutter-gst gstreamer elements are now
   available just like any other GStreamer elements, that includes working with
   gst-launch.

 o Add support for video/x-surface ("hardware" surfaces) that can be converted
   to opengl textures. (Requires -bad 0.10.22.1)

 o Addition of a new element, autocluttersink, a bin that picks up clutter-
   compatible sinks automatically. This allows an eco-system of 3rd party
   decoders and (clutter) sinks to be autoplugged.

 o Various small fixes

Many Thanks to:

    Nicolas Dufresne
    Josep Torra
    Lionel Landwerlin
    Neil Roberts
    Colin Walters
    Laurent Bigonville
    Thomas Wood

clutter-gst 1.4.2 (03/10/2011)
===============================================================================

List of changes since 1.4.0

 o Fix an embarassing bug that was leading to crashes when uploading RGB
   textures (https://bugzilla.gnome.org/show_bug.cgi?id=660732)

 o Don't try to free NULL GstTagLists

Many thanks to:

    György Balló

clutter-gst 1.4.0 (30/09/2011)
===============================================================================

List of changes since 1.3.14

 o Refinement of the subtitles and audio tracks API. clutter-gst now gives
   the full GstTagList to the application

 o Made the internal test player a bit more usable

 o A number of fixes around automatic loading of external subtitles files

Many thanks to:

   Lionel Landwerlin
   Thomas Wood

clutter-gst 1.3.14 (31/08/2011)
===============================================================================

List of changes since 1.3.12

  o Big split between the logic around playbin2 and the clutter-specific part
    to be able to reuse the GStreamer logic to implement new ClutterMedia
    objects.

  o Add new API to get the list of audio and subtitles tracks

  o Fix the leak of GstBus in VideoTexture

  o Fix the key navigation events in the sink

Many thanks to:

    Lionel Landwerlin
    Bastian Winkler
    Dinh Bowman
    Thomas Wood

clutter-gst 1.3.12 (06/06/2011)
===============================================================================

List of changes since 1.3.10:

  o Fix set_uri() with recent versions of GStreamer,

  o Some warning fixes with newer versions of Clutter

Many thanks to:

    Øyvind Kolås
    Bastien Nocera

clutter-gst 1.3.10 (09/05/2011)
===============================================================================

List of changes since 1.3.8:

  o Fix the GstNavigation interface of the sink

Many thanks to:

    Bastien Nocera

clutter-gst 1.3.8 (05/04/2011)
===============================================================================

List of changes since 1.3.6:

  o Implementation of the GstNavigation interface in the sink,

  o Initial support of download buffering (opt in),

  o Series of cleanups in VideoTexture (subtitles reset when changing URI,
    state management, seek behaviour, ...)

  o The audio volume suffered from an hilariously bad bug that multiplied
    the volume set by 10. Took the opportunity to use GStreamer's
    StreamVolume to expose a cubic volume,

  o Compilation fixes for Windows.

Many thanks to:

    Lionel Landwerlin
    Bastien Nocera

clutter-gst 1.3.6 (02/03/2011)
===============================================================================

  * list of changes since 1.3.4

    o Make looping possible with set_playing(TRUE) in the the EOS callback

    o set_uri(NULL) is now handled and defined to stop the pipeline and set
      the video texture in "idle mode" (painted with the idle material)

clutter-gst 1.3.4 (10/01/2011)
===============================================================================

  * list of changes since 1.3.2

    o An API addition: set_seek_flags() on the VideoTexture for a finer control
      on how you can seek (fast or accurate),

    o Fix the notification of "progress" so it does not advertise 0 when
      seeking,

    o Fix the AYUV to RGBA shader.

Many thanks to:

  Chris Lord
  Evan Nemerson
  JuanZhao
  Samuel Degrande

clutter-gst 1.3.2 (20/09/2010)
===============================================================================

  * list of changes since 1.2.0

    o Respects the pixel-aspect-ratio property of the video frames and have
      VideoTexture advertise the right preferred size.

    o Reworked how ARB fp programs are set on the materials using a clutter 1.4
      feature to set a program on a material, fixing the way materials were
      used along the way.

    o Removed all raw GL code and only use Cogl.

Many thanks to:

  Robert Bragg

5 files changed, 54 insertions, 26 deletions

diff --git a/multimedia/clutter-gst/Makefile b/multimedia/clutter-gst/Makefile
index 87ff99ac3d9..74146d78925 100644
--- a/multimedia/clutter-gst/Makefile
+++ b/multimedia/clutter-gst/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2013/06/06 12:53:50 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2013/07/15 02:06:54 obache Exp $
 #
 
-DISTNAME=	clutter-gst-1.2.0
-PKGREVISION=	15
+DISTNAME=	clutter-gst-2.0.4
 CATEGORIES=	multimedia
-MASTER_SITES=	http://source.clutter-project.org/sources/clutter-gst/1.2/
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/clutter-gst/2.0/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.clutter-project.org/
@@ -13,13 +13,15 @@ LICENSE=	gnu-lgpl-v2.1
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	gmake pkg-config
 
 PKGCONFIG_OVERRIDE+=	clutter-gst.pc.in
 
-BUILDLINK_TRANSFORM+=	rm:-DG_DISABLE_DEPRECATED
+.include "options.mk"
 
+BUILDLINK_API_DEPENDS.clutter+=	clutter>=1.6.0
 .include "../../graphics/clutter/buildlink3.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.include "../../graphics/cogl/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/clutter-gst/PLIST b/multimedia/clutter-gst/PLIST
index ddb78a16979..b18418ae112 100644
--- a/multimedia/clutter-gst/PLIST
+++ b/multimedia/clutter-gst/PLIST
@@ -1,18 +1,24 @@
-@comment $NetBSD: PLIST,v 1.4 2010/03/11 04:07:58 obache Exp $
-include/clutter-1.0/clutter-gst/clutter-gst-util.h
-include/clutter-1.0/clutter-gst/clutter-gst-version.h
-include/clutter-1.0/clutter-gst/clutter-gst-video-sink.h
-include/clutter-1.0/clutter-gst/clutter-gst-video-texture.h
-include/clutter-1.0/clutter-gst/clutter-gst.h
-lib/libclutter-gst-1.0.la
-lib/pkgconfig/clutter-gst-1.0.pc
+@comment $NetBSD: PLIST,v 1.5 2013/07/15 02:06:54 obache Exp $
+include/clutter-gst-2.0/clutter-gst/clutter-gst-enum-types.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst-player.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst-types.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst-util.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst-version.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst-video-sink.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst-video-texture.h
+include/clutter-gst-2.0/clutter-gst/clutter-gst.h
+${PLIST.introspection}lib/girepository-1.0/ClutterGst-2.0.typelib
+lib/gstreamer-1.0/libgstclutter.la
+lib/libclutter-gst-2.0.la
+lib/pkgconfig/clutter-gst-2.0.pc
+${PLIST.introspection}share/gir-1.0/ClutterGst-2.0.gir
+share/gtk-doc/html/clutter-gst/ClutterGstPlayer.html
 share/gtk-doc/html/clutter-gst/ClutterGstVideoSink.html
 share/gtk-doc/html/clutter-gst/ClutterGstVideoTexture.html
 share/gtk-doc/html/clutter-gst/ch01.html
 share/gtk-doc/html/clutter-gst/ch02.html
 share/gtk-doc/html/clutter-gst/clutter-gst-Utilities.html
 share/gtk-doc/html/clutter-gst/clutter-gst-Versioning-Macros.html
-share/gtk-doc/html/clutter-gst/clutter-gst.devhelp
 share/gtk-doc/html/clutter-gst/clutter-gst.devhelp2
 share/gtk-doc/html/clutter-gst/home.png
 share/gtk-doc/html/clutter-gst/index.html
diff --git a/multimedia/clutter-gst/buildlink3.mk b/multimedia/clutter-gst/buildlink3.mk
index 86208a83255..c646b992765 100644
--- a/multimedia/clutter-gst/buildlink3.mk
+++ b/multimedia/clutter-gst/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.23 2013/06/06 12:53:50 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.24 2013/07/15 02:06:54 obache Exp $
 #
 
 BUILDLINK_TREE+=	clutter-gst
@@ -6,13 +6,12 @@ BUILDLINK_TREE+=	clutter-gst
 .if !defined(CLUTTER_GST_BUILDLINK3_MK)
 CLUTTER_GST_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.clutter-gst+=	clutter-gst>=1.0.0
-BUILDLINK_ABI_DEPENDS.clutter-gst+=	clutter-gst>=1.2.0nb15
+BUILDLINK_API_DEPENDS.clutter-gst+=	clutter-gst>=2.0.0
 BUILDLINK_PKGSRCDIR.clutter-gst?=	../../multimedia/clutter-gst
 
 .include "../../graphics/clutter/buildlink3.mk"
-.include "../../multimedia/gstreamer0.10/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
+.include "../../multimedia/gstreamer1/buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .endif # CLUTTER_GST_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-clutter-gst
diff --git a/multimedia/clutter-gst/distinfo b/multimedia/clutter-gst/distinfo
index 20ccd695c0b..02bcf059568 100644
--- a/multimedia/clutter-gst/distinfo
+++ b/multimedia/clutter-gst/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2010/09/16 11:23:18 obache Exp $
+$NetBSD: distinfo,v 1.5 2013/07/15 02:06:54 obache Exp $
 
-SHA1 (clutter-gst-1.2.0.tar.gz) = eed8f4a980e4146c470b6ad2f3a9e29bb5e191c3
-RMD160 (clutter-gst-1.2.0.tar.gz) = ed304e729a9e8b89b4fde987f08df199cce7d758
-Size (clutter-gst-1.2.0.tar.gz) = 513743 bytes
+SHA1 (clutter-gst-2.0.4.tar.xz) = 623923ac8bfee20f0ce60b2d3671673ad342afaa
+RMD160 (clutter-gst-2.0.4.tar.xz) = 71a3de98e1204247fc8ca71d2872c25db196c722
+Size (clutter-gst-2.0.4.tar.xz) = 351632 bytes
diff --git a/multimedia/clutter-gst/options.mk b/multimedia/clutter-gst/options.mk
new file mode 100644
index 00000000000..9795de0c5f5
--- /dev/null
+++ b/multimedia/clutter-gst/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2013/07/15 02:06:54 obache Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.clutter-gst
+PKG_SUPPORTED_OPTIONS=	introspection
+PKG_SUGGESTED_OPTIONS=	introspection
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=	introspection
+
+.if !empty(PKG_OPTIONS:Mintrospection)
+USE_TOOLS+=		gmake
+PLIST.introspection=	yes
+BUILDLINK_API_DEPENDS.gobject-introspection+=	gobject-introspection>=0.6.8
+BUILDLINK_DEPMETHOD.gobject-introspection+=	build
+.include "../../devel/gobject-introspection/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-introspection=yes
+.else
+CONFIGURE_ARGS+=	--enable-introspection=no
+.endif