From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Jul 8 03:30:06 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CE78C1065676 for ; Wed, 8 Jul 2009 03:30:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id A988B8FC1D for ; Wed, 8 Jul 2009 03:30:06 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n683U6KY061826 for ; Wed, 8 Jul 2009 03:30:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n683U6pw061825; Wed, 8 Jul 2009 03:30:06 GMT (envelope-from gnats) Resent-Date: Wed, 8 Jul 2009 03:30:06 GMT Resent-Message-Id: <200907080330.n683U6pw061825@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Joseph S. Atkinson" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85E10106566C for ; Wed, 8 Jul 2009 03:25:27 +0000 (UTC) (envelope-from jsa@wickedmachine.net) Received: from shaitan.wickedmachine.net (tn-67-232-95-224.dhcp.embarqhsd.net [67.232.95.224]) by mx1.freebsd.org (Postfix) with ESMTP id 3008B8FC17 for ; Wed, 8 Jul 2009 03:25:27 +0000 (UTC) (envelope-from jsa@wickedmachine.net) Received: from shaitan.wickedmachine.net (localhost [127.0.0.1]) by shaitan.wickedmachine.net (8.14.3/8.14.3) with ESMTP id n67NigYv015915 for ; Tue, 7 Jul 2009 19:44:42 -0400 (EDT) (envelope-from jsa@wickedmachine.net) Message-Id: <1247010282.77969@shaitan.wickedmachine.net> Date: Tue, 7 Jul 2009 19:44:42 -0400 From: "Joseph S. Atkinson" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/136451: multimedia/vlc - VLC 1.0.0 Goldeneye X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jul 2009 03:30:07 -0000 >Number: 136451 >Category: ports >Synopsis: multimedia/vlc - VLC 1.0.0 Goldeneye >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jul 08 03:30:06 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Joseph S. Atkinson >Release: FreeBSD 8.0-BETA1 amd64 >Organization: >Environment: System: FreeBSD 8.0-BETA1 #3 r195422: Mon Jul 6 23:16:46 EDT 2009 jsa@shaitan.wickedmachine.net:/usr/obj/usr/src/sys/SHAITAN >Description: VLC 1.0.0 codenamed Goldeneye has arrived. See www.videolan.org for full details. For FreeBSD: + SKINS now enabled by default. + OPTIMIZED_CFLAGS have been renamed to a more proper OCFLAGS and gaven an -O3 nudge for those who feel they may get something out of this. - OPENGL option that enables the galaktos visualization has been removed due to it's need for fmemopen() which isn't (yet) in FreeBSD. >How-To-Repeat: >Fix: NOTE TO COMMITER: files/patch-modules__gui__qt4__qt4.cpp is dead. --- vlc_1.0.0.diff begins here --- diff -ruN vlc.orig/Makefile vlc/Makefile --- vlc.orig/Makefile 2009-07-07 19:13:02.102409939 -0400 +++ vlc/Makefile 2009-07-07 19:05:23.552359025 -0400 @@ -9,8 +9,7 @@ # PORTNAME= vlc -DISTVERSION= 0.9.9a -PORTREVISION= 2 +DISTVERSION= 1.0.0 PORTEPOCH= 3 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \ @@ -54,11 +53,11 @@ SVG "SVG graphics support" Off \ SVGALIB "SVGALIB video output" Off \ SHOUT "Shout2 support" Off \ - SKINS "Enable winamp skins interface (requires QT4)" Off \ + SKINS "Enable winamp skins interface (requires QT4)" On \ SPEEX "Speex voice codec support" On \ THEORA "OGG/Vorbis video codec support" On \ TWOLAME "Twolame mpeg2 audio encoder support" On \ - V4L "Enable Video for Linux" On\ + V4L "Enable Video for Linux" On \ VORBIS "Vorbis support" On \ WIN32_CODECS "win32 multimedia DLL's" Off \ X264 "Enable H.264/AVC codec support" On \ @@ -82,11 +81,13 @@ LIBS="-lc" CONFIGURE_ARGS+= --enable-vlc \ + --enable-release \ --enable-avcodec \ --enable-avformat \ --enable-postproc \ --without-dv-raw1394 \ - --disable-dv + --disable-dv \ + --disable-galaktos MAN1= vlc.1 \ vlc-config.1 @@ -488,13 +489,6 @@ CONFIGURE_ARGS+=--enable-ncurses .endif -.if defined(WITH_OPENGL) && !defined(WITHOUT_OPENGL) -USE_GL= yes -CONFIGURE_ARGS+=--enable-galaktos -.else -CONFIGURE_ARGS+=--disable-galaktos -.endif - .if !defined(WITHOUT_SAMBA) LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient CONFIGURE_ARGS+=--enable-smb @@ -579,12 +573,9 @@ CONFIGURE_ARGS+=--enable-release .endif -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS+= -O2 -ffast-math -fomit-frame-pointer -CONFIGURE_ARGS+=--enable-release \ - --enable-optimizations -.else -CONFIGURE_ARGS+=--enable-release +.if defined(WITH_OCFLAGS) +CFLAGS+= -O3 -ffast-math -fomit-frame-pointer +CONFIGURE_ARGS+=--enable-optimizations .endif .if defined(WITHOUT_V4L) diff -ruN vlc.orig/Makefile.inc vlc/Makefile.inc --- vlc.orig/Makefile.inc 2009-07-07 19:13:02.102409939 -0400 +++ vlc/Makefile.inc 2009-07-01 11:56:50.784693019 -0400 @@ -174,17 +174,14 @@ # WITHOUT_HAL=yes # Disable HAL support # -# WITH_OPENGL=yes -# Enable OpenGL visual plugin (not playback, play back is default with X11) -# # WITHOUT_SAMBA=yes # Enable SAMBA Access module # # WITH_SSL=yes # Enable TLS/SSL Support for web (httpd) interface # -# WITH_OPTIMIZED_CFLAGS=yes -# Compile with -O2 -ffast-math -fomit-frame-pointer +# WITH_OCFLAGS=yes +# Compile with -O3 -ffast-math -fomit-frame-pointer # # WITH_DVD_DEVICE=/dev/somedevice # default 5.x and above: /dev/acd0 diff -ruN vlc.orig/distinfo vlc/distinfo --- vlc.orig/distinfo 2009-07-07 19:13:02.102409939 -0400 +++ vlc/distinfo 2009-07-07 14:55:12.915828964 -0400 @@ -1,3 +1,3 @@ -MD5 (vlc-0.9.9a.tar.bz2) = c8d832deeef7f4072a73506f8d033198 -SHA256 (vlc-0.9.9a.tar.bz2) = e5d0a168263f56bccc62d30031287d56f0b6a3447b552f3a5224132d0b597dd6 -SIZE (vlc-0.9.9a.tar.bz2) = 17500620 +MD5 (vlc-1.0.0.tar.bz2) = fc78904ab5fa73f518d8fe4e852e7f67 +SHA256 (vlc-1.0.0.tar.bz2) = a41ae622dde65e8eb54abf7bece9949ff9aa4b9fa1f9ca2d06c9689d19bb1d9e +SIZE (vlc-1.0.0.tar.bz2) = 19973964 diff -ruN vlc.orig/files/patch-modules__gui__qt4__qt4.cpp vlc/files/patch-modules__gui__qt4__qt4.cpp --- vlc.orig/files/patch-modules__gui__qt4__qt4.cpp 2009-07-07 19:13:02.102409939 -0400 +++ vlc/files/patch-modules__gui__qt4__qt4.cpp 1969-12-31 19:00:00.000000000 -0500 @@ -1,14 +0,0 @@ ---- patch-modules__gui__qt4__qt4.cpp begins here --- -diff -up vlc-0.9.8a/modules/gui/qt4/qt4.cpp.embedded vlc-0.9.8a/modules/gui/qt4/qt4.cpp ---- modules/gui/qt4/qt4.cpp.embedded 2008-12-05 02:27:20.000000000 +0100 -+++ modules/gui/qt4/qt4.cpp 2008-12-05 02:27:27.000000000 +0100 -@@ -213,7 +213,7 @@ vlc_module_begin(); - - set_callbacks( OpenDialogs, Close ); - --#if 0 -+#if 1 - add_submodule(); - set_capability( "vout window", 50 ); - set_callbacks( WindowOpen, WindowClose ); ---- patch-modules__gui__qt4__qt4.cpp ends here --- diff -ruN vlc.orig/files/patch-v4l vlc/files/patch-v4l --- vlc.orig/files/patch-v4l 2009-07-07 19:13:02.102409939 -0400 +++ vlc/files/patch-v4l 2009-07-07 18:06:47.938281817 -0400 @@ -67,7 +67,7 @@ } - memcpy( p_block->p_buffer, p_frame, p_sys->i_video_frame_size ); -+ if(read(p_sys->fd_video, p_block->p_buffer, p_sys->i_video_frame_size) <= 0) ++ if(read(p_sys->i_fd, p_block->p_buffer, p_sys->i_video_frame_size) <= 0) + return 0; + p_sys->i_video_pts = p_block->i_pts = p_block->i_dts = mdate(); --- vlc_1.0.0.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: