On Sat Sep 22, 2018 at 05:17:45PM +0200, Rafael Sadowski wrote:
> Hi ports@,
>
> a long overdue update for phonon. Unfortunately I don't have the
> capacity to build all consumers it at the moment. There are too many
> consumers.
>
> Can someone help with a bulk build on amd64?
>
> Notable port changes:
>
> - Update all ports to the latest stable version.
> - Bump all major slibs
> - Add VLC Qt5 FLAVOR
>
> Feedback? Ok?
*ping* Any objections?
>
> Index: multimedia/phonon/Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon/Makefile,v
> retrieving revision 1.23
> diff -u -p -u -p -r1.23 Makefile
> --- multimedia/phonon/Makefile 27 Jul 2017 09:55:45 -0000 1.23
> +++ multimedia/phonon/Makefile 22 Sep 2018 14:34:04 -0000
> @@ -2,46 +2,43 @@
>
> COMMENT = multimedia layer for Qt4/KDE4
> CATEGORIES = multimedia devel
> -VERSION = 4.8.3
> +VERSION = 4.10.1
> DISTNAME = phonon-${VERSION}
> -HOMEPAGE = http://phonon.kde.org/
> -REVISION = 6
> +HOMEPAGE = https://phonon.kde.org/
>
> # The phonon_s* are for KDE4-only, renamed to avoid clashing with Qt4's one
> # XXX major should be tweaked on any update, to unbreak
> # IMPORTED_LINK_INTERFACE_LIBRARIES CMake feature.
> -SHARED_LIBS = phonon_s 2.0
> -SHARED_LIBS += phonon_sexperimental 1.0
> +SHARED_LIBS = phonon_s 3.0
> +SHARED_LIBS += phonon_sexperimental 2.0
>
> MAINTAINER = KDE porting team <[email protected]>
>
> # LGPL v2.1
> PERMIT_PACKAGE_CDROM = Yes
>
> +WANTLIB += ${COMPILER_LIBCXX} QtDBus QtGui m pulse pulse-mainloop-glib
> +
> MASTER_SITES =
> ${MASTER_SITE_KDE:=stable/phonon/${VERSION}/src/}
> EXTRACT_SUFX = .tar.xz
>
> -WANTLIB = m pulse pulse-mainloop-glib
> LIB_DEPENDS = audio/pulseaudio
>
> MODULES = x11/kde4
> MODKDE4_USE =
> MODKDE4_LIB_LINKS = Yes
> PHONON_INCLUDE_DIR = ${MODKDE4_INCLUDE_DIR}
> -WANTLIB += QtDBus QtGui
> -WANTLIB += ${COMPILER_LIBCXX}
>
> # Not sure if it's needed at all but doesn't hurt either for now.
> CONFIGURE_ARGS = -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:Bool=Yes
>
> # Clashes with the one provided by Qt itself.
> CONFIGURE_ARGS += -DPHONON_BUILD_DESIGNER_PLUGIN:Bool=No \
> - -DCMAKE_POLICY_DEFAULT_CMP0017=NEW \
> -DPHONON_INSTALL_QT_COMPAT_HEADERS=No
>
> -CONFIGURE_ARGS +=
> -DBACKEND_INSTALL_DIR="${PREFIX}/lib/kde4/plugins/phonon_backend"
> +CONFIGURE_ARGS +=
> -DBACKEND_INSTALL_DIR="${PREFIX}/lib/kde4/plugins/phonon_backend" \
> + -DINCLUDE_INSTALL_DIR=${PHONON_INCLUDE_DIR} \
>
> -# Upstream says, tests need to be redone.
> NO_TEST = Yes
>
> SUBST_VARS = PHONON_INCLUDE_DIR
> Index: multimedia/phonon/distinfo
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- multimedia/phonon/distinfo 5 Jul 2015 01:24:04 -0000 1.5
> +++ multimedia/phonon/distinfo 22 Sep 2018 14:34:04 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (phonon-4.8.3.tar.xz) = oRSclhyhVwlo0HC70jZx5hSqUG+EfKk3SJYOMJ+F2hY=
> -SIZE (phonon-4.8.3.tar.xz) = 322012
> +SHA256 (phonon-4.10.1.tar.xz) = 5amN8xrv/CJJOvyNatvKXW8MJ8wu7XOzvgUZUyHgjbc=
> +SIZE (phonon-4.10.1.tar.xz) = 322100
> Index: multimedia/phonon/phonon.port.mk
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon/phonon.port.mk,v
> retrieving revision 1.8
> diff -u -p -u -p -r1.8 phonon.port.mk
> --- multimedia/phonon/phonon.port.mk 17 Jul 2017 21:17:47 -0000 1.8
> +++ multimedia/phonon/phonon.port.mk 22 Sep 2018 14:34:04 -0000
> @@ -1,10 +1,10 @@
> # $OpenBSD: phonon.port.mk,v 1.8 2017/07/17 21:17:47 zhuk Exp $
> .if ${MODULES:Mx11/qt5} || ${MODULES:Mdevel/kf5}
> MODPHONON_WANTLIB = phonon4qt5
> -MODPHONON_LIB_DEPENDS = phonon-qt5->=4.9.1:multimedia/phonon-qt5
> +MODPHONON_LIB_DEPENDS = phonon-qt5->=4.10.1:multimedia/phonon-qt5
> .else
> MODPHONON_WANTLIB = ${MODKDE4_LIB_DIR}/phonon_s
> -MODPHONON_LIB_DEPENDS = phonon->=4.8.0:multimedia/phonon
> +MODPHONON_LIB_DEPENDS = phonon->=4.10.1:multimedia/phonon
> .endif
>
> # If enabled (default), make sure at least one Phonon backend is
> Index: multimedia/phonon/patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon/patches/patch-CMakeLists_txt,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 patch-CMakeLists_txt
> --- multimedia/phonon/patches/patch-CMakeLists_txt 19 Nov 2015 13:53:34
> -0000 1.5
> +++ multimedia/phonon/patches/patch-CMakeLists_txt 22 Sep 2018 14:34:04
> -0000
> @@ -1,9 +1,10 @@
> $OpenBSD: patch-CMakeLists_txt,v 1.5 2015/11/19 13:53:34 zhuk Exp $
> Rename library to avoid clashing with Qt4's one.
> ---- CMakeLists.txt.orig Thu Dec 4 12:30:26 2014
> -+++ CMakeLists.txt Thu Nov 19 16:04:26 2015
> -@@ -26,7 +26,7 @@ set(PHONON_LIB_MINOR_VERSION "8") # Only change on bin
> - set(PHONON_LIB_PATCH_VERSION "3") # Bump whenever you feel like it :P
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> ++++ CMakeLists.txt
> +@@ -26,7 +26,7 @@ set(PHONON_LIB_MINOR_VERSION "10") # Only change on bi
> + set(PHONON_LIB_PATCH_VERSION "1") # Bump whenever you feel like it :P
> set(PHONON_LIB_VERSION
> "${PHONON_LIB_MAJOR_VERSION}.${PHONON_LIB_MINOR_VERSION}.${PHONON_LIB_PATCH_VERSION}")
> set(PHONON_LIB_SOVERSION ${PHONON_LIB_MAJOR_VERSION})
> -set(PHONON_LIB_SONAME phonon)
> Index: multimedia/phonon/patches/patch-cmake_CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon/patches/patch-cmake_CMakeLists_txt,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-cmake_CMakeLists_txt
> --- multimedia/phonon/patches/patch-cmake_CMakeLists_txt 10 Jul 2014
> 19:50:26 -0000 1.2
> +++ multimedia/phonon/patches/patch-cmake_CMakeLists_txt 22 Sep 2018
> 14:34:04 -0000
> @@ -1,12 +1,12 @@
> -$OpenBSD: patch-cmake_CMakeLists_txt,v 1.2 2014/07/10 19:50:26 zhuk Exp $
> +$OpenBSD: patch-cmake_CMakeLists_txt,v 1.1.1.1 2017/07/17 21:06:37 zhuk Exp $
> Skip installing files we already have in either CMake base
> installation or somewhere else.
> ---- cmake/CMakeLists.txt.orig Fri Dec 6 14:22:44 2013
> -+++ cmake/CMakeLists.txt Wed May 14 12:19:12 2014
> -@@ -1,11 +1,8 @@
> +Index: cmake/CMakeLists.txt
> +--- cmake/CMakeLists.txt.orig
> ++++ cmake/CMakeLists.txt
> +@@ -1,12 +1,9 @@
> install(FILES cmake_uninstall.cmake.in
> COPYING-CMAKE-SCRIPTS
> -- FindAutomoc4.cmake
> - FindPackageHandleStandardArgs.cmake
> FindPhononInternal.cmake
> MacroEnsureVersion.cmake
> @@ -14,4 +14,6 @@ installation or somewhere else.
> MacroOptionalFindPackage.cmake
> - MacroPushRequiredVars.cmake
> PhononMacros.cmake
> + PhononQt4.cmake
> +- PhononQt5.cmake
> DESTINATION ${BUILDSYSTEM_INSTALL_DIR})
> Index: multimedia/phonon/patches/patch-cmake_FindPhononInternal_cmake
> ===================================================================
> RCS file:
> /cvs/ports/multimedia/phonon/patches/patch-cmake_FindPhononInternal_cmake,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 patch-cmake_FindPhononInternal_cmake
> --- multimedia/phonon/patches/patch-cmake_FindPhononInternal_cmake 19 Nov
> 2015 13:53:34 -0000 1.4
> +++ multimedia/phonon/patches/patch-cmake_FindPhononInternal_cmake 22 Sep
> 2018 14:34:04 -0000
> @@ -1,17 +1,17 @@
> -$OpenBSD: patch-cmake_FindPhononInternal_cmake,v 1.4 2015/11/19 13:53:34
> zhuk Exp $
> +$OpenBSD: patch-cmake_FindPhononInternal_cmake,v 1.1.1.1 2017/07/17 21:06:37
> zhuk Exp $
> Allow paths to be overriden.
> Also, make sure that subdirectory paths do not expand to absolute ones
> automatically.
> ---- cmake/FindPhononInternal.cmake.orig Thu Dec 4 12:30:26 2014
> -+++ cmake/FindPhononInternal.cmake Thu Nov 19 16:09:36 2015
> -@@ -171,20 +171,20 @@ set(CMAKE_MODULE_PATH ${_phonon_cmake_module_path_back
> +--- cmake/FindPhononInternal.cmake.orig Sun Mar 26 23:03:05 2017
> ++++ cmake/FindPhononInternal.cmake Sun Mar 26 23:05:34 2017
> +@@ -64,20 +64,20 @@ include(${phonon_cmake_module_dir}/MacroEnsureVersion.
>
> include(GNUInstallDirs)
>
> --set(SHARE_INSTALL_PREFIX "share") # CACHE PATH "Base
> directory for files which go to share/")
> +-set(SHARE_INSTALL_PREFIX "${CMAKE_INSTALL_FULL_DATAROOTDIR}") #
> CACHE PATH "Base directory for files which go to share/")
> -set(INCLUDE_INSTALL_DIR "include" ) # CACHE PATH "The
> subdirectory to the header prefix")
> +set(BIN_INSTALL_DIR "bin" CACHE STRING "The
> install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
> +set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE STRING
> "The subdirectory relative to the install prefix where libraries will be
> installed")
> -+set(SHARE_INSTALL_PREFIX "share" CACHE STRING "Base
> directory for files which go to share/")
> ++set(SHARE_INSTALL_PREFIX "share" CACHE STRING "Base
> directory for files which go to share/")
> if (PHONON_BUILD_PHONON4QT5)
> - set(INCLUDE_INSTALL_DIR "include/${PHONON_LIB_SONAME}" ) #
> CACHE PATH "The subdirectory to the header prefix")
> -endif (PHONON_BUILD_PHONON4QT5)
> @@ -30,50 +30,8 @@ Also, make sure that subdirectory paths
> +endif ()
> if(WIN32) # Imported from Phonon VLC
> set(BACKEND_INSTALL_DIR "bin/${PHONON_LIB_SONAME}_backend")
> -+else()
> ++else ()
> + set(BACKEND_INSTALL_DIR
> "${PLUGIN_INSTALL_DIR}/plugins/${PHONON_LIB_SONAME}_backend")
> endif()
> set(ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons"
> CACHE PATH "The icon install dir (default
> ${SHARE_INSTALL_PREFIX}/share/icons/)")
> set(SERVICES_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/kde4/services"
> CACHE PATH "The install dir for service (desktop, protocol, ...) files")
> -@@ -322,14 +322,14 @@ if (CMAKE_COMPILER_IS_GNUCXX)
> -
> - set (KDE4_ENABLE_EXCEPTIONS "-fexceptions -UQT_NO_EXCEPTIONS")
> - # Select flags.
> -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
> -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
> -- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks
> -fno-schedule-insns -fno-inline")
> -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -DNDEBUG -DQT_NO_DEBUG")
> -+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG")
> -+ set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-reorder-blocks
> -fno-schedule-insns -fno-inline")
> - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
> - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage
> -fprofile-arcs")
> -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
> -- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
> -- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks
> -fno-schedule-insns -fno-inline")
> -+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -DNDEBUG -DQT_NO_DEBUG")
> -+ set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG")
> -+ set(CMAKE_C_FLAGS_DEBUG "-g -fno-reorder-blocks
> -fno-schedule-insns -fno-inline")
> - set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
> - set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage
> -fprofile-arcs")
> -
> -@@ -444,14 +444,14 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
> - set(KDE4_ENABLE_EXCEPTIONS "-fexceptions -UQT_NO_EXCEPTIONS")
> -
> - # Select flags.
> -- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
> -- set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
> -- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-inline")
> -+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -DNDEBUG -DQT_NO_DEBUG")
> -+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG")
> -+ set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-inline")
> - set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
> - set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage
> -fprofile-arcs")
> -- set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
> -- set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
> -- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-inline")
> -+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-g -DNDEBUG -DQT_NO_DEBUG")
> -+ set(CMAKE_C_FLAGS_RELEASE "-DNDEBUG -DQT_NO_DEBUG")
> -+ set(CMAKE_C_FLAGS_DEBUG "-g -fno-inline")
> - set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
> - set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage
> -fprofile-arcs")
> -
> Index: multimedia/phonon/patches/patch-phonon_experimental_CMakeLists_txt
> ===================================================================
> RCS file:
> /cvs/ports/multimedia/phonon/patches/patch-phonon_experimental_CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-phonon_experimental_CMakeLists_txt
> --- multimedia/phonon/patches/patch-phonon_experimental_CMakeLists_txt
> 6 Jul 2015 23:54:04 -0000 1.1
> +++ multimedia/phonon/patches/patch-phonon_experimental_CMakeLists_txt
> 22 Sep 2018 14:34:04 -0000
> @@ -2,12 +2,13 @@ $OpenBSD: patch-phonon_experimental_CMak
> Revert upstream commit 457492e97dd1435021cff15d4fbb8f1fd7be9b24, it breaks
> due to changing "-I/usr/local/include/kde4" to
> "-isystem /usr/local/include/kde4".
> ---- phonon/experimental/CMakeLists.txt.orig Tue Jul 7 02:46:03 2015
> -+++ phonon/experimental/CMakeLists.txt Tue Jul 7 02:46:41 2015
> +Index: phonon/experimental/CMakeLists.txt
> +--- phonon/experimental/CMakeLists.txt.orig
> ++++ phonon/experimental/CMakeLists.txt
> @@ -29,8 +29,6 @@ set_target_properties(${PHONON_LIB_SONAME}experimental
> LINK_INTERFACE_LIBRARIES ""
> )
> - install(TARGETS ${PHONON_LIB_SONAME}experimental EXPORT PhononLibs
> ${INSTALL_TARGETS_DEFAULT_ARGS})
> + install(TARGETS ${PHONON_LIB_SONAME}experimental EXPORT
> PhononExperimentalLibs ${INSTALL_TARGETS_DEFAULT_ARGS})
> -target_include_directories(${PHONON_LIB_SONAME}experimental
> - INTERFACE "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}>")
>
> Index: multimedia/phonon/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 PLIST
> --- multimedia/phonon/pkg/PLIST 17 Jul 2017 21:17:47 -0000 1.7
> +++ multimedia/phonon/pkg/PLIST 22 Sep 2018 14:34:04 -0000
> @@ -1,4 +1,4 @@
> -@comment $OpenBSD: PLIST,v 1.7 2017/07/17 21:17:47 zhuk Exp $
> +@comment $OpenBSD: PLIST,v$
> ${PHONON_INCLUDE_DIR}/
> ${PHONON_INCLUDE_DIR}/KDE/
> ${PHONON_INCLUDE_DIR}/KDE/Phonon/
> @@ -163,10 +163,13 @@ ${PHONON_INCLUDE_DIR}/phonon/videowidget
> ${PHONON_INCLUDE_DIR}/phonon/volumefadereffect.h
> ${PHONON_INCLUDE_DIR}/phonon/volumefaderinterface.h
> ${PHONON_INCLUDE_DIR}/phonon/volumeslider.h
> -lib/cmake/
> lib/cmake/phonon_s/
> lib/cmake/phonon_s/PhononConfig.cmake
> lib/cmake/phonon_s/PhononConfigVersion.cmake
> +lib/cmake/phonon_s/PhononExperimentalConfig.cmake
> +lib/cmake/phonon_s/PhononExperimentalConfigVersion.cmake
> +lib/cmake/phonon_s/PhononExperimentalTargets${MODKDE4_CMAKE_PREFIX}.cmake
> +lib/cmake/phonon_s/PhononExperimentalTargets.cmake
> lib/cmake/phonon_s/PhononTargets${MODKDE4_CMAKE_PREFIX}.cmake
> lib/cmake/phonon_s/PhononTargets.cmake
> lib/kde4/
> @@ -177,8 +180,6 @@ ${KDE4LIB}/
> @lib lib/libphonon_sexperimental.so.${LIBphonon_sexperimental_VERSION}
> lib/pkgconfig/phonon_s.pc
> lib/qt4/mkspecs/modules/qt_phonon_s.pri
> -share/dbus-1/
> -share/dbus-1/interfaces/
> share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
> share/phonon_s/
> share/phonon_s/buildsystem/
> @@ -188,4 +189,5 @@ share/phonon_s/buildsystem/MacroEnsureVe
> share/phonon_s/buildsystem/MacroLogFeature.cmake
> share/phonon_s/buildsystem/MacroOptionalFindPackage.cmake
> share/phonon_s/buildsystem/PhononMacros.cmake
> +share/phonon_s/buildsystem/PhononQt4.cmake
> share/phonon_s/buildsystem/cmake_uninstall.cmake.in
> Index: multimedia/phonon-backend/Makefile.inc
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon-backend/Makefile.inc,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 Makefile.inc
> --- multimedia/phonon-backend/Makefile.inc 27 May 2016 03:44:26 -0000
> 1.4
> +++ multimedia/phonon-backend/Makefile.inc 22 Sep 2018 14:34:04 -0000
> @@ -27,5 +27,3 @@ MODPHONON_PLUGIN_DEPS = No
> SUBST_VARS = BACKEND_DIR
>
> MAINTAINER ?= KDE porting team <[email protected]>
> -
> -MASTER_SITES ?=
> ${MASTER_SITE_KDE:=stable/phonon/${DISTNAME:C/-[0-9].*//}/${VERSION}/src/}
> Index: multimedia/phonon-backend/gstreamer/Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon-backend/gstreamer/Makefile,v
> retrieving revision 1.21
> diff -u -p -u -p -r1.21 Makefile
> --- multimedia/phonon-backend/gstreamer/Makefile 29 Jun 2018 22:16:18
> -0000 1.21
> +++ multimedia/phonon-backend/gstreamer/Makefile 22 Sep 2018 14:34:05
> -0000
> @@ -2,13 +2,13 @@
>
> COMMENT-main = GStreamer-based Phonon backend
> COMMENT-icons = GStreamer-based Phonon backend icons
> -VERSION = 4.8.2
> +VERSION = 4.9.0
> DISTNAME = phonon-backend-gstreamer-${VERSION}
> PKGNAME-main = ${PKGNAME}
> PKGNAME-icons = phonon-gstreamer-icons-${VERSION}
> -HOMEPAGE =
> https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer
> -REVISION-main = 6
> -REVISION-icons =3
> +
> +# Mirrors out of sync
> +MASTER_SITES =
> https://download.kde.org/stable/phonon/phonon-backend-gstreamer/${VERSION}/
>
> FULLPKGNAME-main = ${PKGNAME}
> FULLPKGPATH-main = ${PKGPATH},${FLAVOR},-main
> @@ -27,6 +27,7 @@ RUN_DEPENDS-main = multimedia/gstreamer1
>
> LIB_DEPENDS-icons =
> LIB_DEPENDS-main = ${LIB_DEPENDS} \
> + textproc/libxml \
> multimedia/gstreamer1/core \
> multimedia/gstreamer1/plugins-base
>
> @@ -39,9 +40,12 @@ WANTLIB-main += gstreamer-1.0 gstvideo-1
> FLAVORS = qt5
> FLAVOR ?=
> .if ${FLAVOR:Mqt5}
> -WANTLIB-main += Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
> +LIB_DEPENDS-main += x11/qt5/qtx11extras
> +WANTLIB-main += Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets Qt5X11Extras
> .else
> WANTLIB-main += QtGui QtOpenGL
> .endif
> +
> +WRKDIST = ${WRKDIR}/phonon-gstreamer-${VERSION}
>
> .include <bsd.port.mk>
> Index: multimedia/phonon-backend/gstreamer/distinfo
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon-backend/gstreamer/distinfo,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 distinfo
> --- multimedia/phonon-backend/gstreamer/distinfo 5 Jul 2015 00:27:16
> -0000 1.5
> +++ multimedia/phonon-backend/gstreamer/distinfo 22 Sep 2018 14:34:05
> -0000
> @@ -1,2 +1,2 @@
> -SHA256 (phonon-backend-gstreamer-4.8.2.tar.xz) =
> IOD3HyvrT4WduDhQeaE671Rzhj7m8nqtewZap7/pMeA=
> -SIZE (phonon-backend-gstreamer-4.8.2.tar.xz) = 76044
> +SHA256 (phonon-backend-gstreamer-4.9.0.tar.xz) =
> zsPl7OEmHTRLaDY+8GBuv0l3Jii6lLtVsMDRh3O4hfE=
> +SIZE (phonon-backend-gstreamer-4.9.0.tar.xz) = 75960
> Index:
> multimedia/phonon-backend/gstreamer/patches/patch-cmake_FindGStreamer_cmake
> ===================================================================
> RCS file:
> multimedia/phonon-backend/gstreamer/patches/patch-cmake_FindGStreamer_cmake
> diff -N
> multimedia/phonon-backend/gstreamer/patches/patch-cmake_FindGStreamer_cmake
> ---
> multimedia/phonon-backend/gstreamer/patches/patch-cmake_FindGStreamer_cmake
> 4 Nov 2014 06:55:04 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-cmake_FindGStreamer_cmake,v 1.2 2014/11/04 06:55:04 zhuk Exp
> $
> -*_CFLAGS variables does not contain include directories.
> ---- cmake/FindGStreamer.cmake.orig Sat Sep 6 20:13:59 2014
> -+++ cmake/FindGStreamer.cmake Tue Nov 4 09:47:41 2014
> -@@ -28,6 +28,7 @@ IF (NOT WIN32)
> - PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-1.0)
> - SET(GSTREAMER_VERSION ${PKG_GSTREAMER_VERSION})
> - SET(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS})
> -+ SET(GSTREAMER_INCLUDE_DIRS ${PKG_GSTREAMER_INCLUDE_DIRS})
> - ENDIF (NOT WIN32)
> -
> - FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h
> Index:
> multimedia/phonon-backend/gstreamer/patches/patch-gstreamer_CMakeLists_txt
> ===================================================================
> RCS file:
> multimedia/phonon-backend/gstreamer/patches/patch-gstreamer_CMakeLists_txt
> diff -N
> multimedia/phonon-backend/gstreamer/patches/patch-gstreamer_CMakeLists_txt
> ---
> multimedia/phonon-backend/gstreamer/patches/patch-gstreamer_CMakeLists_txt
> 4 Nov 2014 06:55:04 -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,20 +0,0 @@
> -$OpenBSD: patch-gstreamer_CMakeLists_txt,v 1.3 2014/11/04 06:55:04 zhuk Exp $
> -Use right variable to get whole include directories list, including
> dependencies.
> ---- gstreamer/CMakeLists.txt.orig Sat Sep 6 20:13:59 2014
> -+++ gstreamer/CMakeLists.txt Tue Nov 4 09:48:51 2014
> -@@ -15,12 +15,12 @@
> -
> - include_directories(
> - ${CMAKE_CURRENT_BINARY_DIR}
> -- ${GSTREAMER_INCLUDE_DIR}
> -+ ${GSTREAMER_INCLUDE_DIRS}
> - ${GSTREAMER_PLUGIN_VIDEO_INCLUDE_DIR}
> - ${GSTREAMER_PLUGIN_AUDIO_INCLUDE_DIR}
> - ${GSTREAMER_PLUGIN_PBUTILS_INCLUDE_DIR}
> -- ${GLIB2_INCLUDE_DIR}
> -- ${LIBXML2_INCLUDE_DIR}
> -+ ${GLIB2_INCLUDE_DIRS}
> -+ ${LIBXML2_INCLUDE_DIRS}
> - ${X11_X11_INCLUDE_PATH})
> -
> - if(${PHONON_VERSION} VERSION_GREATER "4.6.49") # Pre-release 4.7 starts at
> 4.6.50
> Index: multimedia/phonon-backend/vlc/Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon-backend/vlc/Makefile,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 Makefile
> --- multimedia/phonon-backend/vlc/Makefile 27 Jul 2017 09:55:45 -0000
> 1.6
> +++ multimedia/phonon-backend/vlc/Makefile 22 Sep 2018 14:34:05 -0000
> @@ -1,12 +1,29 @@
> # $OpenBSD: Makefile,v 1.6 2017/07/27 09:55:45 sthen Exp $
>
> COMMENT = VLC-based Phonon backend
> -VERSION = 0.8.2
> +VERSION = 0.10.1
> DISTNAME = phonon-backend-vlc-${VERSION}
> -REVISION = 0
>
> -LIB_DEPENDS = x11/vlc>=2
> +# Mirrors out of sync
> +MASTER_SITES =
> https://download.kde.org/stable/phonon/phonon-backend-vlc/${VERSION}/
>
> -WANTLIB = lib/qt4/QtGui m vlc vlccore ${COMPILER_LIBCXX}
> +WANTLIB += ${COMPILER_LIBCXX} m vlc vlccore
> +
> +BUILD_DEPENDS = devel/gettext-tools
> +
> +LIB_DEPENDS = x11/vlc>=2
> +
> +FLAVORS = qt5
> +FLAVOR ?=
> +
> +.if ${FLAVOR:Mqt5}
> +WANTLIB += Qt5Core Qt5Gui Qt5Widgets
> +.else
> +WANTLIB += QtGui
> +.endif
> +
> +NO_TEST = Yes
> +
> +WRKDIST = ${WRKDIR}/phonon-vlc-${VERSION}
>
> .include <bsd.port.mk>
> Index: multimedia/phonon-backend/vlc/distinfo
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon-backend/vlc/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 distinfo
> --- multimedia/phonon-backend/vlc/distinfo 5 Jul 2015 00:47:36 -0000
> 1.4
> +++ multimedia/phonon-backend/vlc/distinfo 22 Sep 2018 14:34:05 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (phonon-backend-vlc-0.8.2.tar.xz) =
> 2rf47fU+6QmY5eP88va9ChN1BRGw7N5pOb4GZNRr2qM=
> -SIZE (phonon-backend-vlc-0.8.2.tar.xz) = 59832
> +SHA256 (phonon-backend-vlc-0.10.1.tar.xz) =
> CZZtpq7esbOmp9ZDQWguoGXLSyx8Bmgfz7O5xOevBy0=
> +SIZE (phonon-backend-vlc-0.10.1.tar.xz) = 61096
> Index: multimedia/phonon-backend/vlc/patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: multimedia/phonon-backend/vlc/patches/patch-CMakeLists_txt
> diff -N multimedia/phonon-backend/vlc/patches/patch-CMakeLists_txt
> --- multimedia/phonon-backend/vlc/patches/patch-CMakeLists_txt 10 Jul
> 2014 19:50:26 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-CMakeLists_txt,v 1.2 2014/07/10 19:50:26 zhuk Exp $
> -Force using more strict rules, to avoid potential problems
> -with CMake module names clashing.
> ---- CMakeLists.txt.orig Fri Dec 6 14:23:05 2013
> -+++ CMakeLists.txt Wed May 14 21:49:59 2014
> -@@ -1,6 +1,6 @@
> - project(PhononVLC)
> -
> --cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)
> -+cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)
> - set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
> -
> - # Phonon
> Index: multimedia/phonon-backend/vlc/patches/patch-src_devicemanager_cpp
> ===================================================================
> RCS file: multimedia/phonon-backend/vlc/patches/patch-src_devicemanager_cpp
> diff -N multimedia/phonon-backend/vlc/patches/patch-src_devicemanager_cpp
> --- multimedia/phonon-backend/vlc/patches/patch-src_devicemanager_cpp 5 Jul
> 2015 00:47:36 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,73 +0,0 @@
> -$OpenBSD: patch-src_devicemanager_cpp,v 1.1 2015/07/05 00:47:36 zhuk Exp $
> -Fix runtime problems with VLC 2.2.
> -From upstream.
> ---- src/devicemanager.cpp.orig Thu Dec 4 12:29:23 2014
> -+++ src/devicemanager.cpp Sun Jul 5 03:39:25 2015
> -@@ -239,6 +239,35 @@ void DeviceManager::updateDeviceList()
> - continue;
> - }
> -
> -+ // FIXME: there is a rather ungodly amount of code duplication going
> -+ // on here.
> -+#if (LIBVLC_VERSION_INT >= LIBVLC_VERSION(2, 2, 0, 0))
> -+ bool hasDevices = false;
> -+ VLC_FOREACH(audio_output_device,
> -+ device,
> -+ libvlc_audio_output_device_list_get(libvlc,
> soundSystem),
> -+ libvlc_audio_output_device_list_release) {
> -+ QString idName = QString::fromUtf8(device->psz_device);
> -+ QString longName = QString::fromUtf8(device->psz_description);
> -+
> -+ debug() << "found device" << soundSystem << idName << longName;
> -+
> -+ DeviceInfo info(longName, true);
> -+ info.addAccess(DeviceAccess(soundSystem, idName));
> -+ info.setCapabilities(DeviceInfo::AudioOutput);
> -+ newDeviceList.append(info);
> -+
> -+ hasDevices = true;
> -+ }
> -+
> -+ if (!hasDevices) {
> -+ debug() << "manually injecting sound system" << soundSystem;
> -+ DeviceInfo info(QString::fromUtf8(soundSystem), false);
> -+ info.addAccess(DeviceAccess(soundSystem, ""));
> -+ info.setCapabilities(DeviceInfo::AudioOutput);
> -+ newDeviceList.append(info);
> -+ }
> -+#else
> - const int deviceCount = libvlc_audio_output_device_count(libvlc,
> soundSystem);
> -
> - for (int i = 0; i < deviceCount; i++) {
> -@@ -247,10 +276,10 @@ void DeviceManager::updateDeviceList()
> -
> - debug() << "found device" << soundSystem << idName << longName;
> -
> -- DeviceInfo device(longName, true);
> -- device.addAccess(DeviceAccess(soundSystem, idName));
> -- device.setCapabilities(DeviceInfo::AudioOutput);
> -- newDeviceList.append(device);
> -+ DeviceInfo info(longName, true);
> -+ info.addAccess(DeviceAccess(soundSystem, idName));
> -+ info.setCapabilities(DeviceInfo::AudioOutput);
> -+ newDeviceList.append(info);
> - }
> -
> - // libVLC gives no devices for some sound systems, like OSS
> -@@ -261,11 +290,12 @@ void DeviceManager::updateDeviceList()
> - // selection which on systems such as OSX or Windows can
> - // lead to an empty device list as the injected device is
> - // the only available one.
> -- DeviceInfo device(QString::fromUtf8(soundSystem), false);
> -- device.addAccess(DeviceAccess(soundSystem, ""));
> -- device.setCapabilities(DeviceInfo::AudioOutput);
> -- newDeviceList.append(device);
> -+ DeviceInfo info(QString::fromUtf8(soundSystem), false);
> -+ info.addAccess(DeviceAccess(soundSystem, ""));
> -+ info.setCapabilities(DeviceInfo::AudioOutput);
> -+ newDeviceList.append(info);
> - }
> -+#endif
> - }
> -
> - /*
> Index: multimedia/phonon-backend/vlc/patches/patch-src_mediaobject_cpp
> ===================================================================
> RCS file: multimedia/phonon-backend/vlc/patches/patch-src_mediaobject_cpp
> diff -N multimedia/phonon-backend/vlc/patches/patch-src_mediaobject_cpp
> --- multimedia/phonon-backend/vlc/patches/patch-src_mediaobject_cpp 5 Jul
> 2015 00:47:36 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> -$OpenBSD: patch-src_mediaobject_cpp,v 1.1 2015/07/05 00:47:36 zhuk Exp $
> -Bugfix from upstream.
> ---- src/mediaobject.cpp.orig Thu Dec 4 12:29:23 2014
> -+++ src/mediaobject.cpp Sun Jul 5 03:39:25 2015
> -@@ -319,8 +319,11 @@ void MediaObject::setSource(const MediaSource &source)
> - case MediaSource::Url:
> - debug() << "MediaSource::Url:" << source.url();
> - if (source.url().scheme().isEmpty()) {
> -- url = "file:///";
> -- if (source.url().isRelative())
> -+ url = "file://";
> -+ // QUrl considers url.scheme.isEmpty() == url.isRelative(),
> -+ // so to be sure the url is not actually absolute we just
> -+ // check the first character
> -+ if (!source.url().toString().startsWith('/'))
> - url.append(QFile::encodeName(QDir::currentPath()) + '/');
> - }
> - url += source.url().toEncoded();
> Index:
> multimedia/phonon-backend/vlc/patches/patch-src_video_videodataoutput_cpp
> ===================================================================
> RCS file:
> multimedia/phonon-backend/vlc/patches/patch-src_video_videodataoutput_cpp
> diff -N
> multimedia/phonon-backend/vlc/patches/patch-src_video_videodataoutput_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ multimedia/phonon-backend/vlc/patches/patch-src_video_videodataoutput_cpp
> 22 Sep 2018 14:34:05 -0000
> @@ -0,0 +1,26 @@
> +$OpenBSD$
> +
> +Index: src/video/videodataoutput.cpp
> +--- src/video/videodataoutput.cpp.orig
> ++++ src/video/videodataoutput.cpp
> +@@ -138,16 +138,16 @@ static const vlc_chroma_description_t *setFormat(Video
> + *chroma = 0;
> + return 0;
> + case VideoFrame2::Format_RGB32:
> +- qstrcpy(*chroma, "RV32");
> ++ strcpy(*chroma, "RV32");
> + return vlc_fourcc_GetChromaDescription(VLC_CODEC_RGB32);
> + case VideoFrame2::Format_RGB888:
> +- qstrcpy(*chroma, "RV24");
> ++ strcpy(*chroma, "RV24");
> + return vlc_fourcc_GetChromaDescription(VLC_CODEC_RGB24);
> + case VideoFrame2::Format_YV12:
> +- qstrcpy(*chroma, "YV12");
> ++ strcpy(*chroma, "YV12");
> + return vlc_fourcc_GetChromaDescription(VLC_CODEC_YV12);
> + case VideoFrame2::Format_YUY2:
> +- qstrcpy(*chroma, "YUY2");
> ++ strcpy(*chroma, "YUY2");
> + return vlc_fourcc_GetChromaDescription(VLC_CODEC_YUYV);
> + }
> + return 0;
> Index: multimedia/phonon-backend/vlc/patches/patch-src_video_videowidget_cpp
> ===================================================================
> RCS file:
> multimedia/phonon-backend/vlc/patches/patch-src_video_videowidget_cpp
> diff -N multimedia/phonon-backend/vlc/patches/patch-src_video_videowidget_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ multimedia/phonon-backend/vlc/patches/patch-src_video_videowidget_cpp
> 22 Sep 2018 14:34:05 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: src/video/videowidget.cpp
> +--- src/video/videowidget.cpp.orig
> ++++ src/video/videowidget.cpp
> +@@ -89,7 +89,7 @@ class SurfacePainter : public VideoMemoryStream (priva
> + unsigned *pitches,
> + unsigned *lines)
> + {
> +- qstrcpy(chroma, "RV32");
> ++ strcpy(chroma, "RV32");
> + unsigned bufferSize =
> setPitchAndLines(vlc_fourcc_GetChromaDescription(VLC_CODEC_RGB32),
> + *width, *height,
> + pitches, lines);
> Index: multimedia/phonon-backend/vlc/pkg/PFRAG.no-qt5
> ===================================================================
> RCS file: multimedia/phonon-backend/vlc/pkg/PFRAG.no-qt5
> diff -N multimedia/phonon-backend/vlc/pkg/PFRAG.no-qt5
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ multimedia/phonon-backend/vlc/pkg/PFRAG.no-qt5 22 Sep 2018 14:34:05
> -0000
> @@ -0,0 +1,5 @@
> +@comment $OpenBSD: $
> +share/kde4/
> +share/kde4/services/
> +share/kde4/services/phononbackends/
> +share/kde4/services/phononbackends/vlc.desktop
> Index: multimedia/phonon-backend/vlc/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon-backend/vlc/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 PLIST
> --- multimedia/phonon-backend/vlc/pkg/PLIST 10 Jul 2014 19:50:26 -0000
> 1.2
> +++ multimedia/phonon-backend/vlc/pkg/PLIST 22 Sep 2018 14:34:05 -0000
> @@ -1,8 +1,3 @@
> @comment $OpenBSD: PLIST,v 1.2 2014/07/10 19:50:26 zhuk Exp $
> -lib/kde4/plugins/
> -lib/kde4/plugins/phonon_s_backend/
> -lib/kde4/plugins/phonon_s_backend/phonon_vlc.so
> -share/kde4/
> -share/kde4/services/
> -share/kde4/services/phononbackends/
> -share/kde4/services/phononbackends/vlc.desktop
> +${BACKEND_DIR}/
> +${BACKEND_DIR}/phonon_vlc.so
> Index: multimedia/phonon-qt5/Makefile
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon-qt5/Makefile,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 Makefile
> --- multimedia/phonon-qt5/Makefile 27 Jul 2017 16:58:48 -0000 1.3
> +++ multimedia/phonon-qt5/Makefile 22 Sep 2018 14:34:05 -0000
> @@ -1,28 +1,26 @@
> # $OpenBSD: Makefile,v 1.3 2017/07/27 16:58:48 sthen Exp $
>
> -COMMENT = multimedia layer for Qt4/KDE4
> -VERSION = 4.9.1
> -REVISION = 0
> +COMMENT = multimedia layer for Qt5/KDE5
> +VERSION = 4.10.1
> DISTNAME = phonon-${VERSION}
> PKGNAME = phonon-qt5-${VERSION}
>
> # XXX major should be tweaked on any update, to unbreak
> # IMPORTED_LINK_INTERFACE_LIBRARIES CMake feature.
> -SHARED_LIBS += phonon4qt5 1.0
> -SHARED_LIBS += phonon4qt5experimental 1.0
> +SHARED_LIBS += phonon4qt5 2.0
> +SHARED_LIBS += phonon4qt5experimental 2.0
>
> CATEGORIES = multimedia devel
> -HOMEPAGE = http://phonon.kde.org/
> +HOMEPAGE = https://phonon.kde.org/
> MAINTAINER = KDE porting team <[email protected]>
>
> # LGPL v2.1
> PERMIT_PACKAGE_CDROM = Yes
>
> -MASTER_SITES = ${MASTER_SITE_KDE:=stable/phonon/${VERSION}/}
> -EXTRACT_SUFX = .tar.xz
> +WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5DBus Qt5Gui Qt5Widgets
> +WANTLIB += m pulse pulse-mainloop-glib
>
> -WANTLIB = m pulse pulse-mainloop-glib
> -WANTLIB += Qt5Core Qt5DBus Qt5Gui Qt5Widgets ${COMPILER_LIBCXX}
> +MASTER_SITES = ${MASTER_SITE_KDE:=stable/phonon/${VERSION}/}
>
> MODULES = devel/kf5
>
> @@ -34,7 +32,6 @@ PHONON_INCLUDE_DIR = include/phonon4qt5
>
> # Clashes with the one provided by Qt itself.
> CONFIGURE_ARGS += -DPHONON_BUILD_DESIGNER_PLUGIN:Bool=No \
> - -DCMAKE_POLICY_DEFAULT_CMP0017=NEW \
> -DPHONON_INSTALL_QT_COMPAT_HEADERS=No
>
> CONFIGURE_ARGS += -DPHONON_BUILD_PHONON4QT5=Yes \
> Index: multimedia/phonon-qt5/distinfo
> ===================================================================
> RCS file: /cvs/ports/multimedia/phonon-qt5/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- multimedia/phonon-qt5/distinfo 17 Jul 2017 21:06:37 -0000 1.1.1.1
> +++ multimedia/phonon-qt5/distinfo 22 Sep 2018 14:34:05 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (phonon-4.9.1.tar.xz) = Z77phvhcqLV1GGyLpYqFiGyzscNWfIahGNVhKfIh5pw=
> -SIZE (phonon-4.9.1.tar.xz) = 321872
> +SHA256 (phonon-4.10.1.tar.xz) = 5amN8xrv/CJJOvyNatvKXW8MJ8wu7XOzvgUZUyHgjbc=
> +SIZE (phonon-4.10.1.tar.xz) = 322100
>
