- Update to 0.8.6.20060514

- Add dbus support (WITHOUT_DBUS, enabled by default)

4 files changed, 49 insertions, 13 deletions

diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index b0e3b46132bb..8089bbf92217 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -3,14 +3,13 @@
 # Whom:			Brian Somers <brian@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.6 2006/05/07 22:25:24 ahze Exp $
+#    $MCom: ports/multimedia/vlc-devel/Makefile,v 1.9 2006/05/15 02:56:23 ahze Exp $
 #
 # *** PLEASE READ Makefile.inc for more information on knobs ***
 #
 
 PORTNAME=	vlc
-DISTVERSION=	0.8.6.20060507
-PORTREVISION=	1
+DISTVERSION=	0.8.6.20060514
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://nightlies.videolan.org/build/source/
 #		http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
@@ -212,6 +211,13 @@ CONFIGURE_ARGS+=--enable-corba
 CONFIGURE_ARGS+=--disable-corba
 .endif
 
+.if !defined(WITHOUT_DBUS)
+LIB_DEPENDS+=	dbus:${PORTSDIR}/devel/dbus
+CONFIGURE_ARGS+=	--enable-dbus
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+.endif
+
 .if !defined(WITHOUT_DVBPSI)
 LIB_DEPENDS+=	dvbpsi.4:${PORTSDIR}/multimedia/libdvbpsi
 CONFIGURE_ARGS+=--enable-dvbpsi \
diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc
index 48173df3afe5..31af4f09a1e7 100644
--- a/multimedia/vlc-devel/Makefile.inc
+++ b/multimedia/vlc-devel/Makefile.inc
@@ -5,7 +5,7 @@
 # and will be autodetected to enable
 #
 # $FreeBSD$
-#    $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.1 2006/05/06 06:06:47 ahze Exp $
+#    $MCom: ports/multimedia/vlc-devel/Makefile.inc,v 1.2 2006/05/15 02:46:26 ahze Exp $
 #
 # If you define for example WITH_FAAD and WITHOUT_FAAD
 # the WITHOUT_ will always over ride the WITH_.
@@ -156,6 +156,9 @@
 # WITHOUT_AVAHI=yes
 #  Avahi (Rendezvous/Bonjour (R) ) networking
 #
+# WITHOUT_DBUS=yes
+#  Disable d-bus support
+#
 # WITH_DEBUG=yes
 #  Enable debuging support
 #
diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo
index eb225f04a05e..12192ccc7f70 100644
--- a/multimedia/vlc-devel/distinfo
+++ b/multimedia/vlc-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlc-snapshot-20060507.tar.gz) = 96385e65abfd3765d9c0f925a44ca278
-SHA256 (vlc-snapshot-20060507.tar.gz) = efe8248d3876e331fbd5c2e46371294eb7ed91db139f7e9bbe8f95ae397c914b
-SIZE (vlc-snapshot-20060507.tar.gz) = 11648478
+MD5 (vlc-snapshot-20060514.tar.gz) = 26b0aeefa5de0032543e9c2ef158d6e4
+SHA256 (vlc-snapshot-20060514.tar.gz) = 9c48ddedbe93783aa757c3f7a10cda8afef393800d17eb85830c6619d7c89b21
+SIZE (vlc-snapshot-20060514.tar.gz) = 12412658
diff --git a/multimedia/vlc-devel/files/patch-configure b/multimedia/vlc-devel/files/patch-configure
index d5326ad5963f..43df92bd100f 100644
--- a/multimedia/vlc-devel/files/patch-configure
+++ b/multimedia/vlc-devel/files/patch-configure
@@ -1,6 +1,24 @@
---- configure.orig	Sun Jan  1 18:01:13 2006
-+++ configure	Mon Jan  2 14:38:53 2006
-@@ -21195,11 +21195,7 @@
+--- configure.orig	Sat May 13 18:02:16 2006
++++ configure	Sun May 14 22:38:30 2006
+@@ -33569,7 +33569,7 @@
+ 
+ fi;
+ 
+-if test "${enable_hal}" != "no" -a "${SYS}" = "linux"
++if test "${enable_hal}" != "no"
+ then
+ 
+ pkg_failed=no
+@@ -33854,7 +33854,7 @@
+ 
+ fi;
+ 
+-if test "${enable_dbus}" != "no" -a "${SYS}" = "linux"
++if test "${enable_dbus}" != "no"
+ then
+ 
+ pkg_failed=no
+@@ -37289,11 +37289,7 @@
    done
  
      else
@@ -13,7 +31,7 @@
      fi
    else
  
-@@ -21361,8 +21357,7 @@
+@@ -37455,8 +37451,7 @@
          if test -n "${enable_dv}"
          then
            { { echo "$as_me:$LINENO: error: cannot find libraw1394 headers" >&5
@@ -23,7 +41,7 @@
          fi
  
  fi
-@@ -21381,8 +21376,7 @@
+@@ -37475,8 +37470,7 @@
              echo "$as_me:$LINENO: result: no" >&5
  echo "${ECHO_T}no" >&6
        { { echo "$as_me:$LINENO: error: cannot cd to ${real_dv_raw1394_tree}" >&5
@@ -33,7 +51,7 @@
      fi
      if test -f "${real_dv_raw1394_tree}/src/.libs/libraw1394.a"
      then
-@@ -21610,8 +21604,7 @@
+@@ -37704,8 +37698,7 @@
          if test -n "${enable_dv}"
          then
            { { echo "$as_me:$LINENO: error: cannot find libavc1394 headers" >&5
@@ -43,3 +61,12 @@
          fi
  
  fi
+@@ -39199,7 +39192,7 @@
+   enableval="$enable_gnomevfs"
+ 
+ fi;
+-if test "${enable_gnomevfs}" != "no" -a  "${SYS}" = "linux"
++if test "${enable_gnomevfs}" != "no"
+ then
+ 
+ pkg_failed=no