diff options
author | Michael Johnson <ahze@FreeBSD.org> | 2006-05-22 01:12:08 +0000 |
---|---|---|
committer | Michael Johnson <ahze@FreeBSD.org> | 2006-05-22 01:12:08 +0000 |
commit | 03ee84962c620cecee0896113418cae2343d4b0f (patch) | |
tree | 16fbce5f5fc364ee14d086589a319fe3f90f796a /multimedia/vlc-devel | |
parent | b521fbe031447e7203f3bc80b03633f8d0cfd372 (diff) | |
download | ports-03ee84962c620cecee0896113418cae2343d4b0f.tar.gz ports-03ee84962c620cecee0896113418cae2343d4b0f.zip |
Notes
Diffstat (limited to 'multimedia/vlc-devel')
-rw-r--r-- | multimedia/vlc-devel/Makefile | 12 | ||||
-rw-r--r-- | multimedia/vlc-devel/Makefile.inc | 7 | ||||
-rw-r--r-- | multimedia/vlc-devel/distinfo | 6 | ||||
-rw-r--r-- | multimedia/vlc-devel/files/patch-configure | 72 | ||||
-rw-r--r-- | multimedia/vlc-devel/files/vlc.desktop (renamed from multimedia/vlc-devel/files/wxvlc.desktop) | 0 |
5 files changed, 8 insertions, 89 deletions
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index 8089bbf92217..fa78c688c6c3 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -9,7 +9,7 @@ # PORTNAME= vlc -DISTVERSION= 0.8.6.20060514 +DISTVERSION= 0.8.6.20060521 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://nightlies.videolan.org/build/source/ # http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ @@ -56,7 +56,8 @@ CONFIGURE_ARGS+= --enable-ffmpeg \ --disable-gnome \ --disable-gtk \ --without-libintl-prefix \ - --without-dv-raw1394 + --without-dv-raw1394 \ + --disable-dv MAN1= vlc.1 \ vlc-config.1 @@ -321,13 +322,6 @@ CONFIGURE_ARGS+=--enable-dts CONFIGURE_ARGS+=--disable-dts .endif -.if (defined(WITH_DV) || exists(${LOCALBASE}/lib/libdv.a)) && !defined(WITHOUT_DV) -LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv -CONFIGURE_ARGS+=--enable-dv -.else -CONFIGURE_ARGS+=--disable-dv -.endif - .if defined(WITHOUT_HTTPD) CONFIGURE_ARGS+=--disable-httpd .endif diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc index 31af4f09a1e7..92dbdcb8aa4f 100644 --- a/multimedia/vlc-devel/Makefile.inc +++ b/multimedia/vlc-devel/Makefile.inc @@ -96,9 +96,6 @@ # WITH_CACA=yes # Console Graphics Support (implies WITH_AALIB) # -# WITH_DV=yes -# Digital video input -# # WITH_FRIBIDI=yes # # WITH_GGI=yes @@ -290,7 +287,7 @@ pre-install: .endif .if !defined(WITHOUT_WXGTK) ${ECHO_CMD} "share/pixmaps/vlc.png" >> ${PLIST} - ${ECHO_CMD} "share/applications/wxvlc.desktop" >> ${PLIST} + ${ECHO_CMD} "share/applications/vlc.desktop" >> ${PLIST} .endif .if !defined(WITHOUT_WXGTK) || defined(WITH_SKINS) ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} @@ -365,7 +362,7 @@ do-install: ${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/gvlc.png .endif .if !defined(WITHOUT_WXGTK) - ${INSTALL_DATA} ${FILESDIR}/wxvlc.desktop ${PREFIX}/share/applications + ${INSTALL_DATA} ${FILESDIR}/vlc.desktop ${PREFIX}/share/applications ${INSTALL_DATA} ${FAKEDIR}/share/vlc/vlc48x48.png ${PREFIX}/share/pixmaps/vlc.png .endif .endif diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo index 12192ccc7f70..7b1b01d583a9 100644 --- a/multimedia/vlc-devel/distinfo +++ b/multimedia/vlc-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (vlc-snapshot-20060514.tar.gz) = 26b0aeefa5de0032543e9c2ef158d6e4 -SHA256 (vlc-snapshot-20060514.tar.gz) = 9c48ddedbe93783aa757c3f7a10cda8afef393800d17eb85830c6619d7c89b21 -SIZE (vlc-snapshot-20060514.tar.gz) = 12412658 +MD5 (vlc-snapshot-20060521.tar.gz) = 3e568f2c1c0e9fdc6a932e056299c355 +SHA256 (vlc-snapshot-20060521.tar.gz) = 4bdc4bfaa92d8eb3258698d5f477869c1b417047a76790ff7e61a5c48e09a5fa +SIZE (vlc-snapshot-20060521.tar.gz) = 12539520 diff --git a/multimedia/vlc-devel/files/patch-configure b/multimedia/vlc-devel/files/patch-configure deleted file mode 100644 index 43df92bd100f..000000000000 --- a/multimedia/vlc-devel/files/patch-configure +++ /dev/null @@ -1,72 +0,0 @@ ---- 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 -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -- { { echo "$as_me:$LINENO: error: cannot find ${with_dv_raw1394}/include/libraw1394/raw1394.h" >&5 --echo "$as_me: error: cannot find ${with_dv_raw1394}/include/libraw1394/raw1394.h" >&2;} -- { (exit 1); exit 1; }; } -+ echo "not found" - fi - else - -@@ -37455,8 +37451,7 @@ - if test -n "${enable_dv}" - then - { { echo "$as_me:$LINENO: error: cannot find libraw1394 headers" >&5 --echo "$as_me: error: cannot find libraw1394 headers" >&2;} -- { (exit 1); exit 1; }; } -+echo "$as_me: error: cannot find libraw1394 headers" >&2;} ;} - fi - - fi -@@ -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 --echo "$as_me: error: cannot cd to ${real_dv_raw1394_tree}" >&2;} -- { (exit 1); exit 1; }; } -+echo "$as_me: error: cannot cd to ${real_dv_raw1394_tree}" >&2;} ;} - fi - if test -f "${real_dv_raw1394_tree}/src/.libs/libraw1394.a" - then -@@ -37704,8 +37698,7 @@ - if test -n "${enable_dv}" - then - { { echo "$as_me:$LINENO: error: cannot find libavc1394 headers" >&5 --echo "$as_me: error: cannot find libavc1394 headers" >&2;} -- { (exit 1); exit 1; }; } -+echo "$as_me: error: cannot find libavc1394 headers" >&2;} ; } - 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 diff --git a/multimedia/vlc-devel/files/wxvlc.desktop b/multimedia/vlc-devel/files/vlc.desktop index c95dd3f62a8c..c95dd3f62a8c 100644 --- a/multimedia/vlc-devel/files/wxvlc.desktop +++ b/multimedia/vlc-devel/files/vlc.desktop |