diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile index c9fbe102ac3..14174aa783a 100644 --- a/audio/mpg123/Makefile +++ b/audio/mpg123/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.44 2009/11/22 20:21:27 naddy Exp $ +# $OpenBSD: Makefile,v 1.45 2009/12/07 17:05:23 naddy Exp $ COMMENT= fast console MPEG audio player and decoder library -DISTNAME= mpg123-1.9.2 -SHARED_LIBS= mpg123 2.0 # .20.3 +DISTNAME= mpg123-1.10.0 +SHARED_LIBS= mpg123 2.1 # .22.1 CATEGORIES= audio HOMEPAGE= http://www.mpg123.de/ diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo index e06c47101c6..b943a09e363 100644 --- a/audio/mpg123/distinfo +++ b/audio/mpg123/distinfo @@ -1,5 +1,5 @@ -MD5 (mpg123-1.9.2.tar.bz2) = UxOxvMAnS018OUOXwgW7IA== -RMD160 (mpg123-1.9.2.tar.bz2) = p6eG2F9/t9AZz60mVi9Mizz7d+M= -SHA1 (mpg123-1.9.2.tar.bz2) = idgNpN3g2+0fYFZQwGpJ1wyr/0w= -SHA256 (mpg123-1.9.2.tar.bz2) = S7hmuVE1YuNQgDfY8OT9PfESlwzAu4/9sFvQb3b6Hfs= -SIZE (mpg123-1.9.2.tar.bz2) = 736807 +MD5 (mpg123-1.10.0.tar.bz2) = AAXJqJw4FITi0v9FCz3+Xg== +RMD160 (mpg123-1.10.0.tar.bz2) = /+BqyaTllUNoA+9PYhI6aSeNQRk= +SHA1 (mpg123-1.10.0.tar.bz2) = agTYOjKu8TN80Y2yb8CFUjM7+hM= +SHA256 (mpg123-1.10.0.tar.bz2) = vKv0VJpO1ldwqA/4CuVNRxsGTiviLxVgdkwAfag0vFM= +SIZE (mpg123-1.10.0.tar.bz2) = 745415 diff --git a/audio/mpg123/patches/patch-configure b/audio/mpg123/patches/patch-configure index 4e521d7f405..76bca698d06 100644 --- a/audio/mpg123/patches/patch-configure +++ b/audio/mpg123/patches/patch-configure @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure,v 1.2 2009/11/22 20:21:27 naddy Exp $ ---- configure.orig Thu Nov 19 20:31:46 2009 -+++ configure Sun Nov 22 02:05:23 2009 -@@ -12651,10 +12651,10 @@ fi +$OpenBSD: patch-configure,v 1.3 2009/12/07 17:05:23 naddy Exp $ +--- configure.orig Sat Dec 5 21:30:40 2009 ++++ configure Mon Dec 7 03:02:04 2009 +@@ -12690,10 +12690,10 @@ fi # opt-in for IEEE754 floating point action # We want to make sure not to apply hacks relying on IEEE754 storage format on platforms where we did not make sure that this actually is valid. # It _should_ be fine for about all computers still out there, but we play safe. @@ -15,14 +15,3 @@ $OpenBSD: patch-configure,v 1.2 2009/11/22 20:21:27 naddy Exp $ ;; esac if test "x$ieee" = xyes; then -@@ -14504,8 +14504,8 @@ esac - for i in $more_sources - do - # Echo make sure every file is only once in the list. -- echo "$DECODER_OBJ" | grep -v -w "$i\.\$(OBJEXT)" && DECODER_OBJ="$DECODER_OBJ $i.\$(OBJEXT)" -- echo "$DECODER_LOBJ" | grep -v -w "$i\.lo" && DECODER_LOBJ="$DECODER_LOBJ $i.lo" -+ echo "$DECODER_OBJ" | grep -q -v -w "$i\.\$(OBJEXT)" && DECODER_OBJ="$DECODER_OBJ $i.\$(OBJEXT)" -+ echo "$DECODER_LOBJ" | grep -q -v -w "$i\.lo" && DECODER_LOBJ="$DECODER_LOBJ $i.lo" - done - - diff --git a/audio/mpg123/patches/patch-src_module_c b/audio/mpg123/patches/patch-src_module_c deleted file mode 100644 index ad75545d899..00000000000 --- a/audio/mpg123/patches/patch-src_module_c +++ /dev/null @@ -1,44 +0,0 @@ -$OpenBSD: patch-src_module_c,v 1.1 2009/11/22 20:21:27 naddy Exp $ - -Do not depend on the current directory being in the default module -search path. - ---- src/module.c.orig Sun Nov 22 13:08:15 2009 -+++ src/module.c Sun Nov 22 13:12:37 2009 -@@ -102,22 +102,19 @@ open_module( const char* type, const char* name ) - size_t module_symbol_len = 0; - char *workdir = NULL; - char *moddir = NULL; -- workdir = get_the_cwd(); - moddir = get_module_dir(); -- if(workdir == NULL || moddir == NULL) -+ if(moddir == NULL) - { -- error("Failure getting workdir or moddir!"); -- if(workdir != NULL) free(workdir); -- if(moddir != NULL) free(moddir); -+ error("Failure getting moddir!"); - return NULL; - } - - /* Initialize libltdl */ - if (lt_dlinit()) error( "Failed to initialise libltdl" ); - -- if(chdir(moddir) != 0) -+ if(lt_dlsetsearchpath(moddir) != 0) - { -- error2("Failed to enter module directory %s: %s", moddir, strerror(errno)); -+ error2("Failed to set module directory %s: %s", moddir, lt_dlerror()); - goto om_bad; - } - /* Work out the path of the module to open */ -@@ -173,9 +170,7 @@ om_latebad: - om_bad: - module = NULL; - om_end: -- chdir(workdir); - free(moddir); -- free(workdir); - return module; - } -