From 22aaf62cef4e4046b68ae63a522bf8ed70e1dd49f02a9b01ff4693a5f230aa31 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 7 Sep 2012 15:23:59 +0000 Subject: [PATCH 1/3] Accepting request 133146 from GNOME:Next Push G:N - Resubmit after adjusting based on the comments OBS-URL: https://build.opensuse.org/request/show/133146 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/farstream?expand=0&rev=8 --- farstream-0.1.2.tar.gz | 3 -- farstream-0.2.0.0.tar.xz | 3 ++ farstream.changes | 17 ++++++ farstream.spec | 111 +++++++++++++++++---------------------- 4 files changed, 68 insertions(+), 66 deletions(-) delete mode 100644 farstream-0.1.2.tar.gz create mode 100644 farstream-0.2.0.0.tar.xz diff --git a/farstream-0.1.2.tar.gz b/farstream-0.1.2.tar.gz deleted file mode 100644 index ab570fc..0000000 --- a/farstream-0.1.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa5a40597b47b59d124f7fd57f66704b030d576cdc0d90e107c7a592f05e73d9 -size 1265972 diff --git a/farstream-0.2.0.0.tar.xz b/farstream-0.2.0.0.tar.xz new file mode 100644 index 0000000..6a0d07a --- /dev/null +++ b/farstream-0.2.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89d2576dd014904fd4aa2d838ebf52b68e33ad38eaf5ca01827a5b6beea21d8f +size 747464 diff --git a/farstream.changes b/farstream.changes index 87b34c6..1b73ec3 100644 --- a/farstream.changes +++ b/farstream.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Sep 4 16:18:56 UTC 2012 - dimstar@opensuse.org + +- Update to version 0.1.99 (0.2.0 git snapshot 2012/09/04) + + Port to GStreamer 1.0 +- Drop farstream-gtkdoc.patch: fixed upstream. +- Drop python sub package: python support has been dropped. +- Rename libfarstream-0_1-0 to libfarstream-0_2-0 and + typelib-1_0-Farstream-0_1 to typelib-1_0-Fatstream-0_2, following + upstream library name changes. + +------------------------------------------------------------------- +Tue Aug 14 10:45:54 UTC 2012 - dimstar@opensuse.org + +- Add farstream-gtkdoc.patch: Gtk-doc tags belong after the + description. Fix build on newer gtk-doc versions. + ------------------------------------------------------------------- Mon Mar 26 08:18:15 UTC 2012 - vuntz@opensuse.org diff --git a/farstream.spec b/farstream.spec index e245a2c..1c8e3fa 100644 --- a/farstream.spec +++ b/farstream.spec @@ -17,8 +17,9 @@ Name: farstream -Version: 0.1.2 +Version: 0.1.1.99_0.2.0 Release: 0 +%define _version 0.2.0.0 # License note: the only GPL-2.0+ files are farstream-0.1.1/common/coverage/* # and common/gstdoc-scangobj; those are just used during the build and do not # affect the license of the binary packages @@ -26,58 +27,58 @@ Summary: GStreamer modules and libraries for videoconferencing License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Multimedia/Other Url: http://farsight.freedesktop.org/ -Source: http://freedesktop.org/software/farstream/releases/farstream/%{name}-%{version}.tar.gz +Source: http://freedesktop.org/software/farstream/releases/farstream/%{name}-%{_version}.tar.xz BuildRequires: fdupes BuildRequires: glib2-devel >= 2.30 BuildRequires: gobject-introspection-devel >= 0.10.1 -BuildRequires: gstreamer-0_10-devel >= 0.10.33 -BuildRequires: gstreamer-0_10-plugins-base-devel >= 0.10.33 +BuildRequires: gstreamer-devel >= 0.11 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.16 -BuildRequires: pkgconfig(gst-python-0.10) >= 0.10.10 -BuildRequires: pkgconfig(gupnp-igd-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(gupnp-igd-1.0) >= 0.2 BuildRequires: pkgconfig(nice) >= 0.1.0 BuildRequires: pkgconfig(pygobject-2.0) >= 2.16.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build +%define gst_pluginsdir %(pkg-config --variable pluginsdir gstreamer-1.0) %description Farstream is a collection of GStreamer modules and libraries for videoconferencing. -%package -n libfarstream-0_1-0 +%package -n libfarstream-0_2-0 Summary: GStreamer modules and libraries for videoconferencing License: LGPL-2.1+ Group: System/Libraries Requires: %{name}-data # While not strictly needed, apps using farstream will need the gstreamer # plugins, so simply put a Requires here instead of in all apps -Requires: gstreamer-0_10-plugins-farstream +Requires: gstreamer-plugins-farstream -%description -n libfarstream-0_1-0 +%description -n libfarstream-0_2-0 Farstream is a collection of GStreamer modules and libraries for videoconferencing. -%package -n typelib-1_0-Farstream-0_1 +%package -n typelib-1_0-Farstream-0_2 Summary: GStreamer modules and libraries for videoconferencing -- Introspection bindings License: LGPL-2.1+ Group: System/Libraries -%description -n typelib-1_0-Farstream-0_1 +%description -n typelib-1_0-Farstream-0_2 Farstream is a collection of GStreamer modules and libraries for videoconferencing. This package provides the GObject Introspection bindings for Farstream. -%package -n gstreamer-0_10-plugins-farstream +%package -n gstreamer-plugins-farstream Summary: GStreamer Plug-Ins for videoconferencing License: LGPL-2.1+ Group: Productivity/Multimedia/Other -Requires: gstreamer-0_10-plugins-bad >= 0.10.23 -Requires: gstreamer-0_10-plugins-good >= 0.10.29 +Requires: gstreamer-plugins-bad >= 0.11 +Requires: gstreamer-plugins-good >= 0.11 # Unfortunately, the gstreamer elements have the same name; since we're # dropping farsight, let's Obsolete the old package for a smooth transition Obsoletes: libgstfarsight-0_10-0 -%description -n gstreamer-0_10-plugins-farstream +%description -n gstreamer-plugins-farstream Farstream is a collection of GStreamer modules and libraries for videoconferencing. @@ -98,26 +99,15 @@ used by the library. Summary: GStreamer modules and libraries for videoconferencing -- Development files License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Requires: libfarstream-0_1-0 = %{version} -Requires: typelib-1_0-Farstream-0_1 = %{version} +Requires: libfarstream-0_2-0 = %{version} +Requires: typelib-1_0-Farstream-0_2 = %{version} %description devel Farstream is a collection of GStreamer modules and libraries for videoconferencing. -%package -n python-farstream -Summary: GStreamer modules and libraries for videoconferencing -- Python bindings -License: LGPL-2.1+ -Group: Development/Libraries/Python -Requires: libfarstream-0_1-0 = %{version} -%py_requires - -%description -n python-farstream -Farstream is a collection of GStreamer modules and libraries for -videoconferencing. - %prep -%setup -q +%setup -q -n %{name}-%{_version} %build %configure \ @@ -129,54 +119,49 @@ make %{?_smp_mflags} find %{buildroot} -name '*.la' -delete -print %fdupes %{buildroot}%{_datadir}/gtk-doc/html/ -%post -n libfarstream-0_1-0 -p /sbin/ldconfig +%post -n libfarstream-0_2-0 -p /sbin/ldconfig -%postun -n libfarstream-0_1-0 -p /sbin/ldconfig +%postun -n libfarstream-0_2-0 -p /sbin/ldconfig -%files -n libfarstream-0_1-0 +%files -n libfarstream-0_2-0 %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README -%{_libdir}/libfarstream-0.1.so.* -%dir %{_libdir}/farstream-0.1/ -%{_libdir}/farstream-0.1/libmulticast-transmitter.so -%{_libdir}/farstream-0.1/libnice-transmitter.so -%{_libdir}/farstream-0.1/librawudp-transmitter.so -%{_libdir}/farstream-0.1/libshm-transmitter.so +%{_libdir}/libfarstream-0.2.so.* +%dir %{_libdir}/farstream-0.2/ +%{_libdir}/farstream-0.2/libmulticast-transmitter.so +%{_libdir}/farstream-0.2/libnice-transmitter.so +%{_libdir}/farstream-0.2/librawudp-transmitter.so +%{_libdir}/farstream-0.2/libshm-transmitter.so -%files -n typelib-1_0-Farstream-0_1 +%files -n typelib-1_0-Farstream-0_2 %defattr(-, root, root) -%{_libdir}/girepository-1.0/Farstream-0.1.typelib +%{_libdir}/girepository-1.0/Farstream-0.2.typelib -%files -n gstreamer-0_10-plugins-farstream +%files -n gstreamer-plugins-farstream %defattr(-,root,root) -%{_libdir}/gstreamer-0.10/libfsfunnel.so -%{_libdir}/gstreamer-0.10/libfsmsnconference.so -%{_libdir}/gstreamer-0.10/libfsrawconference.so -%{_libdir}/gstreamer-0.10/libfsrtcpfilter.so -%{_libdir}/gstreamer-0.10/libfsrtpconference.so -%{_libdir}/gstreamer-0.10/libfsvideoanyrate.so +%{gst_pluginsdir}/libfsmsnconference.so +%{gst_pluginsdir}/libfsrawconference.so +%{gst_pluginsdir}/libfsrtcpfilter.so +%{gst_pluginsdir}/libfsrtpconference.so +%{gst_pluginsdir}/libfsvideoanyrate.so %files data %defattr(-, root, root) %dir %{_datadir}/farstream/ -%dir %{_datadir}/farstream/0.1/ -%dir %{_datadir}/farstream/0.1/fsrawconference/ -%{_datadir}/farstream/0.1/fsrawconference/default-element-properties -%dir %{_datadir}/farstream/0.1/fsrtpconference/ -%{_datadir}/farstream/0.1/fsrtpconference/default-codec-preferences -%{_datadir}/farstream/0.1/fsrtpconference/default-element-properties +%dir %{_datadir}/farstream/0.2/ +%dir %{_datadir}/farstream/0.2/fsrawconference/ +%{_datadir}/farstream/0.2/fsrawconference/default-element-properties +%dir %{_datadir}/farstream/0.2/fsrtpconference/ +%{_datadir}/farstream/0.2/fsrtpconference/default-codec-preferences +%{_datadir}/farstream/0.2/fsrtpconference/default-element-properties %files devel %defattr(-,root,root) -%{_includedir}/farstream-0.1/ -%{_libdir}/libfarstream-0.1.so -%{_libdir}/pkgconfig/farstream-0.1.pc -%{_datadir}/gir-1.0/Farstream-0.1.gir -%doc %{_datadir}/gtk-doc/html/farstream-libs-0.10/ -%doc %{_datadir}/gtk-doc/html/farstream-plugins-0.1/ - -%files -n python-farstream -%defattr(-,root,root) -%{py_sitedir}/farstream.so +%{_includedir}/farstream-0.2/ +%{_libdir}/libfarstream-0.2.so +%{_libdir}/pkgconfig/farstream-0.2.pc +%{_datadir}/gir-1.0/Farstream-0.2.gir +%doc %{_datadir}/gtk-doc/html/farstream-libs-1.0/ +%doc %{_datadir}/gtk-doc/html/farstream-plugins-0.2/ %changelog From 45b3bd643c267f06c3a06eb9cb961c742ec4889db0a0f853bf9d03fbba54305c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 21 Sep 2012 19:40:11 +0000 Subject: [PATCH 2/3] Accepting request 134404 from home:dimstar:branches:GNOME:Factory Resubmit after comments - the build failure was a stale glib2 package in my branch... OBS-URL: https://build.opensuse.org/request/show/134404 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/farstream?expand=0&rev=9 --- farstream-0.1.91.tar.gz | 3 +++ farstream-0.2.0.0.tar.xz | 3 --- farstream.changes | 11 ++++++++++- farstream.spec | 21 ++++++++++----------- 4 files changed, 23 insertions(+), 15 deletions(-) create mode 100644 farstream-0.1.91.tar.gz delete mode 100644 farstream-0.2.0.0.tar.xz diff --git a/farstream-0.1.91.tar.gz b/farstream-0.1.91.tar.gz new file mode 100644 index 0000000..a29605a --- /dev/null +++ b/farstream-0.1.91.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8aa148759f7ee771ba03168d0a9e0ef67b9f7b9d0faec07a551baaa10d441e35 +size 1233227 diff --git a/farstream-0.2.0.0.tar.xz b/farstream-0.2.0.0.tar.xz deleted file mode 100644 index 6a0d07a..0000000 --- a/farstream-0.2.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:89d2576dd014904fd4aa2d838ebf52b68e33ad38eaf5ca01827a5b6beea21d8f -size 747464 diff --git a/farstream.changes b/farstream.changes index 1b73ec3..77a1299 100644 --- a/farstream.changes +++ b/farstream.changes @@ -1,7 +1,16 @@ +------------------------------------------------------------------- +Fri Sep 14 19:57:50 UTC 2012 - dimstar@opensuse.org + +- Update to version 0.1.91: + + Minor bug fixes. + + Bump soname, showing that this version is ABI incompatible. +- Rename libfarstream-0_2-0 to libfarstream-0_2-1, following + upstreams soname bump + ------------------------------------------------------------------- Tue Sep 4 16:18:56 UTC 2012 - dimstar@opensuse.org -- Update to version 0.1.99 (0.2.0 git snapshot 2012/09/04) +- Update to version 0.1.1.99 (0.2.0 git snapshot 2012/09/04) + Port to GStreamer 1.0 - Drop farstream-gtkdoc.patch: fixed upstream. - Drop python sub package: python support has been dropped. diff --git a/farstream.spec b/farstream.spec index 1c8e3fa..56fc58b 100644 --- a/farstream.spec +++ b/farstream.spec @@ -17,9 +17,8 @@ Name: farstream -Version: 0.1.1.99_0.2.0 +Version: 0.1.91 Release: 0 -%define _version 0.2.0.0 # License note: the only GPL-2.0+ files are farstream-0.1.1/common/coverage/* # and common/gstdoc-scangobj; those are just used during the build and do not # affect the license of the binary packages @@ -27,7 +26,7 @@ Summary: GStreamer modules and libraries for videoconferencing License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Multimedia/Other Url: http://farsight.freedesktop.org/ -Source: http://freedesktop.org/software/farstream/releases/farstream/%{name}-%{_version}.tar.xz +Source: http://freedesktop.org/software/farstream/releases/farstream/%{name}-%{version}.tar.gz BuildRequires: fdupes BuildRequires: glib2-devel >= 2.30 BuildRequires: gobject-introspection-devel >= 0.10.1 @@ -35,7 +34,7 @@ BuildRequires: gstreamer-devel >= 0.11 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.16 BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gupnp-igd-1.0) >= 0.2 -BuildRequires: pkgconfig(nice) >= 0.1.0 +BuildRequires: pkgconfig(nice) >= 0.1.3 BuildRequires: pkgconfig(pygobject-2.0) >= 2.16.0 BuildRoot: %{_tmppath}/%{name}-%{version}-build %define gst_pluginsdir %(pkg-config --variable pluginsdir gstreamer-1.0) @@ -44,7 +43,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Farstream is a collection of GStreamer modules and libraries for videoconferencing. -%package -n libfarstream-0_2-0 +%package -n libfarstream-0_2-1 Summary: GStreamer modules and libraries for videoconferencing License: LGPL-2.1+ Group: System/Libraries @@ -53,7 +52,7 @@ Requires: %{name}-data # plugins, so simply put a Requires here instead of in all apps Requires: gstreamer-plugins-farstream -%description -n libfarstream-0_2-0 +%description -n libfarstream-0_2-1 Farstream is a collection of GStreamer modules and libraries for videoconferencing. @@ -99,7 +98,7 @@ used by the library. Summary: GStreamer modules and libraries for videoconferencing -- Development files License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Requires: libfarstream-0_2-0 = %{version} +Requires: libfarstream-0_2-1 = %{version} Requires: typelib-1_0-Farstream-0_2 = %{version} %description devel @@ -107,7 +106,7 @@ Farstream is a collection of GStreamer modules and libraries for videoconferencing. %prep -%setup -q -n %{name}-%{_version} +%setup -q %build %configure \ @@ -119,11 +118,11 @@ make %{?_smp_mflags} find %{buildroot} -name '*.la' -delete -print %fdupes %{buildroot}%{_datadir}/gtk-doc/html/ -%post -n libfarstream-0_2-0 -p /sbin/ldconfig +%post -n libfarstream-0_2-1 -p /sbin/ldconfig -%postun -n libfarstream-0_2-0 -p /sbin/ldconfig +%postun -n libfarstream-0_2-1 -p /sbin/ldconfig -%files -n libfarstream-0_2-0 +%files -n libfarstream-0_2-1 %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/libfarstream-0.2.so.* From f623ed94d986fcf113791d8215dedf36c59200ff286005890c34d5acc5b2fd82 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 25 Sep 2012 22:12:39 +0000 Subject: [PATCH 3/3] Accepting request 136003 from home:dimstar:branches:GNOME:Factory Update to 0.2.0 OBS-URL: https://build.opensuse.org/request/show/136003 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/farstream?expand=0&rev=10 --- farstream-0.1.91.tar.gz | 3 --- farstream-0.2.0.tar.gz | 3 +++ farstream.changes | 14 ++++++++++++++ farstream.spec | 20 ++++++++++---------- 4 files changed, 27 insertions(+), 13 deletions(-) delete mode 100644 farstream-0.1.91.tar.gz create mode 100644 farstream-0.2.0.tar.gz diff --git a/farstream-0.1.91.tar.gz b/farstream-0.1.91.tar.gz deleted file mode 100644 index a29605a..0000000 --- a/farstream-0.1.91.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8aa148759f7ee771ba03168d0a9e0ef67b9f7b9d0faec07a551baaa10d441e35 -size 1233227 diff --git a/farstream-0.2.0.tar.gz b/farstream-0.2.0.tar.gz new file mode 100644 index 0000000..6639986 --- /dev/null +++ b/farstream-0.2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5b9d97056ecf43d6dafade7cbe959c2a4e412eb75a3104911586f40f5f0378c9 +size 1243905 diff --git a/farstream.changes b/farstream.changes index 77a1299..82b7b93 100644 --- a/farstream.changes +++ b/farstream.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Sep 25 21:39:04 UTC 2012 - dimstar@opensuse.org + +- Update to version 0.2.0: + + Official GStreamer 1.0 release. + + Ported python example to GStreamer 1.0 and GTK+ 3. + + Use GLib 2.32 APIs. + + Made API more introspection friendly. + + Ignore Error messages from the decoders. + + Prefer Opus and VP8. + + Various bug fixes. +- Rename libfarstream-0_2-1 to libfarstream-0_2-2, following + upstreams soname bump. + ------------------------------------------------------------------- Fri Sep 14 19:57:50 UTC 2012 - dimstar@opensuse.org diff --git a/farstream.spec b/farstream.spec index 56fc58b..0d25bf7 100644 --- a/farstream.spec +++ b/farstream.spec @@ -17,7 +17,7 @@ Name: farstream -Version: 0.1.91 +Version: 0.2.0 Release: 0 # License note: the only GPL-2.0+ files are farstream-0.1.1/common/coverage/* # and common/gstdoc-scangobj; those are just used during the build and do not @@ -28,11 +28,11 @@ Group: Productivity/Multimedia/Other Url: http://farsight.freedesktop.org/ Source: http://freedesktop.org/software/farstream/releases/farstream/%{name}-%{version}.tar.gz BuildRequires: fdupes -BuildRequires: glib2-devel >= 2.30 +BuildRequires: glib2-devel >= 2.32 BuildRequires: gobject-introspection-devel >= 0.10.1 -BuildRequires: gstreamer-devel >= 0.11 +BuildRequires: gstreamer-devel >= 1.0 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.16 -BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 1.0 BuildRequires: pkgconfig(gupnp-igd-1.0) >= 0.2 BuildRequires: pkgconfig(nice) >= 0.1.3 BuildRequires: pkgconfig(pygobject-2.0) >= 2.16.0 @@ -43,7 +43,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Farstream is a collection of GStreamer modules and libraries for videoconferencing. -%package -n libfarstream-0_2-1 +%package -n libfarstream-0_2-2 Summary: GStreamer modules and libraries for videoconferencing License: LGPL-2.1+ Group: System/Libraries @@ -52,7 +52,7 @@ Requires: %{name}-data # plugins, so simply put a Requires here instead of in all apps Requires: gstreamer-plugins-farstream -%description -n libfarstream-0_2-1 +%description -n libfarstream-0_2-2 Farstream is a collection of GStreamer modules and libraries for videoconferencing. @@ -98,7 +98,7 @@ used by the library. Summary: GStreamer modules and libraries for videoconferencing -- Development files License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Requires: libfarstream-0_2-1 = %{version} +Requires: libfarstream-0_2-2 = %{version} Requires: typelib-1_0-Farstream-0_2 = %{version} %description devel @@ -118,11 +118,11 @@ make %{?_smp_mflags} find %{buildroot} -name '*.la' -delete -print %fdupes %{buildroot}%{_datadir}/gtk-doc/html/ -%post -n libfarstream-0_2-1 -p /sbin/ldconfig +%post -n libfarstream-0_2-2 -p /sbin/ldconfig -%postun -n libfarstream-0_2-1 -p /sbin/ldconfig +%postun -n libfarstream-0_2-2 -p /sbin/ldconfig -%files -n libfarstream-0_2-1 +%files -n libfarstream-0_2-2 %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/libfarstream-0.2.so.*