[arch-commits] Commit in nemo-extensions/trunk (PKGBUILD clutter-gst3.patch)
Jan de Groot
jgc at archlinux.org
Wed Nov 4 09:26:30 UTC 2015
Date: Wednesday, November 4, 2015 @ 10:26:30
Author: jgc
Revision: 145937
upgpkg: nemo-extensions 2.6.0-3
Port nemo-preview to clutter-gst, try to patch libtool to reduce library dependencies
Added:
nemo-extensions/trunk/clutter-gst3.patch
Modified:
nemo-extensions/trunk/PKGBUILD
--------------------+
PKGBUILD | 16 +++--
clutter-gst3.patch | 156 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 167 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-11-04 09:24:20 UTC (rev 145936)
+++ PKGBUILD 2015-11-04 09:26:30 UTC (rev 145937)
@@ -13,18 +13,20 @@
#'nemo-rabbitvcs'
pkgver=2.6.0
_pkgver=2.6.x
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
license=('GPL2')
url="https://github.com/linuxmint/nemo-extensions"
-depends=(nemo file-roller cjs clutter-gtk clutter-gst2 gst-plugins-good libmusicbrainz5
+depends=(nemo file-roller cjs clutter-gtk clutter-gst gst-plugins-good libmusicbrainz5
evince gtksourceview3 webkitgtk python2-gobject seahorse-nautilus samba)
makedepends=(gconf gnome-common gtk-doc intltool gobject-introspection) # python2-distutils-extra
options=('!emptydirs')
source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/linuxmint/nemo-extensions/archive/${_pkgver}.tar.gz"
- "gpgversion.patch")
+ "gpgversion.patch"
+ clutter-gst3.patch)
sha256sums=('222a9c96644c3dd22171a97721c11d9bc08e1d27b0c168179947bb94edc824cf'
- '187b9c1d684b81abac7ef3095882cfe859bd50570e554d45fcfdbf6e50455b86')
+ '187b9c1d684b81abac7ef3095882cfe859bd50570e554d45fcfdbf6e50455b86'
+ '7217c05f4cf4d797e8e042392c1cb92481bb616a1e7ce20393228591a6bc91e0')
prepare() {
cd ${pkgbase}-${_pkgver}
@@ -41,6 +43,8 @@
# Fix path for nemo-python
sed -i 's|libdirsuffix="/i386-linux-gnu/"|libdirsuffix=""|' nemo-python/m4/python.m4
+ cd nemo-preview
+ patch -Np1 -i ../../clutter-gst3.patch
}
build() {
@@ -54,6 +58,7 @@
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${dir} \
--disable-static --disable-schemas-compile
make
+ 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
popd
done
@@ -63,6 +68,7 @@
pushd ${dir}
./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/${dir} \
--disable-static --disable-schemas-compile
+ 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
popd
done
@@ -94,7 +100,7 @@
package_nemo-preview(){
pkgdesc=("GtkClutter and Javascript-based quick previewer for Nemo")
- depends=(nemo cjs clutter-gtk clutter-gst2 libmusicbrainz5 evince gtksourceview3 webkitgtk)
+ depends=(nemo cjs clutter-gtk clutter-gst libmusicbrainz5 evince gtksourceview3 webkitgtk)
cd ${pkgbase}-${_pkgver}/nemo-preview
make DESTDIR="${pkgdir}" install
Added: clutter-gst3.patch
===================================================================
--- clutter-gst3.patch (rev 0)
+++ clutter-gst3.patch 2015-11-04 09:26:30 UTC (rev 145937)
@@ -0,0 +1,156 @@
+From ce695719d7292bfe9d8183cfa057afe1df53565b Mon Sep 17 00:00:00 2001
+From: Lionel Landwerlin <llandwerlin at gmail.com>
+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
+
More information about the arch-commits
mailing list