From 6dde4c3fbd300ca53615b6ae9feab5a2cab98660 Mon Sep 17 00:00:00 2001 From: Michael Landin Date: Thu, 13 Jul 2006 16:20:10 +0000 Subject: - remove WITH_XINE option - add fixed libxine dependency No point in attempting to build amarok without any engines.. --- audio/amarok/Makefile | 14 +++----------- audio/amarok/pkg-plist | 10 +++++----- 2 files changed, 8 insertions(+), 16 deletions(-) (limited to 'audio/amarok') diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index 78033013a6df..6cff56cfbe5e 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -15,7 +15,8 @@ COMMENT= Media player for KDE LIB_DEPENDS= tag.5:${PORTSDIR}/audio/taglib \ tunepimp:${PORTSDIR}/audio/libtunepimp \ - mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 + mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \ + xine.15:${PORTSDIR}/multimedia/libxine MIN_OPTIONS_VER= ${PORTNAME}-1.4.0a @@ -27,8 +28,7 @@ USE_SDL= sdl USE_RUBY= yes WRKSRC= ${WRKDIR}/${PORTNAME}-1.4.0 -OPTIONS= XINE "Xine playback engine" on \ - GPOD "iPod support" on \ +OPTIONS= GPOD "iPod support" on \ XMMS "XMMS visualizations" off \ LIBVISUAL "libvisual support" off \ OPENGL "OpenGL support" on \ @@ -42,14 +42,6 @@ CONFIGURE_ARGS+=--without-exscalibar \ --with-mp4v2 \ --with-mp4v2-dir=${PREFIX} -.if !defined(WITH_XINE) -CONFIGURE_ARGS+=--without-xine -PLIST_SUB+= XINE="@comment " -.else -LIB_DEPENDS+= xine.15:${PORTSDIR}/multimedia/libxine -PLIST_SUB+= XINE="" -.endif - .if !defined(WITH_GPOD) PLIST_SUB+= GPOD="@comment " .else diff --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist index 581242bd641b..0d0a9e54e398 100644 --- a/audio/amarok/pkg-plist +++ b/audio/amarok/pkg-plist @@ -16,9 +16,9 @@ lib/kde3/konqsidebar_universalamarok.so lib/kde3/libamarok_generic-mediadevice.so lib/kde3/libamarok_generic-mediadevice.la lib/kde3/libamarok_generic-mediadevice.a -%%XINE%%lib/kde3/libamarok_xine-engine.a -%%XINE%%lib/kde3/libamarok_xine-engine.la -%%XINE%%lib/kde3/libamarok_xine-engine.so +lib/kde3/libamarok_xine-engine.a +lib/kde3/libamarok_xine-engine.la +lib/kde3/libamarok_xine-engine.so lib/kde3/libamarok_void-engine_plugin.a lib/kde3/libamarok_void-engine_plugin.la lib/kde3/libamarok_void-engine_plugin.so @@ -261,7 +261,7 @@ share/apps/konqsidebartng/kicker_entries/amarok.desktop share/apps/konqueror/servicemenus/amarok_append.desktop share/apps/profiles/amarok.profile.xml share/config.kcfg/amarok.kcfg -%%XINE%%share/config.kcfg/xinecfg.kcfg +share/config.kcfg/xinecfg.kcfg share/config/amarokrc share/doc/HTML/da/amarok/advanced.docbook share/doc/HTML/da/amarok/common @@ -668,7 +668,7 @@ share/locale/zh_CN/LC_MESSAGES/amarok.mo share/locale/zh_TW/LC_MESSAGES/amarok.mo %%GPOD%%share/services/amarok_ipod-mediadevice.desktop share/services/amarok_generic-mediadevice.desktop -%%XINE%%share/services/amarok_xine-engine.desktop +share/services/amarok_xine-engine.desktop share/services/amarok_void-engine_plugin.desktop share/servicetypes/amarok_plugin.desktop @dirrmtry share/locale/km/LC_MESSAGES -- cgit v1.2.3