Date: Sunday, November 29, 2009 @ 12:06:48 Author: giovanni Revision: 59913
Merged revisions 59911 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/mpg123/trunk ........ r59911 | giovanni | 2009-11-29 09:05:07 -0800 (dom, 29 nov 2009) | 2 lines upgpkg: mpg123 1.9.2-1 New upstream version and add patch to work with libtool2 2.2.6b ........ Added: mpg123/repos/extra-x86_64/mpg123-1.9.2-libtool.patch (from rev 59911, mpg123/trunk/mpg123-1.9.2-libtool.patch) Modified: mpg123/repos/extra-x86_64/ (properties) mpg123/repos/extra-x86_64/PKGBUILD Deleted: mpg123/repos/extra-x86_64/ChangeLog ----------------------------+ ChangeLog | 30 ------------------------------ PKGBUILD | 18 +++++++++++------- mpg123-1.9.2-libtool.patch | 18 ++++++++++++++++++ 3 files changed, 29 insertions(+), 37 deletions(-) Property changes on: mpg123/repos/extra-x86_64 ___________________________________________________________________ Modified: svnmerge-integrated - /mpg123/trunk:1-52033 + /mpg123/trunk:1-59912 Deleted: extra-x86_64/ChangeLog =================================================================== --- extra-x86_64/ChangeLog 2009-11-29 17:05:53 UTC (rev 59912) +++ extra-x86_64/ChangeLog 2009-11-29 17:06:48 UTC (rev 59913) @@ -1,30 +0,0 @@ -2008-05-23 Eric Belanger <e...@archlinux.org> - - * mpg123 1.4.3-1 - * Upstream update - -2008-04-13 Eric Belanger <e...@archlinux.org> - - * mpg123 1.4.1-1 - * Upstream update - -2008-03-09 Eric Belanger <e...@archlinux.org> - - * mpg123 1.3.1-2 - * libtool rebuild - -2008-03-09 Eric Belanger <e...@archlinux.org> - - * mpg123 1.3.1-1 - * Upstream update - -2008-03-02 Eric Belanger <e...@archlinux.org> - - * mpg123 1.2.1-2 - * libtool rebuild - -2008-02-19 Eric Belanger <e...@archlinux.org> - - * mpg123 1.2.1-1 - * Upstream update - Modified: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2009-11-29 17:05:53 UTC (rev 59912) +++ extra-x86_64/PKGBUILD 2009-11-29 17:06:48 UTC (rev 59913) @@ -1,9 +1,9 @@ # $Id$ # Maintainer: Hugo Doria <h...@archlinux.org> -# Contributor: William Rea <sillywi...@gmail.com> +# Contributor: Giovanni Scafora <giova...@archlinux.org> pkgname=mpg123 -pkgver=1.9.0 +pkgver=1.9.2 pkgrel=1 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3" arch=('i686' 'x86_64') @@ -16,12 +16,16 @@ provides=('mpg321') replaces=('mpg321') options=('libtool') -source=(http://downloads.sourceforge.net/sourceforge/mpg123/${pkgname}-${pkgver}.tar.bz2) -md5sums=('0ea1a5d45680c847a9594188f582d284') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + mpg123-1.9.2-libtool.patch) +md5sums=('5313b1bcc0274b4d7c394397c205bb20' + '570ac56f363011237cc5b9ed8cbdcf9e') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --with-audio="alsa esd sdl" || return 1 + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/mpg123-1.9.2-libtool.patch || return 1 + ./configure --prefix=/usr \ + --with-audio="alsa esd sdl" || return 1 make || return 1 - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR="${pkgdir}" install || return 1 } Copied: mpg123/repos/extra-x86_64/mpg123-1.9.2-libtool.patch (from rev 59911, mpg123/trunk/mpg123-1.9.2-libtool.patch) =================================================================== --- extra-x86_64/mpg123-1.9.2-libtool.patch (rev 0) +++ extra-x86_64/mpg123-1.9.2-libtool.patch 2009-11-29 17:06:48 UTC (rev 59913) @@ -0,0 +1,18 @@ +--- a/src/module.c 2009-11-18 09:21:01.000000000 -0800 ++++ b/src/module.c 2009-11-29 17:52:48.000000000 -0800 +@@ -121,13 +121,13 @@ + goto om_bad; + } + /* Work out the path of the module to open */ +- module_path_len = strlen(type) + 1 + strlen(name) + strlen(MODULE_FILE_SUFFIX) + 1; ++ module_path_len = strlen(type) + 1 + strlen(name) + strlen(MODULE_FILE_SUFFIX) + 1 + 2; + module_path = malloc( module_path_len ); + if (module_path == NULL) { + error1( "Failed to allocate memory for module name: %s", strerror(errno) ); + goto om_bad; + } +- snprintf( module_path, module_path_len, "%s_%s%s", type, name, MODULE_FILE_SUFFIX ); ++ snprintf( module_path, module_path_len, "./%s_%s%s", type, name, MODULE_FILE_SUFFIX ); + /* Display the path of the module created */ + debug1( "Module path: %s", module_path ); +