pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/vlc Merge with my own update.
details: https://anonhg.NetBSD.org/pkgsrc/rev/f4e29d39d658
branches: trunk
changeset: 561103:f4e29d39d658
user: ahoka <ahoka%pkgsrc.org@localhost>
date: Tue Jul 07 19:23:48 2009 +0000
description:
Merge with my own update.
diffstat:
multimedia/vlc/PLIST | 12 ++++++++----
multimedia/vlc/options.mk | 26 ++++++++++++++------------
2 files changed, 22 insertions(+), 16 deletions(-)
diffs (85 lines):
diff -r dae49a063cca -r f4e29d39d658 multimedia/vlc/PLIST
--- a/multimedia/vlc/PLIST Tue Jul 07 19:21:57 2009 +0000
+++ b/multimedia/vlc/PLIST Tue Jul 07 19:23:48 2009 +0000
@@ -1,13 +1,12 @@
-@comment $NetBSD: PLIST,v 1.30 2009/07/07 16:17:47 tnn Exp $
+@comment $NetBSD: PLIST,v 1.31 2009/07/07 19:23:48 ahoka Exp $
${PLIST.altivec}lib/vlc/misc/libmemcpyaltivec_plugin.la
${PLIST.altivec}lib/vlc/video_chroma/libi420_yuy2_altivec_plugin.la
${PLIST.cdda}lib/vlc/access/libcdda_plugin.la
${PLIST.dbus}lib/vlc/control/libdbus_plugin.la
${PLIST.dbus}lib/vlc/misc/libinhibit_plugin.la
-${PLIST.dbus}lib/vlc/misc/libtelepathy_plugin.la
-${PLIST.esound}lib/vlc/audio_output/libesd_plugin.la
${PLIST.faad}lib/vlc/codec/libfaad_plugin.la
${PLIST.gnome}lib/vlc/access/libaccess_gnomevfs_plugin.la
+${PLIST.gnome}lib/vlc/misc/libtelepathy_plugin.la
${PLIST.hal}lib/vlc/misc/libprobe_hal_plugin.la
${PLIST.hal}lib/vlc/services_discovery/libhal_plugin.la
${PLIST.pulseaudio}lib/vlc/audio_output/libpulse_plugin.la
@@ -516,4 +515,9 @@
share/vlc/vlc32x32.xpm
share/vlc/vlc48x48-christmas.png
share/vlc/vlc48x48.png
-@pkgdir share/vlc/skins2/fonts
+@pkgdir share/vlc/osdmenu/dvd/volume
+@pkgdir share/vlc/osdmenu/dvd/unselect
+@pkgdir share/vlc/osdmenu/dvd/selection
+@pkgdir share/vlc/osdmenu/dvd/selected
+@pkgdir share/vlc/http/old/vlm
+@pkgdir share/vlc/http/old/admin
diff -r dae49a063cca -r f4e29d39d658 multimedia/vlc/options.mk
--- a/multimedia/vlc/options.mk Tue Jul 07 19:21:57 2009 +0000
+++ b/multimedia/vlc/options.mk Tue Jul 07 19:23:48 2009 +0000
@@ -1,21 +1,13 @@
-# $NetBSD: options.mk,v 1.14 2009/07/07 16:17:47 tnn Exp $
+# $NetBSD: options.mk,v 1.15 2009/07/07 19:23:48 ahoka Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.vlc
-PKG_SUPPORTED_OPTIONS= debug faad dbus hal skins sdl esound pulseaudio x11 gnome
-PKG_SUGGESTED_OPTIONS= x11 esound pulseaudio
+PKG_SUPPORTED_OPTIONS= debug faad dbus hal skins sdl pulseaudio x11 gnome
+PKG_SUGGESTED_OPTIONS= x11 pulseaudio
.include "../../mk/bsd.options.mk"
PLIST_VARS+= ${PKG_SUPPORTED_OPTIONS}
-## ESOUND audio backend
-
-.if !empty(PKG_OPTIONS:Mesound)
-CONFIGURE_ARGS+= --enable-esd
-.include "../../audio/esound/buildlink3.mk"
-PLIST.esound= yes
-.endif
-
## PulseAudio support
.if !empty(PKG_OPTIONS:Mpulseaudio)
@@ -37,7 +29,7 @@
CONFIGURE_ARGS+= --disable-sdl-image
.endif
-## gnome-vfs support
+## gnome integration
.if !empty(PKG_OPTIONS:Mgnome)
CONFIGURE_ARGS+= --enable-gnomevfs
@@ -56,7 +48,17 @@
.include "../../sysutils/dbus/buildlink3.mk"
CONFIGURE_ARGS+= --enable-notify
.include "../../sysutils/libnotify/buildlink3.mk"
+
+# telepathy needs dbus, but its also gnome-ish
+.if !empty(PKG_OPTIONS:Mgnome)
+.include "../../chat/libtelepathy/buildlink3.mk"
+CONFIGURE_ARGS+= --enable-telepathy
+.else
+CONFIGURE_ARGS+= --disable-telepathy
+.endif
+
PLIST.dbus= yes
+
## HAL support (requires dbus)
.if !empty(PKG_OPTIONS:Mhal)
CONFIGURE_ARGS+= --enable-hal
Home |
Main Index |
Thread Index |
Old Index