Login
[x]
Log in using an account from:
Fedora Account System
Red Hat Associate
Red Hat Customer
Or login using a Red Hat Bugzilla account
Forgot Password
Login:
Hide Forgot
Create an Account
Red Hat Bugzilla – Attachment 226231 Details for
Bug 327211
RFE: Totem should build both the xine and gstreamer backends
[?]
New
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
|
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh83 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
totem.spec patch
totem.spec.patch (text/plain), 10.46 KB, created by
Stewart Adam
on 2007-10-13 01:04:21 UTC
(
hide
)
Description:
totem.spec patch
Filename:
MIME Type:
Creator:
Stewart Adam
Created:
2007-10-13 01:04:21 UTC
Size:
10.46 KB
patch
obsolete
>Index: totem.spec >=================================================================== >RCS file: /cvs/extras/rpms/totem/devel/totem.spec,v >retrieving revision 1.121 >diff -u -p -r1.121 totem.spec >--- totem.spec 18 Sep 2007 10:46:18 -0000 1.121 >+++ totem.spec 13 Oct 2007 01:02:39 -0000 >@@ -1,37 +1,45 @@ >+# for testing... When submitting to buildsys, leave these as 1 >+%define with_gstreamer 1 >+%define with_xine 1 >+ >+%define mozillaplugindir %{_libdir}/mozilla/plugins >+%define schemas totem.schemas totem-handlers.schemas totem-video-thumbnail.schemas >+ >+# Use these gstreamer versions > %define gstreamer_version 0.10.1 > %define gstreamer_plugins_base_version 0.10.14-3 > %define gstreamer_plugins_good_version 0.10.0 > >+# use these xine versions >+%define xine_version 1.1.7 >+ > Summary: Movie player for GNOME 2 > Name: totem > Version: 2.20.0 >-Release: 1%{?dist} >-License: GPLv2 with exception >+Release: 3%{?dist}.1 >+License: GPLv2 with exceptions > Group: Applications/Multimedia > URL: http://www.gnome.org/projects/totem/ > Source0: http://ftp.gnome.org/pub/GNOME/sources/totem/2.20/totem-%{version}.tar.bz2 >+Source1: totem-bin-backend-ondemand.sh >+Patch0: totem-2.20.0-backend-schema.patch > BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) > > Requires(pre): GConf2 >= 2.14 > Requires(preun): GConf2 >= 2.14 > Requires(post): GConf2 >= 2.14 > Requires(post): desktop-file-utils >-Requires(post): scrollkeeper >+Requires(post): scrollkeeper > Requires(postun): desktop-file-utils > Requires(postun): scrollkeeper > > Requires: gnome-desktop >= 2.6.0 >-Requires: gstreamer >= %gstreamer_version >-Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version >-Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version > Requires: iso-codes > Requires: gnome-themes > Requires: %{name}-plparser = %{version}-%{release} >+Requires: %{name}-backend = %{version}-%{release} > > BuildRequires: gcc-c++, pkgconfig, gettext, scrollkeeper >-BuildRequires: gstreamer-devel >= %gstreamer_version >-BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version >-BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version > BuildRequires: gnome-desktop-devel >= 2.6.0, gnome-vfs2-devel, libglade2-devel > BuildRequires: perl(XML::Parser) > BuildRequires: iso-codes-devel >@@ -55,6 +63,42 @@ Totem is simple movie player for the Gno > simple playlist, a full-screen mode, seek and volume controls, as well as > a pretty complete keyboard navigation. > >+# -- # >+ >+%if %{with_gstreamer} >+%package gstreamer >+Summary: Gstreamer backend for Totem >+Group: Applications/Multimedia >+Provides: %{name}-backend >+Requires: %{name} = %{version} >+Requires: gstreamer >= %gstreamer_version >+Requires: gstreamer-plugins-base >= %gstreamer_plugins_base_version >+Requires: gstreamer-plugins-good >= %gstreamer_plugins_good_version >+BuildRequires: gstreamer-devel >= %gstreamer_version >+BuildRequires: gstreamer-plugins-base-devel >= %gstreamer_plugins_base_version >+BuildRequires: gstreamer-plugins-good >= %gstreamer_plugins_good_version >+ >+%description gstreamer >+This package provides the gstreamer backend for the Totem media player. >+%endif >+ >+# -- # >+ >+%if %{with_xine} >+%package xine >+Summary: Gstreamer backend for Totem >+Group: Applications/Multimedia >+Provides: %{name}-backend >+Requires: %{name} = %{version} >+Requires: xine-lib >= %{xine_version} >+BuildRequires: xine-lib-devel >= %{xine_version} >+ >+%description xine >+This package provides the xine backend for the Totem media player. >+%endif >+ >+# -- # >+ > %package mozplugin > Summary: Mozilla plugin for Totem > Group: Applications/Internet >@@ -63,14 +107,19 @@ Group: Applications/Internet > Totem is simple movie player for the Gnome desktop. The mozilla plugin > for totem allows totem to be embeded into a web browser. > >+# -- # >+ > %package plparser > Summary: Totem playlist parser library > License: LGPLv2+ > Group: Development/Libraries >+Obsoletes: totem-xine-plparser > > %description plparser > A library to parse various forms of music playlists. > >+# -- # >+ > %package lirc > Summary: LIRC (Infrared remote) plugin for Totem > Group: Applications/Multimedia >@@ -79,6 +128,8 @@ Requires: %{name} = %{version}-%{release > %description lirc > A plugin to add LIRC (Infrared remote) support to Totem. > >+# -- # >+ > %package galago > Summary: Galago (Instant Messenger status) plugin for Totem > Group: Applications/Multimedia >@@ -91,6 +142,8 @@ playing a movie in fullscreen. > Your Instant Messenging program might require a plugin to take > advantage of this feature. > >+# -- # >+ > %package devel > Summary: Libraries/include files for Totem > License: LGPLv2+ >@@ -109,35 +162,114 @@ a pretty complete keyboard navigation. > This package contains the libraries and includes files necessary to develop > applications with Totem's plparser library. > >+# -- # > > %prep >-%setup -q >+%setup -q -c >+# Whatever needs to be changed in both copies do first >+ >+# remember to update me when changing %doc >+for i in AUTHORS COPYING NEWS README TODO;do >+ mv totem-%{version}/$i . >+done >+ >+pushd totem-%{version} >+%patch0 -b .patch0 >+popd >+ >+# duplicate sources >+cp -a totem-%{version} xine >+mv totem-%{version} gstreamer > > %build >+ >+export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins >+ >+%if %{with_gstreamer} >+pushd gstreamer > # try to work around a problem where gst-inspect does > # not find playbin the first time around > /usr/bin/gst-inspect-0.10 --print-all > /dev/null >-export MOZILLA_PLUGINDIR=%{_libdir}/mozilla/plugins > %configure \ > --enable-gstreamer \ >+ --disable-xine \ >+ --enable-mozilla \ >+ --enable-nautilus \ >+ --disable-scrollkeeper \ >+ --disable-nvtv \ >+ --program-suffix '-gstreamer' >+ >+make %{?_smp_mflags} >+popd >+%endif >+ >+%if %{with_xine} >+pushd xine >+%configure \ >+ --enable-xine \ >+ --disable-gstreamer \ > --enable-mozilla \ > --enable-nautilus \ > --disable-scrollkeeper \ >- --disable-nvtv >+ --disable-nvtv \ >+ --program-suffix '-xine' > > make %{?_smp_mflags} >+popd >+%endif >+ > > %install > rm -rf $RPM_BUILD_ROOT >+ > export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 >-make install DESTDIR=$RPM_BUILD_ROOT > >+%if %{with_gstreamer} >+# GSTREAMER INSTALL >+pushd gstreamer/ >+make install DESTDIR=$RPM_BUILD_ROOT > %find_lang %{name} --with-gnome >+mv %{name}.lang ../ >+# nautilus plugin doesn't use --program-suffix :/ >+# copy manually >+install -m755 ./src/.libs/libtotem-properties-page.so $RPM_BUILD_ROOT%{_libdir}/libtotem-properties-page-gstreamer.so >+popd >+%endif >+ >+%if %{with_xine} >+# XINE INSTALL >+pushd xine >+make install DESTDIR=$RPM_BUILD_ROOT >+# nautilus plugin doesn't use --program-suffix :/ >+# copy manually >+install -m755 ./src/.libs/libtotem-properties-page.so $RPM_BUILD_ROOT%{_libdir}/libtotem-properties-page-xine.so >+popd >+%endif >+ >+# nautilus plugin doesn't use --program-suffix :/ >+# remove binary file at we can symlink it >+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/libtotem-properties-page.so > > # no static libs and libtool archives either > find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.a" -exec rm -f {} ';' > find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" -exec rm -f {} ';' > >+# these man pages are one and the same... so make one copy >+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/%{name}*xine* >+mv $RPM_BUILD_ROOT%{_mandir}/man1/%{name}-gstreamer.1 \ >+ $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 >+mv $RPM_BUILD_ROOT%{_mandir}/man1/totem-video-thumbnailer-gstreamer.1 \ >+ $RPM_BUILD_ROOT%{_mandir}/man1/totem-video-thumbnailer.1 >+ >+install -m755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name} >+# link other binaries >+ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-video-thumbnailer >+ln -sf %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}-video-indexer >+ln -sf totem-plugin-viewer-gstreamer $RPM_BUILD_ROOT%{_libexecdir}/totem-plugin-viewer >+ln -sf ../../libtotem-properties-page-gstreamer.so $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/libtotem-properties-page.so >+ >+ >+ > %clean > rm -rf $RPM_BUILD_ROOT > >@@ -190,24 +322,42 @@ fi > %doc AUTHORS COPYING NEWS README TODO > %config %{_sysconfdir}/gconf/schemas/*.schemas > %{_bindir}/%{name} >+%{_bindir}/%{name}-video-thumbnailer >+%{_bindir}/%{name}-video-indexer > %{_datadir}/applications/%{name}.desktop > %{_datadir}/omf/%{name}/ > %{_datadir}/%{name}/ >-%{_libdir}/nautilus/extensions-1.0/*.so* >-%dir %{_libdir}/totem/plugins >-%{_libdir}/totem/plugins/gromit >-%{_libdir}/totem/plugins/ontop >-%{_libdir}/totem/plugins/screensaver >-%{_libdir}/totem/plugins/skipto >-%{_libdir}/totem/plugins/properties >-%{_libdir}/totem/plugins/media-player-keys >+%{_libdir}/nautilus/extensions-1.0/libtotem-properties-page.so >+%dir %{_libdir}/%{name}/plugins >+%{_libdir}/%{name}/plugins/gromit >+%{_libdir}/%{name}/plugins/ontop >+%{_libdir}/%{name}/plugins/screensaver >+%{_libdir}/%{name}/plugins/skipto >+%{_libdir}/%{name}/plugins/properties >+%{_libdir}/%{name}/plugins/media-player-keys > #%{_libdir}/totem/plugins/bemused >-%{_bindir}/%{name}-video-thumbnailer >-%{_bindir}/%{name}-video-indexer >-%{_datadir}/icons/hicolor/*/apps/totem.png >-%{_datadir}/icons/hicolor/scalable/apps/totem.svg >-%{_mandir}/man1/%{name}.1* >-%{_mandir}/man1/totem-video-thumbnailer.1.gz >+%{_datadir}/icons/hicolor/*/apps/%{name}.png >+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg >+%{_mandir}/man1/%{name}.1.gz >+%{_mandir}/man1/%{name}-video-thumbnailer.1.gz >+ >+%if %{with_gstreamer} >+%files gstreamer >+%{_bindir}/%{name}-gstreamer >+%{_bindir}/%{name}-video-thumbnailer-gstreamer >+%{_bindir}/%{name}-video-indexer-gstreamer >+%{_libdir}/libtotem-properties-page-gstreamer.so >+%{_libexecdir}/totem-plugin-viewer-gstreamer >+%endif >+ >+%if %{with_xine} >+%files xine >+%{_bindir}/%{name}-xine >+%{_bindir}/%{name}-video-thumbnailer-xine >+%{_bindir}/%{name}-video-indexer-xine >+%{_libdir}/libtotem-properties-page-xine.so >+%{_libexecdir}/totem-plugin-viewer-xine >+%endif > > %files galago > %defattr(-, root, root) >@@ -233,6 +383,23 @@ fi > %{_libdir}/*so > > %changelog >+* Thu Oct 11 2007 Stewart Adam <s.adam@diffingo.com> 2.20.0-3.1 >+- Update %%changelog to include the totem's previous log >+- Follow exising coding/spec style >+- Add --set to switcher script >+- Link the switcher script to mozilla plugin and nautilus plugin too >+- Use `ln -sf` so that future install don't generate errors as we link >+ >+* Wed Oct 10 2007 Stewart Adam <s.adam@diffingo.com> 2.20.0-3 >+- Use totem-bin-backend-ondemand.sh for the gconf-based switching >+ >+* Mon Oct 8 2007 Stewart Adam <s.adam@diffingo.com> 2.20.0-2 >+- Add configurable gconf value for backend selection >+ >+* Mon Oct 8 2007 Stewart Adam <s.adam@diffingo.com> 2.20.0-1.1 >+- Merge totem and totem-xine specs >+- Compile twice for each backend >+ > * Sun Sep 16 2007 - Bastien Nocera <bnocera@redhat.com> - 2.20.0-1 > - Update for 2.20.0 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 327211
:
223871
|
223881
|
223891
|
226231
|
226241
|
226251
|
226281
|
233441
|
247201
|
247211
|
296650
|
296651
|
296652
|
296663
|
296927
|
297066
|
297070
|
297102
|
298004
|
298705