2010-12-06 Brian Cameron <
[email protected]>
* specs/SUNWgnome-audio.spec, copyright/SUNWgnome-audio.copyright:
Update now that we do not deliver ESounD in this package.
* base-specs/esound.spec, patches/esound-01-esd-config.diff: Removed.
* base-specs/audiofile.spec, patches/audiofile-01-uninstalled-pc.diff:
Remove patch that was only needed when building with ESounD.
--- a/ChangeLog Mon Dec 06 20:05:34 2010 +0000
+++ b/ChangeLog Mon Dec 06 20:08:21 2010 +0000
@@ -1,3 +1,11 @@
+2010-12-06 Brian Cameron <[email protected]>
+
+ * specs/SUNWgnome-audio.spec, copyright/SUNWgnome-audio.copyright:
+ Update now that we do not deliver ESounD in this package.
+ * base-specs/esound.spec, patches/esound-01-esd-config.diff: Removed.
+ * base-specs/audiofile.spec, patches/audiofile-01-uninstalled-pc.diff:
+ Remove patch that was only needed when building with ESounD.
+
2010-12-06 Brian Cameron <[email protected]>
* specs/SUNWgnome-games.spec, base-specs/ggz-client-libs.spec,
--- a/base-specs/audiofile.spec Mon Dec 06 20:05:34 2010 +0000
+++ b/base-specs/audiofile.spec Mon Dec 06 20:08:21 2010 +0000
@@ -19,10 +19,6 @@
Vendor: 68k.org
Summary: audiofile -
Source: http://www.68k.org/~michael/audiofile/audiofile-%{version}.tar.gz
-# Note - I sent this patch to the maintainer and he agreed to accept it
-# into their next build. There is no bug tracking system for this module.
-#owner:yippi date:2004-02-25 type:feature
-Patch1: audiofile-01-uninstalled-pc.diff
URL: http://www.68k.org/~michael/audiofile/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Docdir: %{_defaultdocdir}/%{name}
@@ -38,7 +34,6 @@
%prep
%setup -q
-%patch1 -p1
%build
%ifos linux
@@ -80,6 +75,8 @@
%{_bindir}/*
%changelog
+* Thu Dec 02 2010 - [email protected]
+- No longer need the unintalled-pc patch since we no longer build ESounD.
* Tue Apr 13 2010 - [email protected]
- Bump to 0.2.7.
* Fri Jan 22 2009 - [email protected]
--- a/base-specs/esound.spec Mon Dec 06 20:05:34 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-#
-# spec file for package esound
-#
-# Copyright 2008 Sun Microsystems, Inc.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-%define owner yippi
-#
-
-%define OSR LFI#105446 (gnome Exec. summary):n/a
-
-Name: esound
-License: LGPL v2
-Group: System/Library/GNOME
-Version: 0.2.41
-Release: 1
-Distribution: Java Desktop System
-Vendor: Gnome Community
-Summary: esound - The Enlightened Sound Daemon
-Source: http://ftp.gnome.org/pub/GNOME/sources/esound/0.2/esound-%{version}.tar.bz2
-# This patch works with the audiofile-01-uninstalled-config.diff to
-# allow esound to be built when audiofile isn't acutally installed on the
-# system.
-#owner:yippi date:2004-05-07 type:feature
-Patch1: esound-01-esd-config.diff
-URL: http://www.tux.org/~ricdude/overview.html
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Docdir: %{_defaultdocdir}/%{name}
-Autoreqprov: on
-Requires: audiofile
-
-%description
-The Enlightened Sound Daemon (ESD or EsounD) is the sound server for
-Enlightenment and GNOME. It mixes several sound streams into one for output.
-It can also manage network-transparent audio.
-
-%prep
-%setup -q
-%patch1 -p1 -b .orig
-
-%build
-%ifos linux
-if [ -x /usr/bin/getconf ]; then
- CPUS=`getconf _NPROCESSORS_ONLN`
-fi
-%else
- CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-%endif
-if test "x$CPUS" = "x" -o $CPUS = 0; then
- CPUS=1
-fi
-
-%if %debug_build
-%define debug_opt --enable-debugging
-%else
-%define debug_opt --disable-debugging
-%endif
-
-libtoolize --force
-aclocal $ACLOCAL_FLAGS -I .
-autoconf
-automake -a -c -f
-./configure --prefix=%{_prefix} \
- --sysconfdir=%{_sysconfdir} \
- --with-esd-dir=%{_prefix}/lib \
- --libdir=%{_libdir} \
- --bindir=%{_bindir} \
- --libexecdir=%{_prefix}/lib \
- --disable-audiofiletest \
- --mandir=%{_mandir} %{debug_opt}
-make -j$CPUS
-
-
-%install
-make install DESTDIR=$RPM_BUILD_ROOT
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr (-, root, root)
-%{_bindir}/*
-%{_libdir}/*
-%{_sysconfdir}/*
-
-%changelog
-* Sun Jul 26 2009 - [email protected]
-- Bump to 0.2.41.
-* Thu Sep 04 2008 - [email protected]
-- Bump to 0.2.40.
-* Wed Jul 16 2008 - [email protected]
-- Bump to 0.2.39.
-* Fri May 04 2007 - [email protected]
-- Bump to 0.2.38.
-* Wed Apr 4 2007 - [email protected]
-- convert to new style 64-bit build
-* Wed Mar 15 2007 - [email protected]
-- Removed adding ccdir to PATH
-* Wed Feb 28 2007 - [email protected]
-- need to run automake because the maintainer's version is incompatible with
- our version of autoconf
-* Wed Feb 28 2007 - [email protected]
-- Bump to 0.2.37.
-* Sun Feb 18 2007 - [email protected]
-- create (split from SUNWgnome-audio.spec)
--- a/copyright/SUNWgnome-audio.copyright Mon Dec 06 20:05:34 2010 +0000
+++ b/copyright/SUNWgnome-audio.copyright Mon Dec 06 20:08:21 2010 +0000
@@ -13,7 +13,6 @@
Package %{name} consists of the following components:
- audiofile-%{audiofile.version}
- - esound-%{esound.version}
Licensing and copyright information for audiofile-%{audiofile.version}:
@@ -92,19 +91,3 @@
The sources of audiofile-%{audiofile.version} were downloaded
from %{audiofile.SOURCE0.url}
-Licensing and copyright information for esound-%{esound.version}:
-
- License: GNU Library General Public License Version 2
-
- You can find more information in the following directory:
- %{_pkg_docdir}
-
- COPYING.LIB.bz2: GNU LGPL
- AUTHORS: List of authors of %{esound.name}
- NEWS.bz2: List of the most important changes in %{esound.name}
- ChangeLog.bz2: List of all changes and authors of %{esound.name}
- README: More information about %{esound.name}
-
- The sources of esound-%{esound.version} were downloaded
- from %{esound.SOURCE0.url}
-
--- a/patches/audiofile-01-uninstalled-pc.diff Mon Dec 06 20:05:34 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- /dev/null 2007-02-28 22:23:33.000000000 -0500
-+++ audiofile-0.2.7/audiofile-uninstalled.pc.in 2007-02-28 22:28:09.585724000 -0500
-@@ -0,0 +1,6 @@
-+Name: audiofile
-+Description: audiofile
-+Requires:
-+Version: @VERSION@
-+Libs: ${pc_top_builddir}/${pcfiledir}/libaudiofile/libaudiofile.la -lm
-+Cflags: -I${pc_top_builddir}/${pcfiledir}/libaudiofile
---- audiofile-0.2.7/configure.ac-orig 2010-04-13 19:54:44.683130295 -0500
-+++ audiofile-0.2.7/configure.ac 2010-04-13 19:55:00.060689759 -0500
-@@ -95,6 +95,7 @@ AC_SUBST(TEST_BIN)
- AC_CONFIG_FILES([
- audiofile.spec
- audiofile.pc
-+ audiofile-uninstalled.pc
- sfcommands/Makefile
- test/Makefile
- examples/Makefile
--- a/patches/esound-01-esd-config.diff Mon Dec 06 20:05:34 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
---- esound-0.2.37/configure.ac.orig 2007-02-26 16:59:11.000000000 -0500
-+++ esound-0.2.37/configure.ac 2007-04-05 00:30:53.388740000 -0400
-@@ -193,7 +193,9 @@
- CPPFLAGS="$CPPFLAGS -I/usr/include/mme"
- AC_CHECK_HEADERS(mme/mme_api.h)
- CPPFLAGS="$xCPPFLAGS"
-- AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no)
-+ dnl Comment this out as the macro is not found and we don't enable sound.
-+ dnl AM_PATH_ARTS(, HAVE_ARTS=yes, HAVE_ARTS=no)
-+ HAVE_ARTS=no
-
- dnl Define the driver needed based on the first header file found
-
-@@ -349,6 +351,10 @@
- CFLAGS="$CFLAGS $AUDIOFILE_CFLAGS"
- LIBS="$LIBS $AUDIOFILE_LIBS"
-
-+PKG_CHECK_MODULES(REAL_AUDIOFILE, audiofile >= 0.1.5)
-+AC_SUBST(REAL_AUDIOFILE_CFLAGS)
-+AC_SUBST(REAL_AUDIOFILE_LIBS)
-+
- build_esdplay=true
-
- AM_CONDITIONAL(BUILD_ESDPLAY, $build_esdplay)
-@@ -424,7 +424,9 @@
- LIBS="$esound_save_LIBS"
- fi
-
--AS_COMPILER_FLAG(-Wall, CFLAGS="$CFLAGS -Wall")
-+dnl This macro is not in gnome-compiler-flags.m4. This option is invalid on
-+dnl Solaris anyway.
-+dnl AS_COMPILER_FLAG(-Wall, CFLAGS="$CFLAGS -Wall")
-
- # set | sort; # just for double checking the script...
-
--- a/specs/SUNWgnome-audio.spec Mon Dec 06 20:05:34 2010 +0000
+++ b/specs/SUNWgnome-audio.spec Mon Dec 06 20:08:21 2010 +0000
@@ -3,7 +3,7 @@
#
# includes module(s): gnome-audio
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -14,12 +14,10 @@
%ifarch amd64 sparcv9
%include arch64.inc
%use audiofile_64 = audiofile.spec
-%use esound_64 = esound.spec
%endif
%include base.inc
%use audiofile = audiofile.spec
-%use esound = esound.spec
Name: SUNWgnome-audio
IPS_package_name: gnome/gnome-audio
@@ -57,12 +55,10 @@
%ifarch amd64 sparcv9
mkdir %name-%version/%_arch64
%audiofile_64.prep -d %name-%version/%_arch64
-%esound_64.prep -d %name-%version/%_arch64
%endif
mkdir %name-%version/%base_arch
%audiofile.prep -d %name-%version/%base_arch
-%esound.prep -d %name-%version/%base_arch
cd %name-%version
gzcat %SOURCE1 | tar xf -
@@ -75,43 +71,29 @@
export ACLOCAL_FLAGS="-I `pwd`/%name-%version/%base_arch/audiofile-%{audiofile.version}"
%ifarch amd64 sparcv9
-export PKG_CONFIG_PATH=../audiofile-%{audiofile.version}
export REAL_AUDIOFILE_CFLAGS=" "
export REAL_AUDIOFILE_LIBS="-L%{_libdir}/%{_arch64} -R%{_libdir}/%{_arch64} -laudiofile -lm"
%audiofile_64.build -d %name-%version/%_arch64
-export PKG_CONFIG_TOP_BUILD_DIR=%{_builddir}/%name-%version/%{_arch64}/esound-%{esound_64.version}
-%esound_64.build -d %name-%version/%_arch64
-unset PKG_CONFIG_TOP_BUILD_DIR
%endif
-export PKG_CONFIG_PATH=../audiofile-%{audiofile.version}
export REAL_AUDIOFILE_CFLAGS=" "
export REAL_AUDIOFILE_LIBS="-laudiofile -lm"
%audiofile.build -d %name-%version/%base_arch
-export PKG_CONFIG_TOP_BUILD_DIR=%{_builddir}/%name-%version/%{base_arch}/esound-%{esound.version}
-%esound.build -d %name-%version/%base_arch
-unset PKG_CONFIG_TOP_BUILD_DIR
%install
rm -rf $RPM_BUILD_ROOT
%ifarch amd64 sparcv9
%audiofile_64.install -d %name-%version/%_arch64
-%esound_64.install -d %name-%version/%_arch64
-
-# leave only esd-config
-rm $RPM_BUILD_ROOT%{_bindir}/%{_arch64}/{sfconvert,sfinfo,esd[a-z]}*
-rm $RPM_BUILD_ROOT%{_libdir}/%{_arch64}/lib*a
-rm $RPM_BUILD_ROOT%{_prefix}/lib/esd
%endif
%audiofile.install -d %name-%version/%base_arch
-%esound.install -d %name-%version/%base_arch
-rm $RPM_BUILD_ROOT%{_libdir}/lib*a
-rm $RPM_BUILD_ROOT%{_bindir}/{sfconvert,sfinfo,esdfilt,esdloop}
+rm $RPM_BUILD_ROOT%{_bindir}/%{_arch64}/{sfconvert,sfinfo}
+rm $RPM_BUILD_ROOT%{_bindir}/{sfconvert,sfinfo}
+find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.a" -exec rm -f {} ';'
+find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" -exec rm -f {} ';'
-rm -r $RPM_BUILD_ROOT%{_mandir}
cd %name-%version/sun-manpages
make install DESTDIR=$RPM_BUILD_ROOT
@@ -122,17 +104,7 @@
%files
%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_bindir}
-# Intentionally omitted essddsp, esdfilt and esdloop because not in
-# 2.0.4 SUNWgnome-audio.
-%{_bindir}/esdcat
-%{_bindir}/esdctl
-%{_bindir}/esdmon
-%{_bindir}/esdplay
-%{_bindir}/esdrec
-%{_bindir}/esdsample
%dir %attr (0755, root, bin) %{_libdir}
-%{_libdir}/esd
%ifarch amd64 sparcv9
%{_libdir}/%{_arch64}/lib*.so*
%endif
@@ -144,29 +116,17 @@
%doc(bzip2) %{base_arch}/audiofile-%{audiofile.version}/COPYING.GPL
%doc(bzip2) %{base_arch}/audiofile-%{audiofile.version}/ChangeLog
%doc(bzip2) %{base_arch}/audiofile-%{audiofile.version}/NEWS
-%doc %{base_arch}/esound-%{esound.version}/AUTHORS
-%doc %{base_arch}/esound-%{esound.version}/README
-%doc(bzip2) %{base_arch}/esound-%{esound.version}/COPYING.LIB
-%doc(bzip2) %{base_arch}/esound-%{esound.version}/ChangeLog
-%doc(bzip2) %{base_arch}/esound-%{esound.version}/NEWS
%dir %attr (0755, root, other) %{_datadir}/doc
%dir %attr(0755, root, bin) %{_mandir}
%dir %attr(0755, root, bin) %{_mandir}/man1
%{_mandir}/man1/*
-%files root
-%defattr (0644, root, sys)
-%attr (0755, root, sys) %dir %{_sysconfdir}
-%{_sysconfdir}/*
-
%files devel
%defattr (-, root, bin)
%dir %attr (0755, root, bin) %{_bindir}
%{_bindir}/audiofile-config
-%{_bindir}/esd-config
%ifarch amd64 sparcv9
%dir %attr (0755, root, bin) %{_bindir}/%{_arch64}
-%{_bindir}/%{_arch64}/esd-config
%{_bindir}/%{_arch64}/audiofile-config
%endif
%dir %attr (0755, root, bin) %{_libdir}
@@ -187,6 +147,8 @@
%{_mandir}/man3/*
%changelog
+* Thu Dec 02 2010 - [email protected]
+- Remove ESounD.
* Wed Jun 02 2009 - [email protected]
- Use PKG_CONFIG_TOP_BUILD_DIR environment variable when building esound,
so that pkg-config expands $(top_builddir), otherwise audiofile pkg-config
@@ -247,5 +209,3 @@
- add missing -devel pkg
* Thu Feb 26 2004 - [email protected]
- fix audiofile dependency in esound
-
-