summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2007-10-20 10:41:20 +0000
committermarkd <markd@pkgsrc.org>2007-10-20 10:41:20 +0000
commit296b4af60825f73a4e82e04e1b6a1b1e2234de38 (patch)
tree30ab8b7006b079d03ea453c2ee8ffff262192fc8 /multimedia
parent43f177bd45de8a9d1b4ed70f7f48cacff2a56bc4 (diff)
downloadpkgsrc-296b4af60825f73a4e82e04e1b6a1b1e2234de38.tar.gz
Update to KDE 3.5.8
audiocd ioslave * Fix powerpc support. JuK * Fix getting cover from internet doesn't work. * Fix last item in play queue is played twice. * Fix right click in History playlist shows wrong column. * Fix empty flac file crashes JuK. KAudioCreator * Fix crash when removing all jobs. * Allow creating group writable directories if umask permits it.
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/kdemultimedia3/Makefile3
-rw-r--r--multimedia/kdemultimedia3/PLIST3
-rw-r--r--multimedia/kdemultimedia3/distinfo21
-rw-r--r--multimedia/kdemultimedia3/patches/patch-aa410
-rw-r--r--multimedia/kdemultimedia3/patches/patch-ad20
-rw-r--r--multimedia/kdemultimedia3/patches/patch-ah10
-rw-r--r--multimedia/kdemultimedia3/patches/patch-aj23
-rw-r--r--multimedia/kdemultimedia3/patches/patch-ak16
-rw-r--r--multimedia/kdemultimedia3/patches/patch-al13
-rw-r--r--multimedia/kdemultimedia3/patches/patch-ao14
-rw-r--r--multimedia/kdemultimedia3/patches/patch-ar11
11 files changed, 121 insertions, 423 deletions
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 90228f8ebd0..c652710f421 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.63 2007/09/21 13:04:07 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2007/10/20 10:41:20 markd Exp $
DISTNAME= kdemultimedia-${_KDE_VERSION}
-PKGREVISION= 1
CATEGORIES= multimedia
COMMENT= Multimedia tools for the KDE integrated X11 desktop
diff --git a/multimedia/kdemultimedia3/PLIST b/multimedia/kdemultimedia3/PLIST
index 86f0e4f7ba2..48ca1432613 100644
--- a/multimedia/kdemultimedia3/PLIST
+++ b/multimedia/kdemultimedia3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2007/05/23 13:16:11 markd Exp $
+@comment $NetBSD: PLIST,v 1.26 2007/10/20 10:41:20 markd Exp $
bin/artsbuilder
bin/artscontrol
bin/juk
@@ -705,6 +705,7 @@ share/kde/apps/juk/jukui-rtl.rc
share/kde/apps/juk/jukui.rc
share/kde/apps/juk/pics/playing.png
share/kde/apps/juk/pics/splash.png
+share/kde/apps/juk/pics/yahoo_credit.png
share/kde/apps/kaboodle/icons/crystalsvg/16x16/actions/kaboodleloop.png
share/kde/apps/kaboodle/icons/crystalsvg/22x22/actions/kaboodleloop.png
share/kde/apps/kaboodle/kaboodlepartui.rc
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 1e6a1330f5e..247addfacaf 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,26 +1,23 @@
-$NetBSD: distinfo,v 1.36 2007/05/23 13:16:11 markd Exp $
+$NetBSD: distinfo,v 1.37 2007/10/20 10:41:20 markd Exp $
-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 (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) = 4e561e1f4cb026f8dd5e9069c653bf45ceafcf93
SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70
SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413
-SHA1 (patch-ad) = 4a84cd2246d61e521b1ce576328c755915304b10
+SHA1 (patch-ad) = 55deb605003a4ba0bfc37babe8657c3408728f62
SHA1 (patch-ae) = 286ee08e2478bd9a417ae1270a0a851fb470570a
SHA1 (patch-af) = 0336b3def99c649a635e6f5eb0cc962944e890b2
SHA1 (patch-ag) = c9d1d9d3cf8f18ed9bc8c2054dc641af961d8fb1
-SHA1 (patch-ah) = e84b9dc302a5c8bb7259cd23343bfbc80c287cf2
+SHA1 (patch-ah) = 78c85113db99f386145cf701db4723d8534342f6
SHA1 (patch-ai) = 8f724e5e96996913906dfd2034f577fee66d0db2
-SHA1 (patch-aj) = 853651ba68cbd2dc8906a0753bb17a89b46153af
-SHA1 (patch-ak) = b55f0915a356949b00c588b25c0aa435aedc109d
-SHA1 (patch-al) = c8c3d6c44d19053c596b41060ab574a051c73eeb
+SHA1 (patch-aj) = f142ee5df76460d5e8c32b6b8279c4ad5ec19919
SHA1 (patch-am) = d08ebf77d69d8c9527728eccaa430b28664a74dd
SHA1 (patch-an) = 79b26912aeeacb881664cd1557417bd99b96451e
-SHA1 (patch-ao) = 1c849de2e1696c4f4e81b660a42b26e2a1c5440e
SHA1 (patch-ap) = 66368931f92a83e03b879e98440756620e65ddeb
SHA1 (patch-aq) = 2c804af0ff952e50e909002a4b4c53422b1ba59c
-SHA1 (patch-ar) = 604469ee9cedaccb5e75567abf1088cddab9bcbc
+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 f4623f01340..8f0e5d6b5a6 100644
--- a/multimedia/kdemultimedia3/patches/patch-aa
+++ b/multimedia/kdemultimedia3/patches/patch-aa
@@ -1,129 +1,8 @@
-$NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
+$NetBSD: patch-aa,v 1.13 2007/10/20 10:41:20 markd Exp $
---- configure.orig 2007-05-14 23:37:28.000000000 +1200
+--- configure.orig 2007-10-09 03:27:15.000000000 +1300
+++ configure
-@@ -31831,31 +31831,13 @@ fi
-
- 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; }
--
-- kde_save_LDFLAGS="$LDFLAGS"
-- kde_save_LIBS="$LIBS"
-- LDFLAGS="$LDFLAGS $all_libraries"
-- case $host_os in
-- aix*) LDFLAGS="-brtl $LDFLAGS"
-- test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-- ;;
-- 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 { 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
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-l$PTHREAD_LIBS $LIBS"
-+LIBS="-lpthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -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
-- eval "$as_ac_Lib=yes"
-+ ac_cv_lib_pthread_pthread_create=yes
-+ LIBPTHREAD="-lpthread"
- else
- 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
- fi
-
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--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
--
-- LDFLAGS="$kde_save_LDFLAGS"
-- LIBS="$kde_save_LIBS"
--
-- PTHREAD_LIBS="$PTHREAD_LIBS_save"
-- fi
-- fi
-+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 "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-+ { 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"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -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
-+ LIBPTHREAD="$PTHREAD_LDFLAGS $PTHREAD_LIBS"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -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; }
--if test $ac_cv_lib_pthread_pthread_create = yes; then
-- LIBPTHREAD="-lpthread"
--fi
--
- fi
-
- if test -z "$LIBPTHREAD" ; then
-@@ -32094,12 +32060,6 @@ rm -f core conftest.err conftest.$ac_obj
- LIBS=$kde_safe_libs
- fi
-
-- if test "x$LIBPTHREAD" = "xPTHREAD" ; then
-- LIBPTHREAD=""
-- fi
--
--
--
-
- USE_THREADS=""
- if test -z "$LIBPTHREAD"; then
-@@ -37849,7 +37809,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
@@ -132,7 +11,7 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -37929,7 +37889,7 @@ fi
+@@ -34998,7 +34974,7 @@ fi
if test "x$have_ossaudio" = xyes; then
# for kmix/ and akode/
@@ -141,7 +20,7 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
fi
-@@ -38593,7 +38553,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
@@ -150,7 +29,7 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
-@@ -38650,7 +38610,7 @@ _ACEOF
+@@ -35611,7 +35587,7 @@ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -159,7 +38,7 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
_ACEOF
if { (ac_try="$ac_cpp conftest.$ac_ext"
case "(($ac_try" in
-@@ -38758,7 +38718,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. */
@@ -168,7 +47,7 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
int
main ()
-@@ -40910,7 +40870,7 @@ if test "${ac_cv_lib_tunepimp_tp_SetFile
+@@ -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
@@ -177,7 +56,7 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41967,13 +41927,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
@@ -195,7 +74,7 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -41987,11 +41947,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -38592,11 +38568,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -209,10 +88,10 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
;
return 0;
}
-@@ -42030,21 +41990,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+@@ -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
- ac_cv_lib_FLAC_FLAC__seekable_stream_decoder_process_single=yes
+ ac_cv_lib_FLAC_FLAC__stream_decoder_process_single=yes
else
@@ -223,7 +102,7 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
+ ac_cv_lib_FLAC_FLAC__stream_decoder_process_single=no
fi
- rm -f core conftest.err conftest.$ac_objext \
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -236,7 +115,7 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
have_libFLAC=yes
fi
-@@ -42262,9 +42222,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
@@ -249,7 +128,7 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -42282,11 +42242,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -38847,11 +38823,11 @@ cat >>conftest.$ac_ext <<_ACEOF
#ifdef __cplusplus
extern "C"
#endif
@@ -263,10 +142,10 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
;
return 0;
}
-@@ -42325,21 +42285,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+@@ -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
- ac_cv_lib_OggFLAC_OggFLAC__seekable_stream_decoder_process_single=yes
+ ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single=yes
else
@@ -277,7 +156,7 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
+ ac_cv_lib_OggFLAC_OggFLAC__stream_decoder_process_single=no
fi
- rm -f core conftest.err conftest.$ac_objext \
+ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -290,203 +169,76 @@ $NetBSD: patch-aa,v 1.12 2007/05/23 13:16:11 markd Exp $
have_libOggFLAC=yes
fi
-@@ -44456,8 +44416,23 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+@@ -40652,7 +40628,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+
++ lib=Xxf86dga
++ shared_lib_found=no
++ for i in ${LDFLAGS}; do
++ case "$i" in
++ -L*)
++ dir=`echo $i | sed "s,^-L,,"`
++ if [ -e $dir/lib${lib}.so ] ||
++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
++ shared_lib_found=yes
++ break;
++ fi
++ esac
++ done
++ if [ "$shared_lib_found" = "yes" ]; then
+ x11_dga2=yes
++ fi
-- x11_dga2=yes
--
-+ lib=Xxf86dga
-+ shared_lib_found=no
-+ for i in ${LDFLAGS}; do
-+ case "$i" in
-+ -L*)
-+ dir=`echo $i | sed "s,^-L,,"`
-+ if [ -e $dir/lib${lib}.so ] ||
-+ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
-+ shared_lib_found=yes
-+ break;
-+ fi
-+ esac
-+ done
-+ if [ "$shared_lib_found" = "yes" ]; then
-+ x11_dga2=yes
-+ fi
-+
else
echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -44534,7 +44509,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
-+ lib=Xv
-+ shared_lib_found=no
-+ for i in ${LDFLAGS}; do
-+ case "$i" in
-+ -L*)
-+ dir=`echo $i | sed "s,^-L,,"`
-+ if [ -e $dir/lib${lib}.so ] ||
-+ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
-+ shared_lib_found=yes
-+ break;
-+ fi
-+ esac
-+ done
-+ if [ "$shared_lib_found" = "yes" ]; then
+@@ -40713,7 +40704,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+
++ lib=Xv
++ shared_lib_found=no
++ for i in ${LDFLAGS}; do
++ case "$i" in
++ -L*)
++ dir=`echo $i | sed "s,^-L,,"`
++ if [ -e $dir/lib${lib}.so ] ||
++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
++ shared_lib_found=yes
++ break;
++ fi
++ esac
++ done
++ if [ "$shared_lib_found" = "yes" ]; then
x11_xv=yes
-+ fi
++ fi
else
echo "$as_me: failed program was:" >&5
-@@ -44612,7 +44602,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
-+ lib=Xxf86vm
-+ shared_lib_found=no
-+ for i in ${LDFLAGS}; do
-+ case "$i" in
-+ -L*)
-+ dir=`echo $i | sed "s,^-L,,"`
-+ if [ -e $dir/lib${lib}.so ] ||
-+ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
-+ shared_lib_found=yes
-+ break;
-+ fi
-+ esac
-+ done
-+ if [ "$shared_lib_found" = "yes" ]; then
+@@ -40774,7 +40780,22 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+
++ lib=Xxf86vm
++ shared_lib_found=no
++ for i in ${LDFLAGS}; do
++ case "$i" in
++ -L*)
++ dir=`echo $i | sed "s,^-L,,"`
++ if [ -e $dir/lib${lib}.so ] ||
++ [ "`echo $dir/lib${lib}.so.*`" != "$dir/lib${lib}.so.*" ]; then
++ shared_lib_found=yes
++ break;
++ fi
++ esac
++ done
++ if [ "$shared_lib_found" = "yes" ]; then
x11_xvidmode=yes
-+ fi
++ fi
else
echo "$as_me: failed program was:" >&5
-@@ -44686,6 +44691,9 @@ case "$OS_TYPE" in
- SunOS)
- kde_mpeglib_compiles=yes
- ;;
-+ DragonFly)
-+ kde_mpeglib_compiles=yes
-+ ;;
- *)
- { echo "$as_me:$LINENO: result: *** We disable mpeglib for this platform ***" >&5
- echo "${ECHO_T}*** We disable mpeglib for this platform ***" >&6; }
-@@ -44695,33 +44703,13 @@ esac
-
-
-
-- 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; }
--
-- kde_save_LDFLAGS="$LDFLAGS"
-- kde_save_LIBS="$LIBS"
-- LDFLAGS="$LDFLAGS $all_libraries"
-- case $host_os in
-- aix*) LDFLAGS="-brtl $LDFLAGS"
-- test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
-- ;;
-- 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 { 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
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-l$PTHREAD_LIBS $LIBS"
-+LIBS="-lpthread $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -44778,31 +44766,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- eval "$as_ac_Lib=yes"
-+ ac_cv_lib_pthread_pthread_create=yes
-+ LIBPTHREAD="-lpthread"
- else
- 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
- fi
-
- rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--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
--
-- LDFLAGS="$kde_save_LDFLAGS"
-- LIBS="$kde_save_LIBS"
--
-- PTHREAD_LIBS="$PTHREAD_LIBS_save"
-- fi
-- fi
-+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
-@@ -44869,6 +44847,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
-+ LIBPTHREAD="$PTHREAD_LDFLAGS $PTHREAD_LIBS"
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -44882,10 +44861,6 @@ 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; }
--if test $ac_cv_lib_pthread_pthread_create = yes; then
-- LIBPTHREAD="-lpthread"
--fi
--
- fi
-
- if test -z "$LIBPTHREAD" ; then
-@@ -44960,10 +44935,6 @@ rm -f core conftest.err conftest.$ac_obj
- LIBS=$kde_safe_libs
- fi
-
-- if test "x$LIBPTHREAD" = "xPTHREAD" ; then
-- LIBPTHREAD=""
-- fi
--
-
-
- case "$OS_TYPE" in
-@@ -44985,7 +44956,7 @@ _ACEOF
-
- ;;
-
-- FreeBSD)
-+ FreeBSD | DragonFly)
- OS_TYPE="BSD"
-
- cat >>confdefs.h <<\_ACEOF
-@@ -49549,11 +49522,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-ad b/multimedia/kdemultimedia3/patches/patch-ad
index dfeb4fbeebb..218c8cf5a26 100644
--- a/multimedia/kdemultimedia3/patches/patch-ad
+++ b/multimedia/kdemultimedia3/patches/patch-ad
@@ -1,25 +1,7 @@
-$NetBSD: patch-ad,v 1.3 2006/01/20 03:51:25 joerg Exp $
+$NetBSD: patch-ad,v 1.4 2007/10/20 10:41:20 markd Exp $
--- kscd/libwm/plat_freebsd.c.orig 2005-10-05 13:22:14.000000000 +0000
+++ kscd/libwm/plat_freebsd.c
-@@ -30,7 +30,7 @@
- *
- */
-
--#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD)
-+#if defined(__FreeBSD__) || defined(__FreeBSD) || defined(__NetBSD__) || defined (__NetBSD) || defined(__DragonFly__)
-
- #include <errno.h>
- #include <stdio.h>
-@@ -61,7 +61,7 @@
- #else
- # define LEFT_PORT 0
- # define RIGHT_PORT 1
--# if __FreeBSD_version < 300000
-+# if defined(__FreeBSD_version) && __FreeBSD_version < 300000
- # include <scsi.h>
- # endif
- #endif
@@ -378,6 +378,14 @@ gen_stop( struct wm_drive *d)
return (ioctl(d->fd, CDIOCSTOP));
} /* gen_stop() */
diff --git a/multimedia/kdemultimedia3/patches/patch-ah b/multimedia/kdemultimedia3/patches/patch-ah
index 7ce787450af..0313b91ee9b 100644
--- a/multimedia/kdemultimedia3/patches/patch-ah
+++ b/multimedia/kdemultimedia3/patches/patch-ah
@@ -1,13 +1,13 @@
-$NetBSD: patch-ah,v 1.1 2005/03/06 13:02:59 markd Exp $
+$NetBSD: patch-ah,v 1.2 2007/10/20 10:41:20 markd Exp $
---- kappfinder-data/Makefile.in.orig 2004-11-30 04:21:02.000000000 +1300
+--- kappfinder-data/Makefile.in.orig 2007-10-09 03:27:12.000000000 +1300
+++ kappfinder-data/Makefile.in
-@@ -424,7 +424,7 @@ x_includes = @x_includes@
+@@ -363,7 +363,7 @@ x_includes = @x_includes@
x_libraries = @x_libraries@
xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
+xdg_menudir = $(prefix)/share/examples/kdemultimedia3
- xine_artsplugin_SUBDIR_included_FALSE = @xine_artsplugin_SUBDIR_included_FALSE@
- xine_artsplugin_SUBDIR_included_TRUE = @xine_artsplugin_SUBDIR_included_TRUE@
kappfinder_multimedia_data_DATA = \
+ ams.desktop \
+ amsynth.desktop \
diff --git a/multimedia/kdemultimedia3/patches/patch-aj b/multimedia/kdemultimedia3/patches/patch-aj
index f7f341406c5..998402174ad 100644
--- a/multimedia/kdemultimedia3/patches/patch-aj
+++ b/multimedia/kdemultimedia3/patches/patch-aj
@@ -1,9 +1,18 @@
-$NetBSD: patch-aj,v 1.3 2006/01/20 03:51:25 joerg Exp $
+$NetBSD: patch-aj,v 1.4 2007/10/20 10:41:21 markd Exp $
---- oggvorbis_artsplugin/oggPlayObject_impl.h.orig 2005-11-15 11:27:27.000000000 +0000
-+++ oggvorbis_artsplugin/oggPlayObject_impl.h
-@@ -3,3 +3,3 @@
+--- kioslave/audiocd/plugins/lame/encoderlame.cpp.orig 2007-10-08 22:48:54.000000000 +1300
++++ kioslave/audiocd/plugins/lame/encoderlame.cpp
+@@ -17,7 +17,13 @@
+ */
--#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)
-+#if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) || defined(__DragonFly__)
- /* union semun is defined by including <sys/sem.h> */
+ #include <config.h>
++#ifdef HAVE_MACHINE_ENDIAN_H
++#include <machine/endian.h>
++#define __BYTE_ORDER _BYTE_ORDER
++#define __LITTLE_ENDIAN _LITTLE_ENDIAN
++#else
+ #include <endian.h>
++#endif
+ #include "encoderlame.h"
+ #include "encoderlameconfig.h"
+ #include "audiocd_lame_encoder.h"
diff --git a/multimedia/kdemultimedia3/patches/patch-ak b/multimedia/kdemultimedia3/patches/patch-ak
deleted file mode 100644
index 16f56a8df6a..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-ak
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2006/01/20 03:51:25 joerg Exp $
-
---- kscd/libwm/include/wm_config.h.orig 2005-11-15 11:59:33.000000000 +0000
-+++ kscd/libwm/include/wm_config.h
-@@ -139,6 +139,11 @@
-
- #endif /* freebsd */
-
-+/* DragonFly */
-+#if defined(__DragonFly__)
-+#define DEFAULT_CD_DEVICE "/dev/acd0c"
-+#endif
-+
- /******************************************************************
- * NetBSD
- ******************************************************************
diff --git a/multimedia/kdemultimedia3/patches/patch-al b/multimedia/kdemultimedia3/patches/patch-al
deleted file mode 100644
index e00aef59d92..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-al,v 1.1 2006/05/10 23:05:00 joerg Exp $
-
---- kmix/kmix-platforms.cpp.orig 2006-05-10 20:05:22.000000000 +0000
-+++ kmix/kmix-platforms.cpp
-@@ -46,7 +46,7 @@
- #define OSS_MIXER
- #endif
-
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(_UNIXWARE)
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(_UNIXWARE) || defined(__DragonFly__)
- #define OSS_MIXER
- #endif
-
diff --git a/multimedia/kdemultimedia3/patches/patch-ao b/multimedia/kdemultimedia3/patches/patch-ao
deleted file mode 100644
index 9c9fc251af1..00000000000
--- a/multimedia/kdemultimedia3/patches/patch-ao
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ao,v 1.3 2006/06/27 14:53:42 wiz Exp $
-
---- mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h.orig 2005-09-10 08:19:52.000000000 +0000
-+++ mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h
-@@ -20,6 +20,9 @@
-
- /* gcc 3.3.1 and later optimise the "not used" (only in asm code)
- symbols away. So we need to mark them as used. */
-+#if defined(__GNUC_PREREQ__) && !defined(__GNUC_PREREQ)
-+#define __GNUC_PREREQ __GNUC_PREREQ__
-+#endif
- #ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (3,1)
- # define __attribute_used__ __attribute__ ((__used__))
diff --git a/multimedia/kdemultimedia3/patches/patch-ar b/multimedia/kdemultimedia3/patches/patch-ar
index 6d09a2282e7..c55f6d9762b 100644
--- a/multimedia/kdemultimedia3/patches/patch-ar
+++ b/multimedia/kdemultimedia3/patches/patch-ar
@@ -1,12 +1,13 @@
-$NetBSD: patch-ar,v 1.2 2004/04/20 13:13:42 markd Exp $
+$NetBSD: patch-ar,v 1.3 2007/10/20 10:41:22 markd Exp $
---- mpeglib/lib/util/audio/Makefile.in.orig 2004-04-06 02:48:26.000000000 +1200
+--- mpeglib/lib/util/audio/Makefile.in.orig 2007-10-09 03:27:13.000000000 +1300
+++ mpeglib/lib/util/audio/Makefile.in
-@@ -55,6 +55,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/a
+@@ -49,7 +49,7 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/a
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libaudio_la_LDFLAGS = $(LIBOSSAUDIO)
- libaudio_la_LIBADD =
+-libaudio_la_LIBADD =
++libaudio_la_LIBADD = $(LIBOSSAUDIO)
am_libaudio_la_OBJECTS = audioIO.lo dspWrapper.lo
#>- libaudio_la_OBJECTS = $(am_libaudio_la_OBJECTS)
+ #>+ 4
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 01:59:38 +0000