diff options
| -rw-r--r-- | audio/xmms2/xmms2-0.8-cython-0.19.1.patch | 47 | ||||
| -rw-r--r-- | audio/xmms2/xmms2.SlackBuild | 16 | ||||
| -rw-r--r-- | audio/xmms2/xmms2.info | 6 |
3 files changed, 8 insertions, 61 deletions
diff --git a/audio/xmms2/xmms2-0.8-cython-0.19.1.patch b/audio/xmms2/xmms2-0.8-cython-0.19.1.patch deleted file mode 100644 index 1d6e59f6c8..0000000000 --- a/audio/xmms2/xmms2-0.8-cython-0.19.1.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6d6d7a7ee38c8e3f57242f2510e06a03f4e7e249 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Mon, 5 Aug 2013 22:29:46 +0300 -Subject: [PATCH] unbreak xmms2 building on cython-0.19.1 - -Error compiling Cython file: ------------------------------------------------------------- -... - def medialib_path_import(self, path, cb = None, encoded=False): - """ - @deprecated - Use medialib_import_path(path, ...) instead - """ - return self.medialib_import_path(self, path, cb=cb, encoded=encoded) - ^ - -Reported-by: ChunFeng -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - src/clients/lib/python/xmmsapi.pyx | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/clients/lib/python/xmmsapi.pyx b/src/clients/lib/python/xmmsapi.pyx -index 501a068..863db88 100644 ---- a/src/clients/lib/python/xmmsapi.pyx -+++ b/src/clients/lib/python/xmmsapi.pyx -@@ -1364,7 +1364,7 @@ cdef class XmmsApi(XmmsCore): - @deprecated - Use medialib_import_path(path, ...) instead - """ -- return self.medialib_import_path(self, path, cb=cb, encoded=encoded) -+ return self.medialib_import_path(path, cb=cb, encoded=encoded) - - @deprecated - def medialib_path_import_encoded(self, path, cb = None): -@@ -1372,7 +1372,7 @@ cdef class XmmsApi(XmmsCore): - @deprecated - Use medialib_import_path(path, ..., encoded=True) instead - """ -- return self.medialib_import_path(self, path, cb=cb, encoded=True) -+ return self.medialib_import_path(path, cb=cb, encoded=True) - - cpdef XmmsResult medialib_property_set(self, int id, key, value, source=None, cb=None): - """ --- -1.8.3.2 - diff --git a/audio/xmms2/xmms2.SlackBuild b/audio/xmms2/xmms2.SlackBuild index 9562503e7c..97de0a8f75 100644 --- a/audio/xmms2/xmms2.SlackBuild +++ b/audio/xmms2/xmms2.SlackBuild @@ -7,8 +7,8 @@ # Updated by Andrew Brouwers, abrouwers at gmail d0t com (13.0, 64-bit) PRGNAM=xmms2 -VERSION="0.8DrO_o" -BUILD=${BUILD:-3} +VERSION="20150712_942b17f" +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -44,7 +44,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . @@ -54,12 +54,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# This fixes building over the newer ffmpeg - NOT -#sed -i "s|^\ \ \ \ flags\.enable_c_error.*||" wscript - -# unbreak xmms2 building on cython-0.19.1 -patch -p1 < $CWD/xmms2-0.8-cython-0.19.1.patch - export CCFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -69,7 +63,7 @@ export CXXFLAGS="$SLKCFLAGS" --with-pkgconfigdir=/usr/lib${LIBDIRSUFFIX}/pkgconfig \ --mandir=/usr/man \ --without-ldconfig \ - --without-plugins=apefile,avcodec,flv,tta \ + --without-plugins=apefile,flv,tta \ --with-perl-archdir=/usr/lib$LIBDIRSUFFIX/perl5 \ -p configure @@ -80,7 +74,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING* INSTALL README TODO \ +cp -a AUTHORS COPYING* README.mdown TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > \ $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/audio/xmms2/xmms2.info b/audio/xmms2/xmms2.info index 02db361d66..61f3ec488c 100644 --- a/audio/xmms2/xmms2.info +++ b/audio/xmms2/xmms2.info @@ -1,8 +1,8 @@ PRGNAM="xmms2" -VERSION="0.8DrO_o" +VERSION="20150712_942b17f" HOMEPAGE="http://wiki.xmms2.xmms.se/" -DOWNLOAD="http://downloads.sourceforge.net/xmms2/xmms2-0.8DrO_o.tar.bz2" -MD5SUM="84d5c05a70bfd31ed392a4e3f701eaa3" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/xmms2-20150712_942b17f.tar.xz" +MD5SUM="8a5c43ef18fdaf24f6853ced83ce1620" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |