[macports-ports] branch master updated: phonon-backend-gstreamer(-qt5): update to 4.9.0 and introduce new subport
Lawrence Velázquez
larryv at macports.org
Tue Dec 13 04:20:15 CET 2016
- Previous message: Build Failure: (from, 10.6, OS, This, X, builds, configure.compiler=macports-gcc-4.7, newer, on, only, and 6 more
- Next message: [macports-ports] branch master updated: phonon-backend-gstreamer(-qt5): update to 4.9.0 and introduce new subport
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Please clean up the commit message when you perform squash merges. Most of the text here is outdated Git metadata (old SHA-1 hashes, repeated author name, irrelevant authorship dates).
vq
> On Dec 12, 2016, at 10:54 PM, Marko Käning <mk at macports.org> wrote:
>
> Marko Käning (mkae) pushed a commit to branch master
> in repository macports-ports.
>
> https://github.com/macports/macports-ports/commit/47c0c4f682b22803ae250258187544187d50f898 <https://github.com/macports/macports-ports/commit/47c0c4f682b22803ae250258187544187d50f898>
> The following commit(s) were added to refs/heads/master by this push:
> new 47c0c4f phonon-backend-gstreamer(-qt5): update to 4.9.0 and introduce new subport
> 47c0c4f is described below
>
> commit 47c0c4f682b22803ae250258187544187d50f898
> Author: Marko Käning <mk at macports.org>
> AuthorDate: Tue Dec 13 04:54:01 2016 +0100
>
> phonon-backend-gstreamer(-qt5): update to 4.9.0 and introduce new subport
>
> Squash commit:
>
> commit 5084c0bb0f4edef8ad380910182fad25a5c203f8
> Author: Marko Käning <mk at macports.org>
> Date: Tue Dec 13 04:51:38 2016 +0100
>
> phonon-backend-gstreamer-qt5: michaelld drops maintainership
>
> commit 848cd25de1d3fa80eab96d6b5aa4d7deb9cb513f
> Author: Marko Käning <mk at macports.org>
> Date: Tue Dec 13 04:47:21 2016 +0100
>
> phonon-backend-gstreamer(-qt5): master_sites's folder changed for 4.9.0
>
> commit 909946083acb91e66b8d88a489773ba066e6954e
> Author: Marko Käning <mk at macports.org>
> Date: Tue Dec 13 04:31:20 2016 +0100
>
> phonon-backend-gstreamer: update to 4.9.0
>
> - avoiding building the X11 renderer has changed => new patch
> - remove unused patches
>
> commit ccaa0e34a4aa2fafc8276a6fb8d86fa8af7398a2
> Author: Marko Käning <mk at macports.org>
> Date: Tue Dec 13 03:09:55 2016 +0100
>
> phonon-backend-gstreamer: introduce qt5 support
>
> - add co-maintainership for RJVB
>
> Closes: https://trac.macports.org/ticket/46558
> ---
> audio/phonon-backend-gstreamer/Portfile | 77 +++++++++++++++-------
> .../files/patch-cmake-FindGStreamer.cmake.diff | 43 ------------
> .../files/patch-gstreamer_CMakeLists.txt.diff | 11 ++++
> .../files/phononBGSTr-avoid-x11renderer.patch | 11 ----
> 4 files changed, 63 insertions(+), 79 deletions(-)
>
> diff --git a/audio/phonon-backend-gstreamer/Portfile b/audio/phonon-backend-gstreamer/Portfile
> index fd000d1..e1babc7 100644
> --- a/audio/phonon-backend-gstreamer/Portfile
> +++ b/audio/phonon-backend-gstreamer/Portfile
> @@ -1,36 +1,63 @@
> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
>
> PortSystem 1.0
> -PortGroup qt4 1.0
> -PortGroup cmake 1.0
>
> name phonon-backend-gstreamer
> -version 4.8.2
> -revision 2
> -categories audio kde kde4
> +version 4.9.0
> license {LGPL-2.1 LGPL-3}
> -maintainers michaelld openmaintainer
> +maintainers gmail.com:rjvbertin mk openmaintainer
> description GStreamer backend for Phonon
> -long_description A GStreamer backend for the Phonon multimedia library.
> platforms darwin
> homepage http://phonon.kde.org
> -master_sites kde:stable/phonon/${name}/${version}/src
> +master_sites kde:stable/phonon/${name}/${version}
> use_xz yes
> distname phonon-backend-gstreamer-${version}
> -checksums rmd160 9c0ec7ef27e925c207e769edc225b1d7202c7e37 \
> - sha256 20e0f71f2beb4f859db8385079a13aef5473863ee6f27aad7b065aa7bfe931e0
> -
> -depends_lib-append port:phonon port:gstreamer1-gst-plugins-base
> -
> -depends_build-append port:automoc
> -
> -patchfiles patch-cmake-FindGStreamer.cmake.diff \
> - phononBGSTr-avoid-x11renderer.patch
> -
> -cmake.out_of_source yes
> -
> -configure.args-append -DPhonon_DIR=${cmake_share_module_dir}/phonon
> -
> -livecheck.type regex
> -livecheck.url http://www.gtlib.gatech.edu/pub/kde/stable/phonon/${name}/
> -livecheck.regex "\(\\d+(?:\\.\\d+)*)\/"
> +checksums rmd160 43095bdb9fe8729fd795910188c46cdcb0eae12f \
> + sha256 cec3e5ece1261d344b68363ef0606ebf49772628ba94bb55b0c0d18773b885f1
> +
> +# ATTENTION: This renaming is suddenly needed, as the foldername skips "-backend" from version 4.8.2 to 4.9.0:
> +worksrcdir phonon-gstreamer-${version}
> +
> +# NOTE: There is now a variable called BUILD_X11RENDERER, which seems to control the building of the X11 renderer.
> +# Weird, but this variable's default value in gstreamer's CMakeLists.txt is set to TRUE, although FALSE is needed!
> +patchfiles-append patch-gstreamer_CMakeLists.txt.diff
> +
> +depends_lib-append port:gstreamer1-gst-plugins-good
> +
> +subport qt5-${name} {
> + replaced_by ${name}-qt5
> + PortGroup obsolete 1.0
> +}
> +
> +subport ${name}-qt5 {
> + PortGroup qt5 1.0
> + PortGroup cmake 1.0
> + categories audio kde kf5
> + long_description A GStreamer backend for the Phonon4Qt5 multimedia library.
> + depends_lib-append port:phonon-qt5
> +
> + configure.args-append -DPHONON_BUILD_PHONON4QT5:BOOL=ON
> + post-destroot {
> + delete ${destroot}${prefix}/share/icons
> + }
> +}
> +
> +if {${subport} ne "${name}-qt5"} {
> + PortGroup qt4 1.0
> + PortGroup cmake 1.0
> + categories audio kde kde4
> + long_description A GStreamer backend for the Phonon multimedia library.
> + depends_lib-append port:phonon port:automoc
> +
> + configure.args-append -DPhonon_DIR=${qt_cmake_module_dir}/phonon
> + post-destroot {
> + if {[file exists ${qt_plugins_dir}] && ![file exists ${qt_plugins_dir}/phonon_backend]} {
> + xinstall -m 755 -d ${destroot}${qt_plugins_dir}
> + ln -s ${prefix}/lib/kde4/plugins/phonon_backend ${destroot}${qt_plugins_dir}
> + }
> + }
> +}
> +
> +livecheck.type regex
> +livecheck.url http://www.gtlib.gatech.edu/pub/kde/stable/phonon/${name}/
> +livecheck.regex "\(\\d+(?:\\.\\d+)*)\/"
> diff --git a/audio/phonon-backend-gstreamer/files/patch-cmake-FindGStreamer.cmake.diff b/audio/phonon-backend-gstreamer/files/patch-cmake-FindGStreamer.cmake.diff
> deleted file mode 100644
> index 013b6d6..0000000
> --- a/audio/phonon-backend-gstreamer/files/patch-cmake-FindGStreamer.cmake.diff
> +++ /dev/null
> @@ -1,43 +0,0 @@
> -https://git.reviewboard.kde.org/r/125690/
> ---- cmake/FindGStreamer.cmake.orig
> -+++ cmake/FindGStreamer.cmake
> -@@ -36,6 +36,27 @@ FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
> - PATH_SUFFIXES gstreamer-1.0
> - )
> -
> -+IF (NOT GSTREAMER_INCLUDE_DIR)
> -+ MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
> -+ENDIF (NOT GSTREAMER_INCLUDE_DIR)
> -+
> -+# Newer versions of GStreamer put gst-config.h under lib/gstreamer-1.0/include
> -+FIND_PATH(GSTREAMER_CONF_INCLUDE_DIR gst/gstconfig.h
> -+ PATHS
> -+ ${PKG_GSTREAMER_INCLUDE_DIRS}
> -+ PATH_SUFFIXES gstreamer-1.0
> -+ )
> -+
> -+IF (NOT GSTREAMER_CONF_INCLUDE_DIR)
> -+ MESSAGE(STATUS "GStreamer: WARNING: gstconfig.h not found")
> -+ENDIF (NOT GSTREAMER_CONF_INCLUDE_DIR)
> -+
> -+IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
> -+ IF (NOT GSTREAMER_CONF_INCLUDE_DIR STREQUAL GSTREAMER_INCLUDE_DIR)
> -+ LIST(APPEND GSTREAMER_INCLUDE_DIR "${GSTREAMER_CONF_INCLUDE_DIR}")
> -+ ENDIF()
> -+ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_CONF_INCLUDE_DIR)
> -+
> - FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0
> - PATHS
> - ${PKG_GSTREAMER_LIBRARY_DIRS}
> -@@ -51,11 +72,6 @@ FIND_LIBRARY(GSTREAMER_APP_LIBRARY NAMES gstapp-1.0
> - ${PKG_GSTREAMER_LIBRARY_DIRS}
> - )
> -
> --IF (GSTREAMER_INCLUDE_DIR)
> --ELSE (GSTREAMER_INCLUDE_DIR)
> -- MESSAGE(STATUS "GStreamer: WARNING: include dir not found")
> --ENDIF (GSTREAMER_INCLUDE_DIR)
> --
> - IF (GSTREAMER_LIBRARIES)
> - ELSE (GSTREAMER_LIBRARIES)
> - MESSAGE(STATUS "GStreamer: WARNING: library not found")
> diff --git a/audio/phonon-backend-gstreamer/files/patch-gstreamer_CMakeLists.txt.diff b/audio/phonon-backend-gstreamer/files/patch-gstreamer_CMakeLists.txt.diff
> new file mode 100644
> index 0000000..85cd3c2
> --- /dev/null
> +++ b/audio/phonon-backend-gstreamer/files/patch-gstreamer_CMakeLists.txt.diff
> @@ -0,0 +1,11 @@
> +--- gstreamer/CMakeLists.txt.orig 2016-04-18 06:25:19.000000000 +0200
> ++++ gstreamer/CMakeLists.txt 2016-12-13 04:16:16.000000000 +0100
> +@@ -88,7 +88,7 @@
> + list(APPEND phonon_gstreamer_SRCS glrenderer.cpp)
> + endif ()
> +
> +-set(BUILD_X11RENDERER TRUE)
> ++set(BUILD_X11RENDERER FALSE)
> + if (PHONON_BUILD_PHONON4QT5)
> + if (Qt5X11Extras_FOUND)
> + set(BUILD_X11RENDERER TRUE)
> diff --git a/audio/phonon-backend-gstreamer/files/phononBGSTr-avoid-x11renderer.patch b/audio/phonon-backend-gstreamer/files/phononBGSTr-avoid-x11renderer.patch
> deleted file mode 100644
> index c542fa2..0000000
> --- a/audio/phonon-backend-gstreamer/files/phononBGSTr-avoid-x11renderer.patch
> +++ /dev/null
> @@ -1,11 +0,0 @@
> ---- gstreamer/devicemanager.cpp.orig
> -+++ gstreamer/devicemanager.cpp
> -@@ -355,7 +355,7 @@ AbstractRenderer *DeviceManager::createVideoRenderer(VideoWidget *parent)
> - if (m_videoSinkWidget == "software") {
> - return new WidgetRenderer(parent);
> - }
> --#ifndef Q_WS_QWS
> -+#if !defined(Q_WS_QWS) && !defined(Q_OS_MAC)
> - else if (m_videoSinkWidget == "xwindow") {
> - return new X11Renderer(parent);
> - } else {
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-dev/attachments/20161212/d79e4784/attachment-0001.html>
- Previous message: Build Failure: (from, 10.6, OS, This, X, builds, configure.compiler=macports-gcc-4.7, newer, on, only, and 6 more
- Next message: [macports-ports] branch master updated: phonon-backend-gstreamer(-qt5): update to 4.9.0 and introduce new subport
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the macports-dev
mailing list