From e9602af5a74f82f4522b50d0e4bbb41530fe8e4f Mon Sep 17 00:00:00 2001 From: markd Date: Tue, 9 Mar 2004 11:59:24 +0000 Subject: Update to KDE 3.2.1. Changes: KMix: Properly save volumes on exit so volumes are correctly restored on next login. Noatun: remember last equalizer setting --- multimedia/kdemultimedia3/Makefile | 3 +-- multimedia/kdemultimedia3/PLIST | 7 +++++-- multimedia/kdemultimedia3/distinfo | 9 ++++----- multimedia/kdemultimedia3/patches/patch-aa | 23 ++++++++++++++++------- multimedia/kdemultimedia3/patches/patch-cr | 12 ------------ 5 files changed, 26 insertions(+), 28 deletions(-) delete mode 100644 multimedia/kdemultimedia3/patches/patch-cr (limited to 'multimedia/kdemultimedia3') diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 0cf1af3dccd..98b9a39d65b 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2004/03/08 19:40:41 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/09 11:59:24 markd Exp $ DISTNAME= kdemultimedia-${_KDE_VERSION} -PKGREVISION= 2 CATEGORIES= multimedia COMMENT= Multimedia tools for the KDE integrated X11 desktop diff --git a/multimedia/kdemultimedia3/PLIST b/multimedia/kdemultimedia3/PLIST index 97bc2e1f357..1dbf8805f46 100644 --- a/multimedia/kdemultimedia3/PLIST +++ b/multimedia/kdemultimedia3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2004/03/01 13:18:20 markd Exp $ +@comment $NetBSD: PLIST,v 1.7 2004/03/09 11:59:24 markd Exp $ bin/artsbuilder bin/artscontrol bin/juk @@ -306,6 +306,10 @@ lib/libkdeinit_krec.la lib/libkdeinit_krec.so lib/libkdeinit_noatun.la lib/libkdeinit_noatun.so +lib/libkmidlib.la +lib/libkmidlib.so +lib/libkmidlib.so.0 +lib/libkmidlib.so.0.0 lib/libmpeg-0.3.0.so lib/libmpeg.la lib/libmpeg.so @@ -329,7 +333,6 @@ lib/libworkman.la lib/libworkman.so lib/libworkman.so.6 lib/libworkman.so.6.0 -lib/libworkmanaudio.a lib/libyafcore.la lib/libyafcore.so lib/libyafcore.so.0 diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index 7a6cde494f9..f3855f1a403 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.2 2004/02/05 07:43:30 markd Exp $ +$NetBSD: distinfo,v 1.3 2004/03/09 11:59:24 markd Exp $ -SHA1 (kdemultimedia-3.2.0.tar.bz2) = b4d9d615ab03cbb0c7173cbd0094f5b6545df27e -Size (kdemultimedia-3.2.0.tar.bz2) = 4893608 bytes -SHA1 (patch-aa) = cc019ece21c25b719bdda78ea121e8ccf0a24a40 +SHA1 (kdemultimedia-3.2.1.tar.bz2) = 1be8550a5535e44c632fbe926bc6516ab85d5399 +Size (kdemultimedia-3.2.1.tar.bz2) = 4926192 bytes +SHA1 (patch-aa) = c289331c35656b8cac6b670f8007b27d2bbfe662 SHA1 (patch-ar) = a0f31a40a2e671dacfe3c00706bc5068e648a472 -SHA1 (patch-cr) = 6159763aaf0ae2b738e31c06ada0da5c47d0692c SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5 SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e SHA1 (patch-cx) = ea42ab342abf2c2cff4c13fa71ab6e01bab5736c diff --git a/multimedia/kdemultimedia3/patches/patch-aa b/multimedia/kdemultimedia3/patches/patch-aa index d3f6550c53a..904191371e2 100644 --- a/multimedia/kdemultimedia3/patches/patch-aa +++ b/multimedia/kdemultimedia3/patches/patch-aa @@ -1,8 +1,17 @@ -$NetBSD: patch-aa,v 1.2 2004/02/05 07:43:30 markd Exp $ +$NetBSD: patch-aa,v 1.3 2004/03/09 11:59:24 markd Exp $ ---- configure.orig Thu May 8 00:05:31 2003 +--- configure.orig 2004-03-01 10:47:15.000000000 +1300 +++ configure -@@ -33020,7 +33054,7 @@ fi +@@ -32634,7 +32634,7 @@ if test "${ac_cv_lib_FLAC_FLAC__seekable + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lFLAC $LIBS" ++LIBS="-lFLAC -lm $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* #line $LINENO "configure" */ + /* confdefs.h. */ +@@ -33519,7 +33519,7 @@ fi echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio_main" >&5 echo "${ECHO_T}$ac_cv_lib_ossaudio_main" >&6 if test $ac_cv_lib_ossaudio_main = yes; then @@ -11,7 +20,7 @@ $NetBSD: patch-aa,v 1.2 2004/02/05 07:43:30 markd Exp $ fi -@@ -34105,8 +34139,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -34785,8 +34785,23 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -37,7 +46,7 @@ $NetBSD: patch-aa,v 1.2 2004/02/05 07:43:30 markd Exp $ else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -34160,7 +34209,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -34840,7 +34855,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -60,7 +69,7 @@ $NetBSD: patch-aa,v 1.2 2004/02/05 07:43:30 markd Exp $ else echo "$as_me: failed program was:" >&5 -@@ -34215,7 +34279,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c +@@ -34895,7 +34925,22 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then @@ -83,7 +92,7 @@ $NetBSD: patch-aa,v 1.2 2004/02/05 07:43:30 markd Exp $ else echo "$as_me: failed program was:" >&5 -@@ -34807,10 +34886,10 @@ _ACEOF +@@ -35487,10 +35532,10 @@ _ACEOF ;; NetBSD) diff --git a/multimedia/kdemultimedia3/patches/patch-cr b/multimedia/kdemultimedia3/patches/patch-cr deleted file mode 100644 index fe2bddd84c4..00000000000 --- a/multimedia/kdemultimedia3/patches/patch-cr +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cr,v 1.1.1.1 2004/01/26 15:42:42 jmmv Exp $ - ---- mpeglib/lib/decoder/decoderPlugin.cpp.orig 2002-11-22 21:52:54.000000000 +0000 -+++ mpeglib/lib/decoder/decoderPlugin.cpp -@@ -337,6 +337,7 @@ int DecoderPlugin::runCheck() { - case _RUN_CHECK_CONTINUE: - break; - case _RUN_CHECK_FALSE: -+ shutdownLock(); - return false; - case _RUN_CHECK_TRUE: - return true; -- cgit v1.2.3