diff options
Diffstat (limited to 'multimedia/phonon-xine/files')
3 files changed, 0 insertions, 69 deletions
diff --git a/multimedia/phonon-xine/files/patch-xine__CMakeLists.txt b/multimedia/phonon-xine/files/patch-xine__CMakeLists.txt deleted file mode 100644 index d4f7ddb3ec8d..000000000000 --- a/multimedia/phonon-xine/files/patch-xine__CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ ---- ./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) diff --git a/multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp b/multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp deleted file mode 100644 index 5fad9690a949..000000000000 --- a/multimedia/phonon-xine/files/patch-xine__kequalizer_plugin.cpp +++ /dev/null @@ -1,36 +0,0 @@ -In file included from xine/kequalizer_plugin.cpp:51: -In file included from /usr/local/include/libavutil/mem.h:35: -In file included from /usr/local/include/libavutil/avutil.h:296: -/usr/local/include/libavutil/common.h:30:2: error: missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS -#error missing -D__STDC_CONSTANT_MACROS / #define __STDC_CONSTANT_MACROS - ^ - ---- xine/kequalizer_plugin.cpp.orig 2011-01-19 19:20:53 UTC -+++ xine/kequalizer_plugin.cpp -@@ -37,6 +37,7 @@ - #include <cmath> - - #define __STDC_FORMAT_MACROS -+#define __STDC_CONSTANT_MACROS - #include <inttypes.h> - - #include <xine.h> -@@ -48,6 +49,9 @@ extern "C" { - #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 +285,7 @@ static post_plugin_t *kequalizer_open_plugin(post_clas - 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; diff --git a/multimedia/phonon-xine/files/patch-xine__mediaobject.cpp b/multimedia/phonon-xine/files/patch-xine__mediaobject.cpp deleted file mode 100644 index 02395ea8ec70..000000000000 --- a/multimedia/phonon-xine/files/patch-xine__mediaobject.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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]; |