[arch-commits] Commit in clutter-gst/repos (6 files)

Jan Steffens heftig at archlinux.org
Thu Jul 16 20:01:22 UTC 2015


    Date: Thursday, July 16, 2015 @ 22:01:21
  Author: heftig
Revision: 242293

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  clutter-gst/repos/extra-i686/PKGBUILD
    (from rev 242292, clutter-gst/trunk/PKGBUILD)
  clutter-gst/repos/extra-i686/stream-crash.patch
    (from rev 242292, clutter-gst/trunk/stream-crash.patch)
  clutter-gst/repos/extra-x86_64/PKGBUILD
    (from rev 242292, clutter-gst/trunk/PKGBUILD)
  clutter-gst/repos/extra-x86_64/stream-crash.patch
    (from rev 242292, clutter-gst/trunk/stream-crash.patch)
Deleted:
  clutter-gst/repos/extra-i686/PKGBUILD
  clutter-gst/repos/extra-x86_64/PKGBUILD

---------------------------------+
 /PKGBUILD                       |   96 ++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD             |   41 ----------------
 extra-i686/stream-crash.patch   |   61 ++++++++++++++++++++++++
 extra-x86_64/PKGBUILD           |   41 ----------------
 extra-x86_64/stream-crash.patch |   61 ++++++++++++++++++++++++
 5 files changed, 218 insertions(+), 82 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-07-16 20:00:40 UTC (rev 242292)
+++ extra-i686/PKGBUILD	2015-07-16 20:01:21 UTC (rev 242293)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-
-pkgname=clutter-gst
-pkgver=3.0.6
-pkgrel=3
-pkgdesc="GStreamer bindings for clutter"
-arch=(i686 x86_64)
-url="http://www.clutter-project.org/"
-license=(LGPL)
-depends=(clutter gst-plugins-base-libs libxdamage libgudev)
-makedepends=(gobject-introspection)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d6d5493ae57cc175deee479304569c419d2bb90de3be124e6f3350ae7e73df76')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=746883
-  rm -rf "${pkgdir}"/usr/lib/gstreamer-1.0
-}
-
-# vim:set ts=2 sw=2 et:

Copied: clutter-gst/repos/extra-i686/PKGBUILD (from rev 242292, clutter-gst/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-07-16 20:01:21 UTC (rev 242293)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=clutter-gst
+pkgver=3.0.6
+pkgrel=4
+pkgdesc="GStreamer bindings for clutter"
+arch=(i686 x86_64)
+url="http://www.clutter-project.org/"
+license=(LGPL)
+depends=(clutter gst-plugins-base-libs libxdamage libgudev)
+makedepends=(gobject-introspection)
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz
+        stream-crash.patch)
+sha256sums=('d6d5493ae57cc175deee479304569c419d2bb90de3be124e6f3350ae7e73df76'
+            '891315e34c1f8dbe7e89d78f59707b567b14953e2e5151ffcbe021ab5a0fe9c2')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../stream-crash.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=746883
+  rm -rf "${pkgdir}"/usr/lib/gstreamer-1.0
+}
+
+# vim:set ts=2 sw=2 et:

Copied: clutter-gst/repos/extra-i686/stream-crash.patch (from rev 242292, clutter-gst/trunk/stream-crash.patch)
===================================================================
--- extra-i686/stream-crash.patch	                        (rev 0)
+++ extra-i686/stream-crash.patch	2015-07-16 20:01:21 UTC (rev 242293)
@@ -0,0 +1,61 @@
+From 1a60f2d443a6ce9345441220c9b847431dfefdec Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
+Date: Thu, 9 Jul 2015 16:27:10 +0100
+Subject: video-sink: force upload of video frames when creating textures
+
+https://bugzilla.gnome.org/show_bug.cgi?id=752098
+
+diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
+index 6136027..4f52762 100644
+--- a/clutter-gst/clutter-gst-video-sink.c
++++ b/clutter-gst/clutter-gst-video-sink.c
+@@ -1052,40 +1052,15 @@ video_texture_new_from_data (CoglContext *ctx,
+                              int rowstride,
+                              const uint8_t *data)
+ {
+-  CoglBitmap *bitmap;
+   CoglTexture *tex;
+   CoglError *internal_error = NULL;
+ 
+-  bitmap = cogl_bitmap_new_for_data (ctx,
+-                                     width, height,
+-                                     format,
+-                                     rowstride,
+-                                     (uint8_t *) data);
+-
+-  if ((is_pot (cogl_bitmap_get_width (bitmap)) &&
+-       is_pot (cogl_bitmap_get_height (bitmap))) ||
+-      cogl_has_feature (ctx, COGL_FEATURE_ID_TEXTURE_NPOT_BASIC))
+-    {
+-      tex = cogl_texture_2d_new_from_bitmap (bitmap);
+-      if (!tex)
+-        {
+-          cogl_error_free (internal_error);
+-          internal_error = NULL;
+-        }
+-    }
+-  else
+-    tex = NULL;
+-
+-  if (!tex)
+-    {
+-      /* Otherwise create a sliced texture */
+-      tex = cogl_texture_2d_sliced_new_from_bitmap (bitmap,
+-                                                    -1); /* no maximum waste */
+-    }
+-
+-  cogl_object_unref (bitmap);
+-
+-  cogl_texture_set_premultiplied (tex, FALSE);
++  tex = cogl_texture_2d_new_from_data (ctx, width, height, format,
++                                       rowstride, data, &internal_error);
++  if (tex == NULL) {
++    GST_WARNING ("Cannot allocate Cogl texture : %s", internal_error->message);
++    return NULL;
++  }
+ 
+   return tex;
+ }
+-- 
+cgit v0.10.2
+

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-07-16 20:00:40 UTC (rev 242292)
+++ extra-x86_64/PKGBUILD	2015-07-16 20:01:21 UTC (rev 242293)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Jan "heftig" Steffens <jan.steffens at gmail.com>
-
-pkgname=clutter-gst
-pkgver=3.0.6
-pkgrel=3
-pkgdesc="GStreamer bindings for clutter"
-arch=(i686 x86_64)
-url="http://www.clutter-project.org/"
-license=(LGPL)
-depends=(clutter gst-plugins-base-libs libxdamage libgudev)
-makedepends=(gobject-introspection)
-source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d6d5493ae57cc175deee479304569c419d2bb90de3be124e6f3350ae7e73df76')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=746883
-  rm -rf "${pkgdir}"/usr/lib/gstreamer-1.0
-}
-
-# vim:set ts=2 sw=2 et:

