Author: oget Update of /cvs/nonfree/rpms/xmms2-nonfree/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv22553/devel Modified Files: .cvsignore sources Added Files: xmms2-0.5DrLecter-moresaneversioning.patch xmms2-0.5DrLecter-no-O0.patch xmms2-0.5DrLecter-use-libdir.patch xmms2-devel.git-37578b59f5d7376213da74b3bf6b7c7f430d0bc9.patch xmms2-nonfree.spec Log Message: * Thu Apr 09 2009 John Doe <anonymous(a)american.us&gt; 0.5-3 - License is LGPLv2+ - Some SPEC file cosmetics * Wed Apr 08 2009 John Doe <anonymous(a)american.us&gt; 0.5-2 - Kill the -mac subpackage * Wed Apr 08 2009 John Doe <anonymous(a)american.us&gt; 0.5-1 - Initial package for RPMFusion (SPEC file is a slightly modified version of xmms2-freeworld) xmms2-0.5DrLecter-moresaneversioning.patch: --- NEW FILE xmms2-0.5DrLecter-moresaneversioning.patch --- diff -up xmms2-0.5DrLecter/wscript.versionsanity xmms2-0.5DrLecter/wscript --- xmms2-0.5DrLecter/wscript.versionsanity 2008-12-10 15:22:56.000000000 -0500 +++ xmms2-0.5DrLecter/wscript 2008-12-10 15:27:09.000000000 -0500 @@ -23,7 +23,7 @@ import Object import Utils import Common -BASEVERSION="0.5 DrLecter" +BASEVERSION="0.5" APPNAME='xmms2' srcdir='.' @@ -252,14 +252,15 @@ def configure(conf): nam,changed = gittools.get_info() conf.check_message("git commit id", "", True, nam) - if Params.g_options.customversion: - conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Params.g_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 Params.g_options.customversion: + ## conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Params.g_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'] xmms2-0.5DrLecter-no-O0.patch: --- NEW FILE xmms2-0.5DrLecter-no-O0.patch --- diff -up xmms2-0.5DrLecter/wscript.BAD xmms2-0.5DrLecter/wscript --- xmms2-0.5DrLecter/wscript.BAD 2008-12-10 15:04:53.000000000 -0500 +++ xmms2-0.5DrLecter/wscript 2008-12-10 15:05:09.000000000 -0500 @@ -261,8 +261,8 @@ def configure(conf): conf.check_message("uncommitted changes", "", bool(changed)) conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) - conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0'] - conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0'] + ## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0'] + ## conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0'] conf.env['XMMS_PKGCONF_FILES'] = [] conf.env['XMMS_OUTPUT_PLUGINS'] = [(-1, "NONE")] xmms2-0.5DrLecter-use-libdir.patch: --- NEW FILE xmms2-0.5DrLecter-use-libdir.patch --- diff -up xmms2-0.5DrLecter/src/include/xmms/wscript.BAD xmms2-0.5DrLecter/src/include/xmms/wscript --- xmms2-0.5DrLecter/src/include/xmms/wscript.BAD 2008-12-04 16:28:12.000000000 -0500 +++ xmms2-0.5DrLecter/src/include/xmms/wscript 2008-12-04 16:28:44.000000000 -0500 @@ -12,8 +12,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.5DrLecter/wafadmin/Tools/python.py.BAD xmms2-0.5DrLecter/wafadmin/Tools/python.py --- xmms2-0.5DrLecter/wafadmin/Tools/python.py.BAD 2008-12-04 16:36:29.000000000 -0500 +++ xmms2-0.5DrLecter/wafadmin/Tools/python.py 2008-12-04 16:36:41.000000000 -0500 @@ -211,7 +211,7 @@ def check_python_version(conf, minver=No else: python_LIBDEST = None if python_LIBDEST is None: - python_LIBDEST = os.path.join(conf.env['PREFIX'], "lib", "python" + pyver) + python_LIBDEST = os.path.join(conf.env['LIBDIR'], "python" + pyver) dir = os.path.join(python_LIBDEST, "site-packages") conf.add_define('PYTHONDIR', dir) xmms2-devel.git-37578b59f5d7376213da74b3bf6b7c7f430d0bc9.patch: --- NEW FILE xmms2-devel.git-37578b59f5d7376213da74b3bf6b7c7f430d0bc9.patch --- From: Daniel Chokola <dan(a)chokola.com&gt; Date: Tue, 22 Jul 2008 14:21:36 +0000 (-0400) Subject: BUG(1998): use XMMS_PATH_MAX in helpers.h X-Git-Url: http://git.xmms.se/?p=xmms2-devel.git;a=commitdiff_plain;h=37578b59f5d737... BUG(1998): use XMMS_PATH_MAX in helpers.h --- diff --git a/src/include/xmmsclient/xmmsclient++/helpers.h b/src/include/xmmsclient/xmmsclient++/helpers.h index b131575..f237231 100644 --- a/src/include/xmmsclient/xmmsclient++/helpers.h +++ b/src/include/xmmsclient/xmmsclient++/helpers.h @@ -44,8 +44,8 @@ namespace Xmms */ inline std::string getUserConfDir() { - char buf[PATH_MAX] = { '\0' }; - if( !xmmsc_userconfdir_get( buf, PATH_MAX ) ) { + char buf[XMMS_PATH_MAX] = { '\0' }; + if( !xmmsc_userconfdir_get( buf, XMMS_PATH_MAX ) ) { throw Xmms::result_error( "Error occured when trying to get " "user config directory." ); } --- NEW FILE xmms2-nonfree.spec --- %global codename DrLecter Name: xmms2-nonfree Summary: Nonfree plugins for XMMS2 Version: 0.5 Release: 3%{?dist} License: LGPLv2+ Group: Applications/Multimedia # Fedora's xmms2 has to use a sanitized tarball, we don't. Source0: http://downloads.sourceforge.net/xmms2/xmms2-%{version}%{codename}.tar.bz2 # From upstream git (Compilation fixes) Patch0: xmms2-devel.git-37578b59f5d7376213da74b3bf6b7c7f430d0bc9.patch # Use libdir properly for Fedora multilib Patch1: xmms2-0.5DrLecter-use-libdir.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 URL: http://wiki.xmms2.xmms.se/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sqlite-devel BuildRequires: glib2-devel BuildRequires: python-devel # RPMFusion only BuildRequires BuildRequires: mac-devel Provides: xmms2-mac = %{version}-%{release} %description XMMS2 is an audio framework, but it is not a general multimedia player - it will not play videos. It has a modular framework and plugin architecture for audio processing, visualisation and output, but this framework has not been designed to support video. Also the client-server design of XMMS2 (and the daemon being independent of any graphics output) practically prevents direct video output being implemented. It has support for a wide range of audio formats, which is expandable via plugins. It includes a basic CLI interface to the XMMS2 framework, but most users will want to install a graphical XMMS2 client (such as gxmms2 or esperanza). This package contains an XMMS2 Plugin for listening to Monkey's Audio files. %prep %setup -q -n xmms2-%{version}%{codename} %patch0 -p1 -b .compilefix %patch1 -p1 -b .plugins-use-libdir %patch4 -p1 -b .noO0 %patch5 -p1 -b .versionsanity # Clean up paths in wafadmin WAFADMIN_FILES=`find wafadmin/ -type f` for i in $WAFADMIN_FILES; do sed -i 's|/usr/lib|%{_libdir}|g' $i done %build export CFLAGS="%{optflags}" ./waf configure --prefix=%{_prefix} \ --with-libdir=%{_libdir} \ --with-pkgconfigdir=%{_libdir}/pkgconfig \ --without-optionals=avahi \ --without-optionals=cli \ --without-optionals=dns_sd \ --without-optionals=et \ --without-optionals=launcher \ --without-optionals=medialib-updater \ --without-optionals=perl \ --without-optionals=pixmaps \ --without-optionals=python \ --without-optionals=ruby \ --without-optionals=xmmsclient-ecore \ --without-optionals=xmmsclient++ \ --without-optionals=xmmsclient++-glib \ --without-plugins=airplay \ --without-plugins=alsa \ --without-plugins=ao \ --without-plugins=asf \ --without-plugins=asx \ --without-plugins=cdda \ --without-plugins=cue \ --without-plugins=curl \ --without-plugins=daap \ --without-plugins=diskwrite \ --without-plugins=equalizer \ --without-plugins=curl \ --without-plugins=file \ --without-plugins=flac \ --without-plugins=gme \ --without-plugins=gvfs \ --without-plugins=ices \ --without-plugins=icymetaint \ --without-plugins=id3v2 \ --without-plugins=jack \ --without-plugins=karaoke \ --without-plugins=lastfm \ --without-plugins=lastfmeta \ --without-plugins=m3u \ --without-plugins=modplug \ --without-plugins=musepack \ --without-plugins=normalize \ --without-plugins=null \ --without-plugins=nulstripper \ --without-plugins=ofa \ --without-plugins=oss \ --without-plugins=pls \ --without-plugins=pulse \ --without-plugins=replaygain \ --without-plugins=rss \ --without-plugins=samba \ --without-plugins=speex \ --without-plugins=vocoder \ --without-plugins=vorbis \ --without-plugins=wave \ --without-plugins=xml \ --without-plugins=xspf \ --without-plugins=avcodec \ --without-plugins=faad \ --without-plugins=mad \ --without-plugins=mms \ --without-plugins=mp4 ./waf build -v %{?_smp_mflags} %install rm -rf %{buildroot} ./waf install \ --destdir=%{buildroot} \ --prefix=%{_prefix} \ --with-libdir=%{_libdir} \ --with-pkgconfigdir=%{_libdir}/pkgconfig # There are lots of things that get built that we don't need # to package, because they're in the Fedora xmms2 package. rm -rf %{buildroot}%{_bindir} \ %{buildroot}%{_libdir}/libxmmsclient* \ %{buildroot}%{_mandir} \ %{buildroot}%{_datadir} \ %{buildroot}%{_includedir} \ %{buildroot}%{_libdir}/pkgconfig # exec flags for debuginfo chmod +x %{buildroot}%{_libdir}/xmms2/* %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc COPYING.LGPL %{_libdir}/xmms2/libxmms_mac.so %changelog * Thu Apr 09 2009 John Doe <anonymous(a)american.us&gt; 0.5-3 - License is LGPLv2+ - Some SPEC file cosmetics * Wed Apr 08 2009 John Doe <anonymous(a)american.us&gt; 0.5-2 - Kill the -mac subpackage * Wed Apr 08 2009 John Doe <anonymous(a)american.us&gt; 0.5-1 - Initial package for RPMFusion (SPEC file is a slightly modified version of xmms2-freeworld) Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/xmms2-nonfree/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Apr 2009 17:36:04 -0000 1.1 +++ .cvsignore 9 Apr 2009 19:43:48 -0000 1.2 @@ -0,0 +1 @@ +xmms2-0.5DrLecter.tar.bz2 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/xmms2-nonfree/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Apr 2009 17:36:04 -0000 1.1 +++ sources 9 Apr 2009 19:43:48 -0000 1.2 @@ -0,0 +1 @@ +9033ef15be9069ef43aeb4b6360a4d36 xmms2-0.5DrLecter.tar.bz2