public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Rex Dieter <rdieter@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/xine-lib] epel9-next: restore -pulseaudio subpkg
Date: Mon, 20 Jul 2026 20:00:36 GMT [thread overview]
Message-ID: <178457763626.1.17396433792748184690.rpms-xine-lib-8561717eb942@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/xine-lib
Branch : epel9-next
Commit : 8561717eb942d76a22d3fec7fd911e745dac2a2a
Author : Rex Dieter <rdieter@fedoraproject.org>
Date : 2008-08-22T15:12:26+00:00
Stats : +36/-18 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/xine-lib/c/8561717eb942d76a22d3fec7fd911e745dac2a2a?branch=epel9-next
Log:
restore -pulseaudio subpkg
upsream -ansi-related patch
cleanup BR's a bit (more)
---
diff --git a/xine-lib.spec b/xine-lib.spec
index aea8a4c..8f5911c 100644
--- a/xine-lib.spec
+++ b/xine-lib.spec
@@ -45,9 +45,13 @@ Source1: %{name}-cleanup-sources.sh
Source2: %{name}-mk-autotools-patch.sh
# autotools patch created with source2
Patch0: %{name}-%{version}-autotools.patch.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
Patch1: %{name}-1.1.4-optflags.patch
Patch6: %{name}-1.1.1-deepbind-939.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+## upstream patches
+# phonon-xine doesn't compile with xine-lib-1.1.15, http://bugs.kde.org/169365
+Patch100: xine-lib-1.1.15-ansi.patch
Provides: xine-lib(plugin-abi) = %{abiver}
# X11
@@ -79,26 +83,25 @@ BuildRequires: ImageMagick-devel >= 6.2.4.6-1
BuildRequires: fontconfig-devel
%endif # freetype
# Audio
-BuildRequires: libogg-devel
-BuildRequires: libvorbis-devel
+BuildRequires: alsa-lib-devel >= 0.9.0
+BuildRequires: esound-devel
BuildRequires: flac-devel
+BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libmodplug-devel
-BuildRequires: esound-devel
-BuildRequires: speex-devel
-%if 0%{?_without_arts:1}
-Obsoletes: %{name}-arts < %{version}-%{release}
-%else
-BuildRequires: arts-devel
-%endif
-BuildRequires: alsa-lib-devel >= 0.9.0
BuildRequires: libmpcdec-devel
-BuildRequires: wavpack-devel
+BuildRequires: libvorbis-devel
%if %{with_pa}
BuildRequires: pulseaudio-lib-devel
Obsoletes: %{name}-pulseaudio < %{version}-%{release}
Provides: %{name}-pulseaudio = %{version}-%{release}
%endif # pa
-BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: speex-devel
+%if 0%{?_without_arts:1}
+Obsoletes: xine-lib-arts < %{version}-%{release}
+%else
+BuildRequires: arts-devel
+%endif
+BuildRequires: wavpack-devel
# CDs
BuildRequires: libcdio-devel
# Other
@@ -141,6 +144,17 @@ Obsoletes: xine-lib-extras < 1.1.7-3
%description arts
This package contains the aRts extra plugin for xine-lib.
+%package pulseaudio
+Summary: Pulseaudio plugin for xine-lib
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+# -pulseaudio was split off -extras at 1.1.11.1-2
+#Obsoletes: xine-lib-extras < 1.1.11.1-2
+
+%description pulseaudio
+This package contains the pulseaudio plugin for xine-lib.
+
+
%package extras
Summary: Additional plugins for xine-lib
Group: System Environment/Libraries
@@ -179,6 +193,8 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4
# Patch6 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
+%patch100 -p1 -b .ansi
+
# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -286,9 +302,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_file.so
%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_none.so
%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_oss.so
-%if %{with_pa}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so
-%endif
%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_bitplane.so
%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gsm610.so
%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_lpcm.so
@@ -364,6 +377,12 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so
%endif
+%if %{with_pa}
+%files pulseaudio
+%defattr(-,root,root,-)
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so
+%endif
+
%files extras
%defattr(-,root,root,-)
%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_esd.so
@@ -401,10 +420,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Fri Aug 15 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.1.15-1
+* Wed Aug 20 2008 Rex Dieter <rdieter@fedoraproject.org> - 1.1.15-1
- xine-lib-1.1.15, plugin ABI 1.24 (rh#455752, CVE-2008-3231)
- Obsoletes: -arts (f9+)
-- move -pulseaudio into main pkg
* Sun Apr 27 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.1.12-3
- rebuild for new ImageMagick (6.4.0.10)
reply other threads:[~2026-07-20 20:00 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178457763626.1.17396433792748184690.rpms-xine-lib-8561717eb942@fedoraproject.org \
--to=rdieter@fedoraproject.org \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox