pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/kdemultimedia3 Update to KDE 3.5.7
details: https://anonhg.NetBSD.org/pkgsrc/rev/92c04a6389ac
branches: trunk
changeset: 529057:92c04a6389ac
user: markd <markd%pkgsrc.org@localhost>
date: Wed May 23 13:16:11 2007 +0000
description:
Update to KDE 3.5.7
JuK
* Tell Google not to send JavaScript when we request images to reduce
errors in the cover art search, and make sure that images we request
have the appropriate http:// protocol.
diffstat:
multimedia/kdemultimedia3/Makefile | 4 +-
multimedia/kdemultimedia3/PLIST | 3 +-
multimedia/kdemultimedia3/distinfo | 10 +-
multimedia/kdemultimedia3/options.mk | 6 +-
multimedia/kdemultimedia3/patches/patch-aa | 223 ++++++++++++++--------------
5 files changed, 122 insertions(+), 124 deletions(-)
diffs (truncated from 592 to 300 lines):
diff -r b65ff1617cd4 -r 92c04a6389ac multimedia/kdemultimedia3/Makefile
--- a/multimedia/kdemultimedia3/Makefile Wed May 23 13:10:04 2007 +0000
+++ b/multimedia/kdemultimedia3/Makefile Wed May 23 13:16:11 2007 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.61 2007/02/16 01:42:46 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2007/05/23 13:16:11 markd Exp $
DISTNAME= kdemultimedia-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= multimedia
COMMENT= Multimedia tools for the KDE integrated X11 desktop
@@ -37,6 +36,7 @@
.include "../../meta-pkgs/kde3/kde3.mk"
.include "../../audio/arts/buildlink3.mk"
.include "../../audio/cdparanoia/buildlink3.mk"
+.include "../../audio/flac/buildlink3.mk"
.include "../../audio/lame/buildlink3.mk"
# version 0.5.x is not supported -- reconsider when updating
#.include "../../audio/libtunepimp/buildlink3.mk"
diff -r b65ff1617cd4 -r 92c04a6389ac multimedia/kdemultimedia3/PLIST
--- a/multimedia/kdemultimedia3/PLIST Wed May 23 13:10:04 2007 +0000
+++ b/multimedia/kdemultimedia3/PLIST Wed May 23 13:16:11 2007 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2007/01/26 02:58:41 markd Exp $
+@comment $NetBSD: PLIST,v 1.25 2007/05/23 13:16:11 markd Exp $
bin/artsbuilder
bin/artscontrol
bin/juk
@@ -493,6 +493,7 @@
share/doc/kde/HTML/en/kmix/index.docbook
share/doc/kde/HTML/en/kmix/kmix-channel-playback.png
share/doc/kde/HTML/en/kmix/kmix-channel-record.png
+share/doc/kde/HTML/en/kmix/kmix-channel-switches.png
share/doc/kde/HTML/en/kmix/kmix-window.png
share/doc/kde/HTML/en/krec/common
share/doc/kde/HTML/en/krec/index.cache.bz2
diff -r b65ff1617cd4 -r 92c04a6389ac multimedia/kdemultimedia3/distinfo
--- a/multimedia/kdemultimedia3/distinfo Wed May 23 13:10:04 2007 +0000
+++ b/multimedia/kdemultimedia3/distinfo Wed May 23 13:16:11 2007 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.35 2007/01/26 02:58:41 markd Exp $
+$NetBSD: distinfo,v 1.36 2007/05/23 13:16:11 markd Exp $
-SHA1 (kdemultimedia-3.5.6.tar.bz2) = 030ca0b5e79f04c6baa99108f1c871f194effee7
-RMD160 (kdemultimedia-3.5.6.tar.bz2) = 7411019e2765f740ad0f3fd592e74f62e04b8387
-Size (kdemultimedia-3.5.6.tar.bz2) = 6291692 bytes
-SHA1 (patch-aa) = dbc6e12e1c72fd0b830782d9ce512c0efe6c29f6
+SHA1 (kdemultimedia-3.5.7.tar.bz2) = 4b3d45403aed404c5c06d03fdb095400aed75f2c
+RMD160 (kdemultimedia-3.5.7.tar.bz2) = 23354d5b5b527c0c5bb1a123b018b130a0734906
+Size (kdemultimedia-3.5.7.tar.bz2) = 6347766 bytes
+SHA1 (patch-aa) = c41faeee522097ff76d81133037a0dc6da919e3d
SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70
SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413
SHA1 (patch-ad) = 4a84cd2246d61e521b1ce576328c755915304b10
diff -r b65ff1617cd4 -r 92c04a6389ac multimedia/kdemultimedia3/options.mk
--- a/multimedia/kdemultimedia3/options.mk Wed May 23 13:10:04 2007 +0000
+++ b/multimedia/kdemultimedia3/options.mk Wed May 23 13:16:11 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2007/01/26 02:58:41 markd Exp $
+# $NetBSD: options.mk,v 1.2 2007/05/23 13:16:11 markd Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.kdemultimedia
PKG_SUPPORTED_OPTIONS= gstreamer oss
@@ -6,8 +6,8 @@
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mgstreamer)
-.include "../../multimedia/gstreamer0.8/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
+.include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Moss)
diff -r b65ff1617cd4 -r 92c04a6389ac multimedia/kdemultimedia3/patches/patch-aa
--- a/multimedia/kdemultimedia3/patches/patch-aa Wed May 23 13:10:04 2007 +0000
+++ b/multimedia/kdemultimedia3/patches/patch-aa Wed May 23 13:16:11 2007 +0000
@@ -1,23 +1,19 @@
-$NetBSD: patch-aa,v 1.11 2007/01/13 18:33:44 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
---- configure.orig 2006-10-02 18:17:13.000000000 +0000
+--- configure.orig 2007-05-14 23:37:28.000000000 +1200
+++ configure
-@@ -28862,34 +28862,15 @@ if test $kde_qtver = 1; then
- kde_qt_dirs="$QTDIR /usr/lib/qt"
- fi
+@@ -31831,31 +31831,13 @@ fi
-+ LIBPTHREAD=""
+ LIBPTHREAD=""
-- LIBPTHREAD=""
--
- if test -n "$PTHREAD_LIBS"; then
- if test "x$PTHREAD_LIBS" = "x-pthread" ; then
- LIBPTHREAD="PTHREAD"
- else
- PTHREAD_LIBS_save="$PTHREAD_LIBS"
- PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
-- echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
--echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6
+- { echo "$as_me:$LINENO: checking for pthread_create in $PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in $PTHREAD_LIBS... $ECHO_C" >&6; }
-
- kde_save_LDFLAGS="$LDFLAGS"
- kde_save_LIBS="$LIBS"
@@ -28,11 +24,11 @@
- ;;
- esac
- as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
--echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-+ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+-{ echo "$as_me:$LINENO: checking for pthread_create in -l$PTHREAD_LIBS" >&5
+-echo $ECHO_N "checking for pthread_create in -l$PTHREAD_LIBS... $ECHO_C" >&6; }
+-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
++{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -42,7 +38,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -28934,38 +28915,26 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -31912,40 +31894,27 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -53,15 +49,17 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--eval "$as_ac_Lib=no"
-+ac_cv_lib_pthread_pthread_create=no
+- eval "$as_ac_Lib=no"
++ ac_cv_lib_pthread_pthread_create=no
fi
- rm -f conftest.err conftest.$ac_objext \
+
+ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
+-ac_res=`eval echo '${'$as_ac_Lib'}'`
+- { echo "$as_me:$LINENO: result: $ac_res" >&5
+-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- LIBPTHREAD="$PTHREAD_LIBS_save"
-fi
@@ -75,22 +73,21 @@
+echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
-- if test -z "$LIBPTHREAD"; then
-- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
+ if test -z "$LIBPTHREAD"; then
+- { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
+-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-+ if test -z "$LIBPTHREAD"; then
-+ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -29011,6 +28980,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -32003,6 +31972,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_lib_pthread_pthread_create=yes
@@ -98,14 +95,14 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -29020,13 +28990,9 @@ fi
- rm -f conftest.err conftest.$ac_objext \
+@@ -32013,13 +31983,9 @@ fi
+ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
-fi
+
- echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
+ echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
-if test $ac_cv_lib_pthread_pthread_create = yes; then
- LIBPTHREAD="-lpthread"
-fi
@@ -113,7 +110,7 @@
fi
if test -z "$LIBPTHREAD" ; then
-@@ -29088,12 +29054,6 @@ rm -f conftest.err conftest.$ac_objext \
+@@ -32094,12 +32060,6 @@ rm -f core conftest.err conftest.$ac_obj
LIBS=$kde_safe_libs
fi
@@ -126,7 +123,7 @@
USE_THREADS=""
if test -z "$LIBPTHREAD"; then
-@@ -34615,7 +34575,7 @@ if test "${ac_cv_lib_ossaudio__oss_ioctl
+@@ -37849,7 +37809,7 @@ if test "${ac_cv_lib_ossaudio__oss_ioctl
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -135,7 +132,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -34682,7 +34642,7 @@ fi
+@@ -37929,7 +37889,7 @@ fi
if test "x$have_ossaudio" = xyes; then
# for kmix/ and akode/
@@ -144,7 +141,7 @@
fi
-@@ -35279,7 +35239,7 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -38593,7 +38553,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -152,17 +149,17 @@
+#include <cdparanoia/cdda_interface.h>
_ACEOF
rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -35323,7 +35283,7 @@ _ACEOF
+ if { (ac_try="$ac_compile"
+@@ -38650,7 +38610,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <cdda_interface.h>
+#include <cdparanoia/cdda_interface.h>
_ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-@@ -35433,7 +35393,7 @@ cat confdefs.h >>conftest.$ac_ext
+ if { (ac_try="$ac_cpp conftest.$ac_ext"
+ case "(($ac_try" in
+@@ -38758,7 +38718,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -171,7 +168,7 @@
int
main ()
-@@ -37432,7 +37392,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetFile
+@@ -40910,7 +40870,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetFile
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -180,15 +177,15 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38427,13 +38387,13 @@ if test $ac_cv_header_FLAC_metadata_h =
+@@ -41967,13 +41927,13 @@ if test $ac_cv_header_FLAC_metadata_h =
test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
;;
esac
-- echo "$as_me:$LINENO: checking for FLAC__seekable_stream_decoder_process_single in -lFLAC" >&5
--echo $ECHO_N "checking for FLAC__seekable_stream_decoder_process_single in -lFLAC... $ECHO_C" >&6
+- { echo "$as_me:$LINENO: checking for FLAC__seekable_stream_decoder_process_single in -lFLAC" >&5
+-echo $ECHO_N "checking for FLAC__seekable_stream_decoder_process_single in -lFLAC... $ECHO_C" >&6; }
-if test "${ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single+set}" = set; then
-+ echo "$as_me:$LINENO: checking for FLAC__stream_decoder_process_single in -lFLAC" >&5
-+echo $ECHO_N "checking for FLAC__stream_decoder_process_single in -lFLAC... $ECHO_C" >&6
++ { echo "$as_me:$LINENO: checking for FLAC__stream_decoder_process_single in -lFLAC" >&5
++echo $ECHO_N "checking for FLAC__stream_decoder_process_single in -lFLAC... $ECHO_C" >&6; }
+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_process_single+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -198,21 +195,21 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38447,11 +38407,11 @@ extern "C"
Home |
Main Index |
Thread Index |
Old Index