Index: branches/2014Q1/multimedia/k9copy-kde4/Makefile =================================================================== --- branches/2014Q1/multimedia/k9copy-kde4/Makefile (revision 341139) +++ branches/2014Q1/multimedia/k9copy-kde4/Makefile (revision 341140) @@ -1,56 +1,45 @@ # Created by: Alexander V. Ribchansky # $FreeBSD$ PORTNAME= k9copy PORTVERSION= 2.3.4 PORTREVISION= 10 CATEGORIES= multimedia kde MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-kde4/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-Source MAINTAINER= egoliveira@gmail.com COMMENT= DVD-9 to DVD-5 shrinking application for KDE +LICENSE= GPLv2 + LIB_DEPENDS= libxine.so:${PORTSDIR}/multimedia/libxine \ libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \ libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 USES= cmake gettext USE_KDE4= kdeprefix kdelibs automoc4 USE_QT4= moc_build qmake_build rcc_build uic_build -LATEST_LINK= ${PORTNAME}-kde4 - CFLAGS= -I${LOCALBASE}/include/ffmpeg0 CPPFLAGS= -I${LOCALBASE}/include/ffmpeg0 CXXFLAGS= -I${LOCALBASE}/include/ffmpeg0 OPTIONS_DEFINE= MENCODER MPLAYER DVDAUTHOR MENCODER_DESC= MEncoder support MPLAYER_DESC= MPlayer support DVDAUTHOR_DESC= DVD Author support -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MMENCODER} -RUN_DEPENDS+= mencoder:${PORTSDIR}/multimedia/mencoder -.endif - -.if ${PORT_OPTIONS:MMPLAYER} -RUN_DEPENDS+= mplayer:${PORTSDIR}/multimedia/mplayer -.endif - -.if ${PORT_OPTIONS:MDVDAUTHOR} -RUN_DEPENDS+= dvdauthor:${PORTSDIR}/multimedia/dvdauthor -.endif +MENCODER_RUN_DEPENDS= mencoder:${PORTSDIR}/multimedia/mencoder +MPLAYER_RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer +DVDAUTHOR_RUN_DEPENDS= dvdauthor:${PORTSDIR}/multimedia/dvdauthor post-patch: @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/cmake/*.cmake @${REINPLACE_CMD} \ -e 's,swscale,swscale0,' \ -e 's,avcodec,avcodec0,' \ -e 's,avformat,avformat0,' \ ${WRKSRC}/CMakeLists.txt .include Index: branches/2014Q1/multimedia/k9copy-kde4/files/patch-CMakeLists.txt =================================================================== --- branches/2014Q1/multimedia/k9copy-kde4/files/patch-CMakeLists.txt (revision 341139) +++ branches/2014Q1/multimedia/k9copy-kde4/files/patch-CMakeLists.txt (revision 341140) @@ -1,38 +1,38 @@ --- ./CMakeLists.txt.orig 2009-12-06 13:13:36.000000000 +0300 +++ ./CMakeLists.txt 2010-01-30 23:39:22.211155391 +0300 @@ -45,6 +45,14 @@ MESSAGE(STATUS "Checking dependencies" ) FINDXINE("xine.h" "xine") FINDLIBMPEG2("mpeg2dec/mpeg2.h" "mpeg2") + +FIND_LIBRARY(LIBMPEG2CONVERT_LIBRARY NAMES mpeg2convert PATHS ) +IF (LIBMPEG2CONVERT_LIBRARY) + MESSAGE(STATUS "Found library mpeg2convert: ${LIBMPEG2CONVERT_LIBRARY}") +ELSE (LIBMPEG2CONVERT_LIBRARY) + MESSAGE(FATAL_ERROR "Could not find mpeg2convert") +ENDIF (LIBMPEG2CONVERT_LIBRARY) + #FINDLIBDVDREAD("dvdread/ifo_types.h" "dvdread") FINDAVFORMAT("avformat") @@ -318,7 +326,7 @@ kde4_add_library(k9copylib STATIC ${k9copylib_SRCS}) -target_link_libraries(k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} -lkdesu -lmpeg2 -lmpeg2convert ) +target_link_libraries(k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KDESU_LIBS} ${LIBMPEG2_LIBRARY} ${LIBMPEG2CONVERT_LIBRARY} ) kde4_add_ui_files(k9copy_SRCS ) @@ -326,9 +334,9 @@ kde4_add_executable(k9play ${k9play_SRCS}) kde4_add_executable(k9xineplayer ${k9xineplayer_SRCS}) -target_link_libraries(k9copy k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} -lphonon ) -+target_link_libraries(k9copy k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${PHONON_LIBRARY} ) ++target_link_libraries(k9copy k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_SOLID_LIBS} ${PHONON_LIBRARY} ) target_link_libraries(k9play k9copylib ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ) -target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} -lxine ) -+target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${XINE_LIBRARY} ) ++target_link_libraries(k9xineplayer ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${XINE_LIBRARY} ${X11_LIBRARIES} ) install(TARGETS k9copy DESTINATION ${BIN_INSTALL_DIR} ) Index: branches/2014Q1/multimedia/k9copy-kde4/files/patch-src-xine-k9xineplayer.cpp =================================================================== --- branches/2014Q1/multimedia/k9copy-kde4/files/patch-src-xine-k9xineplayer.cpp (revision 341139) +++ branches/2014Q1/multimedia/k9copy-kde4/files/patch-src-xine-k9xineplayer.cpp (revision 341140) @@ -1,35 +1,53 @@ ---- src/xine/k9xineplayer.cpp.orig -+++ src/xine/k9xineplayer.cpp -@@ -260,8 +260,10 @@ void k9xinePlayer::init(WId _wid) { +--- src/xine/k9xineplayer.cpp.orig 2009-12-06 10:13:37.000000000 +0000 ++++ src/xine/k9xineplayer.cpp 2013-12-06 15:34:35.000000000 +0000 +@@ -251,7 +251,7 @@ + + if ((vo_port = xine_open_video_driver(xine, + m_vo.toAscii(), XINE_VISUAL_TYPE_X11, (void *) &vis)) == NULL) { +- printf("I'm unable to initialize '%s' video driver. Giving up.\n", m_vo.toAscii()); ++ printf("I'm unable to initialize '%s' video driver. Giving up.\n", m_vo.toAscii().constData()); + return ; + } + +@@ -260,8 +260,10 @@ 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() { +@@ -270,7 +272,7 @@ + running=false; + m_title=""; + if ((!xine_open(stream, m_mrl.toUtf8())) || (!xine_play(stream, 0, 0))) { +- printf("Unable to open mrl '%s'\n", m_mrl.toUtf8()); ++ printf("Unable to open mrl '%s'\n", m_mrl.toUtf8().constData()); + return ; + } + QTimer::singleShot (500, this, SLOT (updatePosition ())); +@@ -284,7 +286,8 @@ 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: branches/2014Q1/multimedia/k9copy-kde4/files/patch-src_mpeg2_kdecmpeg2.cpp =================================================================== --- branches/2014Q1/multimedia/k9copy-kde4/files/patch-src_mpeg2_kdecmpeg2.cpp (nonexistent) +++ branches/2014Q1/multimedia/k9copy-kde4/files/patch-src_mpeg2_kdecmpeg2.cpp (revision 341140) @@ -0,0 +1,10 @@ +--- src/mpeg2/kdecmpeg2.cpp.orig 2009-12-06 10:13:36.000000000 +0000 ++++ src/mpeg2/kdecmpeg2.cpp 2013-12-06 15:00:15.000000000 +0000 +@@ -286,6 +286,7 @@ + } + } + } ++ return 0; + } + + void kDecMPEG2::sync() { Property changes on: branches/2014Q1/multimedia/k9copy-kde4/files/patch-src_mpeg2_kdecmpeg2.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2014Q1 =================================================================== --- branches/2014Q1 (revision 341139) +++ branches/2014Q1 (revision 341140) Property changes on: branches/2014Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r341132