Index: head/multimedia/k9copy-kde4/Makefile =================================================================== --- head/multimedia/k9copy-kde4/Makefile (revision 402459) +++ head/multimedia/k9copy-kde4/Makefile (revision 402460) @@ -1,45 +1,41 @@ # Created by: Alexander V. Ribchansky # $FreeBSD$ PORTNAME= k9copy PORTVERSION= 2.3.4 PORTREVISION= 14 CATEGORIES= multimedia kde MASTER_SITES= LOCAL/rakuco 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 -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 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: head/multimedia/k9copy-kde4/files/patch-CMakeLists.txt =================================================================== --- head/multimedia/k9copy-kde4/files/patch-CMakeLists.txt (revision 402459) +++ head/multimedia/k9copy-kde4/files/patch-CMakeLists.txt (revision 402460) @@ -1,38 +1,53 @@ --- ./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") +@@ -78,12 +86,12 @@ include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/src/player + ${CMAKE_CURRENT_SOURCE_DIR}/src/subtitles + ${CMAKE_CURRENT_SOURCE_DIR}/src/dvdread +-${KDE4_INCLUDES} ${QT_INCLUDES} +- #${LIBDVDREAD_INCLUDE_DIR}/dvdread + ${AVCODEC_INCLUDE_DIR} + ${AVFORMAT_INCLUDE_DIR} + ${FFMPEGSCALE_INCLUDE_DIR} + ${FFMPEG_INCLUDE_DIR} ++${KDE4_INCLUDES} ${QT_INCLUDES} ++ #${LIBDVDREAD_INCLUDE_DIR}/dvdread + ) + + @@ -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} ${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} ${X11_LIBRARIES} ) install(TARGETS k9copy DESTINATION ${BIN_INSTALL_DIR} ) Index: head/multimedia/k9copy-kde4/files/patch-cmake =================================================================== --- head/multimedia/k9copy-kde4/files/patch-cmake (revision 402459) +++ head/multimedia/k9copy-kde4/files/patch-cmake (revision 402460) @@ -1,93 +1,90 @@ --- cmake/FindAvcodec.cmake.orig 2009-12-06 08:13:37.000000000 -0200 +++ cmake/FindAvcodec.cmake 2013-10-21 20:25:43.852646966 -0200 -@@ -6,21 +6,21 @@ +@@ -6,21 +6,20 @@ SET (FFMPEG_INCLUDE_DIR "") IF (AVCODEC_INCLUDE_DIR_FF) - SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF}/ffmpeg") + SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF}/ffmpeg0") ELSE (AVCODEC_INCLUDE_DIR_FF) - FIND_PATH(AVCODEC_INCLUDE_DIR_LAVC "libavcodec/avcodec.h" PATHS) -+ FIND_PATH(AVCODEC_INCLUDE_DIR_LAVC "ffmpeg0/libavcodec/avcodec.h" PATHS) IF (AVCODEC_INCLUDE_DIR_LAVC) - SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_LAVC}/libavcodec") + SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_LAVC}/ffmpeg0/libavcodec") ELSE (AVCODEC_INCLUDE_DIR_LAVC) - FIND_PATH(AVCODEC_INCLUDE_DIR_FF_LAVC "ffmpeg/libavcodec/avcodec.h" PATHS) + FIND_PATH(AVCODEC_INCLUDE_DIR_FF_LAVC "ffmpeg0/libavcodec/avcodec.h" PATHS) IF (AVCODEC_INCLUDE_DIR_FF_LAVC) - SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg/libavcodec") - SET (FFMPEG_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg") + SET (AVCODEC_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg0/libavcodec") + SET (FFMPEG_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF_LAVC}/ffmpeg0") ENDIF (AVCODEC_INCLUDE_DIR_FF_LAVC) ENDIF (AVCODEC_INCLUDE_DIR_LAVC) ENDIF (AVCODEC_INCLUDE_DIR_FF) -FIND_LIBRARY(AVCODEC_LIBRARY NAMES ${_lib} PATHS ) +FIND_LIBRARY(AVCODEC_LIBRARY NAMES ${_lib} PATHS %%LOCALBASE%%/lib/ffmpeg0) IF (AVCODEC_INCLUDE_DIR AND AVCODEC_LIBRARY) SET(INC_FOUND TRUE) --- cmake/FindAvformat.cmake.orig 2009-12-06 08:13:37.000000000 -0200 +++ cmake/FindAvformat.cmake 2013-10-21 20:25:23.140646773 -0200 -@@ -2,22 +2,22 @@ +@@ -2,22 +2,21 @@ FIND_PATH(AVFORMAT_INCLUDE_DIR_FF "ffmpeg/avformat.h" PATHS) IF (AVFORMAT_INCLUDE_DIR_FF) - SET (AVFORMAT_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF}/ffmpeg") + SET (AVFORMAT_INCLUDE_DIR "${AVCODEC_INCLUDE_DIR_FF}/ffmpeg0") ELSE (AVFORMAT_INCLUDE_DIR_FF) - FIND_PATH(AVFORMAT_INCLUDE_DIR_LAVC "libavformat/avformat.h" PATHS) -+ FIND_PATH(AVFORMAT_INCLUDE_DIR_LAVC "ffmpeg0/libavformat/avformat.h" PATHS) IF (AVFORMAT_INCLUDE_DIR_LAVC) - SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_LAVC}/libavformat") + SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_LAVC}/ffmpeg0/libavformat") ELSE (AVFORMAT_INCLUDE_DIR_LAVC) - FIND_PATH(AVFORMAT_INCLUDE_DIR_FF_LAVF "ffmpeg/libavformat/avformat.h" PATHS) + FIND_PATH(AVFORMAT_INCLUDE_DIR_FF_LAVF "ffmpeg0/libavformat/avformat.h" PATHS) IF (AVFORMAT_INCLUDE_DIR_FF_LAVF) - SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_FF_LAVF}/ffmpeg/libavformat") + SET (AVFORMAT_INCLUDE_DIR "${AVFORMAT_INCLUDE_DIR_FF_LAVF}/ffmpeg0/libavformat") ENDIF (AVFORMAT_INCLUDE_DIR_FF_LAVF) ENDIF (AVFORMAT_INCLUDE_DIR_LAVC) ENDIF (AVFORMAT_INCLUDE_DIR_FF) -FIND_LIBRARY(AVFORMAT_LIBRARY NAMES ${_lib} PATHS ) +FIND_LIBRARY(AVFORMAT_LIBRARY NAMES ${_lib} PATHS %%LOCALBASE%%/lib/ffmpeg0) IF (AVFORMAT_INCLUDE_DIR AND AVFORMAT_LIBRARY) SET(INC_FOUND TRUE) --- cmake/FindFFmpegScale.cmake.orig 2009-12-06 08:13:37.000000000 -0200 +++ cmake/FindFFmpegScale.cmake 2013-10-21 20:26:07.389647103 -0200 -@@ -3,22 +3,22 @@ +@@ -3,22 +3,21 @@ FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_FF "ffmpeg/swscale.h" PATHS) IF (FFMPEGSCALE_INCLUDE_DIR_FF) - SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_FF}/ffmpeg") + SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_FF}/ffmpeg0") ELSE (FFMPEGSCALE_INCLUDE_DIR_FF) - FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_LAVC "libswscale/swscale.h" PATHS) -+ FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_LAVC "ffmpeg0/libswscale/swscale.h" PATHS) IF (FFMPEGSCALE_INCLUDE_DIR_LAVC) - SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_LAVC}/libswscale") + SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_LAVC}/ffmpeg0/libswscale") ELSE (FFMPEGSCALE_INCLUDE_DIR_LAVC) - FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_FF_SCAL "ffmpeg/libswscale/swscale.h" PATHS) + FIND_PATH(FFMPEGSCALE_INCLUDE_DIR_FF_SCAL "ffmpeg0/libswscale/swscale.h" PATHS) IF (FFMPEGSCALE_INCLUDE_DIR_FF_SCAL) - SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_FF_SCAL}/ffmpeg/libswscale") + SET (FFMPEGSCALE_INCLUDE_DIR "${FFMPEGSCALE_INCLUDE_DIR_FF_SCAL}/ffmpeg0/libswscale") ENDIF (FFMPEGSCALE_INCLUDE_DIR_FF_SCAL) ENDIF (FFMPEGSCALE_INCLUDE_DIR_LAVC) ENDIF (FFMPEGSCALE_INCLUDE_DIR_FF) -FIND_LIBRARY(FFMPEGSCALE_LIBRARY NAMES ${_lib} PATHS ) +FIND_LIBRARY(FFMPEGSCALE_LIBRARY NAMES ${_lib} PATHS %%LOCALBASE%%/lib/ffmpeg0) IF (FFMPEGSCALE_INCLUDE_DIR AND FFMPEGSCALE_LIBRARY) SET(HAVE_SWSCALE TRUE)