Source: phonon-backend-xine Version: 4:4.6.0really4.4.4-4 Severity: important Tags: patch Usertags: xine-lib-1.2
I intend to upload xine-lib-1.2 to unstable soon. phonon-backend-xine currently fails to build with xine-lib-1.2. The attached patch fixes this. (I have not done more than compile it.) -- | _ | Darren Salt, using Debian GNU/Linux (and Android) | ( ) | | X | ASCII Ribbon campaign against HTML e-mail | / \ | http://www.asciiribbon.org/ liar: n. One who tells an unpleasant truth.
diff -ur phonon-backend-xine-4.6.0really4.4.4/debian/control phonon-backend-xine-4.6.0really4.4.4.new/debian/control --- phonon-backend-xine-4.6.0really4.4.4/debian/control 2011-04-27 12:47:39.000000000 +0000 +++ phonon-backend-xine-4.6.0really4.4.4.new/debian/control 2012-01-22 22:21:12.108087071 +0000 @@ -6,8 +6,8 @@ Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.4.13), cmake (>= 2.6.2), pkg-kde-tools (>= 0.12), automoc, libphonon-dev (>= 4:4.6.0really4.4.4), libphononexperimental-dev (>= 4:4.6.0really4.4.4), + libavutil-dev, libqt4-dev (>= 4.5), libxine-dev (>= 1.1.16.3), libxcb1-dev, libx11-dev -Build-Conflicts: libxine2 Standards-Version: 3.9.2 Homepage: http://phonon.kde.org/ Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-std/phonon-backend-xine.git diff -ur phonon-backend-xine-4.6.0really4.4.4/xine/CMakeLists.txt phonon-backend-xine-4.6.0really4.4.4.new/xine/CMakeLists.txt --- phonon-backend-xine-4.6.0really4.4.4/xine/CMakeLists.txt 2011-01-19 19:20:53.000000000 +0000 +++ phonon-backend-xine-4.6.0really4.4.4.new/xine/CMakeLists.txt 2012-01-22 22:11:12.594985611 +0000 @@ -41,8 +41,8 @@ message(WARNING "xine-lib v${XINE_VERSION} was found on your system. This version is known to have problems when playing short sounds. Consider upgrading to version 1.1.9 or above." "http://sourceforge.net/project/showfiles.php?group_id=9655&package_id=9732") 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") +#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") endif(XINE_MINOR_VERSION LESS 2 AND XINE_BUGFIX_VERSION LESS 90) set(phonon_xine_SRCS diff -ur phonon-backend-xine-4.6.0really4.4.4/xine/kequalizer_plugin.cpp phonon-backend-xine-4.6.0really4.4.4.new/xine/kequalizer_plugin.cpp --- phonon-backend-xine-4.6.0really4.4.4/xine/kequalizer_plugin.cpp 2011-01-19 19:20:53.000000000 +0000 +++ phonon-backend-xine-4.6.0really4.4.4.new/xine/kequalizer_plugin.cpp 2012-01-22 22:23:24.812661288 +0000 @@ -281,7 +281,7 @@ Q_UNUSED(video_target); kequalizer_plugin_t *that; //deprecated: kequalizer_plugin_t *that = static_cast<kequalizer_plugin_t *>(xine_xmalloc(sizeof(kequalizer_plugin_t))); - xine_xmalloc_aligned(2,sizeof(kequalizer_plugin_t),(void**)(&that)); + that = static_cast<kequalizer_plugin_t *>(malloc(sizeof(kequalizer_plugin_t))); post_in_t *input; post_out_t *output; xine_post_in_t *input_api; diff -ur phonon-backend-xine-4.6.0really4.4.4/xine/mediaobject.cpp phonon-backend-xine-4.6.0really4.4.4.new/xine/mediaobject.cpp --- phonon-backend-xine-4.6.0really4.4.4/xine/mediaobject.cpp 2011-01-19 19:20:53.000000000 +0000 +++ phonon-backend-xine-4.6.0really4.4.4.new/xine/mediaobject.cpp 2012-01-22 22:12:17.233745231 +0000 @@ -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];