diff --git a/graphics/clutter/clutter-gst/Makefile b/graphics/clutter/clutter-gst/Makefile index 8bf4b3b7589..82c98991c5b 100644 --- a/graphics/clutter/clutter-gst/Makefile +++ b/graphics/clutter/clutter-gst/Makefile @@ -1,26 +1,27 @@ -# $OpenBSD: Makefile,v 1.14 2012/09/06 12:38:35 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2012/09/27 11:49:04 jasper Exp $ COMMENT= clutter GStreamer integration library GNOME_PROJECT= clutter-gst -GNOME_VERSION= 1.6.0 -REVISION= 2 +GNOME_VERSION= 1.9.92 -SHARED_LIBS += clutter-gst-1.0 0.0 # 406.0 +API_VERSION= 2.0 + +SHARED_LIBS += clutter-gst-2.0 0.0 # 999.0 WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 cairo cairo-gobject WANTLIB += clutter-1.0 cogl cogl-pango drm expat ffi fontconfig WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 -WANTLIB += gobject-2.0 gstaudio-0.10 gstbase-0.10 gstinterfaces-0.10 -WANTLIB += gstpbutils-0.10 gstreamer-0.10 gsttag-0.10 gstvideo-0.10 -WANTLIB += gthread-2.0 json-glib-1.0 m orc-0.4 pango-1.0 pangocairo-1.0 +WANTLIB += gobject-2.0 gstaudio-1.0 gstbase-1.0 gstreamer-1.0 +WANTLIB += gsttag-1.0 gstvideo-1.0 gthread-2.0 harfbuzz icudata +WANTLIB += icule icuuc json-glib-1.0 m orc-0.4 pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs -WANTLIB += stdc++ xcb xcb-render xcb-shm xml2 z +WANTLIB += stdc++ xcb xcb-render xcb-shm z MODGNOME_TOOLS= goi LIB_DEPENDS= graphics/clutter/core>=${MAJOR} \ - multimedia/gstreamer-0.10/plugins-base + multimedia/gstreamer1/plugins-base>=1.0.0 .include diff --git a/graphics/clutter/clutter-gst/distinfo b/graphics/clutter/clutter-gst/distinfo index 614aa4bda58..e869db6969c 100644 --- a/graphics/clutter/clutter-gst/distinfo +++ b/graphics/clutter/clutter-gst/distinfo @@ -1,5 +1,2 @@ -MD5 (clutter/clutter-gst-1.6.0.tar.xz) = 1gqwEYcwzs1d2ZiK19oDSw== -RMD160 (clutter/clutter-gst-1.6.0.tar.xz) = GzSvRBNuxBOvLFUyax/4coUW6Sk= -SHA1 (clutter/clutter-gst-1.6.0.tar.xz) = v8NEMPYRygQx67JI/2PjmMxI1dI= -SHA256 (clutter/clutter-gst-1.6.0.tar.xz) = q8h5zdVi8WQKglExQF9DJ6Qnv+ZbgF68JdDHiQnIxiI= -SIZE (clutter/clutter-gst-1.6.0.tar.xz) = 349332 +SHA256 (clutter/clutter-gst-1.9.92.tar.xz) = XAnc4hj3EaRL1NdB4t0Q/8R+f817DPUUyg6SuCXHbEU= +SIZE (clutter/clutter-gst-1.9.92.tar.xz) = 349488 diff --git a/graphics/clutter/clutter-gst/patches/patch-configure b/graphics/clutter/clutter-gst/patches/patch-configure deleted file mode 100644 index d9b51d47078..00000000000 --- a/graphics/clutter/clutter-gst/patches/patch-configure +++ /dev/null @@ -1,89 +0,0 @@ -$OpenBSD: patch-configure,v 1.1 2012/09/06 11:47:24 ajacoutot Exp $ - -XXX add configure option and push upstream -Unset HAVE_HW_DECODER_SUPPORT; it depends on gstreamer-plugins-bad and -libva and needs a supported driver backend: -http://www.freedesktop.org/wiki/Software/vaapi - ---- configure.orig Wed Sep 5 16:35:25 2012 -+++ configure Wed Sep 5 16:47:00 2012 -@@ -13630,79 +13630,6 @@ fi - - - --pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HW" >&5 --$as_echo_n "checking for HW... " >&6; } -- --if test -n "$HW_CFLAGS"; then -- pkg_cv_HW_CFLAGS="$HW_CFLAGS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-basevideo-\$GST_MAJORMINOR >= \$GST_PLUGINS_BAD_REQ_VERSION\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gstreamer-basevideo-$GST_MAJORMINOR >= $GST_PLUGINS_BAD_REQ_VERSION") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_HW_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-basevideo-$GST_MAJORMINOR >= $GST_PLUGINS_BAD_REQ_VERSION" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi --if test -n "$HW_LIBS"; then -- pkg_cv_HW_LIBS="$HW_LIBS" -- elif test -n "$PKG_CONFIG"; then -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-basevideo-\$GST_MAJORMINOR >= \$GST_PLUGINS_BAD_REQ_VERSION\""; } >&5 -- ($PKG_CONFIG --exists --print-errors "gstreamer-basevideo-$GST_MAJORMINOR >= $GST_PLUGINS_BAD_REQ_VERSION") 2>&5 -- ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then -- pkg_cv_HW_LIBS=`$PKG_CONFIG --libs "gstreamer-basevideo-$GST_MAJORMINOR >= $GST_PLUGINS_BAD_REQ_VERSION" 2>/dev/null` --else -- pkg_failed=yes --fi -- else -- pkg_failed=untried --fi -- -- -- --if test $pkg_failed = yes; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- --if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -- _pkg_short_errors_supported=yes --else -- _pkg_short_errors_supported=no --fi -- if test $_pkg_short_errors_supported = yes; then -- HW_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-basevideo-$GST_MAJORMINOR >= $GST_PLUGINS_BAD_REQ_VERSION" 2>&1` -- else -- HW_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-basevideo-$GST_MAJORMINOR >= $GST_PLUGINS_BAD_REQ_VERSION" 2>&1` -- fi -- # Put the nasty error message in config.log where it belongs -- echo "$HW_PKG_ERRORS" >&5 -- -- have_hw_decoder_support=no --elif test $pkg_failed = untried; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } -- have_hw_decoder_support=no --else -- HW_CFLAGS=$pkg_cv_HW_CFLAGS -- HW_LIBS=$pkg_cv_HW_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } -- -- have_hw_decoder_support=yes -- --$as_echo "#define HAVE_HW_DECODER_SUPPORT 1" >>confdefs.h -- -- --fi - - - diff --git a/graphics/clutter/clutter-gst/pkg/PLIST b/graphics/clutter/clutter-gst/pkg/PLIST index bd70c042808..fe20661b3f8 100644 --- a/graphics/clutter/clutter-gst/pkg/PLIST +++ b/graphics/clutter/clutter-gst/pkg/PLIST @@ -1,20 +1,21 @@ -@comment $OpenBSD: PLIST,v 1.5 2012/07/07 22:49:15 ajacoutot Exp $ -include/clutter-${API_VERSION}/clutter-gst/ -include/clutter-${API_VERSION}/clutter-gst/clutter-gst-enum-types.h -include/clutter-${API_VERSION}/clutter-gst/clutter-gst-player.h -include/clutter-${API_VERSION}/clutter-gst/clutter-gst-types.h -include/clutter-${API_VERSION}/clutter-gst/clutter-gst-util.h -include/clutter-${API_VERSION}/clutter-gst/clutter-gst-version.h -include/clutter-${API_VERSION}/clutter-gst/clutter-gst-video-sink.h -include/clutter-${API_VERSION}/clutter-gst/clutter-gst-video-texture.h -include/clutter-${API_VERSION}/clutter-gst/clutter-gst.h -lib/girepository-${API_VERSION}/ClutterGst-${API_VERSION}.typelib -@comment lib/gstreamer-0.10/libgstclutter.la -lib/gstreamer-0.10/libgstclutter.so -lib/libclutter-gst-${API_VERSION}.la -@lib lib/libclutter-gst-${API_VERSION}.so.${LIBclutter-gst-1.0_VERSION} +@comment $OpenBSD: PLIST,v 1.6 2012/09/27 11:49:04 jasper Exp $ +include/clutter-gst-${API_VERSION}/ +include/clutter-gst-${API_VERSION}/clutter-gst/ +include/clutter-gst-${API_VERSION}/clutter-gst/clutter-gst-enum-types.h +include/clutter-gst-${API_VERSION}/clutter-gst/clutter-gst-player.h +include/clutter-gst-${API_VERSION}/clutter-gst/clutter-gst-types.h +include/clutter-gst-${API_VERSION}/clutter-gst/clutter-gst-util.h +include/clutter-gst-${API_VERSION}/clutter-gst/clutter-gst-version.h +include/clutter-gst-${API_VERSION}/clutter-gst/clutter-gst-video-sink.h +include/clutter-gst-${API_VERSION}/clutter-gst/clutter-gst-video-texture.h +include/clutter-gst-${API_VERSION}/clutter-gst/clutter-gst.h +lib/girepository-1.0/ClutterGst-${API_VERSION}.typelib +lib/gstreamer-1.0/libgstclutter.la +lib/gstreamer-1.0/libgstclutter.so +@comment lib/libclutter-gst-${API_VERSION}.la +@lib lib/libclutter-gst-${API_VERSION}.so.${LIBclutter-gst-2.0_VERSION} lib/pkgconfig/clutter-gst-${API_VERSION}.pc -share/gir-${API_VERSION}/ClutterGst-${API_VERSION}.gir +share/gir-1.0/ClutterGst-${API_VERSION}.gir share/gtk-doc/html/clutter-gst/ share/gtk-doc/html/clutter-gst/ClutterGstPlayer.html share/gtk-doc/html/clutter-gst/ClutterGstVideoSink.html