Copied: clutter-gst/repos/extra-x86_64/PKGBUILD (from rev 242292, clutter-gst/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-07-16 20:01:21 UTC (rev 242293)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgname=clutter-gst
+pkgver=3.0.6
+pkgrel=4
+pkgdesc="GStreamer bindings for clutter"
+arch=(i686 x86_64)
+url="http://www.clutter-project.org/"
+license=(LGPL)
+depends=(clutter gst-plugins-base-libs libxdamage libgudev)
+makedepends=(gobject-introspection)
+source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz
+        stream-crash.patch)
+sha256sums=('d6d5493ae57cc175deee479304569c419d2bb90de3be124e6f3350ae7e73df76'
+            '891315e34c1f8dbe7e89d78f59707b567b14953e2e5151ffcbe021ab5a0fe9c2')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../stream-crash.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --sysconfdir=/etc
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # https://bugzilla.gnome.org/show_bug.cgi?id=746883
+  rm -rf "${pkgdir}"/usr/lib/gstreamer-1.0
+}
+
+# vim:set ts=2 sw=2 et:

Copied: clutter-gst/repos/extra-x86_64/stream-crash.patch (from rev 242292, clutter-gst/trunk/stream-crash.patch)
===================================================================
--- extra-x86_64/stream-crash.patch	                        (rev 0)
+++ extra-x86_64/stream-crash.patch	2015-07-16 20:01:21 UTC (rev 242293)
@@ -0,0 +1,61 @@
+From 1a60f2d443a6ce9345441220c9b847431dfefdec Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
+Date: Thu, 9 Jul 2015 16:27:10 +0100
+Subject: video-sink: force upload of video frames when creating textures
+
+https://bugzilla.gnome.org/show_bug.cgi?id=752098
+
+diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c
+index 6136027..4f52762 100644
+--- a/clutter-gst/clutter-gst-video-sink.c
++++ b/clutter-gst/clutter-gst-video-sink.c
+@@ -1052,40 +1052,15 @@ video_texture_new_from_data (CoglContext *ctx,
+                              int rowstride,
+                              const uint8_t *data)
+ {
+-  CoglBitmap *bitmap;
+   CoglTexture *tex;
+   CoglError *internal_error = NULL;
+ 
+-  bitmap = cogl_bitmap_new_for_data (ctx,
+-                                     width, height,
+-                                     format,
+-                                     rowstride,
+-                                     (uint8_t *) data);
+-
+-  if ((is_pot (cogl_bitmap_get_width (bitmap)) &&
+-       is_pot (cogl_bitmap_get_height (bitmap))) ||
+-      cogl_has_feature (ctx, COGL_FEATURE_ID_TEXTURE_NPOT_BASIC))
+-    {
+-      tex = cogl_texture_2d_new_from_bitmap (bitmap);
+-      if (!tex)
+-        {
+-          cogl_error_free (internal_error);
+-          internal_error = NULL;
+-        }
+-    }
+-  else
+-    tex = NULL;
+-
+-  if (!tex)
+-    {
+-      /* Otherwise create a sliced texture */
+-      tex = cogl_texture_2d_sliced_new_from_bitmap (bitmap,
+-                                                    -1); /* no maximum waste */
+-    }
+-
+-  cogl_object_unref (bitmap);
+-
+-  cogl_texture_set_premultiplied (tex, FALSE);
++  tex = cogl_texture_2d_new_from_data (ctx, width, height, format,
++                                       rowstride, data, &internal_error);
++  if (tex == NULL) {
++    GST_WARNING ("Cannot allocate Cogl texture : %s", internal_error->message);
++    return NULL;
++  }
+ 
+   return tex;
+ }
+-- 
+cgit v0.10.2
+



More information about the arch-commits mailing list