Page MenuHomeFreeBSD
Files F151780450

D9749.id.diff
No OneTemporary
Actions

D9749.id.diff
View Options

Index: multimedia/Makefile
===================================================================
--- multimedia/Makefile
+++ multimedia/Makefile
@@ -161,9 +161,8 @@
SUBDIR += jmref
SUBDIR += k9copy-kde4
SUBDIR += kaffeine
- SUBDIR += kdemultimedia4
- SUBDIR += kdemultimedia4-ffmpegthumbs
- SUBDIR += kdemultimedia4-mplayerthumbs
+ SUBDIR += kdemultimedia
+ SUBDIR += kdemultimedia-ffmpegthumbs
SUBDIR += kdenlive
SUBDIR += kf5-kmediaplayer
SUBDIR += kissdx
Index: multimedia/dragon/Makefile
===================================================================
--- multimedia/dragon/Makefile
+++ multimedia/dragon/Makefile
@@ -2,18 +2,18 @@
# $FreeBSD$
PORTNAME= dragon
-PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= multimedia kde kde-kde4
-# Avoid clash with devel/dragon
-PKGNAMESUFFIX= -player
+PORTVERSION= ${KDE_APPLICATIONS_VERSION}
+CATEGORIES= multimedia kde kde-applications
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE multimedia player with a focus on simplicity
LICENSE= GPLv2
-USES= cmake:outsource kde:4 tar:xz
-USE_KDE= automoc4 kdelibs
-USE_QT4= phonon moc_build qmake_build rcc_build uic_build
+USES= cmake:outsource gettext kde:5 tar:xz
+USE_KDE= config configwidgets coreaddons dbusaddons doctools ecm \
+ i18n iconthemes jobwidgets notifications parts solid \
+ widgetsaddons windowsystem xmlgui
+USE_QT5= buildtools_build phonon4 qmake_build
.include <bsd.port.mk>
Index: multimedia/dragon/distinfo
===================================================================
--- multimedia/dragon/distinfo
+++ multimedia/dragon/distinfo
@@ -1,2 +1,3 @@
-SHA256 (KDE/4.14.3/dragon-4.14.3.tar.xz) = d39ef6d550d114af6c1e0583c4d7a4632042bf1c12af061f16c31a3e28d8b0a4
-SIZE (KDE/4.14.3/dragon-4.14.3.tar.xz) = 391000
+TIMESTAMP = 1486501798
+SHA256 (KDE/applications/16.12.2/dragon-16.12.2.tar.xz) = 7392a7cb24265364703032eef1ade06e1df9df9c9e291e9d479edf99ceb8311e
+SIZE (KDE/applications/16.12.2/dragon-16.12.2.tar.xz) = 479248
Index: multimedia/dragon/pkg-plist
===================================================================
--- multimedia/dragon/pkg-plist
+++ multimedia/dragon/pkg-plist
@@ -1,16 +1,12 @@
bin/dragon
-lib/kde4/dragonpart.so
+etc/xdg/dragonplayerrc
+%%QT_PLUGINDIR%%/dragonpart.so
man/man1/dragon.1.gz
-share/applications/kde4/dragonplayer.desktop
-share/apps/dragonplayer/dragonlogo.png
-share/apps/dragonplayer/dragonplayerui.rc
-share/apps/solid/actions/dragonplayer-opendvd.desktop
-share/config/dragonplayerrc
-share/doc/HTML/en/dragonplayer/common
+share/metainfo/org.kde.dragonplayer.appdata.xml
+share/applications/org.kde.dragonplayer.desktop
share/doc/HTML/en/dragonplayer/index.cache.bz2
share/doc/HTML/en/dragonplayer/index.docbook
share/doc/HTML/en/dragonplayer/main.png
-share/doc/HTML/en/dragonplayer/man-dragon.1.docbook
share/doc/HTML/en/dragonplayer/playmedia.png
share/icons/hicolor/128x128/apps/dragonplayer.png
share/icons/hicolor/16x16/apps/dragonplayer.png
@@ -24,5 +20,9 @@
share/icons/oxygen/32x32/actions/player-volume-muted.png
share/icons/oxygen/48x48/actions/player-volume-muted.png
share/icons/oxygen/scalable/actions/player-volume-muted.svgz
-share/kde4/services/ServiceMenus/dragonplayer_play_dvd.desktop
-share/kde4/services/dragonplayer_part.desktop
+share/kservices5/ServiceMenus/dragonplayer_play_dvd.desktop
+share/kservices5/dragonplayer_part.desktop
+share/kxmlgui5/dragonplayer/dragonlogo.png
+share/kxmlgui5/dragonplayer/dragonplayerui.rc
+share/solid/actions/dragonplayer-openaudiocd.desktop
+share/solid/actions/dragonplayer-opendvd.desktop
Index: multimedia/kdemultimedia-ffmpegthumbs/Makefile
===================================================================
--- multimedia/kdemultimedia-ffmpegthumbs/Makefile
+++ multimedia/kdemultimedia-ffmpegthumbs/Makefile
@@ -2,9 +2,8 @@
# $FreeBSD$
PORTNAME= ffmpegthumbs
-PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
-CATEGORIES= multimedia kde kde-kde4
+PORTVERSION= ${KDE_APPLICATIONS_VERSION}
+CATEGORIES= multimedia kde kde-applications
PKGNAMEPREFIX= kdemultimedia-
MAINTAINER= kde@FreeBSD.org
@@ -14,9 +13,8 @@
LIB_DEPENDS= libswscale.so:multimedia/ffmpeg
-USES= cmake:outsource kde:4 pkgconfig tar:xz
-USE_KDE= automoc4 kdelibs
-USE_QT4= moc_build qmake_build rcc_build uic_build \
- corelib dbus gui network svg xml
+USES= cmake:outsource kde:5 pkgconfig tar:xz
+USE_KDE= kio
+USE_QT5= buildtools_build gui qmake_build
.include <bsd.port.mk>
Index: multimedia/kdemultimedia-ffmpegthumbs/distinfo
===================================================================
--- multimedia/kdemultimedia-ffmpegthumbs/distinfo
+++ multimedia/kdemultimedia-ffmpegthumbs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (KDE/4.14.3/ffmpegthumbs-4.14.3.tar.xz) = 79f0856b370787ec598a161174e659d7c59bfc53e10601209a181168b50052f1
-SIZE (KDE/4.14.3/ffmpegthumbs-4.14.3.tar.xz) = 20228
+TIMESTAMP = 1486501798
+SHA256 (KDE/applications/16.12.2/ffmpegthumbs-16.12.2.tar.xz) = 6cae5ca16b4718f2a81dc9755e4c2bd41ba3ae419929a6404873fcc770c72e5c
+SIZE (KDE/applications/16.12.2/ffmpegthumbs-16.12.2.tar.xz) = 21140
Index: multimedia/kdemultimedia-ffmpegthumbs/pkg-plist
===================================================================
--- multimedia/kdemultimedia-ffmpegthumbs/pkg-plist
+++ multimedia/kdemultimedia-ffmpegthumbs/pkg-plist
@@ -1,2 +1,2 @@
-lib/kde4/ffmpegthumbs.so
-share/kde4/services/ffmpegthumbs.desktop
+%%QT_PLUGINDIR%%/ffmpegthumbs.so
+share/kservices5/ffmpegthumbs.desktop
Index: multimedia/kdemultimedia/Makefile
===================================================================
--- multimedia/kdemultimedia/Makefile
+++ multimedia/kdemultimedia/Makefile
@@ -2,36 +2,29 @@
# $FreeBSD$
PORTNAME= kdemultimedia
-PORTVERSION= ${KDE4_VERSION}
+PORTVERSION= ${KDE_APPLICATIONS_VERSION}
CATEGORIES= multimedia kde
+PKGNAMESUFFIX= -kf5
MAINTAINER= kde@FreeBSD.org
COMMENT= KDE Multimedia applications (meta port)
-USES= kde:4 metaport
+USES= kde:5 metaport
+USE_QT5= #
-OPTIONS_DEFINE= DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD MPLAYER
-OPTIONS_DEFAULT= DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD
+OPTIONS_DEFINE= DRAGON FFMPEG AUDIOCD_KIO KMIX
+OPTIONS_DEFAULT= ${OPTIONS_DEFINE}
DRAGON_DESC= Simple video player
-DRAGON_RUN_DEPENDS= ${KDE_PREFIX}/bin/dragon:multimedia/dragon
+DRAGON_RUN_DEPENDS= ${KDE_PREFIX}/bin/dragon:multimedia/dragon-kf5
FFMPEG_DESC= FFMPEG-based video thumbnailer
-FFMPEG_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/ffmpegthumbs.so:multimedia/kdemultimedia4-ffmpegthumbs
+FFMPEG_RUN_DEPENDS= ${QT_PLUGINDIR}/ffmpegthumbs.so:multimedia/kdemultimedia-ffmpegthumbs-kf5
-JUK_DESC= Audio player
-JUK_RUN_DEPENDS= ${KDE_PREFIX}/bin/juk:audio/juk
-
-KIO_AUDIOCD_DESC= Audio CD IOSlave
-KIO_AUDIOCD_RUN_DEPENDS= ${KDE_PREFIX}/lib/libaudiocdplugins.so:audio/kio-audiocd
+AUDIOCD_KIO_DESC= Audio CD IOSlave
+AUDIOCD_KIO_LIB_DEPENDS= libaudiocdplugins.so:audio/audiocd-kio-kf5
KMIX_DESC= Audio mixer
-KMIX_RUN_DEPENDS= ${KDE_PREFIX}/bin/kmix:audio/kmix
-
-KSCD_DESC= CD Player
-KSCD_RUN_DEPENDS= ${KDE_PREFIX}/bin/kscd:audio/kscd
-
-MPLAYER_DESC= MPlayer-based video thumbnailer
-MPLAYER_RUN_DEPENDS= ${KDE_PREFIX}/bin/mplayerthumbsconfig:multimedia/kdemultimedia4-mplayerthumbs
+KMIX_RUN_DEPENDS= ${KDE_PREFIX}/bin/kmix:audio/kmix-kf5
.include <bsd.port.mk>
Index: multimedia/kdemultimedia4-ffmpegthumbs/Makefile
===================================================================
--- multimedia/kdemultimedia4-ffmpegthumbs/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= ffmpegthumbs
-PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
-CATEGORIES= multimedia kde kde-kde4
-PKGNAMEPREFIX= kdemultimedia-
-
-MAINTAINER= kde@FreeBSD.org
-COMMENT= FFmpeg-based thumbnail generator for video files
-
-LICENSE= GPLv2
-
-LIB_DEPENDS= libswscale.so:multimedia/ffmpeg
-
-USES= cmake:outsource kde:4 pkgconfig tar:xz
-USE_KDE= automoc4 kdelibs
-USE_QT4= moc_build qmake_build rcc_build uic_build \
- corelib dbus gui network svg xml
-
-.include <bsd.port.mk>
Index: multimedia/kdemultimedia4-ffmpegthumbs/distinfo
===================================================================
--- multimedia/kdemultimedia4-ffmpegthumbs/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (KDE/4.14.3/ffmpegthumbs-4.14.3.tar.xz) = 79f0856b370787ec598a161174e659d7c59bfc53e10601209a181168b50052f1
-SIZE (KDE/4.14.3/ffmpegthumbs-4.14.3.tar.xz) = 20228
Index: multimedia/kdemultimedia4-ffmpegthumbs/files/patch-CMakeLists.txt
===================================================================
--- multimedia/kdemultimedia4-ffmpegthumbs/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# Reorder include directories to allow build with multiple ffmpeg installed.
-# This patch must NOT be used, if FFMPEG_INCLUDE_DIRS == ${LOCALBASE}/include
-#
---- ./CMakeLists.txt.orig 2013-03-01 07:07:31.562142000 +0000
-+++ ./CMakeLists.txt 2013-03-06 00:33:28.482362201 +0000
-@@ -7,11 +7,11 @@
- find_package(FFmpeg COMPONENTS AVCODEC AVFORMAT SWSCALE)
-
- include_directories(
-- ${KDE4_INCLUDES}
-- ${CMAKE_CURRENT_BINARY_DIR}
-+ ${FFMPEG_INCLUDE_DIR}
- ${PC_AVCODEC_INCLUDEDIR}
- ${PC_AVFORMAT_INCLUDEDIR}
-- ${FFMPEG_INCLUDE_DIR}
-+ ${KDE4_INCLUDES}
-+ ${CMAKE_CURRENT_BINARY_DIR}
- )
-
- # Certain versions of FFMPEG need this to be defined
Index: multimedia/kdemultimedia4-ffmpegthumbs/files/patch-kde_rb-126992
===================================================================
--- multimedia/kdemultimedia4-ffmpegthumbs/files/patch-kde_rb-126992
+++ /dev/null
@@ -1,253 +0,0 @@
-Fix build with ffmpeg>=2.9
-
-Obtained from: https://git.reviewboard.kde.org/r/126992
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48eed64d76f0542327c8dbce9644e5cc898c8cbc..3c761fa584497e6aba9065e195533b1bf8498648 100644
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -27,7 +27,7 @@ set( ffmpegthumbs_PART_SRCS
-
- kde4_add_plugin(ffmpegthumbs ${ffmpegthumbs_PART_SRCS})
-
--target_link_libraries(ffmpegthumbs ${KDE4_KIO_LIBS} ${AVUTIL_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES} )
-+target_link_libraries(ffmpegthumbs ${KDE4_KIO_LIBS} ${AVUTIL_LIBRARIES} ${AVFILTER_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES} )
-
- install(TARGETS ffmpegthumbs DESTINATION ${PLUGIN_INSTALL_DIR})
-
-diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake
-index 27c6b16de7cfd7514a9a2c273dcd242670248613..915ab5f9f9618c460560342b564963e701a5efd8 100644
---- cmake/FindFFmpeg.cmake
-+++ cmake/FindFFmpeg.cmake
-@@ -99,6 +99,7 @@ if (NOT FFMPEG_LIBRARIES)
-
- # Check for all possible component.
- find_component(AVCODEC libavcodec avcodec libavcodec/avcodec.h)
-+ find_component(AVFILTER libavfilter avfilter libavfilter/avfilter.h)
- find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
- find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
- find_component(AVUTIL libavutil avutil libavutil/avutil.h)
-diff --git a/ffmpegthumbnailer/moviedecoder.h b/ffmpegthumbnailer/moviedecoder.h
-index 288892685b6ae6946f158deacab1eeded5745cb6..b4a76b81724dd5956eb2be61ab7470b2ed351a4c 100644
---- ffmpegthumbnailer/moviedecoder.h
-+++ ffmpegthumbnailer/moviedecoder.h
-@@ -23,6 +23,9 @@
- extern "C" {
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
-+#include <libavfilter/avfilter.h>
-+#include <libavfilter/buffersrc.h>
-+#include <libavfilter/buffersink.h>
- }
-
- namespace ffmpegthumbnailer
-@@ -52,10 +55,14 @@ private:
-
- bool decodeVideoPacket();
- bool getVideoPacket();
-- void convertAndScaleFrame(PixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight);
-- void createAVFrame(AVFrame** avFrame, quint8** frameBuffer, int width, int height, PixelFormat format);
-+ void convertAndScaleFrame(AVPixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight);
-+ void createAVFrame(AVFrame** avFrame, quint8** frameBuffer, int width, int height, AVPixelFormat format);
- void calculateDimensions(int squareSize, bool maintainAspectRatio, int& destWidth, int& destHeight);
-
-+ void delete_filter_graph();
-+ int init_filter_graph(enum AVPixelFormat pixfmt, int width, int height);
-+ int process_filter_graph(AVPicture *dst, const AVPicture *src, enum AVPixelFormat pixfmt, int width, int height);
-+
- private:
- int m_VideoStream;
- AVFormatContext* m_pFormatContext;
-@@ -68,6 +75,13 @@ private:
- bool m_FormatContextWasGiven;
- bool m_AllowSeek;
- bool m_initialized;
-+ AVFilterContext* m_buffersink_ctx;
-+ AVFilterContext* m_buffersrc_ctx;
-+ AVFilterGraph* m_filter_graph;
-+ AVFrame* m_filter_frame;
-+ int m_last_width;
-+ int m_last_height;
-+ enum AVPixelFormat m_last_pixfmt;
- };
-
- }
-diff --git a/ffmpegthumbnailer/moviedecoder.cpp b/ffmpegthumbnailer/moviedecoder.cpp
-index c8ae6d1acd2876cabb5c0594b52f676486be707e..59ae79480575f2394d1f1b7d6dceb5daa7d6e4b7 100644
---- ffmpegthumbnailer/moviedecoder.cpp
-+++ ffmpegthumbnailer/moviedecoder.cpp
-@@ -51,6 +51,9 @@ MovieDecoder::~MovieDecoder()
-
- void MovieDecoder::initialize(const QString& filename)
- {
-+ m_last_width = -1;
-+ m_last_height = -1;
-+ m_last_pixfmt = AV_PIX_FMT_NONE;
- av_register_all();
- avcodec_register_all();
-
-@@ -67,7 +70,7 @@ void MovieDecoder::initialize(const QString& filename)
- }
-
- initializeVideo();
-- m_pFrame = avcodec_alloc_frame();
-+ m_pFrame = av_frame_alloc();
-
- if (m_pFrame) {
- m_initialized=true;
-@@ -82,6 +85,7 @@ bool MovieDecoder::getInitialized()
-
- void MovieDecoder::destroy()
- {
-+ delete_filter_graph();
- if (m_pVideoCodecContext) {
- avcodec_close(m_pVideoCodecContext);
- m_pVideoCodecContext = NULL;
-@@ -99,7 +103,7 @@ void MovieDecoder::destroy()
- }
-
- if (m_pFrame) {
-- av_free(m_pFrame);
-+ av_frame_free(&m_pFrame);
- m_pFrame = NULL;
- }
-
-@@ -239,7 +243,7 @@ bool MovieDecoder::decodeVideoPacket()
- return false;
- }
-
-- avcodec_get_frame_defaults(m_pFrame);
-+ av_frame_unref(m_pFrame);
-
- int frameFinished = 0;
-
-@@ -283,15 +287,83 @@ bool MovieDecoder::getVideoPacket()
- return frameDecoded;
- }
-
-+void MovieDecoder::delete_filter_graph() {
-+ if (m_filter_graph) {
-+ av_frame_free(&m_filter_frame);
-+ avfilter_graph_free(&m_filter_graph);
-+ }
-+}
-+
-+int MovieDecoder::init_filter_graph(enum AVPixelFormat pixfmt, int width, int height) {
-+ AVFilterInOut *inputs = NULL, *outputs = NULL;
-+ char args[512];
-+ int res;
-+
-+ delete_filter_graph();
-+ m_filter_graph = avfilter_graph_alloc();
-+ snprintf(args, sizeof(args),
-+ "buffer=video_size=%dx%d:pix_fmt=%d:time_base=1/1:pixel_aspect=0/1[in];"
-+ "[in]yadif[out];"
-+ "[out]buffersink",
-+ width, height, pixfmt);
-+ res = avfilter_graph_parse2(m_filter_graph, args, &inputs, &outputs);
-+ if (res < 0)
-+ return res;
-+ if(inputs || outputs)
-+ return -1;
-+ res = avfilter_graph_config(m_filter_graph, NULL);
-+ if (res < 0)
-+ return res;
-+
-+ m_buffersrc_ctx = avfilter_graph_get_filter(m_filter_graph, "Parsed_buffer_0");
-+ m_buffersink_ctx = avfilter_graph_get_filter(m_filter_graph, "Parsed_buffersink_2");
-+ if (!m_buffersrc_ctx || !m_buffersink_ctx)
-+ return -1;
-+ m_filter_frame = av_frame_alloc();
-+ m_last_width = width;
-+ m_last_height = height;
-+ m_last_pixfmt = pixfmt;
-+
-+ return 0;
-+}
-+
-+int MovieDecoder::process_filter_graph(AVPicture *dst, const AVPicture *src,
-+ enum AVPixelFormat pixfmt, int width, int height) {
-+ int res;
-+
-+ if (!m_filter_graph || width != m_last_width ||
-+ height != m_last_height || pixfmt != m_last_pixfmt) {
-+ res = init_filter_graph(pixfmt, width, height);
-+ if (res < 0)
-+ return res;
-+ }
-+
-+ memcpy(m_filter_frame->data, src->data, sizeof(src->data));
-+ memcpy(m_filter_frame->linesize, src->linesize, sizeof(src->linesize));
-+ m_filter_frame->width = width;
-+ m_filter_frame->height = height;
-+ m_filter_frame->format = pixfmt;
-+ res = av_buffersrc_add_frame(m_buffersrc_ctx, m_filter_frame);
-+ if (res < 0)
-+ return res;
-+ res = av_buffersink_get_frame(m_buffersink_ctx, m_filter_frame);
-+ if (res < 0)
-+ return res;
-+ av_picture_copy(dst, (const AVPicture *) m_filter_frame, pixfmt, width, height);
-+ av_frame_unref(m_filter_frame);
-+
-+ return 0;
-+}
-+
- void MovieDecoder::getScaledVideoFrame(int scaledSize, bool maintainAspectRatio, VideoFrame& videoFrame)
- {
- if (m_pFrame->interlaced_frame) {
-- avpicture_deinterlace((AVPicture*) m_pFrame, (AVPicture*) m_pFrame, m_pVideoCodecContext->pix_fmt,
-+ process_filter_graph((AVPicture*) m_pFrame, (AVPicture*) m_pFrame, m_pVideoCodecContext->pix_fmt,
- m_pVideoCodecContext->width, m_pVideoCodecContext->height);
- }
-
- int scaledWidth, scaledHeight;
-- convertAndScaleFrame(PIX_FMT_RGB24, scaledSize, maintainAspectRatio, scaledWidth, scaledHeight);
-+ convertAndScaleFrame(AV_PIX_FMT_RGB24, scaledSize, maintainAspectRatio, scaledWidth, scaledHeight);
-
- videoFrame.width = scaledWidth;
- videoFrame.height = scaledHeight;
-@@ -302,7 +374,7 @@ void MovieDecoder::getScaledVideoFrame(int scaledSize, bool maintainAspectRatio,
- memcpy((&(videoFrame.frameData.front())), m_pFrame->data[0], videoFrame.lineSize * videoFrame.height);
- }
-
--void MovieDecoder::convertAndScaleFrame(PixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight)
-+void MovieDecoder::convertAndScaleFrame(AVPixelFormat format, int scaledSize, bool maintainAspectRatio, int& scaledWidth, int& scaledHeight)
- {
- calculateDimensions(scaledSize, maintainAspectRatio, scaledWidth, scaledHeight);
- SwsContext* scaleContext = sws_getContext(m_pVideoCodecContext->width, m_pVideoCodecContext->height,
-@@ -323,7 +395,7 @@ void MovieDecoder::convertAndScaleFrame(PixelFormat format, int scaledSize, bool
- convertedFrame->data, convertedFrame->linesize);
- sws_freeContext(scaleContext);
-
-- av_free(m_pFrame);
-+ av_frame_free(&m_pFrame);
- av_free(m_pFrameBuffer);
-
- m_pFrame = convertedFrame;
-@@ -355,9 +427,9 @@ void MovieDecoder::calculateDimensions(int squareSize, bool maintainAspectRatio,
- }
- }
-
--void MovieDecoder::createAVFrame(AVFrame** avFrame, quint8** frameBuffer, int width, int height, PixelFormat format)
-+void MovieDecoder::createAVFrame(AVFrame** avFrame, quint8** frameBuffer, int width, int height, AVPixelFormat format)
- {
-- *avFrame = avcodec_alloc_frame();
-+ *avFrame = av_frame_alloc();
-
- int numBytes = avpicture_get_size(format, width, height);
- *frameBuffer = reinterpret_cast<quint8*>(av_malloc(numBytes));
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 1728fcdd14b699b8f4d7e9a9ffcd8ddc11f495c6..b46169a6274af3e75bd303434a6ce82c928875a0 100644
---- tests/CMakeLists.txt
-+++ tests/CMakeLists.txt
-@@ -19,7 +19,7 @@ set(ffmpegthumbtest_SRCS ffmpegthumbtest.cpp
-
- kde4_add_executable(ffmpegthumbtest ${ffmpegthumbtest_SRCS} )
-
--target_link_libraries(ffmpegthumbtest ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${AVUTIL_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES})
-+target_link_libraries(ffmpegthumbtest ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${AVUTIL_LIBRARIES} ${AVFILTER_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVCODEC_LIBRARIES} ${SWSCALE_LIBRARIES})
-
-
-
Index: multimedia/kdemultimedia4-ffmpegthumbs/pkg-descr
===================================================================
--- multimedia/kdemultimedia4-ffmpegthumbs/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-ffmpeg-based thumbnail creator for video files.
-
-WWW: http://www.kde.org/
Index: multimedia/kdemultimedia4-ffmpegthumbs/pkg-plist
===================================================================
--- multimedia/kdemultimedia4-ffmpegthumbs/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/kde4/ffmpegthumbs.so
-share/kde4/services/ffmpegthumbs.desktop
Index: multimedia/kdemultimedia4-mplayerthumbs/Makefile
===================================================================
--- multimedia/kdemultimedia4-mplayerthumbs/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-# Created by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= mplayerthumbs
-PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= multimedia kde kde-kde4
-PKGNAMEPREFIX= kdemultimedia-
-
-MAINTAINER= kde@FreeBSD.org
-COMMENT= MPlayer-based thumbnail generator for video files
-
-LICENSE= LGPL21
-
-RUN_DEPENDS= mplayer:multimedia/mplayer
-
-USES= cmake:outsource kde:4 tar:xz
-USE_KDE= automoc4 kdelibs
-USE_QT4= phonon moc_build qmake_build rcc_build uic_build
-
-.include <bsd.port.mk>
Index: multimedia/kdemultimedia4-mplayerthumbs/distinfo
===================================================================
--- multimedia/kdemultimedia4-mplayerthumbs/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (KDE/4.14.3/mplayerthumbs-4.14.3.tar.xz) = bb8874352fe8ca987f6c108b98c63e1a5f81f9720ec3b18b3b951fa82a08367e
-SIZE (KDE/4.14.3/mplayerthumbs-4.14.3.tar.xz) = 27188
Index: multimedia/kdemultimedia4-mplayerthumbs/pkg-descr
===================================================================
--- multimedia/kdemultimedia4-mplayerthumbs/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-MPlayer-based thumbnail generator for video files.
-
-WWW: http://www.kde.org/
Index: multimedia/kdemultimedia4-mplayerthumbs/pkg-plist
===================================================================
--- multimedia/kdemultimedia4-mplayerthumbs/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/mplayerthumbsconfig
-lib/kde4/videopreview.so
-share/apps/videothumbnail/sprocket-large.png
-share/apps/videothumbnail/sprocket-medium.png
-share/apps/videothumbnail/sprocket-small.png
-share/config.kcfg/mplayerthumbs.kcfg
-share/kde4/services/videopreview.desktop
Index: multimedia/kdemultimedia4/Makefile
===================================================================
--- multimedia/kdemultimedia4/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Created by: Martin Wilke <miwi@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= kdemultimedia
-PORTVERSION= ${KDE4_VERSION}
-CATEGORIES= multimedia kde
-
-MAINTAINER= kde@FreeBSD.org
-COMMENT= KDE Multimedia applications (meta port)
-
-USES= kde:4 metaport
-
-OPTIONS_DEFINE= DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD MPLAYER
-OPTIONS_DEFAULT= DRAGON FFMPEG JUK KIO_AUDIOCD KMIX KSCD
-
-DRAGON_DESC= Simple video player
-DRAGON_RUN_DEPENDS= ${KDE_PREFIX}/bin/dragon:multimedia/dragon
-
-FFMPEG_DESC= FFMPEG-based video thumbnailer
-FFMPEG_RUN_DEPENDS= ${KDE_PREFIX}/lib/kde4/ffmpegthumbs.so:multimedia/kdemultimedia4-ffmpegthumbs
-
-JUK_DESC= Audio player
-JUK_RUN_DEPENDS= ${KDE_PREFIX}/bin/juk:audio/juk
-
-KIO_AUDIOCD_DESC= Audio CD IOSlave
-KIO_AUDIOCD_RUN_DEPENDS= ${KDE_PREFIX}/lib/libaudiocdplugins.so:audio/kio-audiocd
-
-KMIX_DESC= Audio mixer
-KMIX_RUN_DEPENDS= ${KDE_PREFIX}/bin/kmix:audio/kmix
-
-KSCD_DESC= CD Player
-KSCD_RUN_DEPENDS= ${KDE_PREFIX}/bin/kscd:audio/kscd
-
-MPLAYER_DESC= MPlayer-based video thumbnailer
-MPLAYER_RUN_DEPENDS= ${KDE_PREFIX}/bin/mplayerthumbsconfig:multimedia/kdemultimedia4-mplayerthumbs
-
-.include <bsd.port.mk>
Index: multimedia/kdemultimedia4/pkg-descr
===================================================================
--- multimedia/kdemultimedia4/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Multimedia tools for KDE4.
-
-WWW: http://multimedia.kde.org

File Metadata

Mime Type
text/plain
Expires
Sat, Apr 11, 3:25 PM (55 m, 14 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31296880
Default Alt Text
D9749.id.diff (23 KB)

Event Timeline