[arch-commits] Commit in mpg123/trunk (PKGBUILD mpg123-1.9.2-libtool.patch)

[Eric Bélanger]

    Date: Sunday, July 11, 2010 @ 14:52:51
  Author: eric
Revision: 85300

upgpkg: mpg123 1.12.3-1
Upstream update, Corrected license, Removed old patch

Modified:
  mpg123/trunk/PKGBUILD
Deleted:
  mpg123/trunk/mpg123-1.9.2-libtool.patch

----------------------------+
 PKGBUILD                   |   19 +++++++++++--------
 mpg123-1.9.2-libtool.patch |   18 ------------------
 2 files changed, 11 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-07-11 16:38:59 UTC (rev 85299)
+++ PKGBUILD	2010-07-11 18:52:51 UTC (rev 85300)
@@ -3,13 +3,13 @@
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=mpg123
-pkgver=1.12.1
+pkgver=1.12.3
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/mpg123"
-license=('GPL2' 'LGPL2')
-depends=('glibc' 'libtool>=2.2' 'alsa-lib')
+license=('GPL2' 'LGPL2.1')
+depends=('glibc' 'libtool' 'alsa-lib')
 makedepends=('esound' 'sdl')
 optdepends=('esound: for additional audio support' 'sdl: for additional audio support')
 conflicts=('mpg321')
@@ -17,13 +17,16 @@
 replaces=('mpg321')
 options=('libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('e7d810a75d22954169f1530a436aca4c')
+md5sums=('c1568be2d1715786bd6b1a89ec6fa7ef')
+sha1sums=('5e92d3c918f6095264089f711a9f38a5d2168b31')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-audio="alsa esd sdl"
+  make
+}
 
-  ./configure --prefix=/usr \
-              --with-audio="alsa esd sdl" || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
 }

Deleted: mpg123-1.9.2-libtool.patch
===================================================================
--- mpg123-1.9.2-libtool.patch	2010-07-11 16:38:59 UTC (rev 85299)
+++ mpg123-1.9.2-libtool.patch	2010-07-11 18:52:51 UTC (rev 85300)
@@ -1,18 +0,0 @@
---- 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 );
-