cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Another meaningful update from KDE land: Phonon 4.7.2 and friends.

Browse Source 
Main change is that VLC backend becames the default (and really performs
better than GStreamer one).

(now please get your children out of display)

Another change is that due the fact that Phonon now supports library
renaming upstream, libphononexperimental.so becomes
libphonon_sexperimental.so. This doesn't affect any ports imported as of now.

REVISION bumps for the dependant ports to follow.
This commit is contained in:
zhuk 2014-07-10 19:50:25 +00:00
parent e1c644379d
commit 284f465ddc
17 changed files with 89 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
multimedia/phonon-backend/gstreamer/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.3 2014/07/10 08:18:35 espie Exp $
# $OpenBSD: Makefile,v 1.4 2014/07/10 19:50:26 zhuk Exp $
COMMENT = GStreamer-based Phonon backend
VERSION = 4.6.3
VERSION = 4.7.1
DISTNAME = phonon-backend-gstreamer-${VERSION}
REVISION = 0
MASTER_SITES = ${MASTER_SITE_KDE:=stable/phonon/phonon-backend-gstreamer/${VERSION}/src/}
MASTER_SITES = ${MASTER_SITE_KDE:=stable/phonon/phonon-backend-gstreamer/${VERSION}/}
# allow playing Vorbis and MP3 notification sounds out of the box
RUN_DEPENDS = multimedia/gstreamer-0.10/plugins-base \
@ -14,7 +13,7 @@ RUN_DEPENDS = multimedia/gstreamer-0.10/plugins-base \
LIB_DEPENDS = multimedia/gstreamer-0.10/core
WANTLIB = GL m stdc++
WANTLIB = GL m
WANTLIB += lib/qt4/QtGui lib/qt4/QtOpenGL
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += gstaudio-0.10 gstbase-0.10 gstinterfaces-0.10 gstpbutils-0.10

4
multimedia/phonon-backend/gstreamer/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (phonon-backend-gstreamer-4.6.3.tar.xz) = VeJz8RPjCfL8PzFrr0siBWLMj7N7JRk6wlf/Hq56r1g=
SIZE (phonon-backend-gstreamer-4.6.3.tar.xz) = 72364
SHA256 (phonon-backend-gstreamer-4.7.1.tar.xz) = eFl4L7PTBOHQNj5mX+7LfTtkpxJwXcMmFRxkAv728so=
SIZE (phonon-backend-gstreamer-4.7.1.tar.xz) = 75528

14
multimedia/phonon-backend/gstreamer/patches/patch-gstreamer_videowidget_cpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-gstreamer_videowidget_cpp,v 1.1.1.1 2013/04/24 08:42:12 zhuk Exp $
Patch taken from here:
https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer/repository/revisions/2db4c430740da89fb22319b2ded63e770f3d6fac
--- gstreamer/videowidget.cpp.orig Thu Nov 29 13:31:42 2012
+++ gstreamer/videowidget.cpp Thu Nov 29 13:32:26 2012
@@ -84,7 +84,7 @@ void VideoWidget::updateWindowID()
void VideoWidget::finalizeLink()
{
connect(root()->pipeline(), SIGNAL(mouseOverActive(bool)), this, SLOT(mouseOverActive(bool)));
- connect(root()->pipeline(), SIGNAL(windowIDNeeded()), this, SLOT(updateWindowID()));
+ connect(root()->pipeline(), SIGNAL(windowIDNeeded()), this, SLOT(updateWindowID()), Qt::DirectConnection);
}
void VideoWidget::prepareToUnlink()

8
multimedia/phonon-backend/gstreamer/pkg/PLIST
View File

