Index: head/multimedia/phonon-xine/Makefile =================================================================== --- head/multimedia/phonon-xine/Makefile (revision 293161) +++ head/multimedia/phonon-xine/Makefile (revision 293162) @@ -1,42 +1,40 @@ # New ports collection Makefile for: phonon # Date created: 2008-01-30 # Whom: Martin Wilke # # $FreeBSD$ PORTNAME= phonon PORTVERSION= 4.4.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src PKGNAMESUFFIX= -xine DISTNAME= ${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION} DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= The xine backend for Phonon LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine CONFLICTS= phonon-4.3.0* PHONON_BRANCH= stable USE_BZIP2= yes USE_CMAKE= yes USE_KDE4= kdehier automoc4 kdeprefix USE_QT_VER= 4 QT_COMPONENTS= gui dbus xml phonon \ qmake_build moc_build rcc_build uic_build PLIST_SUB+= QT_PREFIX=${QT_PREFIX} - -BROKEN= deprecated upstream; refuses to build with libxine 1.2.x pre-su-install: ${MKDIR} ${QT_PLUGINDIR}/phonon_backend post-install: ${LN} -sf ${PREFIX}/lib/kde4/plugins/phonon_backend/phonon_xine.so ${QT_PLUGINDIR}/phonon_backend/libphonon_xine.so .include Property changes on: head/multimedia/phonon-xine/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.20 \ No newline at end of property +1.21 \ No newline at end of property Index: head/multimedia/phonon-xine/files/patch-xine__CMakeLists.txt =================================================================== --- head/multimedia/phonon-xine/files/patch-xine__CMakeLists.txt (revision 293161) +++ head/multimedia/phonon-xine/files/patch-xine__CMakeLists.txt (revision 293162) @@ -1,13 +1,22 @@ ---- ./xine/CMakeLists.txt.orig 2009-01-08 17:47:18.000000000 +0300 -+++ ./xine/CMakeLists.txt 2009-02-21 01:19:39.000000000 +0300 +--- ./xine/CMakeLists.txt.orig 2011-01-19 20:20:53.000000000 +0100 ++++ ./xine/CMakeLists.txt 2012-03-12 11:12:12.244132405 +0100 +@@ -42,7 +42,7 @@ + endif(XINE_BUGFIX_VERSION LESS 9) + endif(XINE_BUGFIX_VERSION LESS 7) + else(XINE_MINOR_VERSION LESS 2 AND XINE_BUGFIX_VERSION LESS 90) +- message(FATAL_ERROR "xine-lib v${XINE_VERSION} was found on your system. This version contains major changes compared to 1.1.x and has not been tested properly for use with this backend. Consider downgrading to version 1.1.9." "http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732") ++# message(FATAL_ERROR "xine-lib v${XINE_VERSION} was found on your system. This version contains major changes compared to 1.1.x and has not been tested properly for use with this backend. Consider downgrading to version 1.1.9." "http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732") + endif(XINE_MINOR_VERSION LESS 2 AND XINE_BUGFIX_VERSION LESS 90) + + set(phonon_xine_SRCS @@ -88,9 +88,7 @@ SET(XINEWIDGET_FOUND FALSE) endif(XCB_FOUND) - - -include_directories(${XINE_INCLUDE_DIR}) +include_directories(${PHONON_INCLUDES} ${XINE_INCLUDE_DIR}) configure_file(config-xine-widget.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xine-widget.h ) configure_file(xine.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/xine.desktop) Property changes on: head/multimedia/phonon-xine/files/patch-xine__CMakeLists.txt ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp =================================================================== --- head/multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp (nonexistent) +++ head/multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp (revision 293162) @@ -0,0 +1,21 @@ +--- ./xine/kequalizer_plugin.cpp.orig 2011-01-19 20:20:53.000000000 +0100 ++++ ./xine/kequalizer_plugin.cpp 2012-03-12 11:12:12.244132405 +0100 +@@ -48,6 +48,9 @@ + #include + #undef this + ++#include ++ ++ + #define KEQUALIZER_MAX_GAIN 12.0 + #define KEQUALIZER_L 2 // Storage for filter taps + #define KEQUALIZER_KM 10 // Max number of bands +@@ -281,7 +284,7 @@ + Q_UNUSED(video_target); + kequalizer_plugin_t *that; + //deprecated: kequalizer_plugin_t *that = static_cast(xine_xmalloc(sizeof(kequalizer_plugin_t))); +- xine_xmalloc_aligned(2,sizeof(kequalizer_plugin_t),(void**)(&that)); ++ that = (kequalizer_plugin_t *)av_mallocz(sizeof(kequalizer_plugin_t)); + post_in_t *input; + post_out_t *output; + xine_post_in_t *input_api; Property changes on: head/multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/multimedia/phonon-xine/files/patch-xine__mediaobject.cpp =================================================================== --- head/multimedia/phonon-xine/files/patch-xine__mediaobject.cpp (nonexistent) +++ head/multimedia/phonon-xine/files/patch-xine__mediaobject.cpp (revision 293162) @@ -0,0 +1,11 @@ +--- ./xine/mediaobject.cpp.orig 2011-01-19 20:20:53.000000000 +0100 ++++ ./xine/mediaobject.cpp 2012-03-12 11:12:12.254129363 +0100 +@@ -443,7 +443,7 @@ + const int lastSize = m_titles.size(); + m_titles.clear(); + int num = 0; +- char **mrls = xine_get_autoplay_mrls(m_stream->xine(), plugin, &num); ++ const char * const *mrls = xine_get_autoplay_mrls(m_stream->xine(), plugin, &num); + for (int i = 0; i < num; ++i) { + if (mrls[i]) { + debug() << Q_FUNC_INFO << mrls[i]; Property changes on: head/multimedia/phonon-xine/files/patch-xine__mediaobject.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property