diff --git a/.cvsignore b/.cvsignore index 624e441..9b96791 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xmms2-0.5DrLecter-clean.tar.bz2 +xmms2-0.6DrMattDestruction-clean.tar.bz2 diff --git a/sources b/sources index f74f952..a037404 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b615fd8396ea5469d618081c2dd802ff xmms2-0.5DrLecter-clean.tar.bz2 +2e73303e6ec81d52d8927b9023793e4c xmms2-0.6DrMattDestruction-clean.tar.bz2 diff --git a/xmms2-0.6DrMattDestruction-moresaneversioning.patch b/xmms2-0.6DrMattDestruction-moresaneversioning.patch new file mode 100644 index 0000000..a7da758 --- /dev/null +++ b/xmms2-0.6DrMattDestruction-moresaneversioning.patch @@ -0,0 +1,36 @@ +diff -up xmms2-0.6DrMattDestruction/wscript.versionsanity xmms2-0.6DrMattDestruction/wscript +--- xmms2-0.6DrMattDestruction/wscript.versionsanity 2009-08-11 14:00:44.013247917 -0400 ++++ xmms2-0.6DrMattDestruction/wscript 2009-08-11 14:01:48.446370522 -0400 +@@ -23,7 +23,7 @@ import Build + import Configure + from logging import fatal, warning + +-BASEVERSION="0.6 DrMattDestruction" ++BASEVERSION="0.6" + APPNAME='xmms2' + + srcdir='.' +@@ -269,14 +269,15 @@ def configure(conf): + + nam,changed = gittools.get_info() + conf.check_message("git commit id", "", True, nam) +- if Options.options.customversion: +- conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion) +- else: +- dirty="" +- if changed: +- dirty="-dirty" +- conf.check_message("uncommitted changes", "", bool(changed)) +- conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) ++ ## if Options.options.customversion: ++ ## conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion) ++ ## else: ++ ## dirty="" ++ ## if changed: ++ ## dirty="-dirty" ++ ## conf.check_message("uncommitted changes", "", bool(changed)) ++ ## conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) ++ conf.env["VERSION"] = BASEVERSION + + ## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0'] + ## conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0'] diff --git a/xmms2-0.6DrMattDestruction-pulse-output-default.patch b/xmms2-0.6DrMattDestruction-pulse-output-default.patch new file mode 100644 index 0000000..8667a1c --- /dev/null +++ b/xmms2-0.6DrMattDestruction-pulse-output-default.patch @@ -0,0 +1,9 @@ +diff -up xmms2-0.6DrMattDestruction/src/plugins/pulse/wscript.BAD xmms2-0.6DrMattDestruction/src/plugins/pulse/wscript +--- xmms2-0.6DrMattDestruction/src/plugins/pulse/wscript.BAD 2009-08-11 13:58:27.922241908 -0400 ++++ xmms2-0.6DrMattDestruction/src/plugins/pulse/wscript 2009-08-11 13:58:32.982243043 -0400 +@@ -7,4 +7,4 @@ def plugin_configure(conf): + + configure, build = plugin("pulse", configure=plugin_configure, + source=["pulse.c", "backend.c"], +- output_prio=25, libs=["pulse"]) ++ output_prio=45, libs=["pulse"]) diff --git a/xmms2-0.6DrMattDestruction-use-libdir.patch b/xmms2-0.6DrMattDestruction-use-libdir.patch new file mode 100644 index 0000000..60bf7e8 --- /dev/null +++ b/xmms2-0.6DrMattDestruction-use-libdir.patch @@ -0,0 +1,68 @@ +diff -up xmms2-0.6DrMattDestruction/src/include/xmms/wscript.BAD xmms2-0.6DrMattDestruction/src/include/xmms/wscript +--- xmms2-0.6DrMattDestruction/src/include/xmms/wscript.BAD 2009-08-11 15:17:57.020242949 -0400 ++++ xmms2-0.6DrMattDestruction/src/include/xmms/wscript 2009-08-11 15:18:04.940381687 -0400 +@@ -15,8 +15,7 @@ def configure(conf): + + defs = {} + +- defs['PKGLIBDIR'] = os.path.join(conf.env['PREFIX'], +- 'lib', 'xmms2') ++ defs['PKGLIBDIR'] = os.path.join(conf.env['LIBDIR'], 'xmms2') + defs['BINDIR'] = conf.env['BINDIR'] + defs['SHAREDDIR'] = os.path.join(conf.env['PREFIX'], + 'share', 'xmms2') +diff -up xmms2-0.6DrMattDestruction/waftools/tool.py.BAD xmms2-0.6DrMattDestruction/waftools/tool.py +--- xmms2-0.6DrMattDestruction/waftools/tool.py.BAD 2009-08-11 15:28:30.157242468 -0400 ++++ xmms2-0.6DrMattDestruction/waftools/tool.py 2009-08-11 15:28:45.251245035 -0400 +@@ -6,5 +6,5 @@ def add_install_flag(bld, obj): + + if env['explicit_install_name']: + libname = obj.env["shlib_PATTERN"] % obj.target +- insname = os.path.join(obj.env["PREFIX"], 'lib', libname) ++ insname = os.path.join(obj.env["LIBDIR"], libname) + obj.env.append_unique("LINKFLAGS", '-install_name ' + insname) +diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py +--- xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py.BAD 2009-08-11 15:33:10.276383650 -0400 ++++ xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py 2009-08-11 15:33:33.646236480 -0400 +@@ -45,7 +45,7 @@ def fakelibtool_build(task): + fu("current=0\n") + fu("age=0\nrevision=0\ninstalled=yes\nshouldnotlink=no\n") + fu("dlopen=''\ndlpreopen=''\n") +- fu("libdir='%s/lib'\n" % env['PREFIX']) ++ fu("libdir='%s'\n" % env['LIBDIR']) + dest.close() + return 0 + +@@ -75,7 +75,7 @@ def apply_link_libtool(self): + self.latask = latask + + if Options.commands['install'] or Options.commands['uninstall']: +- Build.bld.install_files('PREFIX', 'lib', linktask.outputs[0].abspath(self.env), self.env) ++ Build.bld.install_files('LIBDIR', linktask.outputs[0].abspath(self.env), self.env) + + @taskgen + @feature("libtool") +diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py +--- xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py.BAD 2009-08-11 15:35:28.864257981 -0400 ++++ xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py 2009-08-11 15:35:36.165270276 -0400 +@@ -127,7 +127,7 @@ def vars_target_cprogram(self): + @feature('cstaticlib', 'dstaticlib', 'cshlib', 'dshlib') + @before('apply_core') + def vars_target_cstaticlib(self): +- self.default_install_path = '${PREFIX}/lib' ++ self.default_install_path = '${LIBDIR}' + if sys.platform in ['win32', 'cygwin']: + # on win32, libraries need the execute bit, else we + # get 'permission denied' when using them (issue 283) +diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py +--- xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py.BAD 2009-08-11 15:35:49.334273249 -0400 ++++ xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py 2009-08-11 15:36:35.058242288 -0400 +@@ -39,7 +39,7 @@ libexecdir, program executables, $(EXEC_ + sysconfdir, read-only single-machine data, $(PREFIX)/etc + sharedstatedir, modifiable architecture-independent data, $(PREFIX)/com + localstatedir, modifiable single-machine data, $(PREFIX)/var +-libdir, object code libraries, $(EXEC_PREFIX)/lib ++libdir, object code libraries, $(LIBDIR) + includedir, C header files, $(PREFIX)/include + oldincludedir, C header files for non-gcc, /usr/include + datarootdir, read-only arch.-independent data root, $(PREFIX)/share diff --git a/xmms2.spec b/xmms2.spec index 489fb89..3ca782f 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,12 +1,12 @@ -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')} -%define codename DrLecter +%global codename DrMattDestruction Name: xmms2 Summary: A modular audio framework and plugin architecture -Version: 0.5 -Release: 7%{?dist} +Version: 0.6 +Release: 1%{?dist} License: LGPLv2+ and GPLv2+ and BSD Group: Applications/Multimedia # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. @@ -14,18 +14,14 @@ Group: Applications/Multimedia # Cleaning it is simple, just rm -rf src/plugins/mp4 Source0: %{name}-%{version}%{codename}-clean.tar.bz2 Source1: xmms2-client-launcher.sh -# From upstream git (Compilation fixes) -Patch0: xmms2-devel.git-37578b59f5d7376213da74b3bf6b7c7f430d0bc9.patch # Use libdir properly for Fedora multilib -Patch1: xmms2-0.5DrLecter-use-libdir.patch +Patch1: xmms2-0.6DrMattDestruction-use-libdir.patch # Set default output to pulse -Patch2: xmms2-0.5DrLecter-pulse-output-default.patch -# From upstream git (fix speex) -Patch3: xmms2-devel.git-054a12d54325820c8d31e482193007af0ed15be3.patch +Patch2: xmms2-0.6DrMattDestruction-pulse-output-default.patch # Don't add extra CFLAGS, we're smart enough, thanks. Patch4: xmms2-0.5DrLecter-no-O0.patch # More sane versioning -Patch5: xmms2-0.5DrLecter-moresaneversioning.patch +Patch5: xmms2-0.6DrMattDestruction-moresaneversioning.patch URL: http://wiki.xmms2.xmms.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sqlite-devel, flac-devel, libofa-devel @@ -36,6 +32,7 @@ BuildRequires: libao-devel, libshout-devel, Pyrex, ruby-devel, ruby BuildRequires: perl-devel, boost-devel, pulseaudio-libs-devel, avahi-glib-devel BuildRequires: libmodplug-devel, ecore-devel, gamin-devel BuildRequires: avahi-compat-libdns_sd-devel, doxygen +BuildRequires: libvisual-devel, wavpack-devel %description XMMS2 is an audio framework, but it is not a general multimedia player - it @@ -51,7 +48,7 @@ client (such as gxmms2 or esperanza). %package devel Summary: Development libraries and headers for XMMS2 Group: Development/Libraries -Requires: glib2-devel, qt-devel, boost-devel +Requires: glib2-devel, boost-devel Requires: pkgconfig Requires: %{name} = %{version}-%{release} @@ -94,12 +91,20 @@ Requires: ruby(abi) = 1.8 %description ruby Ruby bindings for XMMS2. +%package -n nyxmms2 +Summary: Commandline client for XMMS2 +Group: Applications/Multimedia +Requires: %{name} = %{version}-%{release} + +%description -n nyxmms2 +nyxmms2 is the new official commandline client for XMMS2. It can be run in +either shell-mode (if started without arguments), or in inline-mode where +it executes the command passed as argument directly. + %prep %setup -q -n %{name}-%{version}%{codename} -%patch0 -p1 -b .compilefix %patch1 -p1 -b .plugins-use-libdir %patch2 -p1 -b .default-output-pulse -%patch3 -p1 -b .fix-speex %patch4 -p1 -b .noO0 %patch5 -p1 -b .versionsanity @@ -111,10 +116,12 @@ WAFADMIN_FILES=`find wafadmin/ -type f` for i in $WAFADMIN_FILES; do sed -i 's|/usr/lib|%{_libdir}|g' $i done +sed -i 's|"lib"|"%{_lib}"|g' wscript %build export CFLAGS="%{optflags}" export CPPFLAGS="%{optflags}" +export LIBDIR="%{_libdir}" ./waf configure --prefix=%{_prefix} --with-libdir=%{_libdir} --with-ruby-libdir=%{ruby_sitearch} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig ./waf build -v %{?_smp_mflags} # make the docs @@ -122,6 +129,7 @@ doxygen %install rm -rf %{buildroot} +export LIBDIR="%{_libdir}" ./waf install --destdir=%{buildroot} --prefix=%{_prefix} --with-libdir=%{_libdir} --with-ruby-libdir=%{ruby_sitearch} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig # exec flags for debuginfo @@ -150,6 +158,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING COPYING.GPL COPYING.LGPL README TODO %{_bindir}/%{name}* +%{_bindir}/vistest* %{_libdir}/libxmmsclient*.so.* %{_libdir}/%{name} %{_mandir}/man1/%{name}* @@ -179,7 +188,15 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{ruby_sitearch}/xmmsclient* +%files -n nyxmms2 +%defattr(-,root,root,-) +%{_bindir}/nyxmms2 +%{_mandir}/man1/nyxmms2.* + %changelog +* Tue Aug 11 2009 Tom "spot" Callaway - 0.6-1 +- update to 0.6 + * Mon Jul 27 2009 Fedora Release Engineering - 0.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild