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

Add support for newer Xine-lib.

Browse Source 
ok ajacoutot@
This commit is contained in:
brad 2012-11-28 07:16:17 +00:00
parent d786ddaaf4
commit 6cbc36e98d
4 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
audio/amarok/patches/patch-amarok_src_engine_xine_xine-engine_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-amarok_src_engine_xine_xine-engine_cpp,v 1.1 2012/11/28 07:16:35 brad Exp $
--- amarok/src/engine/xine/xine-engine.cpp.orig Tue Nov 27 18:49:59 2012
+++ amarok/src/engine/xine/xine-engine.cpp Tue Nov 27 18:50:53 2012
@@ -1131,7 +1131,11 @@ bool XineEngine::metaDataForUrl(const KURL &url, Engin
bool XineEngine::getAudioCDContents(const QString &device, KURL::List &urls)
{
+#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 )
+ const char * const* xine_urls = NULL;
+#else
char **xine_urls = NULL;
+#endif
int num;
int i = 0;

15
multimedia/kaffeine/patches/patch-kaffeine_src_player-parts_xine-part_kxinewidget_cpp Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-kaffeine_src_player-parts_xine-part_kxinewidget_cpp,v 1.1 2012/11/28 07:16:17 brad Exp $
--- kaffeine/src/player-parts/xine-part/kxinewidget.cpp.orig Tue Nov 27 18:55:08 2012
+++ kaffeine/src/player-parts/xine-part/kxinewidget.cpp Tue Nov 27 18:56:00 2012
@@ -2634,7 +2634,11 @@ void KXineWidget::getAutoplayPlugins(QStringList& auto
bool KXineWidget::getAutoplayPluginURLS(const QString& plugin, QStringList& list)
{
+#if XINE_MAJOR_VERSION > 1 || ( XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION >= 2 )
+ const char* const* urls = NULL;
+#else
char** urls = NULL;
+#endif
int num;
int i = 0;

4
x11/kde/multimedia3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.73 2012/06/15 08:30:23 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.74 2012/11/28 07:17:04 brad Exp $
COMMENT = K Desktop Environment, multimedia applications
CATEGORIES = x11 x11/kde
@ -62,7 +62,7 @@ SEPARATE_BUILD = flavored
CONFIGURE_ARGS += --without-lame
CONFIGURE_ENV += aktion_has_xanim=yes
REVISION = 10
REVISION = 11
WANTLIB = FLAC>=8 ICE SM X11 Xau Xdmcp Xext Xrender Xv Xxf86dga Xxf86vm akode \
art_lgpl_2 audiofile c cdda_interface cdda_paranoia expat fam \
fontconfig freetype glib-2.0 gmodule-2.0 gobject-2.0 gstreamer-0.10 \

30
x11/kde/multimedia3/patches/patch-xine_artsplugin_xinePlayObject_impl_cpp Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-xine_artsplugin_xinePlayObject_impl_cpp,v 1.1 2012/11/28 07:17:04 brad Exp $
--- xine_artsplugin/xinePlayObject_impl.cpp.orig Tue Nov 27 19:03:56 2012
+++ xine_artsplugin/xinePlayObject_impl.cpp Tue Nov 27 19:06:11 2012
@@ -698,7 +698,7 @@ void xinePlayObject_impl::eventLoop()
if (stream != 0)
{
- xine_gui_send_vo_data( stream,
+ xine_port_send_gui_data( vo_port,
XINE_GUI_SEND_EXPOSE_EVENT,
&event );
}
@@ -714,7 +714,7 @@ void xinePlayObject_impl::eventLoop()
if (stream != 0)
{
- xine_gui_send_vo_data( stream,
+ xine_port_send_gui_data( vo_port,
XINE_GUI_SEND_COMPLETION_EVENT,
&event );
}
@@ -748,7 +748,7 @@ void xineVideoPlayObject_impl::x11WindowId( long windo
{
resizeNotify();
- xine_gui_send_vo_data( stream,
+ xine_port_send_gui_data( vo_port,
XINE_GUI_SEND_DRAWABLE_CHANGED,
(void *)window );
}