@ -1,12 +1,12 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/04/24 08:42:12 zhuk Exp $
@comment $OpenBSD: PLIST,v 1.2 2014/07/10 19:50:26 zhuk Exp $
lib/kde4/plugins/
lib/kde4/plugins/phonon_backend/
lib/kde4/plugins/phonon_backend/phonon_gstreamer.so
lib/kde4/plugins/phonon_s_backend/
lib/kde4/plugins/phonon_s_backend/phonon_gstreamer.so
share/icons/hicolor/128x128/apps/phonon-gstreamer.png
share/icons/hicolor/16x16/apps/phonon-gstreamer.png
share/icons/hicolor/22x22/apps/phonon-gstreamer.png
share/icons/hicolor/32x32/apps/phonon-gstreamer.png
share/icons/hicolor/48x48/apps/phonon-gstreamer.png
share/icons/hicolor/64x64/apps/phonon-gstreamer.png
share/icons/hicolor/scalable/apps/phonon-gstreamer.svgz
share/kde4/
share/kde4/services/

9
multimedia/phonon-backend/vlc/Makefile
View File

@ -1,14 +1,13 @@
# $OpenBSD: Makefile,v 1.1.1.1 2013/04/24 08:42:12 zhuk Exp $
# $OpenBSD: Makefile,v 1.2 2014/07/10 19:50:26 zhuk Exp $
COMMENT = VLC-based Phonon backend
VERSION = 0.6.1
VERSION = 0.7.1
DISTNAME = phonon-backend-vlc-${VERSION}
REVISION = 2
MASTER_SITES = ${MASTER_SITE_KDE:=stable/phonon/phonon-backend-vlc/${VERSION}/src/}
MASTER_SITES = ${MASTER_SITE_KDE:=stable/phonon/phonon-backend-vlc/${VERSION}/}
LIB_DEPENDS = x11/vlc>=2
WANTLIB = lib/qt4/QtGui m stdc++ vlc vlccore
WANTLIB = lib/qt4/QtGui m vlc vlccore
.include <bsd.port.mk>

4
multimedia/phonon-backend/vlc/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (phonon-backend-vlc-0.6.1.tar.xz) = QaN7Zy/I3xtRvncbvWkRtlNpHBKn0VzWbhlcgu34bXM=
SIZE (phonon-backend-vlc-0.6.1.tar.xz) = 54892
SHA256 (phonon-backend-vlc-0.7.1.tar.xz) = Iwu38zd/1ugrGdlDgCYwjXWErjSUXLWqn9sj85mAFY4=
SIZE (phonon-backend-vlc-0.7.1.tar.xz) = 58876

8
multimedia/phonon-backend/vlc/patches/patch-CMakeLists_txt
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2013/04/24 08:42:12 zhuk Exp $
$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 Sat Jul 30 19:49:26 2011
+++ CMakeLists.txt Mon Feb 6 02:00:22 2012
--- 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/modules")
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
# Phonon

7
multimedia/phonon-backend/vlc/pkg/PLIST
View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/04/24 08:42:12 zhuk Exp $
@comment $OpenBSD: PLIST,v 1.2 2014/07/10 19:50:26 zhuk Exp $
lib/kde4/plugins/
lib/kde4/plugins/phonon_backend/
lib/kde4/plugins/phonon_backend/phonon_vlc.so
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

17
multimedia/phonon/Makefile
View File

@ -1,26 +1,25 @@
# $OpenBSD: Makefile,v 1.11 2014/07/10 07:37:32 espie Exp $
# $OpenBSD: Makefile,v 1.12 2014/07/10 19:50:25 zhuk Exp $
COMMENT = multimedia layer for Qt4/KDE4
CATEGORIES = multimedia devel
VERSION = 4.6.0
VERSION = 4.7.2
DISTNAME = phonon-${VERSION}
HOMEPAGE = http://phonon.kde.org/
REVISION = 2
# Renamed to avoid clashing with Qt4's one
SHARED_LIBS = phonon_s 0.0 \
phononexperimental 2.0
SHARED_LIBS = phonon_s 1.0 \
phonon_sexperimental 0.0
# LGPL v2.1
PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = ${MASTER_SITE_KDE:=stable/phonon/${VERSION}/src/}
MASTER_SITES = ${MASTER_SITE_KDE:=stable/phonon/${VERSION}/}
MODULES = x11/kde4
MODKDE4_USE =
MODKDE4_LIB_LINKS = Yes
WANTLIB = m pthread stdc++
WANTLIB = m pthread
WANTLIB += lib/qt4/QtDBus lib/qt4/QtDeclarative lib/qt4/QtGui
WANTLIB += lib/qt4/QtNetwork lib/qt4/QtScript lib/qt4/QtSql lib/qt4/QtSvg
WANTLIB += lib/qt4/QtTest lib/qt4/QtXml lib/qt4/QtXmlPatterns
@ -30,7 +29,9 @@ LIB_DEPENDS = productivity/libqzeitgeist>=0.8.0 \
audio/pulseaudio
# 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
CONFIGURE_ARGS = -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:Bool=Yes \
-DINCLUDE_INSTALL_DIR=include/phonon \
-DBACKEND_INSTALL_DIR="${PREFIX}/lib/kde4/plugins/phonon_backend"
# Clashes with the one provided by Qt itself.
CONFIGURE_ARGS += -DPHONON_BUILD_DESIGNER_PLUGIN:Bool=No

