| 1 |
tetromino 12/11/29 09:38:46 |
| 2 |
|
| 3 |
Added: istanbul-0.2.2-fix-grab-xid.patch |
| 4 |
istanbul-0.2.2-noalsa.patch |
| 5 |
istanbul-0.2.2-dir-overwrite.patch |
| 6 |
istanbul-0.2.2-desktop-file.patch |
| 7 |
istanbul-0.2.2-fix-preview-window.patch |
| 8 |
Log: |
| 9 |
Fix build failure with recent automake (bug #407683, thanks to Helmut Jarausch et al.) Add git snapshot containing numerous serious bug fixes, and some further fixes from the Debian patchset. |
| 10 |
|
| 11 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.1 media-video/istanbul/files/istanbul-0.2.2-fix-grab-xid.patch |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/istanbul/files/istanbul-0.2.2-fix-grab-xid.patch?rev=1.1&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/istanbul/files/istanbul-0.2.2-fix-grab-xid.patch?rev=1.1&content-type=text/plain |
| 18 |
|
| 19 |
Index: istanbul-0.2.2-fix-grab-xid.patch |
| 20 |
=================================================================== |
| 21 |
From: Jef Spaleta <jspaleta@×××××.com> |
| 22 |
Subject: Try to get the xid on realization of the videowidget |
| 23 |
Origin: upstream |
| 24 |
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=604938 |
| 25 |
Bug-Debian: http://bugs.debian.org/554568 |
| 26 |
|
| 27 |
Index: istanbul-0.2.2/istanbul/main/save_window.py |
| 28 |
=================================================================== |
| 29 |
--- istanbul-0.2.2.orig/istanbul/main/save_window.py 2010-07-08 10:38:56.609390459 +0200 |
| 30 |
+++ istanbul-0.2.2/istanbul/main/save_window.py 2010-07-08 10:38:53.153107943 +0200 |
| 31 |
@@ -35,8 +35,13 @@ |
| 32 |
def __init__(self): |
| 33 |
gtk.DrawingArea.__init__(self) |
| 34 |
self.imagesink = None |
| 35 |
+ self._xid = None |
| 36 |
self.unset_flags(gtk.DOUBLE_BUFFERED) |
| 37 |
|
| 38 |
+ def do_realize(self): |
| 39 |
+ gtk.DrawingArea.do_realize(self) |
| 40 |
+ self._xid = self.window.xid |
| 41 |
+ |
| 42 |
def do_expose_event(self, event): |
| 43 |
if self.imagesink: |
| 44 |
self.imagesink.expose() |
| 45 |
@@ -45,9 +50,9 @@ |
| 46 |
return True |
| 47 |
|
| 48 |
def set_sink(self, sink): |
| 49 |
- assert self.window.xid |
| 50 |
+ assert self._xid is not None |
| 51 |
self.imagesink = sink |
| 52 |
- self.imagesink.set_xwindow_id(self.window.xid) |
| 53 |
+ self.imagesink.set_xwindow_id(self._xid) |
| 54 |
|
| 55 |
class SaveWindow(gtk.Window): |
| 56 |
UPDATE_INTERVAL = 500 |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.1 media-video/istanbul/files/istanbul-0.2.2-noalsa.patch |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/istanbul/files/istanbul-0.2.2-noalsa.patch?rev=1.1&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/istanbul/files/istanbul-0.2.2-noalsa.patch?rev=1.1&content-type=text/plain |
| 64 |
|
| 65 |
Index: istanbul-0.2.2-noalsa.patch |
| 66 |
=================================================================== |
| 67 |
From: Luca Bruno <lucab@××××××.org> |
| 68 |
Subject: istanbul: Uninstallable on kfreebsd-* (depends on gstreamer0.10-alsa) |
| 69 |
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=591739 |
| 70 |
|
| 71 |
Index: istanbul-0.2.2/istanbul/main/screencast.py |
| 72 |
=================================================================== |
| 73 |
--- istanbul-0.2.2.orig/istanbul/main/screencast.py 2010-08-17 11:38:02.898762661 +0200 |
| 74 |
+++ istanbul-0.2.2/istanbul/main/screencast.py 2010-08-17 11:38:51.154511463 +0200 |
| 75 |
@@ -95,7 +95,7 @@ |
| 76 |
if Preferences().has_gconf(): |
| 77 |
asource = 'gconfaudiosrc name=audiosource' |
| 78 |
else: |
| 79 |
- asource = 'alsasrc name=audiosource' |
| 80 |
+ asource = 'autoaudiosrc name=audiosource' |
| 81 |
acappipeline = '%s ! audioconvert ! vorbisenc' % asource |
| 82 |
|
| 83 |
vencode_pipeline = 'video/x-raw-yuv,width=%d,height=%d,framerate=%s '\ |
| 84 |
|
| 85 |
|
| 86 |
|
| 87 |
1.1 media-video/istanbul/files/istanbul-0.2.2-dir-overwrite.patch |
| 88 |
|
| 89 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/istanbul/files/istanbul-0.2.2-dir-overwrite.patch?rev=1.1&view=markup |
| 90 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/istanbul/files/istanbul-0.2.2-dir-overwrite.patch?rev=1.1&content-type=text/plain |
| 91 |
|
| 92 |
Index: istanbul-0.2.2-dir-overwrite.patch |
| 93 |
=================================================================== |
| 94 |
From: Luca Bruno <lucab@××××××.org> |
| 95 |
Subject: istanbul: saving screencasts can overwrite directories |
| 96 |
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=592258 |
| 97 |
|
| 98 |
diff --git a/istanbul/main/save_window.py b/istanbul/main/save_window.py |
| 99 |
index dc79ce8..87e5ab0 100644 |
| 100 |
--- a/istanbul/main/save_window.py |
| 101 |
+++ b/istanbul/main/save_window.py |
| 102 |
@@ -256,7 +256,7 @@ class SaveWindow(gtk.Window): |
| 103 |
try: |
| 104 |
trysave = gnomevfs.xfer_uri(gnomevfs.URI("file://%s" % self.location), |
| 105 |
gnomevfs.URI(self.filechooser.get_uri()), |
| 106 |
- gnomevfs.XFER_DELETE_ITEMS, |
| 107 |
+ gnomevfs.XFER_REMOVESOURCE, |
| 108 |
gnomevfs.XFER_ERROR_MODE_ABORT, |
| 109 |
gnomevfs.XFER_OVERWRITE_MODE_ABORT) |
| 110 |
except gnomevfs.FileExistsError: |
| 111 |
@@ -272,10 +272,12 @@ class SaveWindow(gtk.Window): |
| 112 |
dialog.hide() |
| 113 |
if res == gtk.RESPONSE_YES: |
| 114 |
try: |
| 115 |
+ if os.path.isdir(self.filechooser.get_uri()[7:]): |
| 116 |
+ raise Exception() |
| 117 |
trysave = gnomevfs.xfer_uri( |
| 118 |
gnomevfs.URI("file://%s" % self.location), |
| 119 |
gnomevfs.URI(self.filechooser.get_uri()), |
| 120 |
- gnomevfs.XFER_DELETE_ITEMS, |
| 121 |
+ gnomevfs.XFER_REMOVESOURCE, |
| 122 |
gnomevfs.XFER_ERROR_MODE_ABORT, |
| 123 |
gnomevfs.XFER_OVERWRITE_MODE_REPLACE) |
| 124 |
except Exception: |
| 125 |
|
| 126 |
|
| 127 |
|
| 128 |
1.1 media-video/istanbul/files/istanbul-0.2.2-desktop-file.patch |
| 129 |
|
| 130 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/istanbul/files/istanbul-0.2.2-desktop-file.patch?rev=1.1&view=markup |
| 131 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/istanbul/files/istanbul-0.2.2-desktop-file.patch?rev=1.1&content-type=text/plain |
| 132 |
|
| 133 |
Index: istanbul-0.2.2-desktop-file.patch |
| 134 |
=================================================================== |
| 135 |
diff --git a/data/istanbul.desktop.in b/data/istanbul.desktop.in |
| 136 |
index 4235410..a1b5772 100644 |
| 137 |
--- a/data/istanbul.desktop.in |
| 138 |
+++ b/data/istanbul.desktop.in |
| 139 |
@@ -1,11 +1,10 @@ |
| 140 |
[Desktop Entry] |
| 141 |
-Encoding=UTF-8 |
| 142 |
_Name=Istanbul Desktop Session Recorder |
| 143 |
_GenericName=Desktop Session Recorder |
| 144 |
_Comment=Record a video of your desktop session |
| 145 |
Exec=istanbul |
| 146 |
Terminal=false |
| 147 |
Type=Application |
| 148 |
-Icon=istanbul.png |
| 149 |
-Categories=GNOME;Application;AudioVideo; |
| 150 |
+Icon=istanbul |
| 151 |
+Categories=GTK;GNOME;AudioVideo; |
| 152 |
StartupNotify=false |
| 153 |
|
| 154 |
|
| 155 |
|
| 156 |
1.1 media-video/istanbul/files/istanbul-0.2.2-fix-preview-window.patch |
| 157 |
|
| 158 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/istanbul/files/istanbul-0.2.2-fix-preview-window.patch?rev=1.1&view=markup |
| 159 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/istanbul/files/istanbul-0.2.2-fix-preview-window.patch?rev=1.1&content-type=text/plain |
| 160 |
|
| 161 |
Index: istanbul-0.2.2-fix-preview-window.patch |
| 162 |
=================================================================== |
| 163 |
From: Jef Spaleta <jspaleta@×××××.com> |
| 164 |
Subject: Additional patch to fix preview video widget in save_window.py |
| 165 |
Origin: upstream |
| 166 |
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=604938 |
| 167 |
Bug-Debian: http://bugs.debian.org/554568 |
| 168 |
|
| 169 |
Index: istanbul-0.2.2/istanbul/main/save_window.py |
| 170 |
=================================================================== |
| 171 |
--- istanbul-0.2.2.orig/istanbul/main/save_window.py 2010-07-08 10:39:51.433390429 +0200 |
| 172 |
+++ istanbul-0.2.2/istanbul/main/save_window.py 2010-07-08 10:39:49.184894943 +0200 |
| 173 |
@@ -143,8 +143,11 @@ |
| 174 |
yoptions=0) |
| 175 |
table.set_row_spacing(0,6) |
| 176 |
table.set_row_spacing(1,6) |
| 177 |
+ def init_videowidget( widget): |
| 178 |
+ widget._xid = widget.window.xid |
| 179 |
+ self.player.pause() |
| 180 |
self.videowidget.connect_after('realize', |
| 181 |
- lambda *x: self.player.pause() ) |
| 182 |
+ init_videowidget ) |
| 183 |
self.videowidget.set_size_request(width, height) |
| 184 |
|
| 185 |
# create save, edit, cancel buttons |
Archives