rpms/sidplay/devel sidplay.spec,1.7,1.8
by Linus Walleij
Author: snirkel
Update of /cvs/nonfree/rpms/sidplay/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1238
Modified Files:
sidplay.spec
Log Message:
Fix missing libtool BuildRequires
Index: sidplay.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sidplay/devel/sidplay.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sidplay.spec 8 Sep 2009 22:38:16 -0000 1.7
+++ sidplay.spec 9 Sep 2009 23:12:26 -0000 1.8
@@ -3,7 +3,7 @@
Name: sidplay
Version: 2.0.9
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A command-line tool for playing back SID files
URL: http://sidplay2.sourceforge.net/
Group: Applications/Multimedia
@@ -22,6 +22,7 @@
BuildRequires: libstdc++-devel
BuildRequires: automake
BuildRequires: autoconf
+BuildRequires: libtool
Provides: sidplay2
Obsoletes: sidplay2
@@ -59,12 +60,15 @@
%{_bindir}/*
%changelog
-* Mon Sep 07 2009 Bernie Innocenti <bernie(a)codewiz.org> 2.0.9-7
+* Thu Sep 10 2009 Linus Walleij <triad(a)df.lth.se> 2.0.9-9
+- Think it BuildRequires libtool then it'll build I hope?
+
+* Mon Sep 7 2009 Bernie Innocenti <bernie(a)codewiz.org> 2.0.9-8
- Add sidplay-alsa.patch, stolen from Gentoo
- Add sidplay-autohell-fixes.patch, rolled in house
- Rock!
-* Mon May 11 2009 Linus Walleij <triad(a)df.lth.se> 2.0.9-6
+* Mon May 11 2009 Linus Walleij <triad(a)df.lth.se> 2.0.9-7
- Located a suspect GCC 4.4.0 rebuild bug.
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.0.9-6
14 years, 7 months
rpms/mythtv-themes/devel mythtv-themes.spec, 1.18, 1.19 sources, 1.12, 1.13
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv-themes/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3670
Modified Files:
mythtv-themes.spec sources
Log Message:
* Wed Sep 07 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.22-0.4.svn.r21745
- Update to pre-0.22 svn trunk, rev 21745
Index: mythtv-themes.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/mythtv-themes.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- mythtv-themes.spec 30 Aug 2009 03:40:39 -0000 1.18
+++ mythtv-themes.spec 9 Sep 2009 13:27:09 -0000 1.19
@@ -17,7 +17,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r21591
+%define _svnrev r21745
%define branch trunk
#
@@ -115,6 +115,12 @@
%{_datadir}/mythtv/themes/*
%changelog
+* Wed Sep 07 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.22-0.4.svn.r21745
+- Update to pre-0.22 svn trunk, rev 21745
+
+* Sun Sep 06 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.22-0.4.svn.r21685
+- Update to pre-0.22 svn trunk, rev 21685
+
* Sat Aug 29 2009 Jarod Wilson <jarod(a)wilsonet.com> - 0.22-0.4.svn.r21591
- Update to pre-0.22 svn trunk, rev 21591
- Graphite is now an official theme included in mythtv svn
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv-themes/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 30 Aug 2009 03:39:53 -0000 1.12
+++ sources 9 Sep 2009 13:27:09 -0000 1.13
@@ -1,2 +1,2 @@
-6911aed7bd91c0021440dfd4d9b7921a themes-0.22.tar.bz2
-9a94c6b327dd65674f39ae9130738761 myththemes-0.22.tar.bz2
+b5af01919d0e218cace9ed0b8f40e337 myththemes-0.22.tar.bz2
+bb1d544278173ec7501b410f8822c7ed themes-0.22.tar.bz2
14 years, 7 months
rpms/mythtv/devel mythtv.spec,1.44,1.45 sources,1.24,1.25
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3258
Modified Files:
mythtv.spec sources
Log Message:
* Wed Sep 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21745
- Update to pre-0.22 svn trunk revision 21745
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- mythtv.spec 5 Sep 2009 05:06:32 -0000 1.44
+++ mythtv.spec 9 Sep 2009 13:23:34 -0000 1.45
@@ -61,7 +61,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r21667
+%define _svnrev r21745
%define branch trunk
#
@@ -1475,6 +1475,12 @@
################################################################################
%changelog
+* Wed Sep 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21745
+- Update to pre-0.22 svn trunk revision 21745
+
+* Sun Sep 07 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21685
+- Update to pre-0.22 svn trunk revision 21685
+
* Fri Sep 05 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21667
- Update to pre-0.22 svn trunk revision 21667
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 5 Sep 2009 05:06:32 -0000 1.24
+++ sources 9 Sep 2009 13:23:34 -0000 1.25
@@ -1,4 +1,4 @@
be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-f4020d940be2ef5feebe5143a5b20d20 mythplugins-0.22.tar.bz2
-596a0d19cff3d2fd21f55bf1913bff02 mythtv-0.22.tar.bz2
+00263ea4c5192c3713e4324d21c1ccad mythtv-0.22.tar.bz2
+d81d07b06346e9cf19570f1d92b0d68f mythplugins-0.22.tar.bz2
14 years, 7 months
rpms/kdenlive/F-10 kdenlive.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Zarko Pintar
Author: grof
Update of /cvs/free/rpms/kdenlive/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16950/F-10
Modified Files:
.cvsignore sources
Added Files:
kdenlive.spec
Log Message:
--- NEW FILE kdenlive.spec ---
Name: kdenlive
Version: 0.7.5
Release: 1%{?dist}
Summary: Non-linear video editor
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.kdenlive.org
Source: http://downloads.sourceforge.net/kdenlive/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake
BuildRequires: gettext
BuildRequires: kdelibs-devel
BuildRequires: mlt-devel
BuildRequires: soprano-devel
BuildRequires: desktop-file-utils
Requires: recordmydesktop
Requires: dvgrab
Requires: ffmpeg
Requires: dvdauthor
%description
Kdenlive is an intuitive and powerful multi-track video editor, including most
recent video technologies.
%prep
%setup -q
# MLT's binary melt renamed at Fedora, so we must rename it in Kdenlive, too
sed -i 's|/bin/melt|/bin/mlt-melt|' src/mainwindow.cpp
sed -i 's|findExe("melt")|findExe("mlt-melt")|' src/mainwindow.cpp
%build
%cmake_kde4
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mv effects/README README.effects
%find_lang %{name}
%check
desktop-file-validate %{buildroot}/%{_kde4_datadir}/applications/kde4/%{name}.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_kde4_datadir}/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_kde4_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_kde4_datadir}/icons/hicolor &>/dev/null || :
fi
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
%posttrans
gtk-update-icon-cache %{_kde4_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README*
%{_kde4_bindir}/*
%{_kde4_datadir}/applications/kde4/%{name}.desktop
%{_kde4_libdir}/kde4/*.so
%{_kde4_datadir}/config.kcfg/*
%{_kde4_configdir}/*
%{_kde4_datadir}/mime/packages/*
%{_kde4_appsdir}/%{name}
%{_kde4_datadir}/kde4/services/westleypreview.desktop
%{_kde4_datadir}/icons/hicolor/*
%{_kde4_datadir}/menu/%{name}
%{_kde4_datadir}/pixmaps/%{name}.xpm
%{_kde4_datadir}/icons/oxygen/*
%{_mandir}/man1/*.gz
%changelog
* Mon Sep 07 2009 Zarko <zarko.pintar(a)gmail.com> - 0.7.5-1
- new version
* Sat May 30 2009 Zarko <zarko.pintar(a)gmail.com> - 0.7.4-2
- added updating of mime database
- changed dir of .desktop file
* Fri May 22 2009 Zarko <zarko.pintar(a)gmail.com> - 0.7.4-1
- new release
- spec cleaning
* Thu Apr 16 2009 Zarko <zarko.pintar(a)gmail.com> - 0.7.3-2
- some clearing
- added doc files
* Wed Apr 15 2009 Zarko <zarko.pintar(a)gmail.com> - 0.7.3-1
- new release
* Sun Apr 12 2009 Zarko <zarko.pintar(a)gmail.com> - 0.7.2.1-2
- spec convert to kde4 macros
* Mon Mar 16 2009 Zarko <zarko.pintar(a)gmail.com> - 0.7.2.1-1
- update to 0.7.2.1
- spec cleaned
- Resolve RPATHs
* Sun Nov 16 2008 Arkady L. Shane <ashejn(a)yandex-team.ru> - 0.7-1
- update to 0.7
* Wed Nov 5 2008 Arkady L. Shane <ashejn(a)yandex-team.ru> - 0.7-0.1.20081104svn2622
- update to last svn revision
* Tue Nov 4 2008 Arkady L. Shane <ashejn(a)yandex-team.ru> - 0.7-0.beta1
- clean up spec
* Fri Oct 17 2008 jeff <moe(a)blagblagblag.org> - 0.7-1.beta1
- Add URL
- Full URL for Source:
- Remove all Requires:
- Update BuildRoot
- Remove Packager: Brixton Linux Action Group
- Add BuildRequires: ffmpeg-devel kdebindings-devel soprano-devel
- Update %%files
- %%doc with only effects/README
- GPLv2+
- Add lang files
* Tue Jul 8 2008 jeff <moe(a)blagblagblag.org> - 0.6-1.svn2298.0blag.f9
- Update to KDE4 branch
https://kdenlive.svn.sourceforge.net/svnroot/kdenlive/branches/KDE4
* Tue Jul 8 2008 jeff <moe(a)blagblagblag.org> - 0.6-1.svn2298.0blag.f9
- Update to svn r2298
- New Requires
- kdenlive-svn-r2298-renderer-CMakeLists.patch
* Sun Nov 11 2007 jeff <moe(a)blagblagblag.org> - 0.5-1blag.f7
- Update to 0.5 final
* Tue Apr 17 2007 jeff <moe(a)blagblagblag.org> - 0.5-0svn20070417.0blag.fc6
- svn to 20070417
* Fri Apr 6 2007 jeff <moe(a)blagblagblag.org> - 0.5-0svn20070406.0blag.fc6
- svn to 20070406
* Tue Apr 3 2007 jeff <moe(a)blagblagblag.org> - 0.5-0svn20070403.0blag.fc6
- svn to 20070403
* Thu Mar 22 2007 jeff <moe(a)blagblagblag.org> - 0.5-0svn20070322.0blag.fc6
- svn to 20070322
* Thu Mar 15 2007 jeff <moe(a)blagblagblag.org> - 0.5-0svn20070316.0blag.fc6
- BLAG'd
* Sun Apr 27 2003 Jason Wood <jasonwood(a)blueyonder.co.uk> 0.2.2-1mdk
- First stab at an RPM package.
- This is taken from kdenlive-0.2.2 source package.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kdenlive/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 31 May 2009 08:37:19 -0000 1.1
+++ .cvsignore 9 Sep 2009 07:33:09 -0000 1.2
@@ -0,0 +1 @@
+kdenlive-0.7.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kdenlive/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 31 May 2009 08:37:19 -0000 1.1
+++ sources 9 Sep 2009 07:33:09 -0000 1.2
@@ -0,0 +1 @@
+2b56a9a5b2b4e18d026d13fa4e159cba kdenlive-0.7.5.tar.gz
14 years, 7 months
rpms/mlt/F-10 mlt.spec,NONE,1.1 .cvsignore,1.1,1.2 sources,1.1,1.2
by Zarko Pintar
Author: grof
Update of /cvs/free/rpms/mlt/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16433/F-10
Modified Files:
.cvsignore sources
Added Files:
mlt.spec
Log Message:
--- NEW FILE mlt.spec ---
Summary: Toolkit for broadcasters, video editors, media players, transcoders
Name: mlt
Version: 0.4.4
Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.mltframework.org/twiki/bin/view/MLT/
Group: System Environment/Libraries
Source: http://downloads.sourceforge.net/mlt/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: frei0r-devel
BuildRequires: ffmpeg-devel
BuildRequires: qt-devel
BuildRequires: libquicktime-devel
BuildRequires: SDL-devel
BuildRequires: gtk2-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libogg-devel
BuildRequires: libdv-devel
BuildRequires: libvorbis-devel
BuildRequires: libsamplerate-devel
BuildRequires: ladspa-devel
BuildRequires: libxml2-devel
BuildRequires: sox-devel
%description
MLT is an open source multimedia framework, designed and developed for
television broadcasting.
It provides a toolkit for broadcasters, video editors,media players,
transcoders, web streamers and many more types of applications. The
functionality of the system is provided via an assortment of ready to use
tools, xml authoring components, and an extendible plug-in based API.
%package devel
Summary: Libraries, includes to develop applications with %{name}
License: LGPLv2+
Group: Development/Libraries
Requires: pkgconfig
Requires: %{name} = %{version}-%{release}
%description devel
The %{name}-devel package contains the header files and static libraries for
building applications which use %{name}.
%prep
%setup -q
find ./ -name configure -exec chmod 755 {} \;
chmod 755 src/modules/lumas/create_lumas
chmod -x demo/demo
# Don't optimize (breaks debugging)
sed -i -e '/fomit-frame-pointer/d' configure
sed -i -e '/ffast-math/d' configure
%build
%configure \
--enable-gpl \
--enable-motion-est \
%ifarch ppc ppc64
--disable-mmx \
--disable-sse \
%endif
--qimage-libdir=%{_qt4_libdir} \
--qimage-includedir=%{_qt4_headerdir} \
--rename-melt=%{name}-melt \
--avformat-swscale
make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install
mv src/modules/motion_est/README README.motion_est
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING GPL NEWS README*
%{_bindir}/%{name}-melt
%{_libdir}/%{name}
%{_libdir}/*.so.*
%{_datadir}/%{name}
%files devel
%defattr(-,root,root,-)
%doc docs/* demo
%{_libdir}/pkgconfig/*
%{_libdir}/*.so
%{_includedir}/*
%changelog
* Mon Sep 07 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.4.4-1
- new version
- renamed melt binary to mlt-melt
* Wed May 20 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.4.2-1
- new version
- removed obsolete patches
* Wed May 20 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.4.0-3
- added linker and license patches
- set license of MLT devel subpackage to LGPLv2+
* Wed May 20 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.4.0-2
- some PPC clearing
* Mon May 18 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.4.0-1
- update to 0.4.0
* Wed May 13 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.3.9-2
- spec cleaning
* Mon May 11 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.3.9-1
- new release
- MLT++ is now a part of this package
* Fri May 7 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.3.8-3
- unused-direct-shlib-dependency fix
* Fri Apr 17 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.3.8-2
- spec clearing
- added patches for resolving broken lqt-config, lib64 and execstack
* Wed Apr 15 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.3.8-1
- New release
* Thu Apr 9 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.3.6-3
- Enabled MMX support (not for PPC & PPC64)
- include demo files
- some spec cosmetics
* Thu Mar 12 2009 Zarko Pintar <zarko.pintar(a)gmail.com> - 0.3.6-2
- Change URL address
- devel Requires: pkgconfig
* Fri Feb 20 2009 Levente Farkas <lfarkas(a)lfarkas.org> - 0.3.6-1
- Update to 0.3.6
* Wed Nov 5 2008 Arkady L. Shane <ashejn(a)yandex-team.ru> - 0.3.1-0.1.svn1180
- update to upstream r1180
- add --avformat-swscale configure option
* Tue Nov 4 2008 Arkady L. Shane <ashejn(a)yandex-team.ru> - 0.3.0-5
- rebuilt with proper qt4 paths
* Mon Oct 13 2008 jeff <moe(a)blagblagblag.org> - 0.3.0-4
- Build without fomit-frame-pointer ffmath
- Add BuildRequires: prelink
- clear-execstack libmltgtk2.so
- Don't strip binaries
- Group: Development/Libraries
- Prefix albino, humperdink, and miracle binaries with mlt-
* Sun Oct 5 2008 jeff <moe(a)blagblagblag.org> - 0.3.0-3
- License: GPLv2+ and LGPLv2+
- Group: Development/Tools
- ExcludeArch: x86_64 s390 s390x ppc ppc64
- %%defattr(-,root,root)
- %%doc docs/
- %%{_libdir}/%%{name} to main package
* Sun Aug 24 2008 jeff <moe(a)blagblagblag.org> - 0.3.0-2
- Change BuildRoot:
- Full source URL
- ExcludeArch: x86_64
- -devel Requires: pkgconfig, Requires: %%{name} = %%{version}-%%{release}
* Sun Aug 24 2008 jeff <moe(a)blagblagblag.org> - 0.3.0-1
- Update to 0.3.0
- --enable-gpl
- mlt-filehandler.patch
* Tue Jul 8 2008 jeff <moe(a)blagblagblag.org> - 0.2.5-0.svn1155.0blag.f10
- Build for blaghead
* Mon Jul 7 2008 jeff <moe(a)blagblagblag.org> - 0.2.5-0.svn1155.0blag.f9
- Update to svn r1155
- Remove sox-st.h.patch
- Add configure --disable-sox as it breaks build
* Sun Nov 11 2007 jeff <moe(a)blagblagblag.org> - 0.2.4-0blag.f7
- Update to 0.2.4
- Clean up spec
* Sat Jun 23 2007 jeff <moe(a)blagblagblag.org> - 0.2.3-0blag.f7
- Update to 0.2.3
* Sat Dec 30 2006 jeff <moe(a)blagblagblag.org> - 0.2.2-0blag.fc6
- Rebuild for 60k
- Remove --disable-sox
- Add mlt-0.2.2-sox-st.h.patch
* Sat Oct 21 2006 jeff <moe(a)blagblagblag.org> - 0.2.2-0blag.fc5
- Update to 0.2.2
* Sat Oct 21 2006 jeff <moe(a)blagblagblag.org> - 0.2.1-0blag.fc5
- BLAG'd
- Removed "olib" from path, name, etc.
- Add changelog
- Update summary/description
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mlt/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 24 May 2009 11:57:27 -0000 1.1
+++ .cvsignore 9 Sep 2009 07:27:07 -0000 1.2
@@ -0,0 +1 @@
+mlt-0.4.4.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mlt/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 24 May 2009 11:57:27 -0000 1.1
+++ sources 9 Sep 2009 07:27:07 -0000 1.2
@@ -0,0 +1 @@
+0019996624b6a61ea27e07b4851ac765 mlt-0.4.4.tar.gz
14 years, 7 months
rpms/alsa-plugins-freeworld/F-11 alsa-plugins-freeworld.spec, 1.1, 1.2 sources, 1.2, 1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/alsa-plugins-freeworld/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19194/F-11
Modified Files:
alsa-plugins-freeworld.spec sources
Log Message:
Update to 1.0.21
Index: alsa-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/F-11/alsa-plugins-freeworld.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa-plugins-freeworld.spec 29 Aug 2009 17:14:31 -0000 1.1
+++ alsa-plugins-freeworld.spec 8 Sep 2009 22:43:23 -0000 1.2
@@ -1,6 +1,6 @@
Name: alsa-plugins-freeworld
-Version: 1.0.20
-Release: 4%{?dist}
+Version: 1.0.21
+Release: 1%{?dist}
Summary: The ALSA Plugins - freeworld version
# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
License: LGPLv2+
@@ -105,6 +105,9 @@
%changelog
+* Wed Sep 9 2009 kwizart < kwizart at gmail > - 1.0.21-1
+- Update to 1.0.21
+
* Mon Jul 6 2009 kwizart < kwizart at gmail > - 1.0.20-4
- Correctly indent the provides
- Missing %%dir fixing ownership in -lavcrate
Index: sources
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 29 Aug 2009 17:14:31 -0000 1.2
+++ sources 8 Sep 2009 22:43:23 -0000 1.3
@@ -1 +1 @@
-819c4f21e3e913eacefd32993a8fbed7 alsa-plugins-1.0.20.tar.bz2
+392d016c0948c54978c0505f24271e01 alsa-plugins-1.0.21.tar.bz2
14 years, 7 months
rpms/alsa-plugins-freeworld/devel .cvsignore, 1.2, 1.3 alsa-plugins-freeworld.spec, 1.1, 1.2 sources, 1.2, 1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/alsa-plugins-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19194/devel
Modified Files:
.cvsignore alsa-plugins-freeworld.spec sources
Log Message:
Update to 1.0.21
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 29 Aug 2009 17:13:00 -0000 1.2
+++ .cvsignore 8 Sep 2009 22:43:22 -0000 1.3
@@ -1 +1 @@
-alsa-plugins-1.0.20.tar.bz2
+alsa-plugins-1.0.21.tar.bz2
Index: alsa-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/devel/alsa-plugins-freeworld.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa-plugins-freeworld.spec 29 Aug 2009 17:13:00 -0000 1.1
+++ alsa-plugins-freeworld.spec 8 Sep 2009 22:43:22 -0000 1.2
@@ -1,6 +1,6 @@
Name: alsa-plugins-freeworld
-Version: 1.0.20
-Release: 4%{?dist}
+Version: 1.0.21
+Release: 1%{?dist}
Summary: The ALSA Plugins - freeworld version
# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
License: LGPLv2+
@@ -105,6 +105,9 @@
%changelog
+* Wed Sep 9 2009 kwizart < kwizart at gmail > - 1.0.21-1
+- Update to 1.0.21
+
* Mon Jul 6 2009 kwizart < kwizart at gmail > - 1.0.20-4
- Correctly indent the provides
- Missing %%dir fixing ownership in -lavcrate
Index: sources
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 29 Aug 2009 17:13:00 -0000 1.2
+++ sources 8 Sep 2009 22:43:22 -0000 1.3
@@ -1 +1 @@
-819c4f21e3e913eacefd32993a8fbed7 alsa-plugins-1.0.20.tar.bz2
+392d016c0948c54978c0505f24271e01 alsa-plugins-1.0.21.tar.bz2
14 years, 7 months
rpms/alsa-plugins-freeworld/F-10 alsa-plugins-freeworld.spec, 1.1, 1.2 sources, 1.2, 1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/alsa-plugins-freeworld/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19194/F-10
Modified Files:
alsa-plugins-freeworld.spec sources
Log Message:
Update to 1.0.21
Index: alsa-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/F-10/alsa-plugins-freeworld.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- alsa-plugins-freeworld.spec 29 Aug 2009 17:15:28 -0000 1.1
+++ alsa-plugins-freeworld.spec 8 Sep 2009 22:43:23 -0000 1.2
@@ -1,6 +1,6 @@
Name: alsa-plugins-freeworld
-Version: 1.0.20
-Release: 4%{?dist}
+Version: 1.0.21
+Release: 1%{?dist}
Summary: The ALSA Plugins - freeworld version
# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
License: LGPLv2+
@@ -105,6 +105,9 @@
%changelog
+* Wed Sep 9 2009 kwizart < kwizart at gmail > - 1.0.21-1
+- Update to 1.0.21
+
* Mon Jul 6 2009 kwizart < kwizart at gmail > - 1.0.20-4
- Correctly indent the provides
- Missing %%dir fixing ownership in -lavcrate
Index: sources
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 29 Aug 2009 17:15:28 -0000 1.2
+++ sources 8 Sep 2009 22:43:23 -0000 1.3
@@ -1 +1 @@
-819c4f21e3e913eacefd32993a8fbed7 alsa-plugins-1.0.20.tar.bz2
+392d016c0948c54978c0505f24271e01 alsa-plugins-1.0.21.tar.bz2
14 years, 7 months
rpms/sidplay/F-11 sidplay-alsa.patch, NONE, 1.1 sidplay-autohell-fixes.patch, NONE, 1.1 sidplay.spec, 1.6, 1.7
by Linus Walleij
Author: snirkel
Update of /cvs/nonfree/rpms/sidplay/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18779
Modified Files:
sidplay.spec
Added Files:
sidplay-alsa.patch sidplay-autohell-fixes.patch
Log Message:
Fix for ALSA output by Bernie Innocenti
sidplay-alsa.patch:
--- NEW FILE sidplay-alsa.patch ---
>From http://bugs.gentoo.org/98769
diff -Nrup sidplay-2.0.9.orig/configure.ac sidplay-2.0.9/configure.ac
--- sidplay-2.0.9.orig/configure.ac 2009-09-06 00:26:21.370889171 -0400
+++ sidplay-2.0.9/configure.ac 2009-09-06 00:26:38.631866724 -0400
@@ -24,6 +24,8 @@ AC_CHECK_HEADERS(sys/ioctl.h linux/sound
sys/soundcard.h soundcard.h sys/audio.h sun/audioio.h sun/dbriio.h sys/audioio.h \
audio.h dmedia/audio.h)
+AC_ARG_WITH(alsa,[ --with-alsa Use ALSA library for sound],[WANT_ALSA=$withval],[WANT_ALSA=no])
+
AH_TOP(
[/* Define supported audio driver */
#undef HAVE_HARDSID
@@ -60,9 +62,17 @@ case "$host" in
AC_MSG_RESULT(irix)
AC_CHECK_LIB(audio, main, [AUDIO_LDADD=-laudio AC_SUBST(AUDIO_LDADD)])
;;
- *linux*) AC_DEFINE(HAVE_OSS)
- audiodrv_libadd="./audio/oss/liboss.a"
- AC_MSG_RESULT(oss)
+ *linux*)
+ if test "$WANT_ALSA" = "yes" ; then
+ AC_DEFINE(HAVE_ALSA)
+ audiodrv_libadd="./audio/alsa/libalsa.a"
+ AC_MSG_RESULT(alsa)
+ AC_CHECK_LIB(asound, main, [AUDIO_LDFLAGS=-lasound AC_SUBST(AUDIO_LDFLAGS)])
+ else
+ AC_DEFINE(HAVE_OSS)
+ audiodrv_libadd="./audio/oss/liboss.a"
+ AC_MSG_RESULT(oss)
+ fi
;;
*netbsd*) AC_DEFINE(HAVE_OSS)
audiodrv_libadd="./audio/oss/liboss.a"
diff -Nrup sidplay-2.0.9.orig/src/audio/alsa/audiodrv.cpp sidplay-2.0.9/src/audio/alsa/audiodrv.cpp
--- sidplay-2.0.9.orig/src/audio/alsa/audiodrv.cpp 2009-09-06 00:26:21.372869292 -0400
+++ sidplay-2.0.9/src/audio/alsa/audiodrv.cpp 2009-09-06 00:26:38.633866542 -0400
@@ -2,6 +2,9 @@
// Advanced Linux Sound Architecture (ALSA) specific audio driver interface.
// --------------------------------------------------------------------------
/***************************************************************************
+ * 2005-07-12: Heikki Orsila <heikki.orsila(a)iki.fi>
+ * Fixed use of obsolete parts of ALSA API
+ *
* $Log: audiodrv.cpp,v $
* Revision 1.7 2002/03/04 19:07:48 s_a_white
* Fix C++ use of nothrow.
@@ -31,6 +34,7 @@
#include "audiodrv.h"
#ifdef HAVE_ALSA
+#include <iostream>
#include <stdio.h>
#ifdef HAVE_EXCEPTIONS
# include <new>
@@ -57,88 +61,86 @@ void Audio_ALSA::outOfOrder ()
void *Audio_ALSA::open (AudioConfig &cfg, const char *)
{
AudioConfig tmpCfg;
- int mask, wantedFormat, format;
- int rtn;
- int card = -1, dev = 0;
-
- if (_audioHandle != NULL)
- {
+ snd_pcm_uframes_t buffer_frames;
+ snd_pcm_hw_params_t *hw_params;
+
+ // Transfer input parameters to this object.
+ // May later be replaced with driver defaults.
+ tmpCfg = cfg;
+ unsigned int rate = tmpCfg.frequency;
+
+ if (_audioHandle != NULL) {
_errorString = "ERROR: Device already in use";
return NULL;
}
- if ((rtn = snd_pcm_open_preferred (&_audioHandle, &card, &dev, SND_PCM_OPEN_PLAYBACK)))
- {
+ if (snd_pcm_open (&_audioHandle, "default", SND_PCM_STREAM_PLAYBACK, 0)) {
_errorString = "ERROR: Could not open audio device.";
goto open_error;
}
-
- // Transfer input parameters to this object.
- // May later be replaced with driver defaults.
- tmpCfg = cfg;
- snd_pcm_channel_params_t pp;
- snd_pcm_channel_setup_t setup;
-
- snd_pcm_channel_info_t pi;
-
- memset (&pi, 0, sizeof (pi));
- pi.channel = SND_PCM_CHANNEL_PLAYBACK;
- if ((rtn = snd_pcm_plugin_info (_audioHandle, &pi)))
- {
- _errorString = "ALSA: snd_pcm_plugin_info failed.";
- goto open_error;
+ if (snd_pcm_hw_params_malloc(&hw_params) < 0) {
+ _errorString = "ERROR: could not malloc hwparams.";
+ goto open_error;
}
-
- memset(&pp, 0, sizeof (pp));
-
- pp.mode = SND_PCM_MODE_BLOCK;
- pp.channel = SND_PCM_CHANNEL_PLAYBACK;
- pp.start_mode = SND_PCM_START_FULL;
- pp.stop_mode = SND_PCM_STOP_STOP;
-
- pp.buf.block.frag_size = pi.max_fragment_size;
-
- pp.buf.block.frags_max = 1;
- pp.buf.block.frags_min = 1;
-
- pp.format.interleave = 1;
- pp.format.rate = tmpCfg.frequency;
- pp.format.voices = tmpCfg.channels;
-
- // Set sample precision and type of encoding.
- if ( tmpCfg.precision == 8 )
- {
- tmpCfg.encoding = AUDIO_UNSIGNED_PCM;
- pp.format.format = SND_PCM_SFMT_U8;
+
+ if (snd_pcm_hw_params_any (_audioHandle, hw_params) < 0) {
+ _errorString = "ERROR: could not initialize hw params";
+ goto open_error;
}
- if ( tmpCfg.precision == 16 )
- {
- tmpCfg.encoding = AUDIO_SIGNED_PCM;
- pp.format.format = SND_PCM_SFMT_S16_LE;
+
+ if (snd_pcm_hw_params_set_access (_audioHandle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) {
+ _errorString = "ERROR: could not set access type";
+ goto open_error;
}
- if ((rtn = snd_pcm_plugin_params (_audioHandle, &pp)) < 0)
- {
- _errorString = "ALSA: snd_pcm_plugin_params failed.";
- goto open_error;
+ snd_pcm_format_t alsamode;
+ switch (tmpCfg.precision) {
+ case 8:
+ tmpCfg.encoding = AUDIO_UNSIGNED_PCM;
+ alsamode = SND_PCM_FORMAT_U8;
+ break;
+ case 16:
+ tmpCfg.encoding = AUDIO_SIGNED_PCM;
+ alsamode = SND_PCM_FORMAT_S16;
+ break;
+ default:
+ _errorString = "ERROR: set desired number of bits for audio device.";
+ goto open_error;
}
-
- if ((rtn = snd_pcm_plugin_prepare (_audioHandle, SND_PCM_CHANNEL_PLAYBACK)) < 0)
- {
- _errorString = "ALSA: snd_pcm_plugin_prepare failed.";
- goto open_error;
+
+ if (snd_pcm_hw_params_set_format (_audioHandle, hw_params, alsamode)) {
+ _errorString = "ERROR: could not set sample format";
+ goto open_error;
}
-
- memset (&setup, 0, sizeof (setup));
- setup.channel = SND_PCM_CHANNEL_PLAYBACK;
- if ((rtn = snd_pcm_plugin_setup (_audioHandle, &setup)) < 0)
- {
- _errorString = "ALSA: snd_pcm_plugin_setup failed.";
- goto open_error;
+
+ if (snd_pcm_hw_params_set_channels (_audioHandle, hw_params, tmpCfg.channels)) {
+ _errorString = "ERROR: could not set channel count";
+ goto open_error;
}
- tmpCfg.bufSize = setup.buf.block.frag_size;
+ if (snd_pcm_hw_params_set_rate_near (_audioHandle, hw_params, &rate, 0)) {
+ _errorString = "ERROR: could not set sample rate";
+ goto open_error;
+ }
+
+ _alsa_to_frames_divisor = tmpCfg.channels * tmpCfg.precision / 8;
+ buffer_frames = 4096;
+ snd_pcm_hw_params_set_period_size_near(_audioHandle, hw_params, &buffer_frames, 0);
+
+ if (snd_pcm_hw_params (_audioHandle, hw_params)) {
+ _errorString = "ERROR: could not set hw parameters";
+ goto open_error;
+ }
+
+ snd_pcm_hw_params_free (hw_params);
+
+ if (snd_pcm_prepare (_audioHandle)) {
+ _errorString = "ERROR: could not prepare audio interface for use";
+ goto open_error;
+ }
+
+ tmpCfg.bufSize = buffer_frames * _alsa_to_frames_divisor;
#ifdef HAVE_EXCEPTIONS
_sampleBuffer = new(std::nothrow) int_least8_t[tmpCfg.bufSize];
#else
@@ -158,13 +160,11 @@ void *Audio_ALSA::open (AudioConfig &cfg
return _sampleBuffer;
open_error:
+ std::cerr << "ALSA open error: " << _errorString << std::endl;
if (_audioHandle != NULL)
- {
close ();
- }
-
perror ("ALSA");
-return NULL;
+ return NULL;
}
// Close an opened audio device, free any allocated buffers and
@@ -174,7 +174,7 @@ void Audio_ALSA::close ()
if (_audioHandle != NULL )
{
snd_pcm_close(_audioHandle);
- delete [] _sampleBuffer;
+ delete [] ((int_least8_t *) _sampleBuffer);
outOfOrder ();
}
}
@@ -192,7 +192,7 @@ void *Audio_ALSA::write ()
return NULL;
}
- snd_pcm_plugin_write (_audioHandle, _sampleBuffer, _settings.bufSize);
+ snd_pcm_writei (_audioHandle, _sampleBuffer, _settings.bufSize / _alsa_to_frames_divisor);
return (void *) _sampleBuffer;
}
diff -Nrup sidplay-2.0.9.orig/src/audio/alsa/audiodrv.h sidplay-2.0.9/src/audio/alsa/audiodrv.h
--- sidplay-2.0.9.orig/src/audio/alsa/audiodrv.h 2009-09-06 00:26:21.373888163 -0400
+++ sidplay-2.0.9/src/audio/alsa/audiodrv.h 2009-09-06 00:26:38.634867533 -0400
@@ -35,8 +35,7 @@
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/asoundlib.h>
+#include <alsa/asoundlib.h>
#include "../AudioBase.h"
@@ -44,6 +43,7 @@ class Audio_ALSA: public AudioBase
{
private: // ------------------------------------------------------- private
snd_pcm_t * _audioHandle;
+ int _alsa_to_frames_divisor;
void outOfOrder ();
sidplay-autohell-fixes.patch:
--- NEW FILE sidplay-autohell-fixes.patch ---
Author: Bernie Innocenti <bernie(a)codewiz.org>
Fix the build harness for contemporary versions of the autoshite suite.
We can't invoke libtool from within configure because it's not yet there;
but we don't need libtool if we use pkg-config to detect libraries.
This change opens the possibility to drop a bunch of macros from
unix/sidplay2.m4 and simplify other things, but this patch doesn't
bother to.
--- sidplay-2.0.9.old/configure.ac 2009-09-06 16:11:38.362313298 -0400
+++ sidplay-2.0.9/configure.ac 2009-09-06 16:15:34.224189943 -0400
@@ -1,6 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(Makefile.am)
AC_CONFIG_AUX_DIR(unix)
+AC_CONFIG_MACRO_DIR(unix)
AM_CONFIG_HEADER(unix/config.h)
dnl Setup library CURRENT, REVISION and AGE
@@ -114,16 +115,15 @@ MY_CHECK_IOS_BIN
MY_CHECK_IOS_OPENMODE
dnl Check for libraries
-SID2_LIB_CHECKS
-SID2_FIND_LIBSIDPLAY2
-SID2_FIND_LIBSIDUTILS
+PKG_CHECK_MODULES(LIBSIDPLAY2, libsidplay2)
+PKG_CHECK_MODULES(LIBSIDUTILS, libsidutils)
# Find sid builder emulations
SID2_FIND_BUILDERS
dnl Add absolute directory for header files
CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/include \
-\$(LIBSIDPLAY2_CXXFLAGS) \$(LIBSIDUTILS_CXXFLAGS)"
+\$(LIBSIDPLAY2_CFLAGS) \$(LIBSIDUTILS_CFLAGS)"
ACLOCAL_AMFLAGS="-I unix"
AC_SUBST(ACLOCAL_AMFLAGS)
diff -rup sidplay-2.0.9.old/src/Makefile.am sidplay-2.0.9/src/Makefile.am
--- sidplay-2.0.9.old/src/Makefile.am 2003-07-07 15:58:53.000000000 -0400
+++ sidplay-2.0.9/src/Makefile.am 2009-09-06 16:10:21.236220894 -0400
@@ -11,7 +11,7 @@ player.cpp player.h
sidplay2_LDADD = ./audio/null/libnull.a ./audio/wav/libwav.a \
$(AUDIO_DRV) $(AUDIO_LDFLAGS) \
-$(LIBSIDPLAY2_LDFLAGS) $(LIBSIDUTILS_LDFLAGS) \
+$(LIBSIDPLAY2_LIBS) $(LIBSIDUTILS_LIBS) \
$(BUILDERS_LDFLAGS)
# Remove bad default includes
--- sidplay-2.0.9/unix/my_macros.m4 2009-09-07 08:48:22.441381197 -0400
+++ sidplay-2.0.9.bernie/unix/my_macros.m4 2009-09-06 11:51:18.198661349 -0400
@@ -163,7 +163,7 @@ AC_DEFUN([MY_TRY_COMPILE],
CXXFLAGS="$CXXFLAGS $1"
LDFLAGS="$LDFLAGS $2"
- CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
+ #CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
AC_TRY_LINK(
[#include <$3>],
Index: sidplay.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sidplay/F-11/sidplay.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sidplay.spec 11 May 2009 20:10:35 -0000 1.6
+++ sidplay.spec 8 Sep 2009 22:40:58 -0000 1.7
@@ -3,7 +3,7 @@
Name: sidplay
Version: 2.0.9
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A command-line tool for playing back SID files
URL: http://sidplay2.sourceforge.net/
Group: Applications/Multimedia
@@ -12,6 +12,8 @@
# http://packages.debian.org/unstable/oldlibs/sidplay
Patch0: sidplay_2.0.9-5.diff.gz
Patch1: gcc440.patch
+Patch2: sidplay-alsa.patch
+Patch3: sidplay-autohell-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPL
BuildRequires: libsidplay-devel
@@ -35,9 +37,12 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
-%configure --with-sidbuilders=%{_libdir}/sidplay/builders
+ACLOCAL='aclocal -I unix' autoreconf -v --force --install
+%configure --with-sidbuilders=%{_libdir}/sidplay/builders --with-alsa
make %{?_smp_mflags}
%install
@@ -54,6 +59,11 @@
%{_bindir}/*
%changelog
+* Mon Sep 07 2009 Bernie Innocenti <bernie(a)codewiz.org> 2.0.9-7
+- Add sidplay-alsa.patch, stolen from Gentoo
+- Add sidplay-autohell-fixes.patch, rolled in house
+- Rock!
+
* Mon May 11 2009 Linus Walleij <triad(a)df.lth.se> 2.0.9-6
- Located a suspect GCC 4.4.0 rebuild bug.
14 years, 7 months
rpms/sidplay/devel sidplay-alsa.patch, NONE, 1.1 sidplay-autohell-fixes.patch, NONE, 1.1 sidplay.spec, 1.6, 1.7
by Linus Walleij
Author: snirkel
Update of /cvs/nonfree/rpms/sidplay/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18596
Modified Files:
sidplay.spec
Added Files:
sidplay-alsa.patch sidplay-autohell-fixes.patch
Log Message:
Patch from Bernie Innocenti to rebuild with exclusive
ALSA support.
sidplay-alsa.patch:
--- NEW FILE sidplay-alsa.patch ---
>From http://bugs.gentoo.org/98769
diff -Nrup sidplay-2.0.9.orig/configure.ac sidplay-2.0.9/configure.ac
--- sidplay-2.0.9.orig/configure.ac 2009-09-06 00:26:21.370889171 -0400
+++ sidplay-2.0.9/configure.ac 2009-09-06 00:26:38.631866724 -0400
@@ -24,6 +24,8 @@ AC_CHECK_HEADERS(sys/ioctl.h linux/sound
sys/soundcard.h soundcard.h sys/audio.h sun/audioio.h sun/dbriio.h sys/audioio.h \
audio.h dmedia/audio.h)
+AC_ARG_WITH(alsa,[ --with-alsa Use ALSA library for sound],[WANT_ALSA=$withval],[WANT_ALSA=no])
+
AH_TOP(
[/* Define supported audio driver */
#undef HAVE_HARDSID
@@ -60,9 +62,17 @@ case "$host" in
AC_MSG_RESULT(irix)
AC_CHECK_LIB(audio, main, [AUDIO_LDADD=-laudio AC_SUBST(AUDIO_LDADD)])
;;
- *linux*) AC_DEFINE(HAVE_OSS)
- audiodrv_libadd="./audio/oss/liboss.a"
- AC_MSG_RESULT(oss)
+ *linux*)
+ if test "$WANT_ALSA" = "yes" ; then
+ AC_DEFINE(HAVE_ALSA)
+ audiodrv_libadd="./audio/alsa/libalsa.a"
+ AC_MSG_RESULT(alsa)
+ AC_CHECK_LIB(asound, main, [AUDIO_LDFLAGS=-lasound AC_SUBST(AUDIO_LDFLAGS)])
+ else
+ AC_DEFINE(HAVE_OSS)
+ audiodrv_libadd="./audio/oss/liboss.a"
+ AC_MSG_RESULT(oss)
+ fi
;;
*netbsd*) AC_DEFINE(HAVE_OSS)
audiodrv_libadd="./audio/oss/liboss.a"
diff -Nrup sidplay-2.0.9.orig/src/audio/alsa/audiodrv.cpp sidplay-2.0.9/src/audio/alsa/audiodrv.cpp
--- sidplay-2.0.9.orig/src/audio/alsa/audiodrv.cpp 2009-09-06 00:26:21.372869292 -0400
+++ sidplay-2.0.9/src/audio/alsa/audiodrv.cpp 2009-09-06 00:26:38.633866542 -0400
@@ -2,6 +2,9 @@
// Advanced Linux Sound Architecture (ALSA) specific audio driver interface.
// --------------------------------------------------------------------------
/***************************************************************************
+ * 2005-07-12: Heikki Orsila <heikki.orsila(a)iki.fi>
+ * Fixed use of obsolete parts of ALSA API
+ *
* $Log: audiodrv.cpp,v $
* Revision 1.7 2002/03/04 19:07:48 s_a_white
* Fix C++ use of nothrow.
@@ -31,6 +34,7 @@
#include "audiodrv.h"
#ifdef HAVE_ALSA
+#include <iostream>
#include <stdio.h>
#ifdef HAVE_EXCEPTIONS
# include <new>
@@ -57,88 +61,86 @@ void Audio_ALSA::outOfOrder ()
void *Audio_ALSA::open (AudioConfig &cfg, const char *)
{
AudioConfig tmpCfg;
- int mask, wantedFormat, format;
- int rtn;
- int card = -1, dev = 0;
-
- if (_audioHandle != NULL)
- {
+ snd_pcm_uframes_t buffer_frames;
+ snd_pcm_hw_params_t *hw_params;
+
+ // Transfer input parameters to this object.
+ // May later be replaced with driver defaults.
+ tmpCfg = cfg;
+ unsigned int rate = tmpCfg.frequency;
+
+ if (_audioHandle != NULL) {
_errorString = "ERROR: Device already in use";
return NULL;
}
- if ((rtn = snd_pcm_open_preferred (&_audioHandle, &card, &dev, SND_PCM_OPEN_PLAYBACK)))
- {
+ if (snd_pcm_open (&_audioHandle, "default", SND_PCM_STREAM_PLAYBACK, 0)) {
_errorString = "ERROR: Could not open audio device.";
goto open_error;
}
-
- // Transfer input parameters to this object.
- // May later be replaced with driver defaults.
- tmpCfg = cfg;
- snd_pcm_channel_params_t pp;
- snd_pcm_channel_setup_t setup;
-
- snd_pcm_channel_info_t pi;
-
- memset (&pi, 0, sizeof (pi));
- pi.channel = SND_PCM_CHANNEL_PLAYBACK;
- if ((rtn = snd_pcm_plugin_info (_audioHandle, &pi)))
- {
- _errorString = "ALSA: snd_pcm_plugin_info failed.";
- goto open_error;
+ if (snd_pcm_hw_params_malloc(&hw_params) < 0) {
+ _errorString = "ERROR: could not malloc hwparams.";
+ goto open_error;
}
-
- memset(&pp, 0, sizeof (pp));
-
- pp.mode = SND_PCM_MODE_BLOCK;
- pp.channel = SND_PCM_CHANNEL_PLAYBACK;
- pp.start_mode = SND_PCM_START_FULL;
- pp.stop_mode = SND_PCM_STOP_STOP;
-
- pp.buf.block.frag_size = pi.max_fragment_size;
-
- pp.buf.block.frags_max = 1;
- pp.buf.block.frags_min = 1;
-
- pp.format.interleave = 1;
- pp.format.rate = tmpCfg.frequency;
- pp.format.voices = tmpCfg.channels;
-
- // Set sample precision and type of encoding.
- if ( tmpCfg.precision == 8 )
- {
- tmpCfg.encoding = AUDIO_UNSIGNED_PCM;
- pp.format.format = SND_PCM_SFMT_U8;
+
+ if (snd_pcm_hw_params_any (_audioHandle, hw_params) < 0) {
+ _errorString = "ERROR: could not initialize hw params";
+ goto open_error;
}
- if ( tmpCfg.precision == 16 )
- {
- tmpCfg.encoding = AUDIO_SIGNED_PCM;
- pp.format.format = SND_PCM_SFMT_S16_LE;
+
+ if (snd_pcm_hw_params_set_access (_audioHandle, hw_params, SND_PCM_ACCESS_RW_INTERLEAVED)) {
+ _errorString = "ERROR: could not set access type";
+ goto open_error;
}
- if ((rtn = snd_pcm_plugin_params (_audioHandle, &pp)) < 0)
- {
- _errorString = "ALSA: snd_pcm_plugin_params failed.";
- goto open_error;
+ snd_pcm_format_t alsamode;
+ switch (tmpCfg.precision) {
+ case 8:
+ tmpCfg.encoding = AUDIO_UNSIGNED_PCM;
+ alsamode = SND_PCM_FORMAT_U8;
+ break;
+ case 16:
+ tmpCfg.encoding = AUDIO_SIGNED_PCM;
+ alsamode = SND_PCM_FORMAT_S16;
+ break;
+ default:
+ _errorString = "ERROR: set desired number of bits for audio device.";
+ goto open_error;
}
-
- if ((rtn = snd_pcm_plugin_prepare (_audioHandle, SND_PCM_CHANNEL_PLAYBACK)) < 0)
- {
- _errorString = "ALSA: snd_pcm_plugin_prepare failed.";
- goto open_error;
+
+ if (snd_pcm_hw_params_set_format (_audioHandle, hw_params, alsamode)) {
+ _errorString = "ERROR: could not set sample format";
+ goto open_error;
}
-
- memset (&setup, 0, sizeof (setup));
- setup.channel = SND_PCM_CHANNEL_PLAYBACK;
- if ((rtn = snd_pcm_plugin_setup (_audioHandle, &setup)) < 0)
- {
- _errorString = "ALSA: snd_pcm_plugin_setup failed.";
- goto open_error;
+
+ if (snd_pcm_hw_params_set_channels (_audioHandle, hw_params, tmpCfg.channels)) {
+ _errorString = "ERROR: could not set channel count";
+ goto open_error;
}
- tmpCfg.bufSize = setup.buf.block.frag_size;
+ if (snd_pcm_hw_params_set_rate_near (_audioHandle, hw_params, &rate, 0)) {
+ _errorString = "ERROR: could not set sample rate";
+ goto open_error;
+ }
+
+ _alsa_to_frames_divisor = tmpCfg.channels * tmpCfg.precision / 8;
+ buffer_frames = 4096;
+ snd_pcm_hw_params_set_period_size_near(_audioHandle, hw_params, &buffer_frames, 0);
+
+ if (snd_pcm_hw_params (_audioHandle, hw_params)) {
+ _errorString = "ERROR: could not set hw parameters";
+ goto open_error;
+ }
+
+ snd_pcm_hw_params_free (hw_params);
+
+ if (snd_pcm_prepare (_audioHandle)) {
+ _errorString = "ERROR: could not prepare audio interface for use";
+ goto open_error;
+ }
+
+ tmpCfg.bufSize = buffer_frames * _alsa_to_frames_divisor;
#ifdef HAVE_EXCEPTIONS
_sampleBuffer = new(std::nothrow) int_least8_t[tmpCfg.bufSize];
#else
@@ -158,13 +160,11 @@ void *Audio_ALSA::open (AudioConfig &cfg
return _sampleBuffer;
open_error:
+ std::cerr << "ALSA open error: " << _errorString << std::endl;
if (_audioHandle != NULL)
- {
close ();
- }
-
perror ("ALSA");
-return NULL;
+ return NULL;
}
// Close an opened audio device, free any allocated buffers and
@@ -174,7 +174,7 @@ void Audio_ALSA::close ()
if (_audioHandle != NULL )
{
snd_pcm_close(_audioHandle);
- delete [] _sampleBuffer;
+ delete [] ((int_least8_t *) _sampleBuffer);
outOfOrder ();
}
}
@@ -192,7 +192,7 @@ void *Audio_ALSA::write ()
return NULL;
}
- snd_pcm_plugin_write (_audioHandle, _sampleBuffer, _settings.bufSize);
+ snd_pcm_writei (_audioHandle, _sampleBuffer, _settings.bufSize / _alsa_to_frames_divisor);
return (void *) _sampleBuffer;
}
diff -Nrup sidplay-2.0.9.orig/src/audio/alsa/audiodrv.h sidplay-2.0.9/src/audio/alsa/audiodrv.h
--- sidplay-2.0.9.orig/src/audio/alsa/audiodrv.h 2009-09-06 00:26:21.373888163 -0400
+++ sidplay-2.0.9/src/audio/alsa/audiodrv.h 2009-09-06 00:26:38.634867533 -0400
@@ -35,8 +35,7 @@
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
-#include <sys/ioctl.h>
-#include <sys/asoundlib.h>
+#include <alsa/asoundlib.h>
#include "../AudioBase.h"
@@ -44,6 +43,7 @@ class Audio_ALSA: public AudioBase
{
private: // ------------------------------------------------------- private
snd_pcm_t * _audioHandle;
+ int _alsa_to_frames_divisor;
void outOfOrder ();
sidplay-autohell-fixes.patch:
--- NEW FILE sidplay-autohell-fixes.patch ---
Author: Bernie Innocenti <bernie(a)codewiz.org>
Fix the build harness for contemporary versions of the autoshite suite.
We can't invoke libtool from within configure because it's not yet there;
but we don't need libtool if we use pkg-config to detect libraries.
This change opens the possibility to drop a bunch of macros from
unix/sidplay2.m4 and simplify other things, but this patch doesn't
bother to.
--- sidplay-2.0.9.old/configure.ac 2009-09-06 16:11:38.362313298 -0400
+++ sidplay-2.0.9/configure.ac 2009-09-06 16:15:34.224189943 -0400
@@ -1,6 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(Makefile.am)
AC_CONFIG_AUX_DIR(unix)
+AC_CONFIG_MACRO_DIR(unix)
AM_CONFIG_HEADER(unix/config.h)
dnl Setup library CURRENT, REVISION and AGE
@@ -114,16 +115,15 @@ MY_CHECK_IOS_BIN
MY_CHECK_IOS_OPENMODE
dnl Check for libraries
-SID2_LIB_CHECKS
-SID2_FIND_LIBSIDPLAY2
-SID2_FIND_LIBSIDUTILS
+PKG_CHECK_MODULES(LIBSIDPLAY2, libsidplay2)
+PKG_CHECK_MODULES(LIBSIDUTILS, libsidutils)
# Find sid builder emulations
SID2_FIND_BUILDERS
dnl Add absolute directory for header files
CXXFLAGS="$CXXFLAGS -I\$(top_srcdir)/include \
-\$(LIBSIDPLAY2_CXXFLAGS) \$(LIBSIDUTILS_CXXFLAGS)"
+\$(LIBSIDPLAY2_CFLAGS) \$(LIBSIDUTILS_CFLAGS)"
ACLOCAL_AMFLAGS="-I unix"
AC_SUBST(ACLOCAL_AMFLAGS)
diff -rup sidplay-2.0.9.old/src/Makefile.am sidplay-2.0.9/src/Makefile.am
--- sidplay-2.0.9.old/src/Makefile.am 2003-07-07 15:58:53.000000000 -0400
+++ sidplay-2.0.9/src/Makefile.am 2009-09-06 16:10:21.236220894 -0400
@@ -11,7 +11,7 @@ player.cpp player.h
sidplay2_LDADD = ./audio/null/libnull.a ./audio/wav/libwav.a \
$(AUDIO_DRV) $(AUDIO_LDFLAGS) \
-$(LIBSIDPLAY2_LDFLAGS) $(LIBSIDUTILS_LDFLAGS) \
+$(LIBSIDPLAY2_LIBS) $(LIBSIDUTILS_LIBS) \
$(BUILDERS_LDFLAGS)
# Remove bad default includes
--- sidplay-2.0.9/unix/my_macros.m4 2009-09-07 08:48:22.441381197 -0400
+++ sidplay-2.0.9.bernie/unix/my_macros.m4 2009-09-06 11:51:18.198661349 -0400
@@ -163,7 +163,7 @@ AC_DEFUN([MY_TRY_COMPILE],
CXXFLAGS="$CXXFLAGS $1"
LDFLAGS="$LDFLAGS $2"
- CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
+ #CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
AC_TRY_LINK(
[#include <$3>],
Index: sidplay.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sidplay/devel/sidplay.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sidplay.spec 11 May 2009 20:10:35 -0000 1.6
+++ sidplay.spec 8 Sep 2009 22:38:16 -0000 1.7
@@ -3,7 +3,7 @@
Name: sidplay
Version: 2.0.9
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: A command-line tool for playing back SID files
URL: http://sidplay2.sourceforge.net/
Group: Applications/Multimedia
@@ -12,6 +12,8 @@
# http://packages.debian.org/unstable/oldlibs/sidplay
Patch0: sidplay_2.0.9-5.diff.gz
Patch1: gcc440.patch
+Patch2: sidplay-alsa.patch
+Patch3: sidplay-autohell-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
License: GPL
BuildRequires: libsidplay-devel
@@ -35,9 +37,12 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
-%configure --with-sidbuilders=%{_libdir}/sidplay/builders
+ACLOCAL='aclocal -I unix' autoreconf -v --force --install
+%configure --with-sidbuilders=%{_libdir}/sidplay/builders --with-alsa
make %{?_smp_mflags}
%install
@@ -54,6 +59,11 @@
%{_bindir}/*
%changelog
+* Mon Sep 07 2009 Bernie Innocenti <bernie(a)codewiz.org> 2.0.9-7
+- Add sidplay-alsa.patch, stolen from Gentoo
+- Add sidplay-autohell-fixes.patch, rolled in house
+- Rock!
+
* Mon May 11 2009 Linus Walleij <triad(a)df.lth.se> 2.0.9-6
- Located a suspect GCC 4.4.0 rebuild bug.
14 years, 7 months