4
multimedia/phonon/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (phonon-4.6.0.tar.xz) = KRXno3ySoKgje55tLvZ7qLAF7jUp0DmRzT0TfwObo8Q=
SIZE (phonon-4.6.0.tar.xz) = 280712
SHA256 (phonon-4.7.2.tar.xz) = gZ6XNNIOJUtFmdirRfFaaNlURMTiCIx+tXabWJdqEb4=
SIZE (phonon-4.7.2.tar.xz) = 330244

13
multimedia/phonon/patches/patch-CMakeLists_txt Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-CMakeLists_txt,v 1.3 2014/07/10 19:50:26 zhuk Exp $
Rename library to avoid clashing with Qt4's one.
--- CMakeLists.txt.orig Wed May 14 11:37:06 2014
+++ CMakeLists.txt Wed May 14 11:37:30 2014
@@ -24,7 +24,7 @@ set(PHONON_LIB_MINOR_VERSION "7") # Only change on bin
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)
+set(PHONON_LIB_SONAME phonon_s)
set(PHONON_LIB_SONAME_CAMEL Phonon)
if(PHONON_BUILD_PHONON4QT5)

12
multimedia/phonon/patches/patch-cmake_CMakeLists_txt
View File

@ -1,21 +1,17 @@
$OpenBSD: patch-cmake_CMakeLists_txt,v 1.1 2013/04/24 08:53:37 zhuk Exp $
$OpenBSD: patch-cmake_CMakeLists_txt,v 1.2 2014/07/10 19:50:26 zhuk Exp $
Skip installing files we already have in either CMake base
installation or somewhere else.
--- cmake/CMakeLists.txt.orig Sun Feb 5 21:07:55 2012
+++ cmake/CMakeLists.txt Sun Feb 5 21:08:35 2012
@@ -1,15 +1,9 @@
--- 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 @@
install(FILES cmake_uninstall.cmake.in
COPYING-CMAKE-SCRIPTS
- FindAutomoc4.cmake
- FindPackageHandleStandardArgs.cmake
FindPhononInternal.cmake
PhononMacros.cmake
- FindQt4.cmake
MacroEnsureVersion.cmake
MacroLogFeature.cmake
MacroOptionalFindPackage.cmake
- MacroPushRequiredVars.cmake
PhononMacros.cmake
- Qt4ConfigDependentSettings.cmake
- Qt4Macros.cmake
DESTINATION ${BUILDSYSTEM_INSTALL_DIR})

26
multimedia/phonon/patches/patch-cmake_FindPhononInternal_cmake
View File

