Index: audio/amarok/Makefile @@ -18,7 +18,7 @@ COMMENT= Media player for KDE LIB_DEPENDS= tag.1:${PORTSDIR}/audio/taglib \ tunepimp.5:${PORTSDIR}/audio/libtunepimp \ mp4v2.10:${PORTSDIR}/multimedia/mp4v2 \ - xine.1:${PORTSDIR}/multimedia/libxine + xine.2:${PORTSDIR}/multimedia/libxine MIN_OPTIONS_VER= ${PORTNAME}-1.4.1 Index: audio/gogglesmm/Makefile @@ -16,7 +16,7 @@ COMMENT= Music collection manager and pl LICENSE= GPLv3 BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config -LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine \ +LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine \ tag.1:${PORTSDIR}/audio/taglib \ sqlite3.8:${PORTSDIR}/databases/sqlite3 Index: graphics/gimageview/Makefile @@ -98,7 +98,7 @@ PLIST_SUB+= WITH_LIBMPLAYER="@comment " .endif .if defined(WITH_LIBXINE) -LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine CONFIGURE_ARGS+= --with-xine PLIST_SUB+= WITH_LIBXINE="" .else Index: graphics/opencv/Makefile @@ -153,7 +153,7 @@ CMAKE_ARGS+= -DWITH_V4L:BOOL=Off .endif .if defined(WITH_XINE) -LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine CMAKE_ARGS+= -DWITH_XINE:BOOL=On .else CMAKE_ARGS+= -DWITH_XINE:BOOL=Off Index: graphics/osg/Makefile @@ -131,7 +131,7 @@ PLIST_SUB+= OPENVRML="@comment " .if defined(WITH_XINE) FORCE_REQUIRE+= Xine -LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine PLIST_SUB+= XINE="" .else FORCE_IGNORE+= Xine Index: graphics/osg-devel/Makefile @@ -131,7 +131,7 @@ PLIST_SUB+= OPENVRML="@comment " .if defined(WITH_XINE) FORCE_REQUIRE+= Xine -LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine PLIST_SUB+= XINE="" .else FORCE_IGNORE+= Xine Index: graphics/pornview/Makefile @@ -25,8 +25,10 @@ CONFIGURE_ARGS= --with-gtk2 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +# XXX +WITH_LIBXINE= yes .if defined(WITH_LIBXINE) -LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine CONFIGURE_ARGS+= --enable-xine .elif defined(WITH_MPLAYER) RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer Index: multimedia/emotion/Makefile @@ -39,7 +39,7 @@ IGNORE= is useless without playback libr .endif .if !defined(WITHOUT_XINE) -LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine CONFIGURE_ARGS+=--enable-xine PLIST_SUB+= XINE="" .else Index: multimedia/gxine/Makefile @@ -14,7 +14,7 @@ MASTER_SITES= SF/xine/${PORTNAME}/${PORT MAINTAINER= makc@FreeBSD.org COMMENT= An alternative GUI for the Xine media player -LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine USE_BZIP2= yes USE_AUTOTOOLS= libtool Index: multimedia/kaffeine/Makefile @@ -14,7 +14,7 @@ MAINTAINER= arved@FreeBSD.org COMMENT= A xine-base multimedia player BUILD_DEPENDS= ${LOCALBASE}/include/linux/dvb/ca.h:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING Index: multimedia/kdemultimedia4/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= FLAC.10:${PORTSDIR}/audio/f vorbis.4:${PORTSDIR}/audio/libvorbis \ musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \ tunepimp.5:${PORTSDIR}/audio/libtunepimp \ - xine.1:${PORTSDIR}/multimedia/libxine \ + xine.2:${PORTSDIR}/multimedia/libxine \ swscale.1:${PORTSDIR}/multimedia/ffmpeg .if !defined(PACKAGE_BUILDING) Index: multimedia/konverter/Makefile @@ -16,7 +16,7 @@ COMMENT= KDE MEncoder frontend BUILD_DEPENDS= avimerge:${PORTSDIR}/multimedia/transcode \ mencoder:${PORTSDIR}/multimedia/mencoder -LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine USE_KDELIBS_VER=3 USE_AUTOTOOLS= libtool Index: multimedia/phonon-xine/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= The xine backend for Phonon -LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine CONFLICTS= phonon-4.3.0* Index: multimedia/qdvdauthor/Makefile @@ -106,7 +106,7 @@ USE_CDRTOOLS= yes RUN_DEPENDS+= growisofs:${PORTSDIR}/sysutils/dvd+rw-tools .endif .if !defined(WITHOUT_LIBXINE) -LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine CONFIGURE_ARGS+=--with-xine-support .endif .if defined(WITH_MPLAYER) Index: multimedia/quark/Makefile @@ -12,7 +12,7 @@ MASTER_SITES= http://hsgg.github.com/qua MAINTAINER= ports@FreeBSD.org COMMENT= An audio player, for geeks, by geeks -LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING Index: multimedia/subtitlecomposer/Makefile @@ -35,7 +35,7 @@ RUN_DEPENDS+= mplayer:${PORTSDIR}/multim .endif .if defined(WITH_XINE) -LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine .else CONFIGURE_ARGS+=--without-xine --without-xcb .endif Index: multimedia/vdr-plugin-xineliboutput/Makefile @@ -7,6 +7,7 @@ PORTNAME= vdr-plugin-xineliboutput PORTVERSION= 1.0.90s20111129.1002 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF:release \ LOCAL:snapshot @@ -18,7 +19,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:sn MAINTAINER= nox@FreeBSD.org COMMENT= Video Disk Recorder - xineliboutput plugin/viewer -LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine \ +LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine \ avutil.1:${PORTSDIR}/multimedia/ffmpeg \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ vdpau.1:${PORTSDIR}/multimedia/libvdpau Index: multimedia/vdr-plugin-xineliboutput/pkg-plist @@ -1,9 +1,9 @@ bin/vdr-fbfe bin/vdr-sxfe -lib/xine/plugins/1.29/xineplug_inp_xvdr.so -lib/xine/plugins/1.29/post/xineplug_post_autocrop.so -lib/xine/plugins/1.29/post/xineplug_post_swscale.so -lib/xine/plugins/1.29/post/xineplug_post_audiochannel.so +lib/xine/plugins/2.1/xineplug_inp_xvdr.so +lib/xine/plugins/2.1/post/xineplug_post_autocrop.so +lib/xine/plugins/2.1/post/xineplug_post_swscale.so +lib/xine/plugins/2.1/post/xineplug_post_audiochannel.so lib/vdr/libvdr-xineliboutput.so.1.7.22 lib/vdr/libxineliboutput-sxfe.so.1.0.90-cvs @unexec if cmp -s %D/etc/vdr/plugins/xineliboutput/allowed_hosts.conf.sample %D/etc/vdr/plugins/xineliboutput/allowed_hosts.conf; then rm -f %D/etc/vdr/plugins/xineliboutput/allowed_hosts.conf; fi Index: multimedia/xfce4-media/Makefile @@ -16,7 +16,7 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Lightweight media player for Xfce4 based on the xine engine -LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine GNU_CONFIGURE= yes INSTALLS_ICONS= yes Index: multimedia/xine/Makefile @@ -16,7 +16,7 @@ MAINTAINER= makc@FreeBSD.org COMMENT= An X11 multimedia player BUILD_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info -LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine \ +LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine \ png.6:${PORTSDIR}/graphics/png RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info Index: www/npapi-xine/Makefile @@ -16,7 +16,7 @@ PKGNAMEPREFIX= npapi- MAINTAINER= miwi@FreeBSD.org COMMENT= Embed Xine player into browser -LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine USE_BZIP2= yes GNU_CONFIGURE= yes Index: x11/eaglemode/Makefile @@ -40,7 +40,7 @@ BROKEN= Does not build on 6.x .endif .if !defined(WITHOUT_XINE) -LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine BUILD_ARGS+= xine-inc-dir="${LOCALBASE}/include" \ xine-lib-dir="${LOCALBASE}/lib" PLIST_SUB+= EMAV="" Index: x11/kde4-runtime/Makefile @@ -19,7 +19,7 @@ COMMENT= Basic applications for the KDE LIB_DEPENDS= IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ jpeg.11:${PORTSDIR}/graphics/jpeg \ exiv2.10:${PORTSDIR}/graphics/exiv2 \ - xine.1:${PORTSDIR}/multimedia/libxine \ + xine.2:${PORTSDIR}/multimedia/libxine \ slp.1:${PORTSDIR}/net/openslp \ smbclient.0:${PORTSDIR}/net/samba-libsmbclient \ ssh.4:${PORTSDIR}/security/libssh \ Index: multimedia/vdr-plugin-xineliboutput/files/patch-xine_post_audiochannel.c @@ -0,0 +1,47 @@ +--- vdr-xineliboutput/xine_post_audiochannel.c.orig ++++ vdr-xineliboutput/xine_post_audiochannel.c +@@ -72,7 +72,7 @@ typedef struct audioch_post_plugin_s + /* + * Port functions + */ +-#if XINE_VERSION_CODE < 10200 ++#if 1 // XINE_VERSION_CODE < 10200 + static int audioch_port_open(xine_audio_port_t *port_gen, xine_stream_t *stream, + uint32_t bits, uint32_t rate, int mode) + #else +@@ -87,7 +87,7 @@ static int audioch_port_open(xine_audio_ + _x_post_inc_usage(port); + + port->stream = stream; +-#if XINE_VERSION_CODE < 10200 ++#if 1 // XINE_VERSION_CODE < 10200 + port->bits = bits; + port->rate = rate; + port->mode = mode; +@@ -114,7 +114,7 @@ static void audioch_port_put_buffer (xin + int i; + + if(this->channels == 2) { +-#if XINE_VERSION_CODE < 10200 ++#if 1 // XINE_VERSION_CODE < 10200 + int step = buf->format.bits / 8; + #else + int step = sample_bytes_table[buf->format.sample_format]; +@@ -124,7 +124,7 @@ static void audioch_port_put_buffer (xin + newbuf->vpts = buf->vpts; + newbuf->frame_header_count = buf->frame_header_count; + newbuf->first_access_unit = buf->first_access_unit; +-#if XINE_VERSION_CODE < 10200 ++#if 1 // XINE_VERSION_CODE < 10200 + newbuf->format.bits = buf->format.bits; + newbuf->format.rate = buf->format.rate; + newbuf->format.mode = buf->format.mode; +@@ -258,7 +258,7 @@ static post_plugin_t *audioch_open_plugi + input_param->name = "parameters"; + input_param->type = XINE_POST_DATA_PARAMETERS; + input_param->data = &post_api; +-#if XINE_VERSION_CODE >= 10102 ++#if 1 // XINE_VERSION_CODE >= 10102 + xine_list_push_back(this->post_plugin.input, input_param); + #else + xine_list_append_content(this->post_plugin.input, input_param); Index: x11/kdelibs4/files/patch-cmake-modules-FindXine.cmake @@ -0,0 +1,11 @@ +--- cmake/modules/FindXine.cmake 2011-09-26 06:34:51.000000000 -0300 ++++ cmake/modules/FindXine.cmake 2012-01-25 20:37:43.000000000 -0200 +@@ -42,7 +42,7 @@ + ) + + if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE) +- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) ++ execute_process(COMMAND ${XINECONFIG_EXECUTABLE} --version OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET) + if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2 + set(XINE_VERSION_OK TRUE) + string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION}) Index: audio/amarok/files/patch-src-engine-xine-xine-engine.cpp @@ -0,0 +1,14 @@ +--- amarok/src/engine/xine/xine-engine.cpp.orig ++++ amarok/src/engine/xine/xine-engine.cpp +@@ -1131,7 +1131,11 @@ bool XineEngine::metaDataForUrl(const KU + + bool XineEngine::getAudioCDContents(const QString &device, KURL::List &urls) + { ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + char **xine_urls = NULL; ++#else ++ const char * const *xine_urls = NULL; ++#endif + int num; + int i = 0; + Index: graphics/osg/files/patch-src-osgPlugins-xine-video_out_rgb.c @@ -0,0 +1,98 @@ +--- src/osgPlugins/xine/video_out_rgb.c.orig ++++ src/osgPlugins/xine/video_out_rgb.c +@@ -51,6 +51,11 @@ + #include "xine/video_out.h" + #include "video_out_rgb.h" + ++#if !(XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)) ++#define round round_not ++#include ++#undef round ++#endif + + #define THIS "video_out_rgb" + +@@ -2235,9 +2240,15 @@ rgbout_frame_dispose(vo_frame_t* vo_fram + + EVAL(vo_frame != NULL) + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + release(frame->chunk[0]); + release(frame->chunk[1]); + release(frame->chunk[2]); ++#else ++ av_freep(frame->chunk[0]); ++ av_freep(frame->chunk[1]); ++ av_freep(frame->chunk[2]); ++#endif + free(frame); + + FAILURE: +@@ -2301,9 +2312,15 @@ rgbout_update_frame_format(vo_driver_t* + this->frame_width = frame->width; + this->frame_height = frame->height; + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + release(frame->chunk[0]); + release(frame->chunk[1]); + release(frame->chunk[2]); ++#else ++ av_freep(frame->chunk[0]); ++ av_freep(frame->chunk[1]); ++ av_freep(frame->chunk[2]); ++#endif + + CHECK_FRAME: + switch(frame->format) +@@ -2320,6 +2337,7 @@ CHECK_FRAME: + frame->vo_frame.pitches[0] = (frame->width > 7) ? frame->width : 8; + frame->vo_frame.pitches[1] = (frame->width > 15) ? (frame->width >> 1) : 8; + frame->vo_frame.pitches[2] = frame->vo_frame.pitches[1]; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + frame->vo_frame.base[0] = (uint8_t*) xine_xmalloc_aligned(16, + frame->vo_frame.pitches[0] * frame->height, + &(frame->chunk[0])); +@@ -2329,6 +2347,14 @@ CHECK_FRAME: + frame->vo_frame.base[2] = (uint8_t*) xine_xmalloc_aligned(16, + frame->vo_frame.pitches[2] * (frame->height >> 1), + &(frame->chunk[2])); ++#else ++ frame->vo_frame.base[0] = (uint8_t*)(frame->chunk[0] = ++ av_mallocz(frame->vo_frame.pitches[0] * frame->height)); ++ frame->vo_frame.base[1] = (uint8_t*)(frame->chunk[1] = ++ av_mallocz(frame->vo_frame.pitches[1] * (frame->height >> 1))); ++ frame->vo_frame.base[2] = (uint8_t*)(frame->chunk[2] = ++ av_mallocz(frame->vo_frame.pitches[2] * (frame->height >> 1))); ++#endif + } + break; + +@@ -2344,9 +2370,14 @@ CHECK_FRAME: + frame->vo_frame.pitches[0] = (frame->width > 3) ? (frame->width << 1) : 8; + frame->vo_frame.pitches[1] = 0; + frame->vo_frame.pitches[2] = 0; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + frame->vo_frame.base[0] = (uint8_t*) xine_xmalloc_aligned(16, + frame->vo_frame.pitches[0] * frame->height, + &(frame->chunk[0])); ++#else ++ frame->vo_frame.base[0] = (uint8_t*)(frame->chunk[0] = ++ av_mallocz(frame->vo_frame.pitches[0] * frame->height)); ++#endif + frame->vo_frame.base[1] = NULL; + frame->vo_frame.base[2] = NULL; + } +@@ -2767,8 +2798,13 @@ init_class(xine_t* xine, void* vo_visual + clear(rgb_class, sizeof(rgbout_class_t)); + + rgb_class->driver_class.open_plugin = open_plugin; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + rgb_class->driver_class.get_identifier = get_identifier; + rgb_class->driver_class.get_description = get_description; ++#else ++ rgb_class->driver_class.identifier = get_identifier(NULL); ++ rgb_class->driver_class.description = get_description(NULL); ++#endif + rgb_class->driver_class.dispose = dispose_class; + + return(rgb_class); Index: graphics/osg-devel/files/patch-src-osgPlugins-xine-video_out_rgb.c @@ -0,0 +1,98 @@ +--- src/osgPlugins/xine/video_out_rgb.c.orig ++++ src/osgPlugins/xine/video_out_rgb.c +@@ -51,6 +51,11 @@ + #include "xine/video_out.h" + #include "video_out_rgb.h" + ++#if !(XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2)) ++#define round round_not ++#include ++#undef round ++#endif + + #define THIS "video_out_rgb" + +@@ -2237,9 +2242,15 @@ rgbout_frame_dispose(vo_frame_t* vo_fram + + EVAL(vo_frame != NULL) + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + release(frame->chunk[0]); + release(frame->chunk[1]); + release(frame->chunk[2]); ++#else ++ av_freep(frame->chunk[0]); ++ av_freep(frame->chunk[1]); ++ av_freep(frame->chunk[2]); ++#endif + free(frame); + + FAILURE: +@@ -2303,9 +2314,15 @@ rgbout_update_frame_format(vo_driver_t* + this->frame_width = frame->width; + this->frame_height = frame->height; + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + release(frame->chunk[0]); + release(frame->chunk[1]); + release(frame->chunk[2]); ++#else ++ av_freep(frame->chunk[0]); ++ av_freep(frame->chunk[1]); ++ av_freep(frame->chunk[2]); ++#endif + + CHECK_FRAME: + switch(frame->format) +@@ -2322,6 +2339,7 @@ CHECK_FRAME: + frame->vo_frame.pitches[0] = (frame->width > 7) ? frame->width : 8; + frame->vo_frame.pitches[1] = (frame->width > 15) ? (frame->width >> 1) : 8; + frame->vo_frame.pitches[2] = frame->vo_frame.pitches[1]; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + frame->vo_frame.base[0] = (uint8_t*) xine_xmalloc_aligned(16, + frame->vo_frame.pitches[0] * frame->height, + &(frame->chunk[0])); +@@ -2331,6 +2349,14 @@ CHECK_FRAME: + frame->vo_frame.base[2] = (uint8_t*) xine_xmalloc_aligned(16, + frame->vo_frame.pitches[2] * (frame->height >> 1), + &(frame->chunk[2])); ++#else ++ frame->vo_frame.base[0] = (uint8_t*)(frame->chunk[0] = ++ av_mallocz(frame->vo_frame.pitches[0] * frame->height)); ++ frame->vo_frame.base[1] = (uint8_t*)(frame->chunk[1] = ++ av_mallocz(frame->vo_frame.pitches[1] * (frame->height >> 1))); ++ frame->vo_frame.base[2] = (uint8_t*)(frame->chunk[2] = ++ av_mallocz(frame->vo_frame.pitches[2] * (frame->height >> 1))); ++#endif + } + break; + +@@ -2346,9 +2372,14 @@ CHECK_FRAME: + frame->vo_frame.pitches[0] = (frame->width > 3) ? (frame->width << 1) : 8; + frame->vo_frame.pitches[1] = 0; + frame->vo_frame.pitches[2] = 0; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + frame->vo_frame.base[0] = (uint8_t*) xine_xmalloc_aligned(16, + frame->vo_frame.pitches[0] * frame->height, + &(frame->chunk[0])); ++#else ++ frame->vo_frame.base[0] = (uint8_t*)(frame->chunk[0] = ++ av_mallocz(frame->vo_frame.pitches[0] * frame->height)); ++#endif + frame->vo_frame.base[1] = NULL; + frame->vo_frame.base[2] = NULL; + } +@@ -2769,8 +2800,13 @@ init_class(xine_t* xine, void* vo_visual + clear(rgb_class, sizeof(rgbout_class_t)); + + rgb_class->driver_class.open_plugin = open_plugin; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + rgb_class->driver_class.get_identifier = get_identifier; + rgb_class->driver_class.get_description = get_description; ++#else ++ rgb_class->driver_class.identifier = get_identifier(NULL); ++ rgb_class->driver_class.description = get_description(NULL); ++#endif + rgb_class->driver_class.dispose = dispose_class; + + return(rgb_class); Index: multimedia/emotion/files/patch-src-modules-xine-emotion_xine_vo_out.c @@ -0,0 +1,16 @@ +--- src/modules/xine/emotion_xine_vo_out.c.orig ++++ src/modules/xine/emotion_xine_vo_out.c +@@ -119,8 +119,13 @@ _emotion_class_init(xine_t *xine, void * + cl = (Emotion_Class *) malloc(sizeof(Emotion_Class)); + if (!cl) return NULL; + cl->driver_class.open_plugin = _emotion_open; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + cl->driver_class.get_identifier = _emotion_class_identifier_get; + cl->driver_class.get_description = _emotion_class_description_get; ++#else ++ cl->driver_class.identifier = _emotion_class_identifier_get(NULL); ++ cl->driver_class.description = _emotion_class_description_get(NULL); ++#endif + cl->driver_class.dispose = _emotion_class_dispose; + cl->config = xine->config; + cl->xine = xine; Index: multimedia/kmplayer/files/patch-src-xineplayer.cpp @@ -0,0 +1,170 @@ +--- src/xineplayer.cpp.orig ++++ src/xineplayer.cpp +@@ -528,7 +528,11 @@ void KXinePlayer::play (int repeat) { + xine_event_create_listener_thread (event_queue, event_listener, NULL); + if (mrl == "cdda:/") { + int nr; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + char ** mrls = xine_get_autoplay_mrls (xine, "CD", &nr); ++#else ++ const char * const * mrls = xine_get_autoplay_mrls (xine, "CD", &nr); ++#endif + running = 1; + for (int i = 0; i < nr; i++) { + QString m (mrls[i]); +@@ -549,7 +553,8 @@ void KXinePlayer::play (int repeat) { + return; + } + +- xine_gui_send_vo_data(stream, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void *) 1); ++ // xine_gui_send_vo_data(stream, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void *) 1); ++ xine_port_send_gui_data(vo_port, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void *) 1); + + running = 1; + QString mrlsetup = mrl; +@@ -859,10 +864,17 @@ protected: + case XK_p: // previous + mutex.lock (); + if (stream) { ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_event_t xine_event = { + XINE_EVENT_INPUT_PREVIOUS, + stream, 0L, 0, { 0, 0 } + }; ++#else ++ xine_event_t xine_event = { ++ stream, 0L, 0, ++ XINE_EVENT_INPUT_PREVIOUS, { 0, 0 } ++ }; ++#endif + xine_event_send (stream, &xine_event); + } + mutex.unlock (); +@@ -871,10 +883,17 @@ protected: + case XK_n: // next + mutex.lock (); + if (stream) { ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_event_t xine_event = { + XINE_EVENT_INPUT_NEXT, + stream, 0L, 0, { 0, 0 } + }; ++#else ++ xine_event_t xine_event = { ++ stream, 0L, 0, ++ XINE_EVENT_INPUT_NEXT, { 0, 0 } ++ }; ++#endif + xine_event_send (stream, &xine_event); + } + mutex.unlock (); +@@ -883,10 +902,17 @@ protected: + case XK_u: // up menu + mutex.lock (); + if (stream) { ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_event_t xine_event = { + XINE_EVENT_INPUT_MENU1, + stream, 0L, 0, { 0, 0 } + }; ++#else ++ xine_event_t xine_event = { ++ stream, 0L, 0, ++ XINE_EVENT_INPUT_MENU1, { 0, 0 } ++ }; ++#endif + xine_event_send (stream, &xine_event); + } + mutex.unlock (); +@@ -895,10 +921,17 @@ protected: + case XK_r: // root menu + mutex.lock (); + if (stream) { ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_event_t xine_event = { + XINE_EVENT_INPUT_MENU3, + stream, 0L, 0, { 0, 0 } + }; ++#else ++ xine_event_t xine_event = { ++ stream, 0L, 0, ++ XINE_EVENT_INPUT_MENU3, { 0, 0 } ++ }; ++#endif + xine_event_send (stream, &xine_event); + } + mutex.unlock (); +@@ -939,7 +972,8 @@ protected: + if(xevent.xexpose.count != 0 || !stream || xevent.xexpose.window != wid) + break; + mutex.lock (); +- xine_gui_send_vo_data(stream, XINE_GUI_SEND_EXPOSE_EVENT, &xevent); ++ // xine_gui_send_vo_data(stream, XINE_GUI_SEND_EXPOSE_EVENT, &xevent); ++ xine_port_send_gui_data(vo_port, XINE_GUI_SEND_EXPOSE_EVENT, &xevent); + mutex.unlock (); + break; + +@@ -967,17 +1001,25 @@ protected: + if (stream) { + XMotionEvent *mev = (XMotionEvent *) &xevent; + x11_rectangle_t rect = { mev->x, mev->y, 0, 0 }; +- if (xine_gui_send_vo_data (stream, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1) ++ // if (xine_gui_send_vo_data (stream, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1) ++ if (xine_port_send_gui_data (vo_port, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1) + break; + xine_input_data_t data; + data.x = rect.x; + data.y = rect.y; + data.button = 0; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_event_t xine_event = { + XINE_EVENT_INPUT_MOUSE_MOVE, + stream, &data, sizeof (xine_input_data_t), + { 0 , 0 } + }; ++#else ++ xine_event_t xine_event = { ++ stream, &data, sizeof (xine_input_data_t), ++ XINE_EVENT_INPUT_MOUSE_MOVE, { 0, 0 } ++ }; ++#endif + mutex.lock (); + xine_event_send (stream, &xine_event); + mutex.unlock (); +@@ -1001,17 +1043,25 @@ protected: + fprintf(stderr, "ButtonPress\n"); + XButtonEvent *bev = (XButtonEvent *) &xevent; + x11_rectangle_t rect = { bev->x, bev->y, 0, 0 }; +- if (xine_gui_send_vo_data (stream, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1) ++ // if (xine_gui_send_vo_data (stream, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1) ++ if (xine_port_send_gui_data (vo_port, XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, (void*) &rect) == -1) + break; + xine_input_data_t data; + data.x = rect.x; + data.y = rect.y; + data.button = 1; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_event_t xine_event = { + XINE_EVENT_INPUT_MOUSE_BUTTON, + stream, &data, sizeof (xine_input_data_t), + { 0, 0 } + }; ++#else ++ xine_event_t xine_event = { ++ stream, &data, sizeof (xine_input_data_t), ++ XINE_EVENT_INPUT_MOUSE_BUTTON, { 0, 0 } ++ }; ++#endif + mutex.lock (); + xine_event_send (stream, &xine_event); + mutex.unlock (); +@@ -1036,7 +1086,8 @@ protected: + } + + if(xevent.type == completion_event && stream) +- xine_gui_send_vo_data(stream, XINE_GUI_SEND_COMPLETION_EVENT, &xevent); ++ // xine_gui_send_vo_data(stream, XINE_GUI_SEND_COMPLETION_EVENT, &xevent); ++ xine_port_send_gui_data(vo_port, XINE_GUI_SEND_COMPLETION_EVENT, &xevent); + } + } + }; Index: multimedia/konverter/files/patch-src-kxinewidget.cpp @@ -0,0 +1,48 @@ +--- src/kxinewidget.cpp.orig ++++ src/kxinewidget.cpp +@@ -885,7 +885,8 @@ void KXineWidget::run() + { + if (event.xexpose.count == 0) + { +- xine_gui_send_vo_data (m_xineStream, XINE_GUI_SEND_EXPOSE_EVENT, &event); ++ // xine_gui_send_vo_data (m_xineStream, XINE_GUI_SEND_EXPOSE_EVENT, &event); ++ xine_port_send_gui_data (m_videoDriver, XINE_GUI_SEND_EXPOSE_EVENT, &event); + } + } + +@@ -1775,7 +1776,11 @@ void KXineWidget::getAutoplayPlugins(QSt + + bool KXineWidget::getAutoplayPluginURLS(const QString& plugin, QStringList& list) + { ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + char** urls = NULL; ++#else ++ const char* const* urls = NULL; ++#endif + int num; + int i = 0; + +@@ -1859,7 +1864,10 @@ void KXineWidget::mouseMoveEvent(QMouseE + rect.w = 0; + rect.h = 0; + +- xine_gui_send_vo_data(m_xineStream, ++ // xine_gui_send_vo_data(m_xineStream, ++ // XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, ++ // (void*)&rect); ++ xine_port_send_gui_data(m_videoDriver, + XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, + (void*)&rect); + +@@ -1913,7 +1921,10 @@ void KXineWidget::mousePressEvent(QMouse + rect.w = 0; + rect.h = 0; + +- xine_gui_send_vo_data (m_xineStream, ++ // xine_gui_send_vo_data (m_xineStream, ++ // XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, ++ // (void*)&rect); ++ xine_port_send_gui_data(m_videoDriver, + XINE_GUI_SEND_TRANSLATE_GUI_TO_VIDEO, + (void*)&rect); + Index: multimedia/xine_artsplugin/files/patch-xine_artsplugin-xinePlayObject_impl.cpp @@ -0,0 +1,42 @@ +--- xine_artsplugin/xinePlayObject_impl.cpp.orig ++++ xine_artsplugin/xinePlayObject_impl.cpp +@@ -698,9 +698,12 @@ void xinePlayObject_impl::eventLoop() + + if (stream != 0) + { +- xine_gui_send_vo_data( stream, +- XINE_GUI_SEND_EXPOSE_EVENT, +- &event ); ++ // xine_gui_send_vo_data( stream, ++ // XINE_GUI_SEND_EXPOSE_EVENT, ++ // &event ); ++ xine_port_send_gui_data( vo_port, ++ XINE_GUI_SEND_EXPOSE_EVENT, ++ &event ); + } + else + { +@@ -714,7 +717,10 @@ void xinePlayObject_impl::eventLoop() + + if (stream != 0) + { +- xine_gui_send_vo_data( stream, ++ // xine_gui_send_vo_data( stream, ++ // XINE_GUI_SEND_COMPLETION_EVENT, ++ // &event ); ++ xine_port_send_gui_data( vo_port, + XINE_GUI_SEND_COMPLETION_EVENT, + &event ); + } +@@ -748,7 +754,10 @@ void xineVideoPlayObject_impl::x11Window + { + resizeNotify(); + +- xine_gui_send_vo_data( stream, ++ // xine_gui_send_vo_data( stream, ++ // XINE_GUI_SEND_DRAWABLE_CHANGED, ++ // (void *)window ); ++ xine_port_send_gui_data( vo_port, + XINE_GUI_SEND_DRAWABLE_CHANGED, + (void *)window ); + } Index: multimedia/k9copy-kde4/files/patch-src-xine-k9xineplayer.cpp @@ -0,0 +1,35 @@ +--- src/xine/k9xineplayer.cpp.orig ++++ src/xine/k9xineplayer.cpp +@@ -260,8 +260,10 @@ void k9xinePlayer::init(WId _wid) { + event_queue = xine_event_new_queue(stream); + xine_event_create_listener_thread(event_queue, event_listener, this); + +- xine_gui_send_vo_data(stream, XINE_GUI_SEND_DRAWABLE_CHANGED, (void *) m_wid); +- xine_gui_send_vo_data(stream, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void *) 1); ++ // xine_gui_send_vo_data(stream, XINE_GUI_SEND_DRAWABLE_CHANGED, (void *) m_wid); ++ // xine_gui_send_vo_data(stream, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void *) 1); ++ xine_port_send_gui_data(vo_port, XINE_GUI_SEND_DRAWABLE_CHANGED, (void *) m_wid); ++ xine_port_send_gui_data(vo_port, XINE_GUI_SEND_VIDEOWIN_VISIBLE, (void *) 1); + m_execute=true; + + } +@@ -284,7 +286,8 @@ void k9xinePlayer::quit() { + void k9xinePlayer::update() { + if (stream && !running ) { + if (m_mutex.tryLock()) { +- xine_gui_send_vo_data(stream, XINE_GUI_SEND_DRAWABLE_CHANGED, (void *) m_wid); ++ // xine_gui_send_vo_data(stream, XINE_GUI_SEND_DRAWABLE_CHANGED, (void *) m_wid); ++ xine_port_send_gui_data(vo_port, XINE_GUI_SEND_DRAWABLE_CHANGED, (void *) m_wid); + m_mutex.unlock(); + } + } +@@ -317,7 +320,8 @@ void k9xineThread::run() { + case Expose: + if (xevent.xexpose.count != 0) + break; +- xine_gui_send_vo_data(m_player->getStream(), XINE_GUI_SEND_EXPOSE_EVENT, &xevent); ++ // xine_gui_send_vo_data(m_player->getStream(), XINE_GUI_SEND_EXPOSE_EVENT, &xevent); ++ xine_port_send_gui_data(m_player->getPort(), XINE_GUI_SEND_EXPOSE_EVENT, &xevent); + break; + } + } Index: multimedia/k9copy-kde4/files/patch-src-xine-k9xineplayer.h @@ -0,0 +1,10 @@ +--- src/xine/k9xineplayer.h.orig ++++ src/xine/k9xineplayer.h +@@ -68,6 +68,7 @@ public: + int positionAbs() {return m_posabs ;} + int length() {return m_length;} + xine_stream_t *getStream() { return stream;} ++ xine_video_port_t *getPort() { return vo_port;} + bool isRunning() {return running;} + WId wid() const { return m_wid;} + QString title() const {return m_title;} Index: multimedia/qdvdauthor/files/patch-qdvdauthor-qplayer-engines-kxinewidget.cpp @@ -0,0 +1,14 @@ +--- qdvdauthor/qplayer/engines/kxinewidget.cpp.orig ++++ qdvdauthor/qplayer/engines/kxinewidget.cpp +@@ -2494,7 +2494,11 @@ void KXineWidget::getAutoplayPlugins(QSt + + bool KXineWidget::getAutoplayPluginURLS(const QString& plugin, QStringList& list) + { ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + char** urls = NULL; ++#else ++ const char* const* urls = NULL; ++#endif + int num; + int i = 0; + Index: multimedia/qdvdauthor/files/patch-qdvdauthor-qplayer-engines-qxinewidget.cpp @@ -0,0 +1,23 @@ +--- qdvdauthor/qplayer/engines/qxinewidget.cpp.orig ++++ qdvdauthor/qplayer/engines/qxinewidget.cpp +@@ -1403,7 +1403,11 @@ void QXineWidget::GetAutoplayPlugins(QSt + + bool QXineWidget::GetAutoplayPluginMrl(const QString& plugin, QStringList& list) + { ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + char** mrls = NULL; ++#else ++ const char* const* mrls = NULL; ++#endif + int num; + int i = 0; + +@@ -1657,7 +1661,7 @@ trick modes + #define XINE_TRICK_MODE_FAST_FORWARD 3 + #define XINE_TRICK_MODE_FAST_REWIND 4 + */ +- xine_trick_mode(xineStream, XINE_TRICK_MODE_FAST_REWIND, XINE_SPEED_NORMAL); ++ // xine_trick_mode(xineStream, XINE_TRICK_MODE_FAST_REWIND, XINE_SPEED_NORMAL); + } + + QString QXineWidget::GetSupportedExtensions() const Index: graphics/gimageview/files/patch-gimv_xine.c @@ -0,0 +1,46 @@ +--- plugins/image_view/gimv_xine.c.orig ++++ plugins/image_view/gimv_xine.c +@@ -381,7 +381,11 @@ frame_output_cb (void *gxine_gen, + } + + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + static xine_vo_driver_t * ++#else ++static xine_video_port_t * ++#endif + load_video_out_driver (GimvXine *this) + { + #if defined(GDK_WINDOWING_X11) +@@ -393,7 +397,11 @@ load_video_out_driver (GimvXine *this) + + GimvXinePrivate *priv; + const char *video_driver_id; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_vo_driver_t *vo_driver; ++#else ++ xine_video_port_t *vo_driver; ++#endif + + g_return_val_if_fail (GIMV_IS_XINE (this), NULL); + priv = this->private; +@@ -449,11 +457,19 @@ load_video_out_driver (GimvXine *this) + } + + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + static xine_ao_driver_t * ++#else ++static xine_audio_port_t * ++#endif + load_audio_out_driver (GimvXine *this) + { + GimvXinePrivate *priv; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_ao_driver_t *ao_driver; ++#else ++ xine_audio_port_t *ao_driver; ++#endif + const char *audio_driver_id; + + g_return_val_if_fail (GIMV_IS_XINE (this), NULL); Index: graphics/gimageview/files/patch-gimv_xine_priv.h @@ -0,0 +1,16 @@ +--- plugins/image_view/gimv_xine_priv.h.orig ++++ plugins/image_view/gimv_xine_priv.h +@@ -97,8 +97,13 @@ struct GimvXinePrivate_Tag + char *video_driver_id; + char *audio_driver_id; + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_vo_driver_t *vo_driver; + xine_ao_driver_t *ao_driver; ++#else ++ xine_video_port_t *vo_driver; ++ xine_audio_port_t *ao_driver; ++#endif + + int xpos, ypos; + int oldwidth, oldheight; Index: graphics/gimageview/files/patch-xine_image_loader.c @@ -0,0 +1,16 @@ +--- plugins/image_view/xine_image_loader.c.orig ++++ plugins/image_view/xine_image_loader.c +@@ -57,8 +57,13 @@ gimv_xine_image_loader_load_file (GimvIm + GimvXinePrivImage *pimage = NULL; + xine_t *xine; + xine_stream_t *stream; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_vo_driver_t *vo_driver; + xine_ao_driver_t *ao_driver; ++#else ++ xine_video_port_t *vo_driver; ++ xine_audio_port_t *ao_driver; ++#endif + guchar *rgb = NULL; + gint width, height; + gint ret = 0; Index: graphics/pornview/Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/pornview/Makefile,v retrieving revision 1.42 diff -u -p -r1.42 Makefile --- Makefile 23 Sep 2011 22:23:25 -0000 1.42 +++ Makefile 28 Jan 2012 23:06:29 -0000 @@ -26,7 +26,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITH_LIBXINE) -LIB_DEPENDS+= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS+= xine.2:${PORTSDIR}/multimedia/libxine CONFIGURE_ARGS+= --enable-xine .elif defined(WITH_MPLAYER) RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer Index: graphics/pornview/files/patch-gtkxine.c =================================================================== RCS file: /home/pcvs/ports/graphics/pornview/files/patch-gtkxine.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-gtkxine.c --- files/patch-gtkxine.c 7 May 2009 08:25:11 -0000 1.1 +++ files/patch-gtkxine.c 28 Jan 2012 23:21:15 -0000 @@ -1,6 +1,76 @@ ---- src/support/widgets/gtkxine.c.orig 2003-01-03 23:48:21.000000000 +0100 -+++ src/support/widgets/gtkxine.c 2009-04-19 13:58:56.000000000 +0200 -@@ -632,7 +632,7 @@ +--- src/support/widgets/gtkxine.c.orig ++++ src/support/widgets/gtkxine.c +@@ -244,13 +244,21 @@ frame_output_cb (void *gxine_gen, + *dest_pixel_aspect = video_pixel_aspect * gxine->display_ratio; + } + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + static xine_vo_driver_t * ++#else ++static xine_video_port_t * ++#endif + load_video_out_driver (GtkXine * this) + { + double res_h, res_v; + x11_visual_t vis; + const char *video_driver_id; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_vo_driver_t *vo_driver; ++#else ++ xine_video_port_t *vo_driver; ++#endif + + vis.display = this->display; + vis.screen = this->screen; +@@ -296,10 +304,18 @@ load_video_out_driver (GtkXine * this) + XINE_VISUAL_TYPE_X11, (void *) &vis); + } + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + static xine_ao_driver_t * ++#else ++static xine_audio_port_t * ++#endif + load_audio_out_driver (GtkXine * this) + { ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_ao_driver_t *ao_driver; ++#else ++ xine_audio_port_t *ao_driver; ++#endif + const char *audio_driver_id; + + /* +@@ -354,8 +370,13 @@ xine_thread (void *this_gen) + if (event.xexpose.count != 0) + break; + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_gui_send_vo_data (this->stream, +- XINE_GUI_SEND_EXPOSE_EVENT, &event); ++ XINE_GUI_SEND_EXPOSE_EVENT, &event); ++#else ++ xine_port_send_gui_data (this->vo_driver, ++ XINE_GUI_SEND_EXPOSE_EVENT, &event); ++#endif + break; + + case FocusIn: /* happens only in fullscreen mode */ +@@ -368,8 +389,13 @@ xine_thread (void *this_gen) + + if (event.type == this->completion_event) + { ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_gui_send_vo_data (this->stream, + XINE_GUI_SEND_COMPLETION_EVENT, &event); ++#else ++ xine_port_send_gui_data (this->vo_driver, ++ XINE_GUI_SEND_EXPOSE_EVENT, &event); ++#endif + /* + * printf ("gtkxine: completion event\n"); + */ +@@ -632,7 +658,7 @@ gtk_xine_unrealize (GtkWidget * widget) */ if (this->vo_driver != NULL) xine_close_video_driver (this->xine, this->vo_driver); @@ -9,3 +79,51 @@ xine_close_audio_driver (this->xine, this->ao_driver); /* +@@ -748,6 +774,7 @@ gtk_xine_play (GtkXine * gtx, gint pos, + return retval; + } + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + gint + gtk_xine_trick_mode (GtkXine * gtx, gint mode, gint value) + { +@@ -757,6 +784,7 @@ gtk_xine_trick_mode (GtkXine * gtx, gint + + return xine_trick_mode (gtx->stream, mode, value); + } ++#endif + + gint + gtk_xine_get_pos_length (GtkXine * gtx, gint * pos_stream, +@@ -1001,9 +1029,15 @@ gtk_xine_set_fullscreen (GtkXine * gtx, + gtx->toplevel, RevertToNone, CurrentTime); + XMoveWindow (gtx->display, gtx->fullscreen_window, 0, 0); + ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_gui_send_vo_data (gtx->stream, + XINE_GUI_SEND_DRAWABLE_CHANGED, + (void *) gtx->fullscreen_window); ++#else ++ xine_port_send_gui_data (gtx->vo_driver, ++ XINE_GUI_SEND_DRAWABLE_CHANGED, ++ (void *) gtx->fullscreen_window); ++#endif + + /* + * switch off mouse cursor +@@ -1014,9 +1048,15 @@ gtk_xine_set_fullscreen (GtkXine * gtx, + } + else + { ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_gui_send_vo_data (gtx->stream, + XINE_GUI_SEND_DRAWABLE_CHANGED, + (void *) gtx->video_window); ++#else ++ xine_port_send_gui_data (gtx->vo_driver, ++ XINE_GUI_SEND_DRAWABLE_CHANGED, ++ (void *) gtx->video_window); ++#endif + + XDestroyWindow (gtx->display, gtx->fullscreen_window); + } Index: graphics/pornview/files/patch-gtkxine.h =================================================================== RCS file: /home/pcvs/ports/graphics/pornview/files/patch-gtkxine.h,v retrieving revision 1.1 diff -u -p -r1.1 patch-gtkxine.h --- files/patch-gtkxine.h 14 Jan 2009 16:12:02 -0000 1.1 +++ files/patch-gtkxine.h 28 Jan 2012 23:21:42 -0000 @@ -1,6 +1,6 @@ --- src/support/widgets/gtkxine.h.orig Sat Nov 23 22:56:41 2002 +++ src/support/widgets/gtkxine.h Sat Dec 7 15:09:28 2002 -@@ -12,6 +12,7 @@ +@@ -20,6 +20,7 @@ #ifdef ENABLE_XINE @@ -8,3 +8,17 @@ #include #include #include +@@ -56,8 +57,13 @@ extern "C" + xine_event_queue_t *event_queue; + + char configfile[256]; ++#if XINE_MAJOR_VERSION < 1 || (XINE_MAJOR_VERSION == 1 && XINE_MINOR_VERSION < 2) + xine_vo_driver_t *vo_driver; + xine_ao_driver_t *ao_driver; ++#else ++ xine_video_port_t *vo_driver; ++ xine_audio_port_t *ao_driver; ++#endif + x11_visual_t vis; + double display_ratio; + Display *display; Index: multimedia/xfce4-media/Makefile =================================================================== RCS file: /home/pcvs/ports/multimedia/xfce4-media/Makefile,v retrieving revision 1.46 diff -u -p -r1.46 Makefile --- multimedia/xfce4-media/Makefile 9 Nov 2011 18:29:52 -0000 1.46 +++ multimedia/xfce4-media/Makefile 16 Feb 2012 18:27:41 -0000 @@ -16,7 +16,7 @@ DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Lightweight media player for Xfce4 based on the xine engine -LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine +LIB_DEPENDS= xine.2:${PORTSDIR}/multimedia/libxine GNU_CONFIGURE= yes INSTALLS_ICONS= yes Index: multimedia/xfce4-media/files/patch-src_xfmedia-xine.c =================================================================== RCS file: /home/pcvs/ports/multimedia/xfce4-media/files/patch-src_xfmedia-xine.c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_xfmedia-xine.c --- multimedia/xfce4-media/files/patch-src_xfmedia-xine.c 22 Jan 2007 16:45:05 -0000 1.1 +++ multimedia/xfce4-media/files/patch-src_xfmedia-xine.c 16 Feb 2012 18:38:55 -0000 @@ -1,6 +1,6 @@ ---- src/xfmedia-xine.c.orig Thu Nov 30 17:49:55 2006 -+++ src/xfmedia-xine.c Thu Nov 30 17:50:48 2006 -@@ -38,14 +38,14 @@ +--- src/xfmedia-xine.c.orig ++++ src/xfmedia-xine.c +@@ -38,15 +38,15 @@ #ifdef HAVE_MATH_H #include #endif @@ -12,9 +12,20 @@ #endif #ifdef HAVE_SYS_TIME_H #include --#endif + #endif -#ifdef HAVE_SYS_TYPES_H -#include - #endif +-#endif #ifdef HAVE_UNISTD_H #include + #endif +@@ -1457,7 +1457,8 @@ xfmedia_xine_trick_mode(XfmediaXine * xf + g_return_val_if_fail(XFMEDIA_IS_XINE(xfx), 0); + g_return_val_if_fail(xfx->priv->stream != NULL, 0); + +- return xine_trick_mode(xfx->priv->stream, mode, value); ++ //return xine_trick_mode(xfx->priv->stream, mode, value); ++ return 0; + } + + gboolean