[Pkg-gstreamer-commits] [pitivi] 02/02: New upstream release
Sebastian Dröge
slomo at moszumanska.debian.org
Mon Nov 10 16:18:36 UTC 2014
This is an automated email from the git hooks/post-receive script.
slomo pushed a commit to branch debian-experimental
in repository pitivi.
commit 12766cdc5ff27076dd44e17f477cf2f58d132f1a
Author: Sebastian Dröge <sebastian at centricular.com>
Date: Mon Nov 10 16:54:28 2014 +0100
New upstream release
---
debian/changelog | 12 ++
debian/control | 38 ++--
...-fix-crash-in-non-GNOME-Shell-WMs.-timeli.patch | 25 ---
...ct-Fix-setting-of-restriction-caps-values.patch | 46 -----
...i-Start-using-glimagesink-as-default-sink.patch | 116 -----------
...implement-connectWithViewer-for-glimagesi.patch | 79 --------
debian/patches/01_disable-devel-mode.patch | 146 +++++++++++---
...02_elements_Dont_use_path_round_rectangle.patch | 47 -----
.../03_elements_Dont_use_Cogl_anymore.patch | 216 ---------------------
debian/patches/series | 6 -
debian/rules | 2 +-
11 files changed, 156 insertions(+), 577 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ec998ba..db6b00f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+pitivi (0.94-1) experimental; urgency=medium
+
+ * New upstream release:
+ + debian/control:
+ - Update (build-) depends.
+ + debian/patches/*:
+ - Removed, merged upstream.
+ + debian/patches/01_disable-devel-mode.patch:
+ - Refreshed.
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 10 Nov 2014 16:44:00 +0100
+
pitivi (0.93-4.2) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 62f705e..369fbca 100644
--- a/debian/control
+++ b/debian/control
@@ -6,15 +6,15 @@ Uploaders: Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 9),
dpkg-dev (>= 1.16.1~),
dh-buildinfo,
- python-all-dev (>= 2.7),
+ python3-all-dev (>= 2.7),
intltool (>= 0.35),
gnome-doc-utils (>= 0.18.0),
pkg-config,
itstool,
libcairo2-dev,
- python-cairo-dev,
+ python3-cairo-dev,
python-support
-X-Python-Version: >= 2.7
+X-Python-Version: >= 3.0
Standards-Version: 3.9.4
Homepage: http://www.pitivi.org
@@ -23,31 +23,31 @@ Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
${python:Depends},
- python (>= 2.7),
- python-gi (>= 3.10),
+ python3 (>= 2.7),
+ python3-gi (>= 3.10),
gir1.2-glib-2.0,
- gir1.2-gstreamer-1.0 (>= 1.2.3),
- gir1.2-gst-plugins-base-1.0 (>= 1.2.3),
- gir1.2-ges-1.0 (>= 1.2.0),
+ gir1.2-gstreamer-1.0 (>= 1.4.0),
+ gir1.2-gst-plugins-base-1.0 (>= 1.4.0),
+ gir1.2-ges-1.0 (>= 1.4.0),
gir1.2-pango-1.0,
gir1.2-gdkpixbuf-2.0,
gir1.2-gtk-3.0,
gir1.2-clutter-1.0,
gir1.2-clutter-gst-2.0,
gir1.2-gtkclutter-1.0,
- python-gst-1.0,
- python-numpy,
- python-matplotlib,
- python-xdg,
- python-cairo,
- python-gi-cairo,
- python-dbus,
- gstreamer1.0-plugins-base (>= 1.2.3),
- gstreamer1.0-plugins-good (>= 1.2.3),
- gstreamer1.0-plugins-bad (>= 1.2.3),
+ python3-gst-1.0,
+ python3-numpy,
+ python3-matplotlib,
+ python3-xdg,
+ python3-cairo,
+ python3-gi-cairo,
+ python3-dbus,
+ gstreamer1.0-plugins-base (>= 1.4.0),
+ gstreamer1.0-plugins-good (>= 1.4.0),
+ gstreamer1.0-plugins-bad (>= 1.4.0),
gstreamer1.0-pulseaudio | gstreamer1.0-audiosink,
gstreamer1.0-x | gstreamer1.0-videosink,
- gstreamer1.0-gnonlin (>= 1.2.0),
+ gstreamer1.0-gnonlin (>= 1.4.0),
gnome-icon-theme
Suggests: gstreamer1.0-plugins-ugly,
gstreamer1.0-libav,
diff --git a/debian/patches/0001-work-around-fix-crash-in-non-GNOME-Shell-WMs.-timeli.patch b/debian/patches/0001-work-around-fix-crash-in-non-GNOME-Shell-WMs.-timeli.patch
deleted file mode 100644
index c80db94..0000000
--- a/debian/patches/0001-work-around-fix-crash-in-non-GNOME-Shell-WMs.-timeli.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From cae13b0fa9f9367f7a3a30af45e99943b1ca0573 Mon Sep 17 00:00:00 2001
-From: Lubosz Sarnecki <lubosz at gmail.com>
-Date: Fri, 30 May 2014 16:42:34 +0200
-Subject: [PATCH 3/3] work around: fix crash in non GNOME Shell WMs. timeline
- is distached.
-
-Bug-Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=727851
-
-Index: b/pitivi/check.py
-===================================================================
---- a/pitivi/check.py
-+++ b/pitivi/check.py
-@@ -251,10 +251,10 @@
- """
- from gi.repository import Gdk
- Gdk.init([])
-- from gi.repository import GtkClutter
-- GtkClutter.init([])
- from gi.repository import ClutterGst
- ClutterGst.init([])
-+ from gi.repository import GtkClutter
-+ GtkClutter.init([])
-
- import gi
- if not gi.version_info >= (3, 11):
diff --git a/debian/patches/0002-project-Fix-setting-of-restriction-caps-values.patch b/debian/patches/0002-project-Fix-setting-of-restriction-caps-values.patch
deleted file mode 100644
index e515cc0..0000000
--- a/debian/patches/0002-project-Fix-setting-of-restriction-caps-values.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 9e39466d93e6693edbb25fcf917a8e29d84712f3 Mon Sep 17 00:00:00 2001
-From: Thibault Saunier <tsaunier at gnome.org>
-Date: Wed, 24 Sep 2014 16:11:51 +0200
-Subject: [PATCH] project: Fix setting of restriction caps values
-
----
- pitivi/project.py | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/pitivi/project.py b/pitivi/project.py
-index 46d70e7..c554927 100644
---- a/pitivi/project.py
-+++ b/pitivi/project.py
-@@ -709,9 +709,10 @@ class Project(Loggable, GES.Project):
- def set_video_restriction_value(self, name, value):
- if self.video_profile.get_restriction()[0][name] != value and value:
- restriction = self.video_profile.get_restriction().copy_nth(0)
-- restriction[0][name] = value
-+ restriction.set_value(name, value)
- self.video_profile.set_restriction(restriction)
- return True
-+
- return False
-
- def set_audio_restriction_value(self, name, value):
-@@ -1086,13 +1087,13 @@ class Project(Loggable, GES.Project):
- self.timeline.append_layer()
-
- def _ensureVideoRestrictions(self):
-- if not self.videowidth:
-+ if self.videowidth is None:
- self.videowidth = 720
-- if not self.videoheight:
-+ if self.videoheight is None:
- self.videoheight = 576
-- if not self.videorate:
-+ if self.videorate is None:
- self.videorate = Gst.Fraction(25, 1)
-- if not self.videopar:
-+ if self.videopar is None:
- self.videopar = Gst.Fraction(1, 1)
-
- def _ensureAudioRestrictions(self):
---
-2.1.0
-
diff --git a/debian/patches/0005-pitivi-Start-using-glimagesink-as-default-sink.patch b/debian/patches/0005-pitivi-Start-using-glimagesink-as-default-sink.patch
deleted file mode 100644
index 3df7bab..0000000
--- a/debian/patches/0005-pitivi-Start-using-glimagesink-as-default-sink.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From ddefc36f4ebad8a87190fba091a525943e93b896 Mon Sep 17 00:00:00 2001
-From: Mathieu Duponchelle <mathieu.duponchelle at opencreed.com>
-Date: Tue, 9 Sep 2014 21:19:03 +0200
-Subject: [PATCH] pitivi: Start using glimagesink as default sink
-
----
- pitivi/utils/pipeline.py | 18 ++++++------------
- pitivi/viewer.py | 24 +++++++++++++-----------
- 2 files changed, 19 insertions(+), 23 deletions(-)
-
-Index: b/pitivi/utils/pipeline.py
-===================================================================
---- a/pitivi/utils/pipeline.py
-+++ b/pitivi/utils/pipeline.py
-@@ -176,17 +176,11 @@
-
- # Create a cluttersink element used for display. Subclasses must connect
- # it to self._pipeline themselves
-- self._clutter_sink = Gst.ElementFactory.make("cluttersink", None)
-+ self._opengl_sink = Gst.ElementFactory.make("glimagesink", None)
- if isinstance(pipeline, GES.Pipeline):
-- self._pipeline.preview_set_video_sink(self._clutter_sink)
-+ self._pipeline.preview_set_video_sink(self._opengl_sink)
- else:
-- self._pipeline.set_property("video_sink", self._clutter_sink)
--
-- def connectWithViewer(self, viewer):
-- """
-- Connect the specified ViewerWidget so this pipeline can be displayed.
-- """
-- self._clutter_sink.props.texture = viewer.texture
-+ self._pipeline.set_property("video_sink", self._opengl_sink)
-
- def release(self):
- """
-@@ -276,7 +270,7 @@
- else:
- self.play()
-
-- #{ Position and Seeking methods
-+ # { Position and Seeking methods
-
- def getPosition(self, format=Gst.Format.TIME):
- """
-@@ -420,8 +414,8 @@
- seekvalue = max(0, min(self.getPosition() + time, self.getDuration()))
- self.simple_seek(seekvalue)
-
-- #}
-- ## Private methods
-+ # }
-+ # Private methods
-
- def _busMessageCb(self, unused_bus, message):
- if message.type == Gst.MessageType.EOS:
-Index: b/pitivi/viewer.py
-===================================================================
---- a/pitivi/viewer.py
-+++ b/pitivi/viewer.py
-@@ -39,6 +39,8 @@
- from pitivi.utils.ui import SPACING, hex_to_rgb
- from pitivi.utils.widgets import TimeWidget
-
-+import platform
-+
- GlobalSettings.addConfigSection("viewer")
- GlobalSettings.addConfigOption("viewerDocked", section="viewer",
- key="docked",
-@@ -130,6 +132,8 @@
- self.pipeline.connect("position", self._positionCb)
- self.pipeline.connect("duration-changed", self._durationChangedCb)
-
-+ self.sink = pipeline._opengl_sink
-+
- self._switch_output_window()
- self._setUiActive()
-
-@@ -459,7 +463,13 @@
-
- if self.target.get_realized():
- self.debug("Connecting the pipeline to the viewer's texture")
-- self.pipeline.connectWithViewer(self.target)
-+ if platform.system() == 'Windows':
-+ xid = self.target.drawing_area.get_window().get_handle()
-+ else:
-+ xid = self.target.drawing_area.get_window().get_xid()
-+
-+ self.sink.set_window_handle(xid)
-+ self.sink.expose()
- else:
- # Show the widget and wait for the realized callback
- self.log("Target is not realized, showing the widget")
-@@ -796,7 +806,7 @@
- ratio=4.0 / 3.0, obey_child=False)
- Loggable.__init__(self)
-
-- self.drawing_area = GtkClutter.Embed()
-+ self.drawing_area = Gtk.DrawingArea()
- self.drawing_area.set_double_buffered(False)
- # We keep the ViewerWidget hidden initially, or the desktop wallpaper
- # would show through the non-double-buffered widget!
-@@ -804,14 +814,6 @@
- self.drawing_area.connect("realize", realizedCb, self)
- self.add(self.drawing_area)
-
-- layout_manager = Clutter.BinLayout(x_align=Clutter.BinAlignment.FILL, y_align=Clutter.BinAlignment.FILL)
-- self.drawing_area.get_stage().set_layout_manager(layout_manager)
-- self.texture = Clutter.Texture()
-- # This is a trick to make the viewer appear darker at the start.
-- self.texture.set_from_rgb_data(data=[0] * 3, has_alpha=False,
-- width=1, height=1, rowstride=3, bpp=3,
-- flags=Clutter.TextureFlags.NONE)
-- self.drawing_area.get_stage().add_child(self.texture)
- self.drawing_area.show()
-
- self.seeker = Seeker()
diff --git a/debian/patches/0006-pipeline-Reimplement-connectWithViewer-for-glimagesi.patch b/debian/patches/0006-pipeline-Reimplement-connectWithViewer-for-glimagesi.patch
deleted file mode 100644
index f9ec6b6..0000000
--- a/debian/patches/0006-pipeline-Reimplement-connectWithViewer-for-glimagesi.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 13809971498fa11c3aceba8005e97c56a199f457 Mon Sep 17 00:00:00 2001
-From: Thibault Saunier <tsaunier at gnome.org>
-Date: Wed, 24 Sep 2014 16:12:43 +0200
-Subject: [PATCH] pipeline: Reimplement connectWithViewer for glimagesink
-
----
- pitivi/mediafilespreviewer.py | 7 +++----
- pitivi/utils/pipeline.py | 11 +++++++++++
- 2 files changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/pitivi/mediafilespreviewer.py b/pitivi/mediafilespreviewer.py
-index d7105c6..fc55ea5 100644
---- a/pitivi/mediafilespreviewer.py
-+++ b/pitivi/mediafilespreviewer.py
-@@ -89,13 +89,13 @@ class PreviewWidget(Gtk.Grid, Loggable):
-
- self.discoverer = GstPbutils.Discoverer.new(Gst.SECOND)
-
-- #playbin for play pics
-+ # playbin for play pics
- self.player = AssetPipeline(clip=None, name="preview-player")
- self.player.connect('eos', self._pipelineEosCb)
- self.player.connect('error', self._pipelineErrorCb)
- self.player._bus.connect('message::tag', self._tag_found_cb)
-
-- #some global variables for preview handling
-+ # some global variables for preview handling
- self.is_playing = False
- self.original_dims = (PREVIEW_WIDTH, PREVIEW_HEIGHT)
- self.countinuous_seek = False
-@@ -125,7 +125,7 @@ class PreviewWidget(Gtk.Grid, Loggable):
- self.play_button.connect("clicked", self._on_start_stop_clicked_cb)
- self.bbox.pack_start(self.play_button, False, False, 0)
-
-- #Scale for position handling
-+ # Scale for position handling
- self.pos_adj = Gtk.Adjustment()
- self.seeker = Gtk.Scale.new(Gtk.Orientation.HORIZONTAL, self.pos_adj)
- self.seeker.connect('button-press-event', self._on_seeker_press_cb)
-@@ -246,7 +246,6 @@ class PreviewWidget(Gtk.Grid, Loggable):
- self.preview_video.set_size_request(w, h)
- self.preview_video.setDisplayAspectRatio(float(video_width) / video_height)
- self.preview_video.show()
-- self.player.connectWithViewer(self.preview_video)
- self.bbox.show()
- self.play_button.show()
- self.seeker.show()
-diff --git a/pitivi/utils/pipeline.py b/pitivi/utils/pipeline.py
-index 93255f9..77c625c 100644
---- a/pitivi/utils/pipeline.py
-+++ b/pitivi/utils/pipeline.py
-@@ -24,6 +24,9 @@
- """
- High-level pipelines
- """
-+
-+import platform
-+
- from pitivi.utils.loggable import Loggable
- from pitivi.utils.signal import Signallable
- from pitivi.utils.misc import format_ns
-@@ -517,6 +520,14 @@ class AssetPipeline(SimplePipeline):
- def setClipUri(self, uri):
- self._pipeline.set_property("uri", uri)
-
-+ def connectWithViewer(self, widget):
-+ if platform.system() == 'Windows':
-+ handle = widget.drawing_area.get_window().get_handle()
-+ else:
-+ handle = widget.drawing_area.get_window().get_xid()
-+
-+ self._opengl_sink.set_window_handle(handle)
-+
-
- class Pipeline(GES.Pipeline, SimplePipeline):
- """
---
-2.1.0
-
diff --git a/debian/patches/01_disable-devel-mode.patch b/debian/patches/01_disable-devel-mode.patch
index 3947fa4..a340ca1 100644
--- a/debian/patches/01_disable-devel-mode.patch
+++ b/debian/patches/01_disable-devel-mode.patch
@@ -1,25 +1,40 @@
Index: pitivi/bin/pitivi.in
===================================================================
---- pitivi.orig/bin/pitivi.in 2014-03-29 15:24:00.782574262 +0100
-+++ pitivi/bin/pitivi.in 2014-03-29 15:24:00.778574243 +0100
-@@ -46,8 +46,7 @@
+--- pitivi.orig/bin/pitivi.in
++++ pitivi/bin/pitivi.in
+@@ -52,21 +52,10 @@ def jump_through_hoops():
+ os.execv(sys.argv[0], sys.argv)
- # Check if we're in development or installed version and set paths properly
- def _in_devel():
+
+-# Check if we're in development or installed version and set paths properly
+-def _in_devel():
- root_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
- return os.path.exists(os.path.join(root_dir, '.git'))
-+ return False
-
-
+-
+-
def _add_pitivi_path():
+ dir = os.path.dirname(os.path.abspath(__file__))
+- if _in_devel():
+- root = os.path.split(dir)[0]
+- sys.path.append(os.path.join(root, "pitivi", "coptimizations", ".libs"))
+- localedir = os.path.join(os.path.split(dir)[0], 'locale')
+- else:
+- root = os.path.join(LIBDIR, 'pitivi', 'python')
+- localedir = os.path.join(DATADIR, "locale")
++ root = os.path.join(LIBDIR, 'pitivi', 'python')
++ localedir = os.path.join(DATADIR, "locale")
+
+ if not root in sys.path:
+ sys.path.append(root)
Index: pitivi/pitivi/configure.py
===================================================================
---- pitivi.orig/pitivi/configure.py 2014-03-29 15:24:00.782574262 +0100
-+++ pitivi/pitivi/configure.py 2014-03-29 15:24:38.154750476 +0100
-@@ -26,17 +26,8 @@
- import os.path
+--- pitivi.orig/pitivi/configure.py
++++ pitivi/pitivi/configure.py
+@@ -25,19 +25,6 @@ Enables identical use for installed and
+ import os.path
+-
-# Again, mostly the same thing as in bin/pitivi.in and pitivi/utils/misc.py:
-def _get_root_dir():
- return '/'.join(os.path.dirname(os.path.abspath(__file__)).split('/')[:-1])
@@ -31,16 +46,36 @@ Index: pitivi/pitivi/configure.py
- """
- rd = _get_root_dir()
- return os.path.exists(os.path.join(rd, '.git'))
-+def in_devel():
-+ return False
+-
+ if "APPDIR" in os.environ:
+ basedir = os.environ["APPDIR"]
+ LIBDIR = os.path.join(basedir, 'usr', 'lib')
+@@ -51,18 +38,11 @@ APPNAME = 'Pitivi'
+ APPURL = 'http://www.pitivi.org/'
+ RELEASES_URL = 'http://pitivi.org/releases.txt'
+ APPMANUALURL_ONLINE = 'http://www.pitivi.org/manual'
+-
+-
+-if in_devel():
+- APPMANUALURL_OFFLINE = 'ghelp://%s' % os.path.join(_get_root_dir(), 'help/C')
+-else:
+- APPMANUALURL_OFFLINE = 'help:pitivi'
++APPMANUALURL_OFFLINE = 'help:pitivi'
- LIBDIR = '/usr/local/lib'
+ def get_data_dir():
+- if in_devel():
+- datadir = os.path.join(_get_root_dir(), "data")
+- elif os.getenv("PITIVI_TOP_LEVEL_DIR"):
++ if os.getenv("PITIVI_TOP_LEVEL_DIR"):
+ top_level = os.getenv("PITIVI_TOP_LEVEL_DIR")
+ datadir = os.path.join(top_level, "data")
+ else:
Index: pitivi/pitivi/configure.py.in
===================================================================
---- pitivi.orig/pitivi/configure.py.in 2014-03-29 15:24:00.782574262 +0100
-+++ pitivi/pitivi/configure.py.in 2014-03-29 15:24:50.862810463 +0100
-@@ -26,18 +26,8 @@
+--- pitivi.orig/pitivi/configure.py.in
++++ pitivi/pitivi/configure.py.in
+@@ -26,18 +26,6 @@ Enables identical use for installed and
import os.path
@@ -56,8 +91,75 @@ Index: pitivi/pitivi/configure.py.in
- rd = _get_root_dir()
- return os.path.exists(os.path.join(rd, '.git'))
-
-+def in_devel():
-+ return False
+ if "APPDIR" in os.environ:
+ basedir = os.environ["APPDIR"]
+ LIBDIR = os.path.join(basedir, 'usr', 'lib')
+@@ -51,18 +39,11 @@ APPNAME = '@PACKAGE_NAME@'
+ APPURL = 'http://www.pitivi.org/'
+ RELEASES_URL = 'http://pitivi.org/releases.txt'
+ APPMANUALURL_ONLINE = 'http://www.pitivi.org/manual'
+-
+-
+-if in_devel():
+- APPMANUALURL_OFFLINE = 'ghelp://%s' % os.path.join(_get_root_dir(), 'help/C')
+-else:
+- APPMANUALURL_OFFLINE = 'help:pitivi'
++APPMANUALURL_OFFLINE = 'help:pitivi'
+
+
+ def get_data_dir():
+- if in_devel():
+- datadir = os.path.join(_get_root_dir(), "data")
+- elif os.getenv("PITIVI_TOP_LEVEL_DIR"):
++ if os.getenv("PITIVI_TOP_LEVEL_DIR"):
+ top_level = os.getenv("PITIVI_TOP_LEVEL_DIR")
+ datadir = os.path.join(top_level, "data")
+ else:
+Index: pitivi/pitivi/mainwindow.py
+===================================================================
+--- pitivi.orig/pitivi/mainwindow.py
++++ pitivi/pitivi/mainwindow.py
+@@ -36,7 +36,7 @@ from gi.repository import Gtk
+ from gi.repository import GstPbutils
+
+ from pitivi.clipproperties import ClipProperties
+-from pitivi.configure import in_devel, VERSION, APPNAME, APPURL, get_pixmap_dir, get_ui_dir
++from pitivi.configure import VERSION, APPNAME, APPURL, get_pixmap_dir, get_ui_dir
+ from pitivi.effects import EffectListWidget
+ from pitivi.mediafilespreviewer import PreviewWidget
+ from pitivi.medialibrary import MediaLibraryWidget
+@@ -551,9 +551,7 @@ class PitiviMainWindow(Gtk.ApplicationWi
+ abt.set_program_name(APPNAME)
+ abt.set_website(APPURL)
+
+- if in_devel():
+- version_str = _("Development version")
+- elif not self.app.isLatest():
++ if not self.app.isLatest():
+ version_str = _("Version %(cur_ver)s — %(new_ver)s is available" %
+ {"cur_ver": VERSION,
+ "new_ver": self.app.getLatest()})
+Index: pitivi/tests/runtests.py
+===================================================================
+--- pitivi.orig/tests/runtests.py
++++ pitivi/tests/runtests.py
+@@ -32,15 +32,10 @@ def get_pitivi_dir():
+
+
+ def get_build_dir():
+- from pitivi.configure import in_devel
+- if in_devel():
+- # It's the same.
+- build_dir = get_pitivi_dir()
+- else:
+- # Probably running make distcheck. The path to the test files
+- # is different than the build path, so we must use the current
+- # dir which is build_path/tests.
+- build_dir = os.path.join(os.path.abspath(os.path.curdir), os.path.pardir)
++ # Probably running make distcheck. The path to the test files
++ # is different than the build path, so we must use the current
++ # dir which is build_path/tests.
++ build_dir = os.path.join(os.path.abspath(os.path.curdir), os.path.pardir)
+ return os.path.abspath(build_dir)
+
- LIBDIR = '@LIBDIR@'
- PKGDATADIR = '@DATADIR@/@PACKAGE@'
diff --git a/debian/patches/02_elements_Dont_use_path_round_rectangle.patch b/debian/patches/02_elements_Dont_use_path_round_rectangle.patch
deleted file mode 100644
index a3a4adc..0000000
--- a/debian/patches/02_elements_Dont_use_path_round_rectangle.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c4c11dedd3cc966f8fa75fad080aff3abf1cf3f6 Mon Sep 17 00:00:00 2001
-From: Mathieu Duponchelle <mathieu.duponchelle at opencreed.com>
-Date: Wed, 2 Apr 2014 18:09:14 +0200
-Subject: elements: Don't use path_round_rectangle.
-
-We didn't actually make rounded rectangles anyway.
-
-This class will need to go altogether at some point.
-
-diff --git a/pitivi/timeline/elements.py b/pitivi/timeline/elements.py
-index 955cba8..189ef0a 100644
---- a/pitivi/timeline/elements.py
-+++ b/pitivi/timeline/elements.py
-@@ -86,12 +86,10 @@ class RoundedRectangle(Clutter.Actor):
- if self._border_color:
- # draw the rectangle for the border which is the same size as the
- # object
-- Cogl.path_round_rectangle(0, 0, self.props.width, self.props.height,
-- self._arc, self._step)
-- Cogl.path_round_rectangle(self._border_width, self._border_width,
-- self.props.width - self._border_width,
-- self.props.height - self._border_width,
-- self._arc, self._step)
-+ Cogl.path_rectangle(0, 0, self.props.width, self.props.height)
-+ Cogl.path_rectangle(self._border_width, self._border_width,
-+ self.props.width - self._border_width,
-+ self.props.height - self._border_width)
- Cogl.path_set_fill_rule(Cogl.PathFillRule.EVEN_ODD)
- Cogl.path_close()
-
-@@ -102,10 +100,9 @@ class RoundedRectangle(Clutter.Actor):
- if self._color:
- # draw the content with is the same size minus the width of the border
- # finish the clip
-- Cogl.path_round_rectangle(self._border_width, self._border_width,
-- self.props.width - self._border_width,
-- self.props.height - self._border_width,
-- self._arc, self._step)
-+ Cogl.path_rectangle(self._border_width, self._border_width,
-+ self.props.width - self._border_width,
-+ self.props.height - self._border_width)
- Cogl.path_close()
-
- # set the color of the filled area
---
-cgit v0.10.1
-
diff --git a/debian/patches/03_elements_Dont_use_Cogl_anymore.patch b/debian/patches/03_elements_Dont_use_Cogl_anymore.patch
deleted file mode 100644
index 5445a46..0000000
--- a/debian/patches/03_elements_Dont_use_Cogl_anymore.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From af65ef5317e2b7a0492ef165f2686c47b7011279 Mon Sep 17 00:00:00 2001
-From: Mathieu Duponchelle <mathieu.duponchelle at opencreed.com>
-Date: Wed, 2 Apr 2014 20:56:08 +0200
-Subject: elements: Don't use Cogl anymore.
-
-
---- a/pitivi/timeline/elements.py
-+++ b/pitivi/timeline/elements.py
-@@ -33,12 +33,12 @@ from datetime import datetime
-
- import weakref
-
--from gi.repository import Clutter, Gtk, GtkClutter, Cogl, GES, Gdk, Gst, GstController
-+from gi.repository import Clutter, Gtk, GtkClutter, GES, Gdk, Gst, GstController
- from pitivi.utils.timeline import Zoomable, EditingContext, SELECT, UNSELECT, SELECT_ADD, Selected
- from previewers import AudioPreviewer, VideoPreviewer
-
- import pitivi.configure as configure
--from pitivi.utils.ui import EXPANDED_SIZE, SPACING, KEYFRAME_SIZE, CONTROL_WIDTH, create_cogl_color
-+from pitivi.utils.ui import EXPANDED_SIZE, SPACING, KEYFRAME_SIZE, CONTROL_WIDTH
-
- # Colors for keyframes and clips (RGBA)
- KEYFRAME_LINE_COLOR = (237, 212, 0, 255) # "Tango" yellow
-@@ -46,10 +46,10 @@ KEYFRAME_NORMAL_COLOR = Clutter.Color.ne
- KEYFRAME_SELECTED_COLOR = Clutter.Color.new(200, 200, 200, 200)
- CLIP_SELECTED_OVERLAY_COLOR = Clutter.Color.new(60, 60, 60, 100)
- GHOST_CLIP_COLOR = Clutter.Color.new(255, 255, 255, 50)
--TRANSITION_COLOR = create_cogl_color(35, 85, 125, 125) # light blue
-+TRANSITION_COLOR = Clutter.Color.new(35, 85, 125, 125) # light blue
-
--BORDER_NORMAL_COLOR = create_cogl_color(100, 100, 100, 255)
--BORDER_SELECTED_COLOR = create_cogl_color(200, 200, 10, 255)
-+BORDER_NORMAL_COLOR = Clutter.Color.new(100, 100, 100, 255)
-+BORDER_SELECTED_COLOR = Clutter.Color.new(200, 200, 10, 255)
-
- NORMAL_CURSOR = Gdk.Cursor.new(Gdk.CursorType.LEFT_PTR)
- DRAG_CURSOR = Gdk.Cursor.new(Gdk.CursorType.HAND1)
-@@ -57,79 +57,6 @@ DRAG_LEFT_HANDLEBAR_CURSOR = Gdk.Cursor.
- DRAG_RIGHT_HANDLEBAR_CURSOR = Gdk.Cursor.new(Gdk.CursorType.RIGHT_SIDE)
-
-
--class RoundedRectangle(Clutter.Actor):
-- """
-- Custom actor used to draw a rectangle that can have rounded corners
-- """
-- __gtype_name__ = 'RoundedRectangle'
--
-- def __init__(self, width, height, arc, step,
-- color=None, border_color=None, border_width=0):
-- """
-- Creates a new rounded rectangle
-- """
-- Clutter.Actor.__init__(self)
--
-- self.props.width = width
-- self.props.height = height
--
-- self._arc = arc
-- self._step = step
-- self._border_width = border_width
-- self._color = color
-- self._border_color = border_color
--
-- def do_paint(self):
-- # Set a rectangle for the clipping
-- Cogl.clip_push_rectangle(0, 0, self.props.width, self.props.height)
--
-- if self._border_color:
-- # draw the rectangle for the border which is the same size as the
-- # object
-- Cogl.path_rectangle(0, 0, self.props.width, self.props.height)
-- Cogl.path_rectangle(self._border_width, self._border_width,
-- self.props.width - self._border_width,
-- self.props.height - self._border_width)
-- Cogl.path_set_fill_rule(Cogl.PathFillRule.EVEN_ODD)
-- Cogl.path_close()
--
-- # set color to border color
-- Cogl.set_source_color(self._border_color)
-- Cogl.path_fill()
--
-- if self._color:
-- # draw the content with is the same size minus the width of the border
-- # finish the clip
-- Cogl.path_rectangle(self._border_width, self._border_width,
-- self.props.width - self._border_width,
-- self.props.height - self._border_width)
-- Cogl.path_close()
--
-- # set the color of the filled area
-- Cogl.set_source_color(self._color)
-- Cogl.path_fill()
--
-- Cogl.clip_pop()
--
-- def get_color(self):
-- return self._color
--
-- def set_color(self, color):
-- self._color = color
-- self.queue_redraw()
--
-- def get_border_width(self):
-- return self._border_width
--
-- def set_border_width(self, width):
-- self._border_width = width
-- self.queue_redraw()
--
-- def set_border_color(self, color):
-- self._border_color = color
-- self.queue_redraw()
--
--
- class Ghostclip(Clutter.Actor):
- """
- The concept of a ghostclip is to represent future actions without
-@@ -343,7 +270,7 @@ class TimelineElement(Clutter.Actor, Zoo
- size = self.bElement.get_duration()
-
- self.background = self._createBackground()
-- self.background.set_position(0, 0)
-+ self.background.set_position(1, 1)
- self.add_child(self.background)
-
- self.preview = self._createPreview()
-@@ -352,6 +279,8 @@ class TimelineElement(Clutter.Actor, Zoo
- self.border = self._createBorder()
- self.add_child(self.border)
-
-+ self.set_child_below_sibling(self.border, self.background)
-+
- self.marquee = self._createMarquee()
- self.add_child(self.marquee)
-
-@@ -386,13 +315,13 @@ class TimelineElement(Clutter.Actor, Zoo
- self.rightHandle.set_easing_duration(600)
-
- self.marquee.set_size(width, height)
-- self.background.props.width = width
-- self.background.props.height = height
-+ self.background.props.width = width - 2
-+ self.background.props.height = height - 2
- self.border.props.width = width
- self.border.props.height = height
- self.props.width = width
- self.props.height = height
-- self.preview.set_size(width, height)
-+ self.preview.set_size(width - 2, height - 2)
- if self.rightHandle:
- self.rightHandle.set_position(width - self.rightHandle.props.width, 0)
-
-@@ -576,10 +505,9 @@ class TimelineElement(Clutter.Actor, Zoo
- pass
-
- def _createBorder(self):
-- border = RoundedRectangle(0, 0, 0, 0)
-+ border = Clutter.Actor()
- border.bElement = self.bElement
-- border.set_border_color(BORDER_NORMAL_COLOR)
-- border.set_border_width(1)
-+ border.set_background_color(BORDER_NORMAL_COLOR)
- border.set_position(0, 0)
- return border
-
-@@ -660,7 +588,7 @@ class TimelineElement(Clutter.Actor, Zoo
- self.hideKeyframes()
- self.marquee.props.visible = isSelected
- color = BORDER_SELECTED_COLOR if isSelected else BORDER_NORMAL_COLOR
-- self.border.set_border_color(color)
-+ self.border.set_background_color(color)
-
-
- class Gradient(Clutter.Actor):
-@@ -1145,11 +1073,15 @@ class TransitionElement(TimelineElement)
- self.set_reactive(True)
-
- def _createBackground(self):
-- background = RoundedRectangle(0, 0, 0, 0)
-- background.set_color(TRANSITION_COLOR)
-- background.set_border_width(1)
-+ background = Clutter.Actor()
-+ background.set_background_color(TRANSITION_COLOR)
- return background
-
-+ def _createBorder(self):
-+ border = Clutter.Actor()
-+ border.set_background_color(Clutter.Color.new(0, 0, 0, 0))
-+ return border
-+
- def _selectedChangedCb(self, selected, isSelected):
- TimelineElement._selectedChangedCb(self, selected, isSelected)
-
---- a/pitivi/utils/ui.py
-+++ b/pitivi/utils/ui.py
-@@ -35,7 +35,6 @@ import urllib
- from gettext import ngettext, gettext as _
-
- from gi.repository import Clutter
--from gi.repository import Cogl
- from gi.repository import GLib
- from gi.repository import GES
- from gi.repository import Gdk
-@@ -199,12 +198,6 @@ def hex_to_rgb(value):
- return tuple(float(int(value[i:i + 2], 16)) / 255.0 for i in range(0, 6, 2))
-
-
--def create_cogl_color(red, green, blue, alpha):
-- color = Cogl.Color()
-- color.init_from_4ub(red, green, blue, alpha)
-- return color
--
--
- def set_cairo_color(context, color):
- if type(color) is Clutter.Color:
- color = (color.red, color.green, color.blue)
diff --git a/debian/patches/series b/debian/patches/series
index 8979333..edc48b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1 @@
01_disable-devel-mode.patch
-02_elements_Dont_use_path_round_rectangle.patch
-03_elements_Dont_use_Cogl_anymore.patch
-0001-work-around-fix-crash-in-non-GNOME-Shell-WMs.-timeli.patch
-0002-project-Fix-setting-of-restriction-caps-values.patch
-0005-pitivi-Start-using-glimagesink-as-default-sink.patch
-0006-pipeline-Reimplement-connectWithViewer-for-glimagesi.patch
diff --git a/debian/rules b/debian/rules
index df0745a..41aaac7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ configure_flags += \
$(NULL)
%:
- dh $@ --with python2
+ dh $@ --with python3
override_dh_auto_configure:
dh_auto_configure -- $(configure_flags)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/pitivi.git
More information about the Pkg-gstreamer-commits
mailing list