[kde-freebsd] [patch] phonon-xine with libxine-1.2.1

[Axel Gonzalez]

This patches allow the build of multimedia/phonon-xine with the new 
libxine-1.2.1

hopefully this will allow to mark the port as not-broken again.

Put the patches in $PORTS/multimedia/phonon-xine/files and build normally


Cheers!


PS.

I have installed the other 2 phonon backends, but xine works best for me.


-- 
Sun Mar 11 18:20:31 2012 GMT

      ***
   ********
 ************
*************
*************
 ************
   ********
      ***       17.
--- ./xine/CMakeLists.txt.orig  2009-01-08 17:47:18.000000000 +0300
+++ ./xine/CMakeLists.txt       2009-02-21 01:19:39.000000000 +0300
@@ -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)
--- ./xine/kequalizer_plugin.cpp.orig	2012-03-11 01:12:56.000000000 -0600
+++ ./xine/kequalizer_plugin.cpp	2012-03-11 01:48:33.000000000 -0600
@@ -48,6 +48,9 @@
 #include <xine/xineutils.h>
 #undef this
 
+#include <libavutil/mem.h>
+
+
 #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<kequalizer_plugin_t *>(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;
--- ./xine/mediaobject.cpp.orig	2012-03-11 01:07:39.000000000 -0600
+++ ./xine/mediaobject.cpp	2012-03-11 01:07:48.000000000 -0600
@@ -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];
_______________________________________________
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information