diff options
author | nox <nox@FreeBSD.org> | 2012-02-26 23:22:37 +0800 |
---|---|---|
committer | nox <nox@FreeBSD.org> | 2012-02-26 23:22:37 +0800 |
commit | 43ee86bbe02ddd769636f9076096c9871a4f8b95 (patch) | |
tree | deefe265cb512ac12217d02a6d9cf5f09e408e70 /x11/kdelibs4 | |
parent | 3d59b95822df4fff8ceaf461bcf666bc3ecd7e26 (diff) | |
download | freebsd-ports-gnome-43ee86bbe02ddd769636f9076096c9871a4f8b95.tar.gz freebsd-ports-gnome-43ee86bbe02ddd769636f9076096c9871a4f8b95.tar.zst freebsd-ports-gnome-43ee86bbe02ddd769636f9076096c9871a4f8b95.zip |
- 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 <oz@nixil.net> (maintainer, via private email) [4],
xfce@ (rene, via irc) [5],
Eduardo Gielamo Oliveira <egoliveira@gmail.com> (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
Diffstat (limited to 'x11/kdelibs4')
-rw-r--r-- | x11/kdelibs4/Makefile | 2 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-cmake-modules-FindXine.cmake | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index f179f83c3b15..39f520c83557 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,7 +8,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/x11/kdelibs4/files/patch-cmake-modules-FindXine.cmake b/x11/kdelibs4/files/patch-cmake-modules-FindXine.cmake new file mode 100644 index 000000000000..1942c75267f1 --- /dev/null +++ b/x11/kdelibs4/files/patch-cmake-modules-FindXine.cmake @@ -0,0 +1,11 @@ +--- cmake/modules/FindXine.cmake 2011-09-26 06:34:51.000000000 -0300 ++++ cmake/modules/FindXine.cmake 2012-01-25 20:37:43.000000000 -0200 +@@ -42,7 +42,7 @@ + ) + + if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) +- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) ++ execute_process(COMMAND ${XINECONFIG_EXECUTABLE} --version OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) + if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2 + set(XINE_VERSION_OK TRUE) + string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) |