From owner-cvs-ports@FreeBSD.ORG Sun Feb 26 15:22:38 2012 Return-Path: Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1BBA6106566C; Sun, 26 Feb 2012 15:22:38 +0000 (UTC) (envelope-from nox@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E10218FC15; Sun, 26 Feb 2012 15:22:37 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id q1QFMbnN098920; Sun, 26 Feb 2012 15:22:37 GMT (envelope-from nox@repoman.freebsd.org) Received: (from nox@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id q1QFMbkb098919; Sun, 26 Feb 2012 15:22:37 GMT (envelope-from nox) Message-Id: <201202261522.q1QFMbkb098919@repoman.freebsd.org> From: Juergen Lock Date: Sun, 26 Feb 2012 15:22:37 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/multimedia/libxine Makefile distinfo pkg-plist ports/multimedia/libxine/files ffmpeg-vaapi_xine-lib-1.1.19-initerrorhack.diff ffmpeg-vaapi_xine-lib-1.2.1-defaultoff.diff patch-4bf51c8a7dad patch-configure patch-contrib-libdha-sysdep-pci_freebsd.c patch-include-xine-post.h patch-include-xine-xine_internal.h patch-libav-0.7 ... X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Feb 2012 15:22:38 -0000 nox 2012-02-26 15:22:37 UTC FreeBSD ports repository Modified files: multimedia/libxine Makefile distinfo pkg-plist multimedia/libxine/files patch-configure patch-misc_libxine.pc.in patch-src_audio_out_audio_oss_out.c audio/amarok Makefile audio/atunes Makefile audio/clementine-player Makefile audio/gogglesmm Makefile graphics/gimageview Makefile graphics/opencv Makefile graphics/osg Makefile graphics/osg-devel Makefile graphics/pornview Makefile graphics/pornview/files patch-gtkxine.c patch-gtkxine.h multimedia/emotion Makefile multimedia/gxine Makefile multimedia/kaffeine Makefile x11/kdelibs4 Makefile multimedia/kdemultimedia4 Makefile multimedia/kmplayer Makefile multimedia/konverter Makefile multimedia/phonon-xine Makefile multimedia/qdvdauthor Makefile multimedia/quark Makefile multimedia/subtitlecomposer Makefile multimedia/subtitlecomposer-kde4 Makefile multimedia/vdr-plugin-xineliboutput Makefile pkg-plist multimedia/xfce4-media Makefile multimedia/xfce4-media/files patch-src_xfmedia-xine.c multimedia/xine Makefile multimedia/xine_artsplugin Makefile multimedia/k9copy-kde4 Makefile www/npapi-xine Makefile x11/eaglemode Makefile x11/kde4-runtime Makefile Added files: multimedia/libxine/files ffmpeg-vaapi_xine-lib-1.2.1-defaultoff.diff patch-4bf51c8a7dad patch-contrib-libdha-sysdep-pci_freebsd.c patch-include-xine-post.h patch-include-xine-xine_internal.h patch-src-libw32dll-wine-registry.c patch-src-vdr-input_vdr.c audio/amarok/files patch-src-engine-xine-xine-engine.cpp graphics/gimageview/files patch-gimv_xine.c patch-gimv_xine_priv.h patch-xine_image_loader.c graphics/osg/files patch-src-osgPlugins-xine-video_out_rgb.c graphics/osg-devel/files patch-src-osgPlugins-xine-video_out_rgb.c multimedia/emotion/files patch-src-modules-xine-emotion_xine_vo_out.c x11/kdelibs4/files patch-cmake-modules-FindXine.cmake multimedia/kmplayer/files patch-src-xineplayer.cpp multimedia/konverter/files patch-src-kxinewidget.cpp multimedia/qdvdauthor/files patch-qdvdauthor-qplayer-engines-kxinewidget.cpp patch-qdvdauthor-qplayer-engines-qxinewidget.cpp multimedia/vdr-plugin-xineliboutput/files patch-xine_post_audiochannel.c multimedia/xine_artsplugin/files patch-xine_artsplugin-xinePlayObject_impl.cpp multimedia/k9copy-kde4/files patch-src-xine-k9xineplayer.cpp patch-src-xine-k9xineplayer.h Removed files: multimedia/libxine/files ffmpeg-vaapi_xine-lib-1.1.19-initerrorhack.diff patch-libav-0.7 patch-src-video_out-xxmc.h patch-src:libffmpeg:libavcodec:h263.c patch-src:libffmpeg:libavcodec:mpeg12.c patch-src:libffmpeg:libavcodec:msmpeg4.c patch-src:xine-engine:post.h patch-src:xine-engine:xine_internal.h patch-src_libffmpeg_libavcodec_dsputil.c patch-src_libffmpeg_libavcodec_huffyuv.c patch-src_libffmpeg_libavcodec_mpegvideo.c patch-src_libffmpeg_libavcodec_vorbis.c patch-src_video_out_libdha_sysdep_pci_freebsd.c Log: - Update multimedia/libxine to 1.2.1 with a commit merged from hg to fix DVB support. (which still is broken for tuners using hardware pid filtering, like when running webcamd with "-m dvb-usb-init.force_pid_filter_usage=1".) - Add patches to fix build of ports depending on libxine to: audio/amarok, graphics/gimageview [1], graphics/pornview [1], graphics/osg [2], graphics/osg-devel [2], multimedia/emotion, x11/kdelibs4 [3], multimedia/kmplayer, multimedia/konverter, multimedia/qdvdauthor [4], multimedia/vdr-plugin-xineliboutput, multimedia/xfce4-media [5], multimedia/xine_artsplugin, multimedia/k9copy-kde4 [6] - Fix RUN_DEPENDS= xine... which should be LIB_DEPENDS for audio/atunes . [7] - Mark multimedia/phonon-xine BROKEN which refuses to build with libxine 1.2.x and is deprecated upstream. [3] - Disable XINE knob for x11/eaglemode for which I don't have a fix. [2] - Note: multimedia/kaffeine runs after rakuco's x11/kdelibs4 fix, but it only shows a green window at least with mp4 or ts files. (avi files and audio still work.) It seems the kaffeine developers have found this too and are now switching away from libxine in their git repo - so I guess we'll have a broken kaffeine at least until they release a new version. - Bump PORTREVISIONs for ports depending on libxine by default. - Add optional libbluray support to multimedia/libxine and multimedia/vdr-plugin-xineliboutput. PR: ports/165057 [6] Submitted by: nox (self) [6], rakuco [3] Approved by: dinoex (maintainer, via irc) [1], amdmi3 (maintainer, via private email) [2], kde@ (rakuco, via irc) [3], Phil Oleson (maintainer, via private email) [4], xfce@ (rene, via irc) [5], Eduardo Gielamo Oliveira (maintainer) [6], lme (maintainer, via irc) [7] Thanx to: Darren Salt (upstream libxine maintainer) for a few hints on irc to help with patching ports depending on deprecated libxine features Revision Changes Path 1.111 +2 -2 ports/audio/amarok/Makefile 1.1 +14 -0 ports/audio/amarok/files/patch-src-engine-xine-xine-engine.cpp (new) 1.22 +1 -1 ports/audio/atunes/Makefile 1.16 +2 -2 ports/audio/clementine-player/Makefile 1.41 +2 -2 ports/audio/gogglesmm/Makefile 1.55 +1 -1 ports/graphics/gimageview/Makefile 1.1 +46 -0 ports/graphics/gimageview/files/patch-gimv_xine.c (new) 1.1 +16 -0 ports/graphics/gimageview/files/patch-gimv_xine_priv.h (new) 1.1 +16 -0 ports/graphics/gimageview/files/patch-xine_image_loader.c (new) 1.37 +1 -1 ports/graphics/opencv/Makefile 1.65 +1 -1 ports/graphics/osg-devel/Makefile 1.1 +98 -0 ports/graphics/osg-devel/files/patch-src-osgPlugins-xine-video_out_rgb.c (new) 1.58 +1 -1 ports/graphics/osg/Makefile 1.1 +98 -0 ports/graphics/osg/files/patch-src-osgPlugins-xine-video_out_rgb.c (new) 1.44 +1 -1 ports/graphics/pornview/Makefile 1.2 +121 -3 ports/graphics/pornview/files/patch-gtkxine.c 1.2 +15 -1 ports/graphics/pornview/files/patch-gtkxine.h 1.21 +2 -2 ports/multimedia/emotion/Makefile 1.1 +16 -0 ports/multimedia/emotion/files/patch-src-modules-xine-emotion_xine_vo_out.c (new) 1.63 +2 -2 ports/multimedia/gxine/Makefile 1.25 +1 -1 ports/multimedia/k9copy-kde4/Makefile 1.1 +35 -0 ports/multimedia/k9copy-kde4/files/patch-src-xine-k9xineplayer.cpp (new) 1.1 +10 -0 ports/multimedia/k9copy-kde4/files/patch-src-xine-k9xineplayer.h (new) 1.70 +2 -2 ports/multimedia/kaffeine/Makefile 1.182 +2 -2 ports/multimedia/kdemultimedia4/Makefile 1.53 +1 -1 ports/multimedia/kmplayer/Makefile 1.1 +170 -0 ports/multimedia/kmplayer/files/patch-src-xineplayer.cpp (new) 1.30 +2 -2 ports/multimedia/konverter/Makefile 1.1 +48 -0 ports/multimedia/konverter/files/patch-src-kxinewidget.cpp (new) 1.180 +22 -37 ports/multimedia/libxine/Makefile 1.44 +2 -6 ports/multimedia/libxine/distinfo 1.3 +0 -851 ports/multimedia/libxine/files/ffmpeg-vaapi_xine-lib-1.1.19-initerrorhack.diff (dead) 1.1 +5990 -0 ports/multimedia/libxine/files/ffmpeg-vaapi_xine-lib-1.2.1-defaultoff.diff (new) 1.1 +38 -0 ports/multimedia/libxine/files/patch-4bf51c8a7dad (new) 1.14 +11 -30 ports/multimedia/libxine/files/patch-configure 1.1 +11 -0 ports/multimedia/libxine/files/patch-contrib-libdha-sysdep-pci_freebsd.c (new) 1.1 +11 -0 ports/multimedia/libxine/files/patch-include-xine-post.h (new) 1.1 +127 -0 ports/multimedia/libxine/files/patch-include-xine-xine_internal.h (new) 1.2 +0 -237 ports/multimedia/libxine/files/patch-libav-0.7 (dead) 1.2 +6 -6 ports/multimedia/libxine/files/patch-misc_libxine.pc.in 1.1 +13 -0 ports/multimedia/libxine/files/patch-src-libw32dll-wine-registry.c (new) 1.1 +12 -0 ports/multimedia/libxine/files/patch-src-vdr-input_vdr.c (new) 1.2 +0 -10 ports/multimedia/libxine/files/patch-src-video_out-xxmc.h (dead) 1.9 +0 -39 ports/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:h263.c (dead) 1.7 +0 -94 ports/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:mpeg12.c (dead) 1.7 +0 -20 ports/multimedia/libxine/files/patch-src:libffmpeg:libavcodec:msmpeg4.c (dead) 1.3 +0 -11 ports/multimedia/libxine/files/patch-src:xine-engine:post.h (dead) 1.6 +0 -127 ports/multimedia/libxine/files/patch-src:xine-engine:xine_internal.h (dead) 1.4 +16 -16 ports/multimedia/libxine/files/patch-src_audio_out_audio_oss_out.c 1.2 +0 -11 ports/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_dsputil.c (dead) 1.2 +0 -10 ports/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_huffyuv.c (dead) 1.2 +0 -10 ports/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_mpegvideo.c (dead) 1.2 +0 -11 ports/multimedia/libxine/files/patch-src_libffmpeg_libavcodec_vorbis.c (dead) 1.2 +0 -11 ports/multimedia/libxine/files/patch-src_video_out_libdha_sysdep_pci_freebsd.c (dead) 1.58 +73 -85 ports/multimedia/libxine/pkg-plist 1.20 +4 -2 ports/multimedia/phonon-xine/Makefile 1.31 +2 -2 ports/multimedia/qdvdauthor/Makefile 1.1 +14 -0 ports/multimedia/qdvdauthor/files/patch-qdvdauthor-qplayer-engines-kxinewidget.cpp (new) 1.1 +23 -0 ports/multimedia/qdvdauthor/files/patch-qdvdauthor-qplayer-engines-qxinewidget.cpp (new) 1.36 +2 -2 ports/multimedia/quark/Makefile 1.20 +1 -1 ports/multimedia/subtitlecomposer-kde4/Makefile 1.17 +1 -1 ports/multimedia/subtitlecomposer/Makefile 1.12 +4 -5 ports/multimedia/vdr-plugin-xineliboutput/Makefile 1.1 +47 -0 ports/multimedia/vdr-plugin-xineliboutput/files/patch-xine_post_audiochannel.c (new) 1.5 +4 -4 ports/multimedia/vdr-plugin-xineliboutput/pkg-plist 1.48 +2 -2 ports/multimedia/xfce4-media/Makefile 1.2 +16 -5 ports/multimedia/xfce4-media/files/patch-src_xfmedia-xine.c 1.105 +2 -2 ports/multimedia/xine/Makefile 1.39 +1 -1 ports/multimedia/xine_artsplugin/Makefile 1.1 +42 -0 ports/multimedia/xine_artsplugin/files/patch-xine_artsplugin-xinePlayObject_impl.cpp (new) 1.14 +2 -2 ports/www/npapi-xine/Makefile 1.28 +4 -3 ports/x11/eaglemode/Makefile 1.251 +2 -2 ports/x11/kde4-runtime/Makefile 1.271 +1 -1 ports/x11/kdelibs4/Makefile 1.1 +11 -0 ports/x11/kdelibs4/files/patch-cmake-modules-FindXine.cmake (new)