From 7530a5e4eba1f9dcec0e457447e722b843bc9404 Mon Sep 17 00:00:00 2001 From: Andrew Brouwers Date: Thu, 13 May 2010 00:22:18 +0200 Subject: audio/xmms2: Updated for version 0.6DrMattDestruction --- audio/xmms2/0.6_fix_libdir.diff | 55 +++++++++++++++++++++++++++++++++++++ audio/xmms2/xmms2-ruby-1.9.patch | 59 ++++++++++++++++++++++++++++++++++++++++ audio/xmms2/xmms2.SlackBuild | 41 ++++++++++++++++++++-------- audio/xmms2/xmms2.info | 14 ++++++---- 4 files changed, 152 insertions(+), 17 deletions(-) create mode 100644 audio/xmms2/0.6_fix_libdir.diff create mode 100644 audio/xmms2/xmms2-ruby-1.9.patch diff --git a/audio/xmms2/0.6_fix_libdir.diff b/audio/xmms2/0.6_fix_libdir.diff new file mode 100644 index 0000000000..283b8ea1ae --- /dev/null +++ b/audio/xmms2/0.6_fix_libdir.diff @@ -0,0 +1,55 @@ +diff -aur xmms2-0.6DrMattDestruction/src/include/xmms/wscript xmms2-0.6DrMattDestruction.e/src/include/xmms/wscript +--- xmms2-0.6DrMattDestruction/src/include/xmms/wscript 2009-04-21 19:51:11.000000000 +0200 ++++ xmms2-0.6DrMattDestruction.e/src/include/xmms/wscript 2009-11-01 19:39:25.226520223 +0100 +@@ -15,8 +15,7 @@ + + 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 -aur xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py xmms2-0.6DrMattDestruction.e/wafadmin/Tools/ccroot.py +--- xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py 2009-04-21 19:51:11.000000000 +0200 ++++ xmms2-0.6DrMattDestruction.e/wafadmin/Tools/ccroot.py 2009-11-01 19:27:40.099784900 +0100 +@@ -121,13 +121,13 @@ + @feature('cprogram', 'dprogram') + @before('apply_core') + def vars_target_cprogram(self): +- self.default_install_path = '${PREFIX}/bin' ++ self.default_install_path = '${BINDIR}' + self.default_chmod = O755 + + @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 -aur xmms2-0.6DrMattDestruction/waftools/tool.py xmms2-0.6DrMattDestruction.e/waftools/tool.py +--- xmms2-0.6DrMattDestruction/waftools/tool.py 2009-04-21 19:51:11.000000000 +0200 ++++ xmms2-0.6DrMattDestruction.e/waftools/tool.py 2009-11-01 19:39:25.227770032 +0100 +@@ -6,5 +6,5 @@ + + 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 -aur xmms2-0.6DrMattDestruction/wscript xmms2-0.6DrMattDestruction.e/wscript +--- xmms2-0.6DrMattDestruction/wscript 2009-04-21 19:51:11.000000000 +0200 ++++ xmms2-0.6DrMattDestruction.e/wscript 2009-11-01 19:39:44.857519630 +0100 +@@ -103,7 +103,7 @@ + 'LIB': lib, + 'PREFIX': bld.env['PREFIX'], + 'BINDIR': os.path.join("${prefix}", "bin"), +- 'LIBDIR': os.path.join("${prefix}", "lib"), ++ 'LIBDIR': bld.env['LIBDIR'], + 'INCLUDEDIR': os.path.join("${prefix}", "include", "xmms2"), + 'VERSION': bld.env["VERSION"], + } + diff --git a/audio/xmms2/xmms2-ruby-1.9.patch b/audio/xmms2/xmms2-ruby-1.9.patch new file mode 100644 index 0000000000..6316ace61f --- /dev/null +++ b/audio/xmms2/xmms2-ruby-1.9.patch @@ -0,0 +1,59 @@ +diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c +--- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_collection.c 2009-04-21 17:51:11.000000000 +0000 ++++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_collection.c 2009-09-14 09:13:19.000000000 +0000 +@@ -241,10 +241,10 @@ + COLL_METHOD_HANDLER_HEADER + + rb_ary = RARRAY (ids); +- ary = malloc (sizeof (unsigned int *) * (rb_ary->len + 1)); ++ ary = malloc (sizeof (unsigned int *) * (RARRAYLEN(rb_ary) + 1)); + +- for (i = 0; i < rb_ary->len; i++) +- ary[i] = NUM2UINT (rb_ary->ptr[i]); ++ for (i = 0; i < RARRAYLEN(rb_ary); i++) ++ ary[i] = NUM2UINT (RARRAY_PTR(rb_ary)[i]); + + ary[i] = 0; + +diff -wbBur xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c +--- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c 2009-04-21 17:51:11.000000000 +0000 ++++ xmms2-0.6DrMattDestruction.my/src/clients/lib/ruby/rb_xmmsclient.c 2009-09-14 09:14:51.000000000 +0000 +@@ -1421,10 +1421,10 @@ + if (!NIL_P (rb_check_array_type (value))) { + struct RArray *ary = RARRAY (value); + +- ret = malloc (sizeof (char *) * (ary->len + 1)); ++ ret = malloc (sizeof (char *) * (RARRAYLEN(ary) + 1)); + +- for (i = 0; i < ary->len; i++) +- ret[i] = StringValuePtr (ary->ptr[i]); ++ for (i = 0; i < RARRAYLEN(ary); i++) ++ ret[i] = StringValuePtr (RARRAY_PTR(ary)[i]); + + ret[i] = NULL; + } else { +@@ -1451,10 +1451,10 @@ + struct RArray *ary = RARRAY (value); + int i; + +- for (i = 0; i < ary->len; i++) { ++ for (i = 0; i < RARRAYLEN(ary); i++) { + xmmsv_t *elem; + +- elem = xmmsv_new_string (StringValuePtr (ary->ptr[i])); ++ elem = xmmsv_new_string (StringValuePtr (RARRAY_PTR(ary)[i])); + xmmsv_list_append (list, elem); + xmmsv_unref (elem); + } +diff -wbBur xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h +--- xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h 2009-04-21 17:51:11.000000000 +0000 ++++ xmms2-0.6DrMattDestruction.my/src/include/xmmsclient/xmmsclient++/helpers.h 2009-09-14 09:00:11.000000000 +0000 +@@ -33,6 +33,8 @@ + #include + #include + ++#include ++ + namespace Xmms + { + diff --git a/audio/xmms2/xmms2.SlackBuild b/audio/xmms2/xmms2.SlackBuild index 404c2f037f..3dc928e7b5 100644 --- a/audio/xmms2/xmms2.SlackBuild +++ b/audio/xmms2/xmms2.SlackBuild @@ -4,11 +4,12 @@ # Written by Kyle Guinn # Updated by Rainer Wittmaack +# Updated by Andrew Brouwers, abrouwers at gmail d0t com (13.0, 64-bit) PRGNAM=xmms2 -VERSION="0.4DrKosmos" +VERSION="0.6DrMattDestruction" ARCH=${ARCH:-i486} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} CWD=$(pwd) @@ -18,8 +19,13 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi set -e @@ -33,22 +39,35 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . +# Sorry waf, you have no right outside of $TMP +# NOTE: this is fixed in master with a configure option (--without-ldconfig) +sed -i 's#/sbin/ldconfig#/bin/true#' wscript + +# Don't be fooled by --with-libdir (fixed upstream, too) +patch -Np1 -i $CWD/0.6_fix_libdir.diff + +# Fix compile for ruby 1.9 +# patch -Np1 -i $CWD/xmms2-ruby-1.9.patch + export CCFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" -./waf configure --prefix=/usr --with-perl-archdir=/usr/lib/perl5/vendor_perl/5.10.0 -./waf +./waf --prefix=/usr \ + --with-libdir=/usr/lib${LIBDIRSUFFIX} \ + --with-pkgconfigdir=/usr/lib${LIBDIRSUFFIX}/pkgconfig \ + --with-mandir=/usr/man \ + -p configure + +./waf build ./waf install --destdir=$PKG ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \ + xargs strip --strip-unneeded 2> /dev/null || true ) -# The man pages are pre-gzipped, we don't have to do that here. -# However, we do need to move them to the proper location. -mv $PKG/usr/share/man $PKG/usr - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING* INSTALL README TODO $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -57,4 +76,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/xmms2/xmms2.info b/audio/xmms2/xmms2.info index febf02073d..11e3247fb9 100644 --- a/audio/xmms2/xmms2.info +++ b/audio/xmms2/xmms2.info @@ -1,8 +1,10 @@ PRGNAM="xmms2" -VERSION="0.4DrKosmos" +VERSION="0.6DrMattDestruction" HOMEPAGE="http://wiki.xmms2.xmms.se/" -DOWNLOAD="http://downloads.sourceforge.net/xmms2/xmms2-0.4DrKosmos.tar.bz2" -MD5SUM="f363857a77606a2d7d14603ab375f454" -MAINTAINER="Kyle Guinn" -EMAIL="elyk03@gmail.com" -APPROVED="David Somero" +DOWNLOAD="http://downloads.sourceforge.net/xmms2/xmms2-0.6DrMattDestruction.tar.bz2" +DOWNLOAD_x86_64="" +MD5SUM="954fb9c76b5db5e324a105e81b273200" +MD5SUM_x86_64="" +MAINTAINER="Andrew Brouwers" +EMAIL="abrouwers@gmail.com" +APPROVED="dsomero" -- cgit v1.2.3