Control: tags 747009 + patch Control: tags 747009 + pending Dear maintainer,
I've prepared an NMU for pitivi (versioned as 0.93-4.1) and uploaded it to unstable. Regards. -- Antonio Terceiro <[email protected]> http://softwarelivre.org/terceiro
diff -Nru pitivi-0.93/debian/changelog pitivi-0.93/debian/changelog --- pitivi-0.93/debian/changelog 2014-04-25 06:04:25.000000000 -0300 +++ pitivi-0.93/debian/changelog 2014-09-04 18:46:04.000000000 -0300 @@ -1,3 +1,10 @@ +pitivi (0.93-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply upstream patches to remove dependency on Cogl (Closes: #747009) + + -- Antonio Terceiro <[email protected]> Thu, 04 Sep 2014 18:41:31 -0300 + pitivi (0.93-4) unstable; urgency=medium * debian/control: diff -Nru pitivi-0.93/debian/patches/02_elements_Dont_use_path_round_rectangle.patch pitivi-0.93/debian/patches/02_elements_Dont_use_path_round_rectangle.patch --- pitivi-0.93/debian/patches/02_elements_Dont_use_path_round_rectangle.patch 1969-12-31 21:00:00.000000000 -0300 +++ pitivi-0.93/debian/patches/02_elements_Dont_use_path_round_rectangle.patch 2014-09-04 18:43:42.000000000 -0300 @@ -0,0 +1,47 @@ +From c4c11dedd3cc966f8fa75fad080aff3abf1cf3f6 Mon Sep 17 00:00:00 2001 +From: Mathieu Duponchelle <[email protected]> +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 -Nru pitivi-0.93/debian/patches/03_elements_Dont_use_Cogl_anymore.patch pitivi-0.93/debian/patches/03_elements_Dont_use_Cogl_anymore.patch --- pitivi-0.93/debian/patches/03_elements_Dont_use_Cogl_anymore.patch 1969-12-31 21:00:00.000000000 -0300 +++ pitivi-0.93/debian/patches/03_elements_Dont_use_Cogl_anymore.patch 2014-09-04 18:45:11.000000000 -0300 @@ -0,0 +1,216 @@ +From af65ef5317e2b7a0492ef165f2686c47b7011279 Mon Sep 17 00:00:00 2001 +From: Mathieu Duponchelle <[email protected]> +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 -Nru pitivi-0.93/debian/patches/series pitivi-0.93/debian/patches/series --- pitivi-0.93/debian/patches/series 2013-11-01 07:17:49.000000000 -0200 +++ pitivi-0.93/debian/patches/series 2014-09-04 18:45:29.000000000 -0300 @@ -1 +1,3 @@ 01_disable-devel-mode.patch +02_elements_Dont_use_path_round_rectangle.patch +03_elements_Dont_use_Cogl_anymore.patch
signature.asc
Description: Digital signature