@ -1,19 +1,23 @@
$OpenBSD: patch-cmake_FindPhononInternal_cmake,v 1.1 2013/04/24 08:53:37 zhuk Exp $
$OpenBSD: patch-cmake_FindPhononInternal_cmake,v 1.2 2014/07/10 19:50:26 zhuk Exp $
Allow paths to be overriden.
--- cmake/FindPhononInternal.cmake.orig Thu Nov 15 15:47:01 2012
+++ cmake/FindPhononInternal.cmake Thu Nov 15 15:46:55 2012
@@ -90,10 +90,10 @@ set(CMAKE_MODULE_PATH ${_phonon_cmake_module_path_back
--- cmake/FindPhononInternal.cmake.orig Fri Dec 6 14:22:44 2013
+++ cmake/FindPhononInternal.cmake Wed May 14 12:20:09 2014
@@ -171,13 +171,13 @@ set(CMAKE_MODULE_PATH ${_phonon_cmake_module_path_back
set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
include(GNUInstallDirs)
-set(SHARE_INSTALL_PREFIX "share") # CACHE PATH "Base directory for files which go to share/")
-set(INCLUDE_INSTALL_DIR "include" ) # CACHE PATH "The subdirectory to the header prefix")
+set(SHARE_INSTALL_PREFIX "share" CACHE PATH "Base directory for files which go to share/")
+set(INCLUDE_INSTALL_DIR "include" CACHE PATH "The subdirectory to the header prefix")
if (PHONON_BUILD_PHONON4QT5)
- set(INCLUDE_INSTALL_DIR "include/${PHONON_LIB_SONAME}" ) # CACHE PATH "The subdirectory to the header prefix")
+ set(INCLUDE_INSTALL_DIR "include/${PHONON_LIB_SONAME}" CACHE PATH "The subdirectory to the header prefix")
endif (PHONON_BUILD_PHONON4QT5)
-set(BIN_INSTALL_DIR "bin" ) # CACHE PATH "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
-set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" ) # CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})")
+set(SHARE_INSTALL_PREFIX "share" CACHE PATH "Base directory for files which go to share/")
+set(INCLUDE_INSTALL_DIR "include" CACHE PATH "The subdirectory to the header prefix")
-set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" ) # CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed"
+set(BIN_INSTALL_DIR "bin" CACHE PATH "The install dir for executables (default ${EXEC_INSTALL_PREFIX}/bin)")
+set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX})")
+set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed")
set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/kde4" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
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")
if (PHONON_BUILD_PHONON4QT5)
set(PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/qt5" CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/qt5)" FORCE)

12
multimedia/phonon/patches/patch-phonon_CMakeLists_txt
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-phonon_CMakeLists_txt,v 1.1 2013/04/24 08:53:37 zhuk Exp $
Rename library file name to distinguish from Qt's one.
--- phonon/CMakeLists.txt.orig Mon Nov 5 22:31:52 2012
+++ phonon/CMakeLists.txt Mon Nov 5 23:29:22 2012
@@ -103,6 +103,7 @@ set_target_properties(phonon PROPERTIES
SOVERSION ${PHONON_LIB_SOVERSION}
DEFINE_SYMBOL MAKE_PHONON_LIB
LINK_INTERFACE_LIBRARIES ""
+ OUTPUT_NAME "phonon_s"
)
# LINK_INTERFACE_LIBRARIES: By default don't add any linked libraries to the "exported"
# link interfaces, so that executables linking against this library

11
multimedia/phonon/patches/patch-phonon_pc_cmake
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-phonon_pc_cmake,v 1.1 2013/04/24 08:53:37 zhuk Exp $
Rename library file name to distinguish from Qt's one.
--- phonon.pc.cmake.orig Mon Nov 5 23:34:21 2012
+++ phonon.pc.cmake Mon Nov 5 23:34:30 2012
@@ -8,5 +8,5 @@ Name: Phonon
Description: Phonon library needed to build applications
Version: @PHONON_LIB_MAJOR_VERSION@.@PHONON_LIB_MINOR_VERSION@.@PHONON_LIB_PATCH_VERSION@
Requires: QtCore QtGui QtDBus
-Libs: -L${libdir} -lphonon
+Libs: -L${libdir} -lphonon_s
Cflags: -I${includedir}

6
multimedia/phonon/phonon.port.mk
View File

@ -1,12 +1,12 @@
# $OpenBSD: phonon.port.mk,v 1.2 2013/04/25 11:54:01 zhuk Exp $
# $OpenBSD: phonon.port.mk,v 1.3 2014/07/10 19:50:25 zhuk Exp $
MODPHONON_WANTLIB = ${MODKDE4_LIB_DIR}/phonon_s
MODPHONON_LIB_DEPENDS = phonon->=4.6.0:multimedia/phonon
MODPHONON_LIB_DEPENDS = phonon->=4.7.0:multimedia/phonon
# If enabled (default), make sure at least one Phonon backend is
# installed prior installing affected port.
MODPHONON_PLUGIN_DEPS ?= Yes
.if ${MODPHONON_PLUGIN_DEPS:L} == "yes"
MODPHONON_RUN_DEPENDS = phonon-gstreamer-*|phonon-vlc-*:multimedia/phonon-backend/gstreamer
MODPHONON_RUN_DEPENDS = phonon-vlc-*|phonon-vlc-*:multimedia/phonon-backend/vlc
.endif
WANTLIB += ${MODPHONON_WANTLIB}

38
multimedia/phonon/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2014/04/29 08:40:02 zhuk Exp $
@comment $OpenBSD: PLIST,v 1.4 2014/07/10 19:50:26 zhuk Exp $
include/kde4/
include/kde4/KDE/
include/kde4/KDE/Phonon/
@ -163,26 +163,26 @@ include/kde4/phonon/videowidgetinterface.h
include/kde4/phonon/volumefadereffect.h
include/kde4/phonon/volumefaderinterface.h
include/kde4/phonon/volumeslider.h
lib/cmake/phonon/
lib/cmake/phonon/PhononConfig.cmake
lib/cmake/phonon/PhononConfigVersion.cmake
lib/cmake/phonon/PhononTargets${MODKDE4_CMAKE_PREFIX}.cmake
lib/cmake/phonon/PhononTargets.cmake
lib/cmake/phonon_s/
lib/cmake/phonon_s/PhononConfig.cmake
lib/cmake/phonon_s/PhononConfigVersion.cmake
lib/cmake/phonon_s/PhononTargets${MODKDE4_CMAKE_PREFIX}.cmake
lib/cmake/phonon_s/PhononTargets.cmake
lib/kde4/
${KDE4LIB}/
@lib ${KDE4LIB}/libphonon_s.so.${LIBphonon_s_VERSION}
@lib ${KDE4LIB}/libphononexperimental.so.${LIBphononexperimental_VERSION}
@lib ${KDE4LIB}/libphonon_sexperimental.so.${LIBphonon_sexperimental_VERSION}
@lib lib/libphonon_s.so.${LIBphonon_s_VERSION}
@lib lib/libphononexperimental.so.${LIBphononexperimental_VERSION}
lib/pkgconfig/phonon.pc
@comment lib/qt4/mkspecs/modules/qt_phonon.pri
@lib lib/libphonon_sexperimental.so.${LIBphonon_sexperimental_VERSION}
lib/pkgconfig/phonon_s.pc
lib/qt4/mkspecs/modules/qt_phonon_s.pri
share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
share/phonon/
share/phonon/buildsystem/
share/phonon/buildsystem/COPYING-CMAKE-SCRIPTS
share/phonon/buildsystem/FindPhononInternal.cmake
share/phonon/buildsystem/MacroEnsureVersion.cmake
share/phonon/buildsystem/MacroLogFeature.cmake
share/phonon/buildsystem/MacroOptionalFindPackage.cmake
share/phonon/buildsystem/PhononMacros.cmake
share/phonon/buildsystem/cmake_uninstall.cmake.in
share/phonon_s/
share/phonon_s/buildsystem/
share/phonon_s/buildsystem/COPYING-CMAKE-SCRIPTS
share/phonon_s/buildsystem/FindPhononInternal.cmake
share/phonon_s/buildsystem/MacroEnsureVersion.cmake
share/phonon_s/buildsystem/MacroLogFeature.cmake
share/phonon_s/buildsystem/MacroOptionalFindPackage.cmake
share/phonon_s/buildsystem/PhononMacros.cmake
share/phonon_s/buildsystem/cmake_uninstall.cmake.in