Date: Thursday, May 19, 2016 @ 21:06:06 Author: heftig Revision: 268319
3.20.0-1 Modified: sushi/trunk/PKGBUILD Deleted: sushi/trunk/clutter-gst3.patch sushi/trunk/sushi.install --------------------+ PKGBUILD | 37 +++++------- clutter-gst3.patch | 156 --------------------------------------------------- sushi.install | 11 --- 3 files changed, 18 insertions(+), 186 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-05-19 18:50:46 UTC (rev 268318) +++ PKGBUILD 2016-05-19 19:06:06 UTC (rev 268319) @@ -1,39 +1,38 @@ # $Id$ -# Maintainer: Ionut Biru <[email protected]> +# Maintainer: Jan Alexander Steffens (heftig) <[email protected]> +# Contributor: Ionut Biru <[email protected]> pkgname=sushi -pkgver=3.18.0 -pkgrel=2 +pkgver=3.20.0 +pkgrel=1 pkgdesc="A quick previewer for Nautilus" arch=(i686 x86_64) -url="http://www.gnome.org"; -license=('GPL2') +url="https://git.gnome.org/browse/sushi"; +license=(GPL2) groups=(gnome) -depends=('clutter-gtk' 'clutter-gst' 'gjs' 'libmusicbrainz5' 'webkit2gtk' 'gtksourceview3' 'evince') +depends=(clutter-gtk clutter-gst gjs libmusicbrainz5 webkit2gtk gtksourceview3 evince) optdepends=('unoconv: OpenDocument formats') -install=sushi.install -makedepends=('intltool' 'gobject-introspection') -source=(http://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz - clutter-gst3.patch) -sha256sums=('7f4df92be950bf23aff28da49ce108766dd21a88efc14a9d0807e10225608e9c' - '7217c05f4cf4d797e8e042392c1cb92481bb616a1e7ce20393228591a6bc91e0') +makedepends=(intltool gobject-introspection) +source=(https://download.gnome.org/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz) +sha256sums=('6e729c789e9e7f02505e25d4ac6cfed47e676366f0942fca740094f7fe9eae9e') prepare() { - cd "$pkgname-$pkgver" - patch -Np1 -i ../clutter-gst3.patch + cd $pkgname-$pkgver } build() { - cd "$pkgname-$pkgver" - autoreconf -fi - ./configure --prefix=/usr --libexecdir=/usr/lib/sushi + cd $pkgname-$pkgver + + ./configure --prefix=/usr --libexecdir=/usr/lib/$pkgname + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + make } package() { - cd "$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: Deleted: clutter-gst3.patch =================================================================== --- clutter-gst3.patch 2016-05-19 18:50:46 UTC (rev 268318) +++ clutter-gst3.patch 2016-05-19 19:06:06 UTC (rev 268319) @@ -1,156 +0,0 @@ -From ce695719d7292bfe9d8183cfa057afe1df53565b Mon Sep 17 00:00:00 2001 -From: Lionel Landwerlin <[email protected]> -Date: Sat, 17 Oct 2015 00:24:42 +0100 -Subject: viewer: gst: port to ClutterGst 3.0 - -https://bugzilla.gnome.org/show_bug.cgi?id=756725 ---- - configure.ac | 2 +- - src/js/viewers/gst.js | 56 +++++++++++++++++++++++++++------------------------ - 2 files changed, 31 insertions(+), 27 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3b5ff56..7e869d5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -62,7 +62,7 @@ PKG_CHECK_MODULES(SUSHI, - clutter-x11-1.0 >= $CLUTTER_MIN_VERSION - gtk+-3.0 >= $GTK_MIN_VERSION - clutter-gtk-1.0 >= $CLUTTER_GTK_MIN_VERSION -- clutter-gst-2.0 -+ clutter-gst-3.0 - gstreamer-1.0 - gstreamer-pbutils-1.0 - gstreamer-tag-1.0 -diff --git a/src/js/viewers/gst.js b/src/js/viewers/gst.js -index 3560277..6a010f6 100644 ---- a/src/js/viewers/gst.js -+++ b/src/js/viewers/gst.js -@@ -23,7 +23,7 @@ - * - */ - --imports.gi.versions.ClutterGst = '2.0'; -+imports.gi.versions.ClutterGst = '3.0'; - const ClutterGst = imports.gi.ClutterGst; - const Clutter = imports.gi.Clutter; - const Gdk = imports.gi.Gdk; -@@ -60,29 +60,33 @@ const GstRenderer = new Lang.Class({ - }, - - clear : function() { -- this._video.playing = false; -+ this._player.playing = false; - }, - - _createVideo : function(file) { -- this._video = -- new ClutterGst.VideoTexture({ sync_size: false }); -+ this._player = new ClutterGst.Playback(); -+ this._video = new Clutter.Actor({ -+ content: new ClutterGst.Aspectratio({ -+ player: this._player -+ }) -+ }); - -- this._video.set_uri(file.get_uri()); -- this._video.playing = true; -+ this._player.set_uri(file.get_uri()); -+ this._player.playing = true; - - this._videoSizeChangeId = -- this._video.connect('size-change', -- Lang.bind(this, -- this._onVideoSizeChange)); -- this._video.connect('notify::playing', -- Lang.bind(this, -- this._onVideoPlayingChange)); -- this._video.connect('notify::progress', -- Lang.bind(this, -- this._onVideoProgressChange)); -- this._video.connect('notify::duration', -- Lang.bind(this, -- this._onVideoDurationChange)); -+ this._player.connect('size-change', -+ Lang.bind(this, -+ this._onVideoSizeChange)); -+ this._player.connect('notify::playing', -+ Lang.bind(this, -+ this._onVideoPlayingChange)); -+ this._player.connect('notify::progress', -+ Lang.bind(this, -+ this._onVideoProgressChange)); -+ this._player.connect('notify::duration', -+ Lang.bind(this, -+ this._onVideoDurationChange)); - }, - - _updateProgressBar : function() { -@@ -90,7 +94,7 @@ const GstRenderer = new Lang.Class({ - return; - - this._isSettingValue = true; -- this._progressBar.set_value(this._video.progress * 1000); -+ this._progressBar.set_value(this._player.progress * 1000); - this._isSettingValue = false; - }, - -@@ -99,7 +103,7 @@ const GstRenderer = new Lang.Class({ - return; - - let currentTime = -- Math.floor(this._video.duration * this._video.progress); -+ Math.floor(this._player.duration * this._player.progress); - - this._currentLabel.set_text(Utils.formatTimeString(currentTime)); - }, -@@ -108,7 +112,7 @@ const GstRenderer = new Lang.Class({ - if (!this._mainToolbar) - return; - -- let totalTime = this._video.duration; -+ let totalTime = this._player.duration; - - this._durationLabel.set_text(Utils.formatTimeString(totalTime)); - }, -@@ -123,7 +127,7 @@ const GstRenderer = new Lang.Class({ - }, - - _onVideoPlayingChange : function() { -- if (this._video.playing) -+ if (this._player.playing) - this._toolbarPlay.set_icon_name('media-playback-pause-symbolic'); - else - { -@@ -166,8 +170,8 @@ const GstRenderer = new Lang.Class({ - - this._toolbarPlay.connect('clicked', - Lang.bind(this, function () { -- let playing = !this._video.playing; -- this._video.playing = playing; -+ let playing = !this._player.playing; -+ this._player.playing = playing; - })); - - this._progressBar = -@@ -178,7 +182,7 @@ const GstRenderer = new Lang.Class({ - this._progressBar.connect('value-changed', - Lang.bind(this, function() { - if(!this._isSettingValue) -- this._video.progress = this._progressBar.get_value() / 1000; -+ this._player.progress = this._progressBar.get_value() / 1000; - })); - - item = new Gtk.ToolItem(); -@@ -200,7 +204,7 @@ const GstRenderer = new Lang.Class({ - return this._toolbarActor; - }, - -- _onVideoSizeChange : function(video, width, height) { -+ _onVideoSizeChange : function(player, width, height) { - this._videoWidth = width; - this._videoHeight = height; - --- -cgit v0.11.2 - Deleted: sushi.install =================================================================== --- sushi.install 2016-05-19 18:50:46 UTC (rev 268318) +++ sushi.install 2016-05-19 19:06:06 UTC (rev 268319) @@ -1,11 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -}
