diff options
author | markd <markd> | 2008-02-20 10:00:24 +0000 |
---|---|---|
committer | markd <markd> | 2008-02-20 10:00:24 +0000 |
commit | e7b3a537d5588671af14953946a5b709512d1e65 (patch) | |
tree | 01825005df16e16f726e2cb62bd2b945ec9fc56f /multimedia | |
parent | 0dcff9f015f592289a9139117cfb690790789b15 (diff) | |
download | pkgsrc-e7b3a537d5588671af14953946a5b709512d1e65.tar.gz |
Update to kde3.5.9
Minor bugfixes
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/kdemultimedia3/Makefile | 3 | ||||
-rw-r--r-- | multimedia/kdemultimedia3/distinfo | 11 | ||||
-rw-r--r-- | multimedia/kdemultimedia3/patches/patch-aa | 51 | ||||
-rw-r--r-- | multimedia/kdemultimedia3/patches/patch-ct | 21 |
4 files changed, 24 insertions, 62 deletions
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index d143fb39f27..fbc52065520 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.67 2008/01/18 05:08:38 tnn Exp $ +# $NetBSD: Makefile,v 1.68 2008/02/20 10:03:47 markd Exp $ DISTNAME= kdemultimedia-${_KDE_VERSION} -PKGREVISION= 3 CATEGORIES= multimedia COMMENT= Multimedia tools for the KDE integrated X11 desktop diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index 2d5296f692b..93a35fff712 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.38 2008/02/16 14:26:37 wiz Exp $ +$NetBSD: distinfo,v 1.39 2008/02/20 10:03:47 markd Exp $ -SHA1 (kdemultimedia-3.5.8.tar.bz2) = fd70cf7f7378653e92c03fa0b9d9a5368451632c -RMD160 (kdemultimedia-3.5.8.tar.bz2) = 5fcb8d282e2d49baca4daa9fb4e24b5216df92ee -Size (kdemultimedia-3.5.8.tar.bz2) = 6316739 bytes -SHA1 (patch-aa) = 156171733eb9a7c554d3e3b9e5f0ed58cbf02b0a +SHA1 (kdemultimedia-3.5.9.tar.bz2) = 742265fcadfcde20fd824757eafe0a7539ce0f81 +RMD160 (kdemultimedia-3.5.9.tar.bz2) = 275c9219f32ab57a52ed09516c8338a86381bac7 +Size (kdemultimedia-3.5.9.tar.bz2) = 6327361 bytes +SHA1 (patch-aa) = 4e561e1f4cb026f8dd5e9069c653bf45ceafcf93 SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70 SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413 SHA1 (patch-ad) = 55deb605003a4ba0bfc37babe8657c3408728f62 @@ -19,5 +19,4 @@ SHA1 (patch-ap) = 66368931f92a83e03b879e98440756620e65ddeb SHA1 (patch-aq) = 2c804af0ff952e50e909002a4b4c53422b1ba59c SHA1 (patch-ar) = 820defab2ffe3868b237b2264bace82c6aa298ad SHA1 (patch-cs) = 6b00976b20b3d6af611f75921e20f88086061ce5 -SHA1 (patch-ct) = b61875aa683a08e69f0a403a8111319469fa3c4e SHA1 (patch-cu) = 778e1d00bf485c55ddec7cebb47406f87b9e4ec8 diff --git a/multimedia/kdemultimedia3/patches/patch-aa b/multimedia/kdemultimedia3/patches/patch-aa index 7895414d92e..82fcc16ba43 100644 --- a/multimedia/kdemultimedia3/patches/patch-aa +++ b/multimedia/kdemultimedia3/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ +$NetBSD: patch-aa,v 1.15 2008/02/20 10:03:48 markd Exp $ ---- configure.orig 2007-10-08 14:27:15.000000000 +0000 +--- configure.orig 2007-10-09 03:27:15.000000000 +1300 +++ configure -@@ -34934,7 +34934,7 @@ if test "${ac_cv_lib_ossaudio__oss_ioctl +@@ -34934,7 +34910,7 @@ if test "${ac_cv_lib_ossaudio__oss_ioctl echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -34998,7 +34998,7 @@ fi +@@ -34998,7 +34974,7 @@ fi if test "x$have_ossaudio" = xyes; then # for kmix/ and akode/ @@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ fi -@@ -35571,7 +35571,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -35571,7 +35547,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $ac_includes_default @@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ _ACEOF rm -f conftest.$ac_objext if { (ac_try="$ac_compile" -@@ -35611,7 +35611,7 @@ _ACEOF +@@ -35611,7 +35587,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" case "(($ac_try" in -@@ -35712,7 +35712,7 @@ cat confdefs.h >>conftest.$ac_ext +@@ -35712,7 +35688,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ int main () -@@ -37701,7 +37701,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetTRMC +@@ -37701,7 +37677,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetTRMC echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -56,7 +56,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -38572,13 +38572,13 @@ if test $ac_cv_header_FLAC_metadata_h = +@@ -38572,13 +38548,13 @@ if test $ac_cv_header_FLAC_metadata_h = test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac @@ -74,7 +74,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -38592,11 +38592,11 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -38592,11 +38568,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif @@ -88,7 +88,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ ; return 0; } -@@ -38619,21 +38619,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -38619,21 +38595,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then @@ -115,7 +115,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ have_libFLAC=yes fi -@@ -38827,9 +38827,9 @@ if test $ac_cv_header_OggFLAC_seekable_s +@@ -38827,9 +38803,9 @@ if test $ac_cv_header_OggFLAC_seekable_s test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS" ;; esac @@ -128,7 +128,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -@@ -38847,11 +38847,11 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -38847,11 +38823,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif @@ -142,7 +142,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ ; return 0; } -@@ -38874,21 +38874,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -38874,21 +38850,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec test ! -s conftest.err } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then @@ -169,7 +169,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ have_libOggFLAC=yes fi -@@ -40652,7 +40652,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -40652,7 +40628,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec test ! -s conftest.err } && test -s conftest.$ac_objext; then @@ -192,7 +192,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ else echo "$as_me: failed program was:" >&5 -@@ -40713,7 +40728,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -40713,7 +40704,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec test ! -s conftest.err } && test -s conftest.$ac_objext; then @@ -215,7 +215,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ else echo "$as_me: failed program was:" >&5 -@@ -40774,7 +40804,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec +@@ -40774,7 +40780,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec test ! -s conftest.err } && test -s conftest.$ac_objext; then @@ -238,22 +238,7 @@ $NetBSD: patch-aa,v 1.14 2008/02/16 14:26:37 wiz Exp $ else echo "$as_me: failed program was:" >&5 -@@ -42602,11 +42647,11 @@ echo $ECHO_N "checking for XINE-LIB vers - XINE_CFLAGS=`$XINE_CONFIG $xine_config_args --cflags` - XINE_LIBS=`$XINE_CONFIG $xine_config_args --libs` - xine_config_major_version=`$XINE_CONFIG $xine_config_args --version | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\1/'` - xine_config_minor_version=`$XINE_CONFIG $xine_config_args --version | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\2/'` - xine_config_sub_version=`$XINE_CONFIG $xine_config_args --version | \ -- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -+ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3/'` - xine_script_dir=`$XINE_CONFIG $xine_config_args --scriptdir` - xine_plugin_dir=`$XINE_CONFIG $xine_config_args --plugindir` - xine_locale_dir=`$XINE_CONFIG $xine_config_args --localedir` -@@ -45675,11 +45720,6 @@ done # for ac_tag +@@ -45675,11 +45668,6 @@ done # for ac_tag { (exit 0); exit 0; } _ACEOF diff --git a/multimedia/kdemultimedia3/patches/patch-ct b/multimedia/kdemultimedia3/patches/patch-ct deleted file mode 100644 index cb0f0d58472..00000000000 --- a/multimedia/kdemultimedia3/patches/patch-ct +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ct,v 1.1.1.1 2004/01/26 15:42:43 jmmv Exp $ - ---- mpeglib/example/yaf/yafvorbis/vorbis_control.cpp.orig 2003-11-08 13:30:14.000000000 +0100 -+++ mpeglib/example/yaf/yafvorbis/vorbis_control.cpp 2003-11-08 13:29:46.000000000 +0100 -@@ -19,7 +19,7 @@ - - - --#include <iostream.h> -+#include <iostream> - #include <stdio.h> - #include <stdlib.h> - #include <math.h> -@@ -33,6 +33,7 @@ - #include <getopt.h> - #endif - -+using namespace std; - - - |