Author: witekfl Date: Thu Aug 12 14:14:35 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- 1.12.3
---- Files affected:
packages/mpg123:
mpg123-no-la.patch (1.4 -> 1.5) , mpg123.spec (1.106 -> 1.107)
---- Diffs:
================================================================
Index: packages/mpg123/mpg123-no-la.patch
diff -u packages/mpg123/mpg123-no-la.patch:1.4
packages/mpg123/mpg123-no-la.patch:1.5
--- packages/mpg123/mpg123-no-la.patch:1.4 Sun Nov 8 17:08:24 2009
+++ packages/mpg123/mpg123-no-la.patch Thu Aug 12 16:14:30 2010
@@ -1,6 +1,6 @@
---- mpg123-1.1.0/src/module.c.orig 2008-01-15 03:27:32.000000000 +0100
-+++ mpg123-1.1.0/src/module.c 2008-01-23 23:58:43.093716521 +0100
-@@ -19,7 +19,7 @@
+--- mpg123-1.12.3/src/module.c.orig 2010-07-05 00:03:03.000000000 +0200
++++ mpg123-1.12.3/src/module.c 2010-08-12 16:06:12.000000000 +0200
+@@ -20,7 +20,7 @@
#error Cannot build without LTDL library support
#endif
@@ -9,7 +9,7 @@
#define MODULE_SYMBOL_PREFIX "mpg123_"
#define MODULE_SYMBOL_SUFFIX "_module_info"
-@@ -75,14 +75,11 @@
+@@ -102,14 +102,11 @@
size_t module_path_len = 0;
char* module_symbol = NULL;
size_t module_symbol_len = 0;
@@ -26,7 +26,7 @@
if(moddir != NULL) free(moddir);
return NULL;
}
-@@ -90,19 +87,14 @@
+@@ -117,20 +114,15 @@
/* Initialize libltdl */
if (lt_dlinit()) error( "Failed to initialise libltdl" );
@@ -36,19 +36,20 @@
- 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;
+ /* Note that we need to open ./file, not just file! */
+- module_path_len = 2 + strlen(type) + 1 + strlen(name) +
strlen(MODULE_FILE_SUFFIX) + 1;
+ module_path_len = strlen(moddir) + 1 + strlen(type) + 1 + strlen(name)
+ strlen(MODULE_FILE_SUFFIX) + 1;
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 );
+ snprintf( module_path, module_path_len, "%s/%s_%s%s", moddir, type,
name, MODULE_FILE_SUFFIX );
/* Display the path of the module created */
- debug1( "Module path: %s", module_path );
+ if(param.verbose > 1) fprintf(stderr, "Module path: %s\n", module_path
);
-@@ -144,9 +140,7 @@
+@@ -179,9 +171,7 @@
om_bad:
module = NULL;
om_end:
================================================================
Index: packages/mpg123/mpg123.spec
diff -u packages/mpg123/mpg123.spec:1.106 packages/mpg123/mpg123.spec:1.107
--- packages/mpg123/mpg123.spec:1.106 Tue Jul 13 16:44:52 2010
+++ packages/mpg123/mpg123.spec Thu Aug 12 16:14:30 2010
@@ -22,13 +22,13 @@
Summary(ru.UTF-8): Проигрыватель MPEG аудиофайлов
Summary(uk.UTF-8): Програвач MPEG аудіофайлів
Name: mpg123
-Version: 1.9.1
-Release: 3
+Version: 1.12.3
+Release: 1
# some old parts are GPLed, but they are not included in package
License: LGPL v2.1
Group: Applications/Sound
-Source0: http://dl.sourceforge.net/mpg123/%{name}-%{version}.tar.bz2
-# Source0-md5: 39aa4407b53fa8c86f7d963bfe0702c9
+Source0:
http://downloads.sourceforge.net/mpg123/%{name}-%{version}.tar.bz2
+# Source0-md5: c1568be2d1715786bd6b1a89ec6fa7ef
Patch0: %{name}-am.patch
Patch1: %{name}-no-la.patch
URL: http://www.mpg123.de/
@@ -356,6 +356,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.107 2010/08/12 14:14:30 witekfl
+- 1.12.3
+
Revision 1.106 2010/07/13 14:44:52 glen
- unify pulseaudio bcond
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mpg123/mpg123-no-la.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mpg123/mpg123.spec?r1=1.106&r2=1.107&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
