diff options
author | Michael Johnson <ahze@FreeBSD.org> | 2007-05-01 21:54:22 +0000 |
---|---|---|
committer | Michael Johnson <ahze@FreeBSD.org> | 2007-05-01 21:54:22 +0000 |
commit | fa4cd49d32b70ba45bc330f4481a9f11770a4f8c (patch) | |
tree | ff4eedf0ac85d0cd5a37d4757563e8ae5b83e9e7 /multimedia | |
parent | - Build with dynamic libdca instead of static libdts (diff) |
- Update to 0.9.0.20070501 snapshot, this update is HUGE it now uses qt4 instead
of wxgtk but the wxgtk interfece is still there (for now)
Notes
Notes:
svn path=/head/; revision=191331
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/vlc-devel/Makefile | 37 | ||||
-rw-r--r-- | multimedia/vlc-devel/Makefile.inc | 9 | ||||
-rw-r--r-- | multimedia/vlc-devel/distinfo | 6 | ||||
-rw-r--r-- | multimedia/vlc-devel/files/patch-configure | 25 | ||||
-rw-r--r-- | multimedia/vlc-devel/files/patch-modules_video_filter_swscale_common.h | 21 |
5 files changed, 51 insertions, 47 deletions
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile index 1096661654bb..6299054939cd 100644 --- a/multimedia/vlc-devel/Makefile +++ b/multimedia/vlc-devel/Makefile @@ -9,22 +9,22 @@ # PORTNAME= vlc -DISTVERSION= 0.8.6b -PORTREVISION= 1 +DISTVERSION= 0.9.0.20070501 PORTEPOCH= 2 CATEGORIES= multimedia audio ipv6 net www -MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \ - http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${DISTVERSION}/ \ - ftp://ftp.crans.org/pub/videolan/vlc/${DISTVERSION}/ \ - ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${DISTVERSION}/ +MASTER_SITES= http://nightlies.videolan.org/build/source/ +#MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${DISTVERSION}/ \ +# http://ftp.snt.utwente.nl/pub/software/videolan/vlc/${DISTVERSION}/ \ +# ftp://ftp.crans.org/pub/videolan/vlc/${DISTVERSION}/ \ +# ftp://videolan.cs.pu.edu.tw/Windows/VideoLAN/vlc/${DISTVERSION}/ PKGNAMESUFFIX= -devel +DISTNAME= ${PORTNAME}-snapshot-${DISTVERSION:S/0.9.0.//} MAINTAINER= multimedia@FreeBSD.org COMMENT= Multimedia streaming server and player for various audio/video formats LIB_DEPENDS= notify.1:${PORTSDIR}/devel/libnotify \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg-devel - RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera OPTIONS+= A52 "a52 audio support, many DVDs use this" On @@ -48,6 +48,7 @@ OPTIONS+= MATROSKA "Matroska Container Format support" On OPTIONS+= MPEG2 "Mpeg-2 audio/video decoder Support" On OPTIONS+= NCURSES "Enable ncueses (console) interface" Off OPTIONS+= OGG "Ogg audio decoder support" On +OPTIONS+= QT4 "QT4 Interface" On OPTIONS+= REALAUDIO "Real audio(R) support" On OPTIONS+= SAMBA "SAMBA Access module" On OPTIONS+= SDL "SDL video output" On @@ -60,8 +61,10 @@ OPTIONS+= THEORA "OGG/Vorbis video codec support" Off OPTIONS+= TWOLAME "Twolame mpeg2 audio encoder support" Off OPTIONS+= VORBIS "Vorbis support" On OPTIONS+= WIN32_CODECS "win32 multimedia DLL's" Off +OPTIONS+= WXGTK "WxGTK/WxWidgets Interface" Off OPTIONS+= X264 "Enable H.264/AVC codec support" On +WRKSRC= ${WRKDIR}/${PORTNAME}-0.9.0-svn CONFLICTS= vlc-[0-9]* WITH_VLC_DEFAULT_FONT?= ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf @@ -96,6 +99,9 @@ CONFIGURE_ARGS+= --enable-ffmpeg \ --without-dv-raw1394 \ --disable-dv +##### BROKEN ### +CONFIGURE_ARGS+= --disable-opengl + MAN1= vlc.1 \ vlc-config.1 @@ -158,10 +164,19 @@ DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE} DEFAULT_CDROM_DEVICE=/dev/acd0 .endif +.if !defined(WITHOUT_QT4) +USE_QT_VER+= 4 +QT_COMPONENTS+= gui corelib +.include "${PORTSDIR}/Mk/bsd.kde.mk" +CONFIGURE_ARGS+=--enable-qt4 +.else +CONFIGURE_ARGS+=--disable-qt4 +.endif + .if defined(WITH_SKINS) && !defined(WITHOUT_SKINS) LIB_DEPENDS+= tar.0:${PORTSDIR}/devel/libtar CONFIGURE_ARGS+=--enable-skins2 -.undef WITHOUT_WXGTK +WITH_WXGTK=yes .else CONFIGURE_ARGS+=--disable-skins2 .endif @@ -173,7 +188,7 @@ CONFIGURE_ARGS+=--enable-loader CONFIGURE_ARGS+=--disable-loader .endif -.if !defined(WITHOUT_WXGTK) +.if defined(WITH_WXGTK) USE_WX= 2.8 WX_UNICODE= yes CONFIGURE_ARGS+=--enable-wxwidgets @@ -327,9 +342,9 @@ CONFIGURE_ARGS+=--disable-daap .if !defined(WITHOUT_DTS) LIB_DEPENDS+= dca.0:${PORTSDIR}/multimedia/libdca -CONFIGURE_ARGS+=--enable-dts +CONFIGURE_ARGS+=--enable-dca .else -CONFIGURE_ARGS+=--disable-dts +CONFIGURE_ARGS+=--disable-dca .endif .if defined(WITHOUT_HTTPD) diff --git a/multimedia/vlc-devel/Makefile.inc b/multimedia/vlc-devel/Makefile.inc index 503fe2b03a17..0b0fde2b6729 100644 --- a/multimedia/vlc-devel/Makefile.inc +++ b/multimedia/vlc-devel/Makefile.inc @@ -245,21 +245,18 @@ post-patch: @${RM} -f ${WRKSRC}/po/*.bak @${REINPLACE_CMD} -e 's|Linux OSS|FreeBSD OSS|' \ ${WRKSRC}/modules/audio_output/oss.c -# pthreads/cflags @${REINPLACE_CMD} -e 's/-lpthread/${PTHREAD_LIBS}/' \ -e 's/-lc_r/${PTHREAD_LIBS}/' \ - -e 's|-mcpu=pentiumpro||' \ + -e 's|-mcpu=pentiumpro||; s|-ldl||' \ ${WRKSRC}/configure # cdrom/dvd support @${REINPLACE_CMD} -e 's|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|; \ s|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \ ${WRKSRC}/include/vlc_config.h -.if ${ARCH}=="i386" && defined(WITH_WIN32_CODECS) @${REINPLACE_CMD} -e 's|-DWIN32_PATH=\\"\\"|-DWIN32_PATH=\\"${LOCALBASE}/lib/win32\\"|' \ - ${WRKSRC}/loader/Makefile.in + ${WRKSRC}/libs/loader/Makefile.in @${REINPLACE_CMD} -e 's|/usr/lib/win32|${LOCALBASE}/lib/win32|' \ - ${WRKSRC}/loader/module.c -.endif + ${WRKSRC}/libs/loader/module.c pre-configure: .if !exists(${LOCALBASE}/libdata/pkgconfig/libavcodec.pc) && exists(${LOCALBASE}/lib/libavformat.a) diff --git a/multimedia/vlc-devel/distinfo b/multimedia/vlc-devel/distinfo index b8be9d9176a6..cf655ab79b85 100644 --- a/multimedia/vlc-devel/distinfo +++ b/multimedia/vlc-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (vlc-0.8.6b.tar.bz2) = eef8e95e34a3e0d2414b080cb7a1f749 -SHA256 (vlc-0.8.6b.tar.bz2) = 1a101f517485cd1bcabac5c4d180421d34e86af78710ed858ec61f78e3602377 -SIZE (vlc-0.8.6b.tar.bz2) = 10479890 +MD5 (vlc-snapshot-20070501.tar.bz2) = 9359a34477e4ef5b6b234f4d20fa51a0 +SHA256 (vlc-snapshot-20070501.tar.bz2) = 958a3a0a6020b678b9adb4573368600041f29d1b2ffbd9e2613f5dce326b1627 +SIZE (vlc-snapshot-20070501.tar.bz2) = 11685468 diff --git a/multimedia/vlc-devel/files/patch-configure b/multimedia/vlc-devel/files/patch-configure index e7e6e9e29b77..fdba703dbb67 100644 --- a/multimedia/vlc-devel/files/patch-configure +++ b/multimedia/vlc-devel/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Fri Dec 8 20:33:49 2006 -+++ configure Sun Dec 10 09:40:46 2006 -@@ -2412,8 +2412,7 @@ +--- configure.orig Mon Apr 30 18:01:36 2007 ++++ configure Tue May 1 08:22:07 2007 +@@ -2483,8 +2483,7 @@ done if test -z "$ac_aux_dir"; then { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autotools \"$srcdir\"/autotools" >&5 @@ -10,7 +10,7 @@ fi # These three variables are undocumented and unsupported, -@@ -37873,8 +37872,7 @@ +@@ -40476,8 +40475,7 @@ if test -n "${enable_dv}" then { { echo "$as_me:$LINENO: error: cannot find libraw1394 headers" >&5 @@ -20,7 +20,7 @@ fi fi -@@ -37893,8 +37891,7 @@ +@@ -40496,8 +40494,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 @@ -30,7 +30,7 @@ fi if test -f "${real_dv_raw1394_tree}/src/.libs/libraw1394.a" then -@@ -38113,8 +38110,7 @@ +@@ -40716,8 +40713,7 @@ if test -n "${enable_dv}" then { { echo "$as_me:$LINENO: error: cannot find libavc1394 headers" >&5 @@ -40,3 +40,16 @@ fi fi +@@ -62436,12 +62432,6 @@ + + if test "${WX_CONFIG}" != "no" -a "${CXX}" != "" + then +- if expr 2.6.0 \> `${WX_CONFIG} --version` >/dev/null || expr 2.7.0 \<= `${WX_CONFIG} --version` >/dev/null +- then +- { { echo "$as_me:$LINENO: error: You need wxWidgets of the 2.6 branch. Please upgrade/downgrade and try again. Better yet, you can configure with --disable-wxwidgets." >&5 +-echo "$as_me: error: You need wxWidgets of the 2.6 branch. Please upgrade/downgrade and try again. Better yet, you can configure with --disable-wxwidgets." >&2;} +- { (exit 1); exit 1; }; } +- fi + ac_ext=cpp + ac_cpp='$CXXCPP $CPPFLAGS' + ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' diff --git a/multimedia/vlc-devel/files/patch-modules_video_filter_swscale_common.h b/multimedia/vlc-devel/files/patch-modules_video_filter_swscale_common.h deleted file mode 100644 index 4219d8b5377a..000000000000 --- a/multimedia/vlc-devel/files/patch-modules_video_filter_swscale_common.h +++ /dev/null @@ -1,21 +0,0 @@ ---- modules/video_filter/swscale/common.h.orig Fri May 13 03:23:24 2005 -+++ modules/video_filter/swscale/common.h Fri May 13 03:37:24 2005 -@@ -36,7 +36,17 @@ - #define MANGLE(a) #a - #endif - --#ifdef ARCH_X86 -+#if (defined(__unix__) || defined(unix)) && !defined(USG) -+#include <sys/param.h> -+#endif -+ -+#if (defined(__FreeBSD__) && __FreeBSD_version >= 500000) -+#include <sys/endian.h> -+#define bswap_16(x) bswap16(x) -+#elif (defined(__FreeBSD__) && __FreeBSD_version <= 500000) -+#include <sys/endian.h> -+#define bswap_16(x) be16toh(x) -+#elif ARCH_X86 - static inline unsigned short ByteSwap16(unsigned short x) - { - __asm("xchgb %b0,%h0" : |