summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2021-09-01 11:14:47 +0000
committermarkd <markd@pkgsrc.org>2021-09-01 11:14:47 +0000
commit24bbed313f237fb1997f3e9d1370853d061975d1 (patch)
tree3c69cdd3428ffbff44956cb2cc65512dfb2c4feb
parent3d0844a12e96047a38e47e09ad987a4776197f25 (diff)
downloadpkgsrc-24bbed313f237fb1997f3e9d1370853d061975d1.tar.gz
kmix: update to 20.12.3
QT5/KF5 version
-rw-r--r--multimedia/kmix/Makefile47
-rw-r--r--multimedia/kmix/PLIST223
-rw-r--r--multimedia/kmix/distinfo13
-rw-r--r--multimedia/kmix/options.mk19
-rw-r--r--multimedia/kmix/patches/patch-CMakeLists.txt36
-rw-r--r--multimedia/kmix/patches/patch-tests_CMakeLists.txt13
6 files changed, 222 insertions, 129 deletions
diff --git a/multimedia/kmix/Makefile b/multimedia/kmix/Makefile
index fa6af9c03e3..00879982362 100644
--- a/multimedia/kmix/Makefile
+++ b/multimedia/kmix/Makefile
@@ -1,24 +1,47 @@
-# $NetBSD: Makefile,v 1.72 2021/07/30 12:27:03 ryoon Exp $
+# $NetBSD: Makefile,v 1.73 2021/09/01 11:14:47 markd Exp $
-DISTNAME= kmix-${_KDE_VERSION}
-PKGREVISION= 47
+DISTNAME= kmix-${KAPPSVER}
CATEGORIES= multimedia
+
+HOMEPAGE= https://kde.org/applications/multimedia/kmix/
COMMENT= KDE's soundcard mixer program
+LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2
+
+.include "../../meta-pkgs/kde/applications.mk"
+
+BUILD_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+DEPENDS+= kinit>=5.19.0:../../x11/kinit
-# lib/libkdeinit4_kmixctrl.so: undefined reference to `vtable for ControlAdaptor'
-MAKE_JOBS_SAFE= no
+USE_TOOLS+= msgmerge pkg-config
-.include "../../meta-pkgs/kde4/Makefile.kde4"
+SUBST_CLASSES+= xdg
+SUBST_STAGE.xdg= pre-configure
+SUBST_MESSAGE.xdg= Install via examples dir.
+SUBST_FILES.xdg= CMakeLists.txt
+SUBST_SED.xdg= -e 's:{KDE_INSTALL_AUTOSTARTDIR}:{KDE_INSTALL_AUTOSTARTEXDIR}:'
-.include "../../mk/bsd.prefs.mk"
-.include "options.mk"
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/autostart
+CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/autostart/kmix_autostart.desktop \
+ ${PKG_SYSCONFDIR}/xdg/autostart/kmix_autostart.desktop
+CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/autostart/restore_kmix_volumes.desktop \
+ ${PKG_SYSCONFDIR}/xdg/autostart/restore_kmix_volumes.desktop
-.include "../../meta-pkgs/kde4/kde4.mk"
+# generation of kded.moc fails when ${PREFIX}/include in the moc include path
+SUBST_CLASSES+= fix-moc
+SUBST_STAGE.fix-moc= post-configure
+SUBST_MESSAGE.fix-moc= Cleaning up MOC includes
+SUBST_FILES.fix-moc= _KDE_build/CMakeFiles/kded_kmixd_autogen.dir/AutogenInfo.json
+SUBST_FILES.fix-moc+= _KDE_build/plasma/engine/CMakeFiles/plasma_engine_mixer_autogen.dir/AutogenInfo.json
+SUBST_NOOP_OK.fix-moc= yes
+SUBST_SED.fix-moc= -e 's;"${PREFIX}/include",;;g'
+.include "../../audio/alsa-lib/buildlink3.mk"
.include "../../audio/libcanberra/buildlink3.mk"
+.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../mk/oss.buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../mk/oss.buildlink3.mk"
-
+.include "../../x11/plasma-framework/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/kmix/PLIST b/multimedia/kmix/PLIST
index 85a595e4546..336e921e80d 100644
--- a/multimedia/kmix/PLIST
+++ b/multimedia/kmix/PLIST
@@ -1,57 +1,178 @@
-@comment $NetBSD: PLIST,v 1.2 2014/11/13 12:06:45 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/09/01 11:14:47 markd Exp $
bin/kmix
bin/kmixctrl
bin/kmixremote
-lib/kde4/kded_kmixd.so
-lib/kde4/plasma_engine_mixer.so
-lib/libkdeinit4_kmix.so
-lib/libkdeinit4_kmixctrl.so
-share/applications/kde4/kmix.desktop
+lib/libkmixcore.so.5
+lib/libkmixcore.so.5.13.80
+qt5/plugins/kf5/kded/kmixd.so
+qt5/plugins/plasma/dataengine/plasma_engine_mixer.so
+share/applications/org.kde.kmix.desktop
share/dbus-1/interfaces/org.kde.kmix.control.xml
share/dbus-1/interfaces/org.kde.kmix.mixer.xml
share/dbus-1/interfaces/org.kde.kmix.mixset.xml
-share/doc/kde/HTML/en/kmix/common
-share/doc/kde/HTML/en/kmix/index.cache.bz2
-share/doc/kde/HTML/en/kmix/index.docbook
-share/doc/kde/HTML/en/kmix/kmix-configure-general.png
-share/doc/kde/HTML/en/kmix/kmix-configure-sound-menu.png
-share/doc/kde/HTML/en/kmix/kmix-configure-start.png
-share/doc/kde/HTML/en/kmix/kmix-file.png
-share/doc/kde/HTML/en/kmix/kmix-master.png
-share/doc/kde/HTML/en/kmix/kmix-options.png
-share/doc/kde/HTML/en/kmix/kmix.png
-share/icons/hicolor/128x128/apps/kmix.png
-share/icons/hicolor/16x16/apps/kmix.png
-share/icons/hicolor/32x32/apps/kmix.png
-share/icons/hicolor/48x48/apps/kmix.png
-share/icons/hicolor/64x64/apps/kmix.png
-share/kde/apps/kmix/kmixui.rc
-share/kde/apps/kmix/pics/kmixdocked.png
-share/kde/apps/kmix/pics/kmixdocked_error.png
-share/kde/apps/kmix/pics/kmixdocked_mute.png
-share/kde/apps/kmix/pics/mixer-ac97.png
-share/kde/apps/kmix/pics/mixer-capture.png
-share/kde/apps/kmix/pics/mixer-cd.png
-share/kde/apps/kmix/pics/mixer-digital.png
-share/kde/apps/kmix/pics/mixer-front.png
-share/kde/apps/kmix/pics/mixer-headset.png
-share/kde/apps/kmix/pics/mixer-lfe.png
-share/kde/apps/kmix/pics/mixer-line.png
-share/kde/apps/kmix/pics/mixer-master.png
-share/kde/apps/kmix/pics/mixer-microphone.png
-share/kde/apps/kmix/pics/mixer-midi.png
-share/kde/apps/kmix/pics/mixer-pcm-default.png
-share/kde/apps/kmix/pics/mixer-pcm.png
-share/kde/apps/kmix/pics/mixer-surround.png
-share/kde/apps/kmix/pics/mixer-video.png
-share/kde/apps/kmix/profiles/ALSA.TerraTec_DMX6Fire.1.default.xml
-share/kde/apps/kmix/profiles/ALSA.capture.xml
-share/kde/apps/kmix/profiles/ALSA.default.xml
-share/kde/apps/kmix/profiles/ALSA.playback.xml
-share/kde/apps/kmix/profiles/OSS.default.xml
-share/kde/apps/plasma/services/mixer.operations
-share/kde/autostart/kmix_autostart.desktop
-share/kde/autostart/restore_kmix_volumes.desktop
-share/kde4/services/kded/kmixd.desktop
-share/kde4/services/kmixctrl_restore.desktop
-share/kde4/services/plasma-engine-mixer.desktop
+share/doc/HTML/ca/kmix/index.cache.bz2
+share/doc/HTML/ca/kmix/index.docbook
+share/doc/HTML/cs/kmix/index.cache.bz2
+share/doc/HTML/cs/kmix/index.docbook
+share/doc/HTML/de/kmix/index.cache.bz2
+share/doc/HTML/de/kmix/index.docbook
+share/doc/HTML/de/kmix/kmix-channels.png
+share/doc/HTML/de/kmix/kmix-configure.png
+share/doc/HTML/de/kmix/kmix-file.png
+share/doc/HTML/de/kmix/kmix-master.png
+share/doc/HTML/de/kmix/kmix-options.png
+share/doc/HTML/de/kmix/kmix.png
+share/doc/HTML/en/kmix/index.cache.bz2
+share/doc/HTML/en/kmix/index.docbook
+share/doc/HTML/en/kmix/kmix-configure-general.png
+share/doc/HTML/en/kmix/kmix-configure-sound-menu.png
+share/doc/HTML/en/kmix/kmix-configure-start.png
+share/doc/HTML/en/kmix/kmix-file.png
+share/doc/HTML/en/kmix/kmix-master.png
+share/doc/HTML/en/kmix/kmix-options.png
+share/doc/HTML/en/kmix/kmix.png
+share/doc/HTML/es/kmix/index.cache.bz2
+share/doc/HTML/es/kmix/index.docbook
+share/doc/HTML/es/kmix/kmix-file.png
+share/doc/HTML/es/kmix/kmix-master.png
+share/doc/HTML/es/kmix/kmix-options.png
+share/doc/HTML/es/kmix/kmix.png
+share/doc/HTML/et/kmix/index.cache.bz2
+share/doc/HTML/et/kmix/index.docbook
+share/doc/HTML/fr/kmix/index.cache.bz2
+share/doc/HTML/fr/kmix/index.docbook
+share/doc/HTML/gl/kmix/index.cache.bz2
+share/doc/HTML/gl/kmix/index.docbook
+share/doc/HTML/id/kmix/index.cache.bz2
+share/doc/HTML/id/kmix/index.docbook
+share/doc/HTML/it/kmix/index.cache.bz2
+share/doc/HTML/it/kmix/index.docbook
+share/doc/HTML/it/kmix/kmix-channel-playback.png
+share/doc/HTML/it/kmix/kmix-channel-record.png
+share/doc/HTML/it/kmix/kmix-configure-general.png
+share/doc/HTML/it/kmix/kmix-configure-sound-menu.png
+share/doc/HTML/it/kmix/kmix-configure-start.png
+share/doc/HTML/it/kmix/kmix-file.png
+share/doc/HTML/it/kmix/kmix-master.png
+share/doc/HTML/it/kmix/kmix-options.png
+share/doc/HTML/it/kmix/kmix-window.png
+share/doc/HTML/it/kmix/kmix.png
+share/doc/HTML/lt/kmix/index.cache.bz2
+share/doc/HTML/lt/kmix/index.docbook
+share/doc/HTML/nl/kmix/index.cache.bz2
+share/doc/HTML/nl/kmix/index.docbook
+share/doc/HTML/pt/kmix/index.cache.bz2
+share/doc/HTML/pt/kmix/index.docbook
+share/doc/HTML/pt_BR/kmix/index.cache.bz2
+share/doc/HTML/pt_BR/kmix/index.docbook
+share/doc/HTML/pt_BR/kmix/kmix-file.png
+share/doc/HTML/pt_BR/kmix/kmix-master.png
+share/doc/HTML/pt_BR/kmix/kmix-options.png
+share/doc/HTML/pt_BR/kmix/kmix.png
+share/doc/HTML/ru/kmix/index.cache.bz2
+share/doc/HTML/ru/kmix/index.docbook
+share/doc/HTML/sr/kmix/index.cache.bz2
+share/doc/HTML/sr/kmix/index.docbook
+share/doc/HTML/sv/kmix/index.cache.bz2
+share/doc/HTML/sv/kmix/index.docbook
+share/doc/HTML/sv/kmix/kmix-channel-switches.png
+share/doc/HTML/sv/kmix/kmix-window.png
+share/doc/HTML/uk/kmix/index.cache.bz2
+share/doc/HTML/uk/kmix/index.docbook
+share/doc/HTML/uk/kmix/kmix-configure-general.png
+share/doc/HTML/uk/kmix/kmix-configure-sound-menu.png
+share/doc/HTML/uk/kmix/kmix-configure-start.png
+share/doc/HTML/uk/kmix/kmix-file.png
+share/doc/HTML/uk/kmix/kmix-master.png
+share/doc/HTML/uk/kmix/kmix-options.png
+share/doc/HTML/uk/kmix/kmix.png
+share/examples/kde-xdg/autostart/kmix_autostart.desktop
+share/examples/kde-xdg/autostart/restore_kmix_volumes.desktop
+share/icons/hicolor/128x128/actions/kmix.png
+share/icons/hicolor/16x16/actions/kmix.png
+share/icons/hicolor/32x32/actions/kmix.png
+share/icons/hicolor/48x48/actions/kmix.png
+share/icons/hicolor/64x64/actions/kmix.png
+share/kmix/pics/mixer-ac97.png
+share/kmix/pics/mixer-capture.png
+share/kmix/pics/mixer-cd.png
+share/kmix/pics/mixer-digital.png
+share/kmix/pics/mixer-front.png
+share/kmix/pics/mixer-headset.png
+share/kmix/pics/mixer-lfe.png
+share/kmix/pics/mixer-line.png
+share/kmix/pics/mixer-master.png
+share/kmix/pics/mixer-microphone.png
+share/kmix/pics/mixer-midi.png
+share/kmix/pics/mixer-pcm-default.png
+share/kmix/pics/mixer-pcm.png
+share/kmix/pics/mixer-surround.png
+share/kmix/pics/mixer-video.png
+share/kmix/pics/show-mixer.png
+share/kmix/profiles/ALSA.TerraTec_DMX6Fire.1.default.xml
+share/kmix/profiles/ALSA.capture.xml
+share/kmix/profiles/ALSA.default.xml
+share/kmix/profiles/ALSA.playback.xml
+share/kmix/profiles/MPRIS2.default.xml
+share/kmix/profiles/OSS.default.xml
+share/kmix/profiles/PulseAudio.default.xml
+share/kmix/profiles/SUNAudio.default.xml
+share/knotifications5/kmix.notifyrc
+share/kservices5/kmixctrl_restore.desktop
+share/kservices5/plasma-dataengine-mixer.desktop
+share/kxmlgui5/kmix/kmixui.rc
+share/locale/ar/LC_MESSAGES/kmix.mo
+share/locale/bg/LC_MESSAGES/kmix.mo
+share/locale/bs/LC_MESSAGES/kmix.mo
+share/locale/ca/LC_MESSAGES/kmix.mo
+share/locale/ca@valencia/LC_MESSAGES/kmix.mo
+share/locale/cs/LC_MESSAGES/kmix.mo
+share/locale/da/LC_MESSAGES/kmix.mo
+share/locale/de/LC_MESSAGES/kmix.mo
+share/locale/el/LC_MESSAGES/kmix.mo
+share/locale/en_GB/LC_MESSAGES/kmix.mo
+share/locale/eo/LC_MESSAGES/kmix.mo
+share/locale/es/LC_MESSAGES/kmix.mo
+share/locale/et/LC_MESSAGES/kmix.mo
+share/locale/eu/LC_MESSAGES/kmix.mo
+share/locale/fa/LC_MESSAGES/kmix.mo
+share/locale/fi/LC_MESSAGES/kmix.mo
+share/locale/fr/LC_MESSAGES/kmix.mo
+share/locale/ga/LC_MESSAGES/kmix.mo
+share/locale/gl/LC_MESSAGES/kmix.mo
+share/locale/he/LC_MESSAGES/kmix.mo
+share/locale/hi/LC_MESSAGES/kmix.mo
+share/locale/hr/LC_MESSAGES/kmix.mo
+share/locale/hu/LC_MESSAGES/kmix.mo
+share/locale/ia/LC_MESSAGES/kmix.mo
+share/locale/id/LC_MESSAGES/kmix.mo
+share/locale/is/LC_MESSAGES/kmix.mo
+share/locale/it/LC_MESSAGES/kmix.mo
+share/locale/ja/LC_MESSAGES/kmix.mo
+share/locale/kk/LC_MESSAGES/kmix.mo
+share/locale/km/LC_MESSAGES/kmix.mo
+share/locale/ko/LC_MESSAGES/kmix.mo
+share/locale/lt/LC_MESSAGES/kmix.mo
+share/locale/lv/LC_MESSAGES/kmix.mo
+share/locale/mr/LC_MESSAGES/kmix.mo
+share/locale/nb/LC_MESSAGES/kmix.mo
+share/locale/nds/LC_MESSAGES/kmix.mo
+share/locale/nl/LC_MESSAGES/kmix.mo
+share/locale/nn/LC_MESSAGES/kmix.mo
+share/locale/pa/LC_MESSAGES/kmix.mo
+share/locale/pl/LC_MESSAGES/kmix.mo
+share/locale/pt/LC_MESSAGES/kmix.mo
+share/locale/pt_BR/LC_MESSAGES/kmix.mo
+share/locale/ro/LC_MESSAGES/kmix.mo
+share/locale/ru/LC_MESSAGES/kmix.mo
+share/locale/sk/LC_MESSAGES/kmix.mo
+share/locale/sl/LC_MESSAGES/kmix.mo
+share/locale/sr/LC_MESSAGES/kmix.mo
+share/locale/sv/LC_MESSAGES/kmix.mo
+share/locale/tr/LC_MESSAGES/kmix.mo
+share/locale/ug/LC_MESSAGES/kmix.mo
+share/locale/uk/LC_MESSAGES/kmix.mo
+share/locale/zh_CN/LC_MESSAGES/kmix.mo
+share/locale/zh_TW/LC_MESSAGES/kmix.mo
+share/metainfo/org.kde.kmix.appdata.xml
+share/plasma/services/mixer.operations
diff --git a/multimedia/kmix/distinfo b/multimedia/kmix/distinfo
index 7907fe75459..570f446c73c 100644
--- a/multimedia/kmix/distinfo
+++ b/multimedia/kmix/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 23:54:27 agc Exp $
+$NetBSD: distinfo,v 1.10 2021/09/01 11:14:47 markd Exp $
-SHA1 (kmix-4.14.3.tar.xz) = 556d49a0d54f5908ab5ffaacfe821e2ec3047b81
-RMD160 (kmix-4.14.3.tar.xz) = 217854ce2004ccf70e0c76b99095a9b4abb96d24
-SHA512 (kmix-4.14.3.tar.xz) = b4581a8f847618088b55710815c45a64fe22d1ea782aa57d8e724237cf4283a49d005e2c6389974e0587352d10da46718d7a696e4faafce63950288ab7b6cd62
-Size (kmix-4.14.3.tar.xz) = 379220 bytes
-SHA1 (patch-CMakeLists.txt) = 94d47c2e106f5073b1474ba1ed3ebe8018943063
-SHA1 (patch-tests_CMakeLists.txt) = 4c39d6268e6c690099d06a8ba6946cb90242791e
+SHA1 (kmix-20.12.3.tar.xz) = b0e4d97664c508dc35aa2a02c4fea31e8e751d1e
+RMD160 (kmix-20.12.3.tar.xz) = 079188ea212919179af359eb5d4efcf950ad4e0b
+SHA512 (kmix-20.12.3.tar.xz) = cd261b9b42e81187136366a8cfcce7296d576553e8ec541785b5d53f9529cfd570af43c952dc0c36a5d3ad22abc56b02dbe040b7aebf5e9353b0ea3e670a6480
+Size (kmix-20.12.3.tar.xz) = 1150476 bytes
+SHA1 (patch-CMakeLists.txt) = 30806caf7b2fb414ba36a84fe42bc6c11c03f33a
diff --git a/multimedia/kmix/options.mk b/multimedia/kmix/options.mk
deleted file mode 100644
index 350fa44998e..00000000000
--- a/multimedia/kmix/options.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: options.mk,v 1.1 2013/04/03 11:13:10 markd Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.kmix
-PKG_SUPPORTED_OPTIONS= pulseaudio alsa
-PKG_SUGGESTED_OPTIONS=
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mpulseaudio)
-.include "../../audio/pulseaudio/buildlink3.mk"
-.else
-CMAKE_ARGS+= -DWITH_PulseAudio:BOOL=OFF
-.endif
-
-.if !empty(PKG_OPTIONS:Malsa)
-.include "../../audio/alsa-lib/buildlink3.mk"
-.else
-CMAKE_ARGS+= -DWITH_ALSA:BOOL=OFF
-.endif
diff --git a/multimedia/kmix/patches/patch-CMakeLists.txt b/multimedia/kmix/patches/patch-CMakeLists.txt
index 8c082e6244d..97a287348aa 100644
--- a/multimedia/kmix/patches/patch-CMakeLists.txt
+++ b/multimedia/kmix/patches/patch-CMakeLists.txt
@@ -1,33 +1,15 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2014/11/13 12:06:45 markd Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2021/09/01 11:14:47 markd Exp $
Add $ENV{LIBOSSAUDIO}
---- CMakeLists.txt.orig 2014-07-16 08:24:17.000000000 +0000
+--- CMakeLists.txt.orig 2021-08-30 05:16:46.750048434 +0000
+++ CMakeLists.txt
-@@ -132,7 +132,7 @@ set(kmix_KDEINIT_SRCS ${kmix_adaptor_SRC
+@@ -214,6 +214,8 @@ if (CANBERRA_FOUND)
+ target_link_libraries(kmixcore PRIVATE ${CANBERRA_LIBRARIES})
+ endif (CANBERRA_FOUND)
- kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
++target_link_libraries(kmixcore PRIVATE $ENV{LIBOSSAUDIO})
++
+ install(TARGETS kmixcore DESTINATION ${KDE_INSTALL_LIBDIR} LIBRARY NAMELINK_SKIP)
--target_link_libraries(kdeinit_kmix ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS})
-+target_link_libraries(kdeinit_kmix ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS} $ENV{LIBOSSAUDIO})
- #target_link_libraries(kdeinit_kmix ${KDE4_KUTILS_LIBS} /home/kde/workspace/kdelibs/build/lib/libsolid.so.4.7.0 ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS} ${QT_QTXML_LIBRARY})
-
- if (HAVE_LIBASOUND2)
-@@ -174,7 +174,7 @@ install(TARGETS kmix ${INSTALL_TARGETS_
- kde4_add_plugin(kded_kmixd ${kded_kmixd_SRCS})
-
-
--target_link_libraries(kded_kmixd ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS})
-+target_link_libraries(kded_kmixd ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS} $ENV{LIBOSSAUDIO})
-
- if (HAVE_LIBASOUND2)
- target_link_libraries(kded_kmixd ${ASOUND_LIBRARY})
-@@ -217,7 +217,7 @@ set(kmixctrl_KDEINIT_SRCS ${kmix_adaptor
-
- kde4_add_kdeinit_executable( kmixctrl ${kmixctrl_KDEINIT_SRCS})
-
--target_link_libraries(kdeinit_kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS})
-+target_link_libraries(kdeinit_kmixctrl ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_PHONON_LIBS} $ENV{LIBOSSAUDIO})
-
- if (HAVE_LIBASOUND2)
- target_link_libraries(kdeinit_kmixctrl ${ASOUND_LIBRARY})
+ ####################################################################################################
diff --git a/multimedia/kmix/patches/patch-tests_CMakeLists.txt b/multimedia/kmix/patches/patch-tests_CMakeLists.txt
deleted file mode 100644
index 3aeaf4f0a3a..00000000000
--- a/multimedia/kmix/patches/patch-tests_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-tests_CMakeLists.txt,v 1.1 2013/04/03 11:13:10 markd Exp $
-
---- tests/CMakeLists.txt.orig 2011-01-19 22:23:29.000000000 +0000
-+++ tests/CMakeLists.txt
-@@ -21,7 +21,7 @@ kde4_add_executable(profiletest ${profil
- ${kmix_adaptor_SRCS}
- )
-
--target_link_libraries(profiletest ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} )
-+target_link_libraries(profiletest ${KDE4_KDECORE_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} $ENV{LIBOSSAUDIO})
-
- if (HAVE_LIBASOUND2)
- target_link_libraries(profiletest ${ASOUND_LIBRARY})