From: Jakub Bogusz Date: Sun, 10 Jan 2016 10:46:33 +0000 (+0100) Subject: - updated to 0.95 (for gstreamer 1.x/gtk+3/python3; 0.15.x left on pitivi-0.15 branch) X-Git-Tag: auto/th/pitivi-0.95-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=9b8f249a866f35d587e2955a67c7cafa436f0fc9;p=packages%2Fpitivi.git - updated to 0.95 (for gstreamer 1.x/gtk+3/python3; 0.15.x left on pitivi-0.15 branch) - removed outdated ignore-unknown-stream-types patch --- diff --git a/pitivi-0.15.0-ignore-unknown-stream-types.patch b/pitivi-0.15.0-ignore-unknown-stream-types.patch deleted file mode 100644 index ff2c7ee..0000000 --- a/pitivi-0.15.0-ignore-unknown-stream-types.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -rup pitivi/effects.py pitivi/effects.py ---- pitivi/effects.py 2011-09-24 11:16:29.000000000 -0400 -+++ pitivi/effects.py 2011-11-18 11:09:21.475474154 -0500 -@@ -187,9 +187,13 @@ class EffectsHandler(object): - - if padTmp.direction == gst.PAD_SRC: - stream = get_stream_for_pad(pad) -+ if stream is None: -+ continue - factory.addInputStream(stream) - elif padTmp.direction == gst.PAD_SINK: - stream = get_stream_for_pad(pad) -+ if stream is None: -+ continue - factory.addOutputStream(stream) - return True - -diff -rup pitivi/stream.py pitivi/stream.py ---- pitivi/stream.py 2011-09-24 11:16:29.000000000 -0400 -+++ pitivi/stream.py 2011-11-18 11:09:43.524670882 -0500 -@@ -370,6 +370,8 @@ def get_stream_for_pad(pad, store_pad=Fa - caps = pad.get_caps() - pad_id = get_pad_id(pad) - stream = get_stream_for_caps(caps, pad) -+ if stream is None: -+ return None - stream.pad_id = pad_id - if store_pad: - stream.pad = pad diff --git a/pitivi.spec b/pitivi.spec index f6a2655..e1e7acb 100644 --- a/pitivi.spec +++ b/pitivi.spec @@ -1,38 +1,44 @@ Summary: Non-linear video editor -Summary(pl.UTF-8): Edytor wideo +Summary(pl.UTF-8): Nieliniowy edytor filmów Name: pitivi -Version: 0.15.2 -Release: 3 -License: LGPL v2+ +Version: 0.95 +Release: 1 +License: LGPL v2.1+ Group: X11/Applications/Multimedia -Source0: http://ftp.gnome.org/pub/GNOME/sources/pitivi/0.15/%{name}-%{version}.tar.xz -# Source0-md5: e0e379fca759025140ac1316819b2173 -Patch0: pitivi-0.15.0-ignore-unknown-stream-types.patch +Source0: http://ftp.gnome.org/pub/GNOME/sources/pitivi/0.95/%{name}-%{version}.tar.xz +# Source0-md5: 7bb0bca1b25ef592f0105c3ad93b8c20 URL: http://www.pitivi.org/ BuildRequires: autoconf >= 2.52 BuildRequires: automake +BuildRequires: cairo-devel BuildRequires: gettext-tools +BuildRequires: glib2-devel >= 1:2.30.0 +BuildRequires: gobject-introspection-devel >= 1.32.0 +BuildRequires: gstreamer-devel >= 1.6.0 +BuildRequires: gstreamer-plugins-base-devel >= 1.6.0 +BuildRequires: gtk+3-devel >= 3.10.0 BuildRequires: intltool >= 0.35.0 -BuildRequires: python >= 1:2.5 -BuildRequires: python-modules +BuildRequires: libtool >= 2:2 +BuildRequires: pkgconfig +BuildRequires: python3 >= 1:3.2 +BuildRequires: python3-devel >= 1:3.2 +BuildRequires: python3-modules >= 1:3.2 +BuildRequires: python3-pycairo-devel BuildRequires: rpm-pythonprov BuildRequires: rpmbuild(macros) >= 1.311 +BuildRequires: yelp-tools Requires(post,postun): desktop-file-utils Requires(post,postun): gtk-update-icon-cache Requires(post,postun): shared-mime-info -Requires: Zope-Interface -Requires: gstreamer-audiosink >= 0.10.29 -Requires: gstreamer-gnonlin >= 0.10.16 -Requires: gstreamer-plugins-good -Requires: gstreamer-videosink >= 0.10.29 +Requires: gstreamer-audiosink >= 1.6.0 +Requires: gstreamer-editing-services >= 1.6.0 +Requires: gstreamer-plugins-good >= 1.6.0 +Requires: gstreamer-videosink >= 1.6.0 +Requires: gtk+3 >= 3.10.0 Requires: hicolor-icon-theme -Requires: python-gstreamer >= 0.10.19 -Requires: python-pycairo -Requires: python-pygoocanvas -Requires: python-pygtk-glade >= 2:2.24.0 -Requires: python-pygtk-gtk >= 2:2.24.0 -Requires: python-pyxdg -Requires: python-setuptools +Requires: python3-gstreamer >= 1.6.0 +Requires: python3-pycairo +Requires: python3-pygobject3 >= 3 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -43,14 +49,14 @@ PiTiVi jest programem do edycji wideo używającym GStreamera. %prep %setup -q -%patch0 -p0 %build -%{__intltoolize} -%{__aclocal} -I common/m4 +%{__libtoolize} +%{__aclocal} -I m4 -I common/m4 %{__autoconf} %{__automake} -%configure +%configure \ + --disable-static %{__make} %install @@ -59,6 +65,8 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/python/pitivi/timeline/renderer.la + %find_lang %{name} --with-gnome %clean @@ -76,12 +84,23 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS ChangeLog NEWS README RELEASE +%doc AUTHORS COPYING NEWS README RELEASE %attr(755,root,root) %{_bindir}/pitivi -%{_libdir}/%{name} +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/python +%dir %{_libdir}/%{name}/python/pitivi +%{_libdir}/%{name}/python/pitivi/*.py +%{_libdir}/%{name}/python/pitivi/__pycache__ +%{_libdir}/%{name}/python/pitivi/dialogs +%dir %{_libdir}/%{name}/python/pitivi/timeline +%{_libdir}/%{name}/python/pitivi/timeline/*.py +%{_libdir}/%{name}/python/pitivi/timeline/__pycache__ +%attr(755,root,root) %{_libdir}/%{name}/python/pitivi/timeline/renderer.so +%{_libdir}/%{name}/python/pitivi/undo +%{_libdir}/%{name}/python/pitivi/utils %{_datadir}/%{name} +%{_datadir}/appdata/pitivi.appdata.xml %{_datadir}/mime/packages/%{name}.xml %{_desktopdir}/%{name}.desktop -%{_iconsdir}/hicolor/*/*/*.png -%{_iconsdir}/hicolor/*/*/*.svg -%{_mandir}/man1/%{name}.1* +%{_iconsdir}/hicolor/*x*/apps/pitivi.png +%{_mandir}/man1/pitivi.1*