diff options
| -rw-r--r-- | multimedia/vlc-devel/Makefile | 15 | ||||
| -rw-r--r-- | multimedia/vlc-devel/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/vlc-devel/files/patch-include_vlc_control.h | 56 |
3 files changed, 10 insertions, 67 deletions
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index f787492b4..1697ac91a 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -3,23 +3,22 @@ # Whom: Brian Somers <brian@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/multimedia/vlc-devel/Makefile,v 1.4 2006/05/04 15:12:38 ahze Exp $ +# $MCom: ports/multimedia/vlc-devel/Makefile,v 1.5 2006/05/06 06:06:47 ahze Exp $ # # *** PLEASE READ Makefile.inc for more information on knobs *** # PORTNAME= vlc -DISTVERSION= 0.8.5.20060423-test4 +DISTVERSION= 0.8.6.20060507 PORTREVISION= 0 CATEGORIES= multimedia audio ipv6 net www -MASTER_SITES= http://download.videolan.org/pub/videolan/testing/vlc-0.8.5-test4/ -# http://nightlies.videolan.org/build/source/ +MASTER_SITES= http://nightlies.videolan.org/build/source/ # http://download.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \ # http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${PORTVERSION}/ \ # ftp://ftp.crans.org/pub/videolan/vlc/${PORTVERSION}/ \ # ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${PORTVERSION}/ \ PKGNAMESUFFIX= -devel -DISTNAME= ${PORTNAME}-${DISTVERSION:S/.20060423//} +DISTNAME= ${PORTNAME}-snapshot-${DISTVERSION:S/0.8.6.//} MAINTAINER= ahze@FreeBSD.org COMMENT= Multimedia streaming server and player for various audio/video formats @@ -28,11 +27,11 @@ RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fo CONFLICTS= vlc-[0-9]* -#WRKSRC= ${WRKDIR}/${PORTNAME}-0.8.5-test1 +WRKSRC= ${WRKDIR}/${PORTNAME}-0.8.6-svn WITH_VLC_DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf -USE_BZIP2= yes +#USE_BZIP2= yes USE_X_PREFIX= yes USE_GETOPT_LONG=yes USE_GETTEXT= yes @@ -391,7 +390,7 @@ CONFIGURE_AGRS+= --enable-shout .endif .if (defined(WITH_THEORA) || exists(${LOCALBASE}/lib/libtheora.a)) && !defined(WITHOUT_THEORA) -LIB_DEPENDS+= theora.1:${PORTSDIR}/multimedia/libtheora +LIB_DEPENDS+= theora.2:${PORTSDIR}/multimedia/libtheora CONFIGURE_ARGS+=--enable-theora .else CONFIGURE_ARGS+=--disable-theora diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo index 847eafd5e..eb225f04a 100644 --- a/multimedia/vlc-devel/distinfo +++ b/multimedia/vlc-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (vlc-0.8.5-test4.tar.bz2) = c7e06ee27097493cb3dcdffe5d8be36e -SHA256 (vlc-0.8.5-test4.tar.bz2) = 0a93d9499cae65ae911f4330a2860864d4f404440d5e17df4c471c2d0ff438f7 -SIZE (vlc-0.8.5-test4.tar.bz2) = 8450554 +MD5 (vlc-snapshot-20060507.tar.gz) = 96385e65abfd3765d9c0f925a44ca278 +SHA256 (vlc-snapshot-20060507.tar.gz) = efe8248d3876e331fbd5c2e46371294eb7ed91db139f7e9bbe8f95ae397c914b +SIZE (vlc-snapshot-20060507.tar.gz) = 11648478 diff --git a/multimedia/vlc-devel/files/patch-include_vlc_control.h b/multimedia/vlc-devel/files/patch-include_vlc_control.h deleted file mode 100644 index d3e8d64c7..000000000 --- a/multimedia/vlc-devel/files/patch-include_vlc_control.h +++ /dev/null @@ -1,56 +0,0 @@ ---- /dev/null Mon Jan 2 14:48:08 2006 -+++ include/vlc_control.h Mon Jan 2 14:46:25 2006 -@@ -0,0 +1,53 @@ -+/***************************************************************************** -+ * control.h: private header for mediacontrol -+ ***************************************************************************** -+ * Copyright (C) 2005 the VideoLAN team -+ * $Id: patch-include_vlc_control.h,v 1.1 2006-05-04 15:12:39 ahze Exp $ -+ * -+ * Authors: Olivier Aubert <olivier.aubert@liris.univ-lyon1.fr> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ *****************************************************************************/ -+ -+#ifndef _VLC_PRIVATE_CONTROL_H -+#define _VLC_PRIVATE_CONTROL_H 1 -+ -+# ifdef __cplusplus -+extern "C" { -+# endif -+ -+#include <vlc/vlc.h> -+#include "vlc/control_structures.h" -+ -+typedef struct { -+ vlc_object_t *p_vlc; -+ playlist_t *p_playlist; -+ intf_thread_t *p_intf; -+ int vlc_object_id; -+} mediacontrol_Instance; -+ -+vlc_int64_t mediacontrol_unit_convert( input_thread_t *p_input, -+ mediacontrol_PositionKey from, -+ mediacontrol_PositionKey to, -+ vlc_int64_t value ); -+vlc_int64_t mediacontrol_position2microsecond( -+ input_thread_t *p_input, -+ const mediacontrol_Position *pos ); -+ -+# ifdef __cplusplus -+} -+# endif -+ -+#endif |