Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions

5
sysutils/k3b/DESCR Normal file
View File

@@ -0,0 +1,5 @@
K3b is a CD and DVD burning application for Linux and BSD systems
optimized for KDE. It provides a comfortable user interface to perform
most CD/DVD burning tasks like creating an Audio CD from a set of audio
files or copying a CD. The actual burning in K3b is done by the command
line utilities cdrecord, cdrdao, and growisofs.

57
sysutils/k3b/Makefile Normal file
View File

@@ -0,0 +1,57 @@
# $NetBSD: Makefile,v 1.62 2013/06/06 12:55:04 wiz Exp $
#
DISTNAME= k3b-2.0.2
PKGREVISION= 19
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=k3b/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://www.k3b.org/
COMMENT= DVD and CD authoring program
BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
DEPENDS+= cdrdao-[0-9]*:../../sysutils/cdrdao
DEPENDS+= {cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
USE_TOOLS+= perl pkg-config gmake msgfmt
USE_LANGUAGES= c c++
CMAKE_ARGS+= -DK3B_BUILD_MUSE_DECODER_PLUGIN=OFF
CONF_FILES= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.k3bsetup.conf \
${PKG_SYSCONFBASE}/dbus-1/system.d/org.kde.kcontrol.k3bsetup.conf
ONLY_FOR_PLATFORM= FreeBSD-*-* Linux-*-* NetBSD-*-* DragonFly-*-*
SUBST_CLASSES+= pathfix
SUBST_STAGE.pathfix= post-patch
SUBST_MESSAGE.pathfix= Add cdrtools path.
SUBST_FILES.pathfix= libk3b/core/k3bexternalbinmanager.cpp
SUBST_SED.pathfix= -e 's:"/usr/bin/":"${LOCALBASE}/bin", "/usr/bin/":g'
pre-configure:
# buildlink loses this symlink
ln -s ${BUILDLINK_PREFIX.qt4-libs}/qt4/mkspecs/default ${BUILDLINK_DIR}/qt4/mkspecs/default
.include "../../mk/dlopen.buildlink3.mk"
BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
.include "../../meta-pkgs/kde4/kde4.mk"
.include "../../audio/flac/buildlink3.mk"
.include "../../audio/lame/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
#.include "../../audio/libmpcdec/buildlink3.mk"
.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/musicbrainz/buildlink3.mk"
.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../audio/taglib/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../multimedia/ffmpeg/buildlink3.mk"
.include "../../multimedia/libdvdread/buildlink3.mk"
.include "../../multimedia/libkcddb/buildlink3.mk"
.include "../../security/polkit-qt/buildlink3.mk"
.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../mk/bsd.pkg.mk"

604
sysutils/k3b/PLIST Normal file
View File

@@ -0,0 +1,604 @@
@comment $NetBSD: PLIST,v 1.10 2012/03/22 06:39:00 markd Exp $
bin/k3b
bin/k3bsetup
include/k3b_export.h
include/k3bactivepipe.h
include/k3baudiocdtrackdrag.h
include/k3baudiocdtracksource.h
include/k3baudiocuefilewritingjob.h
include/k3baudiodatasource.h
include/k3baudiodatasourceiterator.h
include/k3baudiodecoder.h
include/k3baudiodoc.h
include/k3baudioencoder.h
include/k3baudiofile.h
include/k3baudiofileanalyzerjob.h
include/k3baudiojob.h
include/k3baudiotrack.h
include/k3baudiozerodata.h
include/k3bbinimagewritingjob.h
include/k3bblankingjob.h
include/k3bbootitem.h
include/k3bbusywidget.h
include/k3bcdcopyjob.h
include/k3bcddb.h
include/k3bcdparanoialib.h
include/k3bcdrdaowriter.h
include/k3bcdrecordwriter.h
include/k3bcdtext.h
include/k3bcdtextvalidator.h
include/k3bchecksumpipe.h
include/k3bclonejob.h
include/k3bcore.h
include/k3bcuefileparser.h
include/k3bdatadoc.h
include/k3bdataitem.h
include/k3bdatajob.h
include/k3bdefaultexternalprograms.h
include/k3bdevice.h
include/k3bdevice_export.h
include/k3bdevicecombobox.h
include/k3bdeviceglobals.h
include/k3bdevicehandler.h
include/k3bdevicemanager.h
include/k3bdeviceselectiondialog.h
include/k3bdevicetypes.h
include/k3bdiritem.h
include/k3bdirsizejob.h
include/k3bdiskinfo.h
include/k3bdoc.h
include/k3bdvdcopyjob.h
include/k3bdvdformattingjob.h
include/k3bexceptions.h
include/k3bexternalbinmanager.h
include/k3bfileitem.h
include/k3bfilesplitter.h
include/k3bfilesysteminfo.h
include/k3bglobals.h
include/k3bglobalsettings.h
include/k3bgrowisofswriter.h
include/k3bimagefilereader.h
include/k3binffilewriter.h
include/k3bintmapcombobox.h
include/k3bintvalidator.h
include/k3biso9660.h
include/k3biso9660backend.h
include/k3biso9660imagewritingjob.h
include/k3bisooptions.h
include/k3bjob.h
include/k3bjobhandler.h
include/k3blistview.h
include/k3blistviewitemanimator.h
include/k3bmd5job.h
include/k3bmediacache.h
include/k3bmedium.h
include/k3bmetawriter.h
include/k3bmixeddoc.h
include/k3bmixedjob.h
include/k3bmovixdoc.h
include/k3bmovixfileitem.h
include/k3bmovixjob.h
include/k3bmsf.h
include/k3bmsfedit.h
include/k3bmultichoicedialog.h
include/k3bplugin.h
include/k3bpluginconfigwidget.h
include/k3bpluginmanager.h
include/k3bprocess.h
include/k3bprogressdialog.h
include/k3bprojectplugin.h
include/k3bpushbutton.h
include/k3brawaudiodatasource.h
include/k3brichtextlabel.h
include/k3bsignalwaiter.h
include/k3bsimplejobhandler.h
include/k3bstdguiitems.h
include/k3bstringutils.h
include/k3bthreadjob.h
include/k3bthreadwidget.h
include/k3bthroughputestimator.h
include/k3btoc.h
include/k3btocfilewriter.h
include/k3btrack.h
include/k3bvalidators.h
include/k3bvcddoc.h
include/k3bvcdjob.h
include/k3bvcdoptions.h
include/k3bverificationjob.h
include/k3bversion.h
include/k3bvideodvd.h
include/k3bvideodvdaudiostream.h
include/k3bvideodvddoc.h
include/k3bvideodvdjob.h
include/k3bvideodvdptt.h
include/k3bvideodvdsubpicturestream.h
include/k3bvideodvdtime.h
include/k3bvideodvdtitle.h
include/k3bvideodvdtitledetectclippingjob.h
include/k3bvideodvdtitletranscodingjob.h
include/k3bvideodvdvideostream.h
include/k3bwavefilewriter.h
lib/kde4/k3baudiometainforenamerplugin.so
lib/kde4/k3baudioprojectcddbplugin.so
lib/kde4/k3bexternalencoder.so
lib/kde4/k3bffmpegdecoder.so
lib/kde4/k3bflacdecoder.so
lib/kde4/k3blameencoder.so
lib/kde4/k3blibsndfiledecoder.so
lib/kde4/k3bmaddecoder.so
lib/kde4/k3boggvorbisdecoder.so
lib/kde4/k3boggvorbisencoder.so
lib/kde4/k3bsoxencoder.so
lib/kde4/k3bwavedecoder.so
lib/kde4/kcm_k3bexternalencoder.so
lib/kde4/kcm_k3blameencoder.so
lib/kde4/kcm_k3boggvorbisencoder.so
lib/kde4/kcm_k3bsetup.so
lib/kde4/kcm_k3bsoxencoder.so
lib/kde4/kio_videodvd.so
lib/kde4/libexec/k3bsetuphelper
lib/libk3bdevice.so
lib/libk3bdevice.so.6
lib/libk3bdevice.so.6.0.0
lib/libk3blib.so
lib/libk3blib.so.6
lib/libk3blib.so.6.0.0
share/PolicyKit/policy/org.kde.kcontrol.k3bsetup.policy
share/applications/kde4/k3b.desktop
share/dbus-1/system-services/org.kde.kcontrol.k3bsetup.service
share/doc/kde/HTML/en/k3b/K3bAddButton.png
share/doc/kde/HTML/en/k3b/K3bAdvancedSettings.png
share/doc/kde/HTML/en/k3b/K3bDiskChoice.png
share/doc/kde/HTML/en/k3b/K3bMoreActions.png
share/doc/kde/HTML/en/k3b/K3bSetVerify.png
share/doc/kde/HTML/en/k3b/K3bsetup.png
share/doc/kde/HTML/en/k3b/common
share/doc/kde/HTML/en/k3b/index.cache.bz2
share/doc/kde/HTML/en/k3b/index.docbook
share/examples/kde4-dbus/org.kde.kcontrol.k3bsetup.conf
share/icons/hicolor/128x128/apps/k3b.png
share/icons/hicolor/16x16/apps/k3b.png
share/icons/hicolor/22x22/apps/k3b.png
share/icons/hicolor/32x32/apps/k3b.png
share/icons/hicolor/48x48/apps/k3b.png
share/icons/hicolor/64x64/apps/k3b.png
share/icons/hicolor/scalable/apps/k3b.svgz
share/kde/apps/k3b/cdi/cdi_imag.rtf
share/kde/apps/k3b/cdi/cdi_text.fnt
share/kde/apps/k3b/cdi/cdi_vcd.app
share/kde/apps/k3b/cdi/cdi_vcd.cfg
share/kde/apps/k3b/cdi/icdia.htm
share/kde/apps/k3b/cdi/vcd_on_cdi_41.pdf
share/kde/apps/k3b/extra/k3bphotosvcd.mpg
share/kde/apps/k3b/extra/k3bphotovcd.mpg
share/kde/apps/k3b/icons/hicolor/16x16/actions/musicbrainz.png
share/kde/apps/k3b/icons/hicolor/64x64/actions/musicbrainz.png
share/kde/apps/k3b/icons/oxygen/128x128/actions/tools-rip-audio-cd.png
share/kde/apps/k3b/icons/oxygen/128x128/actions/tools-rip-video-cd.png
share/kde/apps/k3b/icons/oxygen/128x128/actions/tools-rip-video-dvd.png
share/kde/apps/k3b/icons/oxygen/128x128/devices/media-optical-audio.png
share/kde/apps/k3b/icons/oxygen/128x128/devices/media-optical-cd-video.png
share/kde/apps/k3b/icons/oxygen/128x128/devices/media-optical-dvd-video.png
share/kde/apps/k3b/icons/oxygen/128x128/devices/media-optical-mixed-cd.png
share/kde/apps/k3b/icons/oxygen/128x128/devices/media-optical-video.png
share/kde/apps/k3b/icons/oxygen/128x128/mimetypes/application-x-k3b.png
share/kde/apps/k3b/icons/oxygen/16x16/actions/tools-rip-audio-cd.png
share/kde/apps/k3b/icons/oxygen/16x16/actions/tools-rip-video-cd.png
share/kde/apps/k3b/icons/oxygen/16x16/actions/tools-rip-video-dvd.png
share/kde/apps/k3b/icons/oxygen/16x16/devices/media-optical-audio.png
share/kde/apps/k3b/icons/oxygen/16x16/devices/media-optical-cd-video.png
share/kde/apps/k3b/icons/oxygen/16x16/devices/media-optical-data.png
share/kde/apps/k3b/icons/oxygen/16x16/devices/media-optical-mixed-cd.png
share/kde/apps/k3b/icons/oxygen/16x16/devices/media-optical-video.png
share/kde/apps/k3b/icons/oxygen/22x22/actions/tools-rip-audio-cd.png
share/kde/apps/k3b/icons/oxygen/22x22/actions/tools-rip-video-cd.png
share/kde/apps/k3b/icons/oxygen/22x22/actions/tools-rip-video-dvd.png
share/kde/apps/k3b/icons/oxygen/22x22/devices/media-optical-audio.png
share/kde/apps/k3b/icons/oxygen/22x22/devices/media-optical-cd-video.png
share/kde/apps/k3b/icons/oxygen/22x22/devices/media-optical-data.png
share/kde/apps/k3b/icons/oxygen/22x22/devices/media-optical-mixed-cd.png
share/kde/apps/k3b/icons/oxygen/22x22/devices/media-optical-video.png
share/kde/apps/k3b/icons/oxygen/32x32/actions/tools-rip-audio-cd.png
share/kde/apps/k3b/icons/oxygen/32x32/actions/tools-rip-video-cd.png
share/kde/apps/k3b/icons/oxygen/32x32/actions/tools-rip-video-dvd.png
share/kde/apps/k3b/icons/oxygen/32x32/devices/media-optical-audio.png
share/kde/apps/k3b/icons/oxygen/32x32/devices/media-optical-cd-video.png
share/kde/apps/k3b/icons/oxygen/32x32/devices/media-optical-data.png
share/kde/apps/k3b/icons/oxygen/32x32/devices/media-optical-dvd-video.png
share/kde/apps/k3b/icons/oxygen/32x32/devices/media-optical-mixed-cd.png
share/kde/apps/k3b/icons/oxygen/32x32/devices/media-optical-video.png
share/kde/apps/k3b/icons/oxygen/32x32/mimetypes/application-x-k3b.png
share/kde/apps/k3b/icons/oxygen/48x48/actions/tools-rip-audio-cd.png
share/kde/apps/k3b/icons/oxygen/48x48/actions/tools-rip-video-cd.png
share/kde/apps/k3b/icons/oxygen/48x48/actions/tools-rip-video-dvd.png
share/kde/apps/k3b/icons/oxygen/48x48/devices/media-optical-audio.png
share/kde/apps/k3b/icons/oxygen/48x48/devices/media-optical-cd-video.png
share/kde/apps/k3b/icons/oxygen/48x48/devices/media-optical-data.png
share/kde/apps/k3b/icons/oxygen/48x48/devices/media-optical-dvd-video.png
share/kde/apps/k3b/icons/oxygen/48x48/devices/media-optical-mixed-cd.png
share/kde/apps/k3b/icons/oxygen/48x48/devices/media-optical-video.png
share/kde/apps/k3b/icons/oxygen/48x48/mimetypes/application-x-k3b.png
share/kde/apps/k3b/icons/oxygen/64x64/actions/tools-rip-audio-cd.png
share/kde/apps/k3b/icons/oxygen/64x64/actions/tools-rip-video-cd.png
share/kde/apps/k3b/icons/oxygen/64x64/actions/tools-rip-video-dvd.png
share/kde/apps/k3b/icons/oxygen/64x64/devices/media-optical-audio.png
share/kde/apps/k3b/icons/oxygen/64x64/devices/media-optical-cd-video.png
share/kde/apps/k3b/icons/oxygen/64x64/devices/media-optical-dvd-video.png
share/kde/apps/k3b/icons/oxygen/64x64/devices/media-optical-mixed-cd.png
share/kde/apps/k3b/icons/oxygen/64x64/devices/media-optical-video.png
share/kde/apps/k3b/icons/oxygen/64x64/mimetypes/application-x-k3b.png
share/kde/apps/k3b/icons/oxygen/scalable/actions/tools-rip-audio-cd.svgz
share/kde/apps/k3b/icons/oxygen/scalable/actions/tools-rip-video-cd.svgz
share/kde/apps/k3b/icons/oxygen/scalable/actions/tools-rip-video-dvd.svgz
share/kde/apps/k3b/icons/oxygen/scalable/devices/media-optical-audio.svgz
share/kde/apps/k3b/icons/oxygen/scalable/devices/media-optical-cd-video.svgz
share/kde/apps/k3b/icons/oxygen/scalable/devices/media-optical-data.svgz
share/kde/apps/k3b/icons/oxygen/scalable/devices/media-optical-dvd-video.svgz
share/kde/apps/k3b/icons/oxygen/scalable/devices/media-optical-mixed-cd.svgz
share/kde/apps/k3b/icons/oxygen/scalable/devices/media-optical-video.svgz
share/kde/apps/k3b/icons/oxygen/scalable/mimetypes/application-x-k3b.svgz
share/kde/apps/k3b/k3b.notifyrc
share/kde/apps/k3b/k3bdeviceui.rc
share/kde/apps/k3b/k3bui.rc
share/kde/apps/k3b/pics/73lab/dialog_left.png
share/kde/apps/k3b/pics/73lab/dialog_right.png
share/kde/apps/k3b/pics/73lab/k3b.theme
share/kde/apps/k3b/pics/73lab/media_audio.png
share/kde/apps/k3b/pics/73lab/media_data.png
share/kde/apps/k3b/pics/73lab/media_empty.png
share/kde/apps/k3b/pics/73lab/media_left.png
share/kde/apps/k3b/pics/73lab/media_mixed.png
share/kde/apps/k3b/pics/73lab/media_none.png
share/kde/apps/k3b/pics/73lab/media_video.png
share/kde/apps/k3b/pics/73lab/probing.png
share/kde/apps/k3b/pics/73lab/progress_fail.png
share/kde/apps/k3b/pics/73lab/progress_right.png
share/kde/apps/k3b/pics/73lab/progress_success.png
share/kde/apps/k3b/pics/73lab/progress_working.png
share/kde/apps/k3b/pics/73lab/project_left.png
share/kde/apps/k3b/pics/73lab/project_right.png
share/kde/apps/k3b/pics/73lab/splash.png
share/kde/apps/k3b/pics/73lab/welcome_bg.png
share/kde/apps/k3b/pics/RobsTheme/dialog_left.png
share/kde/apps/k3b/pics/RobsTheme/dialog_right.png
share/kde/apps/k3b/pics/RobsTheme/k3b.theme
share/kde/apps/k3b/pics/RobsTheme/media_audio.png
share/kde/apps/k3b/pics/RobsTheme/media_data.png
share/kde/apps/k3b/pics/RobsTheme/media_empty.png
share/kde/apps/k3b/pics/RobsTheme/media_left.png
share/kde/apps/k3b/pics/RobsTheme/media_mixed.png
share/kde/apps/k3b/pics/RobsTheme/media_none.png
share/kde/apps/k3b/pics/RobsTheme/media_video.png
share/kde/apps/k3b/pics/RobsTheme/progress_fail.png
share/kde/apps/k3b/pics/RobsTheme/progress_right.png
share/kde/apps/k3b/pics/RobsTheme/progress_success.png
share/kde/apps/k3b/pics/RobsTheme/progress_working.png
share/kde/apps/k3b/pics/RobsTheme/project_left.png
share/kde/apps/k3b/pics/RobsTheme/project_right.png
share/kde/apps/k3b/pics/RobsTheme/splash.png
share/kde/apps/k3b/pics/RobsTheme/welcome_bg.png
share/kde/apps/k3b/pics/crystal/dialog_left.png
share/kde/apps/k3b/pics/crystal/dialog_right.png
share/kde/apps/k3b/pics/crystal/k3b.theme
share/kde/apps/k3b/pics/crystal/media_audio.png
share/kde/apps/k3b/pics/crystal/media_data.png
share/kde/apps/k3b/pics/crystal/media_empty.png
share/kde/apps/k3b/pics/crystal/media_left.png
share/kde/apps/k3b/pics/crystal/media_mixed.png
share/kde/apps/k3b/pics/crystal/media_none.png
share/kde/apps/k3b/pics/crystal/media_video.png
share/kde/apps/k3b/pics/crystal/probing.png
share/kde/apps/k3b/pics/crystal/progress_fail.png
share/kde/apps/k3b/pics/crystal/progress_right.png
share/kde/apps/k3b/pics/crystal/progress_success.png
share/kde/apps/k3b/pics/crystal/progress_working.png
share/kde/apps/k3b/pics/crystal/project_left.png
share/kde/apps/k3b/pics/crystal/project_right.png
share/kde/apps/k3b/pics/crystal/splash.png
share/kde/apps/k3b/pics/crystal/welcome_bg.png
share/kde/apps/k3b/pics/quant/dialog_left.png
share/kde/apps/k3b/pics/quant/dialog_right.png
share/kde/apps/k3b/pics/quant/k3b.theme
share/kde/apps/k3b/pics/quant/media_audio.png
share/kde/apps/k3b/pics/quant/media_data.png
share/kde/apps/k3b/pics/quant/media_empty.png
share/kde/apps/k3b/pics/quant/media_left.png
share/kde/apps/k3b/pics/quant/media_mixed.png
share/kde/apps/k3b/pics/quant/media_none.png
share/kde/apps/k3b/pics/quant/media_video.png
share/kde/apps/k3b/pics/quant/progress_fail.png
share/kde/apps/k3b/pics/quant/progress_right.png
share/kde/apps/k3b/pics/quant/progress_success.png
share/kde/apps/k3b/pics/quant/progress_working.png
share/kde/apps/k3b/pics/quant/project_left.png
share/kde/apps/k3b/pics/quant/project_right.png
share/kde/apps/k3b/pics/quant/splash.png
share/kde/apps/k3b/pics/quant/welcome_bg.png
share/kde/apps/k3b/tips
share/kde/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
share/kde/apps/solid/actions/k3b_audiocd_rip.desktop
share/kde/apps/solid/actions/k3b_copy_disc.desktop
share/kde/apps/solid/actions/k3b_create_audio_cd_from_blank_medium.desktop
share/kde/apps/solid/actions/k3b_create_data_project_from_blank_medium.desktop
share/kde/apps/solid/actions/k3b_videodvd_rip.desktop
share/kde4/services/ServiceMenus/k3b_create_audio_cd.desktop
share/kde4/services/ServiceMenus/k3b_create_data_project.desktop
share/kde4/services/ServiceMenus/k3b_create_video_cd.desktop
share/kde4/services/ServiceMenus/k3b_write_bin_image.desktop
share/kde4/services/ServiceMenus/k3b_write_iso_image.desktop
share/kde4/services/k3baudiometainforenamerplugin.desktop
share/kde4/services/k3baudioprojectcddbplugin.desktop
share/kde4/services/k3bexternalencoder.desktop
share/kde4/services/k3bffmpegdecoder.desktop
share/kde4/services/k3bflacdecoder.desktop
share/kde4/services/k3blameencoder.desktop
share/kde4/services/k3blibsndfiledecoder.desktop
share/kde4/services/k3bmaddecoder.desktop
share/kde4/services/k3boggvorbisdecoder.desktop
share/kde4/services/k3boggvorbisencoder.desktop
share/kde4/services/k3bsetup.desktop
share/kde4/services/k3bsoxencoder.desktop
share/kde4/services/k3bwavedecoder.desktop
share/kde4/services/kcm_k3bexternalencoder.desktop
share/kde4/services/kcm_k3blameencoder.desktop
share/kde4/services/kcm_k3boggvorbisencoder.desktop
share/kde4/services/kcm_k3bsoxencoder.desktop
share/kde4/services/videodvd.protocol
share/kde4/servicetypes/k3bplugin.desktop
share/locale/ast/LC_MESSAGES/k3b.mo
share/locale/ast/LC_MESSAGES/k3bsetup.mo
share/locale/ast/LC_MESSAGES/kio_videodvd.mo
share/locale/ast/LC_MESSAGES/libk3b.mo
share/locale/ast/LC_MESSAGES/libk3bdevice.mo
share/locale/be/LC_MESSAGES/k3b.mo
share/locale/be/LC_MESSAGES/k3bsetup.mo
share/locale/be/LC_MESSAGES/libk3b.mo
share/locale/be/LC_MESSAGES/libk3bdevice.mo
share/locale/bg/LC_MESSAGES/k3b.mo
share/locale/bg/LC_MESSAGES/k3bsetup.mo
share/locale/bg/LC_MESSAGES/libk3b.mo
share/locale/bg/LC_MESSAGES/libk3bdevice.mo
share/locale/ca/LC_MESSAGES/k3b.mo
share/locale/ca/LC_MESSAGES/k3bsetup.mo
share/locale/ca/LC_MESSAGES/kio_videodvd.mo
share/locale/ca/LC_MESSAGES/libk3b.mo
share/locale/ca/LC_MESSAGES/libk3bdevice.mo
share/locale/ca@valencia/LC_MESSAGES/k3b.mo
share/locale/ca@valencia/LC_MESSAGES/k3bsetup.mo
share/locale/ca@valencia/LC_MESSAGES/kio_videodvd.mo
share/locale/ca@valencia/LC_MESSAGES/libk3b.mo
share/locale/ca@valencia/LC_MESSAGES/libk3bdevice.mo
share/locale/cs/LC_MESSAGES/k3b.mo
share/locale/cs/LC_MESSAGES/k3bsetup.mo
share/locale/cs/LC_MESSAGES/kio_videodvd.mo
share/locale/cs/LC_MESSAGES/libk3b.mo
share/locale/cs/LC_MESSAGES/libk3bdevice.mo
share/locale/csb/LC_MESSAGES/k3b.mo
share/locale/csb/LC_MESSAGES/k3bsetup.mo
share/locale/da/LC_MESSAGES/k3b.mo
share/locale/da/LC_MESSAGES/k3bsetup.mo
share/locale/da/LC_MESSAGES/kio_videodvd.mo
share/locale/da/LC_MESSAGES/libk3b.mo
share/locale/da/LC_MESSAGES/libk3bdevice.mo
share/locale/de/LC_MESSAGES/k3b.mo
share/locale/de/LC_MESSAGES/k3bsetup.mo
share/locale/de/LC_MESSAGES/kio_videodvd.mo
share/locale/de/LC_MESSAGES/libk3b.mo
share/locale/de/LC_MESSAGES/libk3bdevice.mo
share/locale/el/LC_MESSAGES/k3b.mo
share/locale/el/LC_MESSAGES/k3bsetup.mo
share/locale/el/LC_MESSAGES/libk3b.mo
share/locale/el/LC_MESSAGES/libk3bdevice.mo
share/locale/en_GB/LC_MESSAGES/k3b.mo
share/locale/en_GB/LC_MESSAGES/k3bsetup.mo
share/locale/en_GB/LC_MESSAGES/kio_videodvd.mo
share/locale/en_GB/LC_MESSAGES/libk3b.mo
share/locale/en_GB/LC_MESSAGES/libk3bdevice.mo
share/locale/eo/LC_MESSAGES/k3b.mo
share/locale/eo/LC_MESSAGES/k3bsetup.mo
share/locale/eo/LC_MESSAGES/libk3b.mo
share/locale/eo/LC_MESSAGES/libk3bdevice.mo
share/locale/es/LC_MESSAGES/k3b.mo
share/locale/es/LC_MESSAGES/k3bsetup.mo
share/locale/es/LC_MESSAGES/kio_videodvd.mo
share/locale/es/LC_MESSAGES/libk3b.mo
share/locale/es/LC_MESSAGES/libk3bdevice.mo
share/locale/et/LC_MESSAGES/k3b.mo
share/locale/et/LC_MESSAGES/k3bsetup.mo
share/locale/et/LC_MESSAGES/kio_videodvd.mo
share/locale/et/LC_MESSAGES/libk3b.mo
share/locale/et/LC_MESSAGES/libk3bdevice.mo
share/locale/eu/LC_MESSAGES/k3b.mo
share/locale/eu/LC_MESSAGES/k3bsetup.mo
share/locale/eu/LC_MESSAGES/libk3b.mo
share/locale/eu/LC_MESSAGES/libk3bdevice.mo
share/locale/fi/LC_MESSAGES/k3b.mo
share/locale/fi/LC_MESSAGES/k3bsetup.mo
share/locale/fi/LC_MESSAGES/libk3b.mo
share/locale/fi/LC_MESSAGES/libk3bdevice.mo
share/locale/fr/LC_MESSAGES/k3b.mo
share/locale/fr/LC_MESSAGES/k3bsetup.mo
share/locale/fr/LC_MESSAGES/libk3b.mo
share/locale/fr/LC_MESSAGES/libk3bdevice.mo
share/locale/ga/LC_MESSAGES/k3b.mo
share/locale/ga/LC_MESSAGES/k3bsetup.mo
share/locale/ga/LC_MESSAGES/kio_videodvd.mo
share/locale/ga/LC_MESSAGES/libk3b.mo
share/locale/ga/LC_MESSAGES/libk3bdevice.mo
share/locale/gl/LC_MESSAGES/k3b.mo
share/locale/gl/LC_MESSAGES/k3bsetup.mo
share/locale/gl/LC_MESSAGES/libk3b.mo
share/locale/gl/LC_MESSAGES/libk3bdevice.mo
share/locale/he/LC_MESSAGES/k3b.mo
share/locale/he/LC_MESSAGES/k3bsetup.mo
share/locale/he/LC_MESSAGES/libk3b.mo
share/locale/he/LC_MESSAGES/libk3bdevice.mo
share/locale/hi/LC_MESSAGES/k3b.mo
share/locale/hi/LC_MESSAGES/k3bsetup.mo
share/locale/hi/LC_MESSAGES/libk3b.mo
share/locale/hi/LC_MESSAGES/libk3bdevice.mo
share/locale/hne/LC_MESSAGES/k3b.mo
share/locale/hne/LC_MESSAGES/k3bsetup.mo
share/locale/hne/LC_MESSAGES/libk3b.mo
share/locale/hne/LC_MESSAGES/libk3bdevice.mo
share/locale/hr/LC_MESSAGES/k3b.mo
share/locale/hr/LC_MESSAGES/k3bsetup.mo
share/locale/hr/LC_MESSAGES/kio_videodvd.mo
share/locale/hr/LC_MESSAGES/libk3b.mo
share/locale/hr/LC_MESSAGES/libk3bdevice.mo
share/locale/hu/LC_MESSAGES/k3b.mo
share/locale/hu/LC_MESSAGES/k3bsetup.mo
share/locale/hu/LC_MESSAGES/kio_videodvd.mo
share/locale/hu/LC_MESSAGES/libk3b.mo
share/locale/hu/LC_MESSAGES/libk3bdevice.mo
share/locale/is/LC_MESSAGES/k3b.mo
share/locale/is/LC_MESSAGES/k3bsetup.mo
share/locale/is/LC_MESSAGES/kio_videodvd.mo
share/locale/is/LC_MESSAGES/libk3b.mo
share/locale/is/LC_MESSAGES/libk3bdevice.mo
share/locale/it/LC_MESSAGES/k3b.mo
share/locale/it/LC_MESSAGES/k3bsetup.mo
share/locale/it/LC_MESSAGES/libk3b.mo
share/locale/it/LC_MESSAGES/libk3bdevice.mo
share/locale/ja/LC_MESSAGES/k3b.mo
share/locale/ja/LC_MESSAGES/k3bsetup.mo
share/locale/ja/LC_MESSAGES/kio_videodvd.mo
share/locale/ja/LC_MESSAGES/libk3b.mo
share/locale/ja/LC_MESSAGES/libk3bdevice.mo
share/locale/km/LC_MESSAGES/k3b.mo
share/locale/km/LC_MESSAGES/k3bsetup.mo
share/locale/km/LC_MESSAGES/libk3b.mo
share/locale/km/LC_MESSAGES/libk3bdevice.mo
share/locale/ko/LC_MESSAGES/k3b.mo
share/locale/ko/LC_MESSAGES/k3bsetup.mo
share/locale/ko/LC_MESSAGES/libk3b.mo
share/locale/ko/LC_MESSAGES/libk3bdevice.mo
share/locale/ku/LC_MESSAGES/k3b.mo
share/locale/lt/LC_MESSAGES/k3b.mo
share/locale/lt/LC_MESSAGES/k3bsetup.mo
share/locale/lt/LC_MESSAGES/kio_videodvd.mo
share/locale/lt/LC_MESSAGES/libk3b.mo
share/locale/lt/LC_MESSAGES/libk3bdevice.mo
share/locale/lv/LC_MESSAGES/k3bsetup.mo
share/locale/lv/LC_MESSAGES/libk3b.mo
share/locale/lv/LC_MESSAGES/libk3bdevice.mo
share/locale/mai/LC_MESSAGES/k3b.mo
share/locale/mai/LC_MESSAGES/libk3b.mo
share/locale/ms/LC_MESSAGES/k3b.mo
share/locale/ms/LC_MESSAGES/k3bsetup.mo
share/locale/ms/LC_MESSAGES/kio_videodvd.mo
share/locale/ms/LC_MESSAGES/libk3b.mo
share/locale/ms/LC_MESSAGES/libk3bdevice.mo
share/locale/nb/LC_MESSAGES/k3b.mo
share/locale/nb/LC_MESSAGES/k3bsetup.mo
share/locale/nb/LC_MESSAGES/kio_videodvd.mo
share/locale/nb/LC_MESSAGES/libk3b.mo
share/locale/nb/LC_MESSAGES/libk3bdevice.mo
share/locale/nds/LC_MESSAGES/k3b.mo
share/locale/nds/LC_MESSAGES/k3bsetup.mo
share/locale/nds/LC_MESSAGES/kio_videodvd.mo
share/locale/nds/LC_MESSAGES/libk3b.mo
share/locale/nds/LC_MESSAGES/libk3bdevice.mo
share/locale/nl/LC_MESSAGES/k3b.mo
share/locale/nl/LC_MESSAGES/k3bsetup.mo
share/locale/nl/LC_MESSAGES/kio_videodvd.mo
share/locale/nl/LC_MESSAGES/libk3b.mo
share/locale/nl/LC_MESSAGES/libk3bdevice.mo
share/locale/nn/LC_MESSAGES/k3b.mo
share/locale/nn/LC_MESSAGES/k3bsetup.mo
share/locale/nn/LC_MESSAGES/kio_videodvd.mo
share/locale/nn/LC_MESSAGES/libk3b.mo
share/locale/nn/LC_MESSAGES/libk3bdevice.mo
share/locale/oc/LC_MESSAGES/k3b.mo
share/locale/oc/LC_MESSAGES/k3bsetup.mo
share/locale/oc/LC_MESSAGES/libk3b.mo
share/locale/oc/LC_MESSAGES/libk3bdevice.mo
share/locale/pa/LC_MESSAGES/k3b.mo
share/locale/pa/LC_MESSAGES/k3bsetup.mo
share/locale/pa/LC_MESSAGES/libk3b.mo
share/locale/pa/LC_MESSAGES/libk3bdevice.mo
share/locale/pl/LC_MESSAGES/k3b.mo
share/locale/pl/LC_MESSAGES/k3bsetup.mo
share/locale/pl/LC_MESSAGES/libk3b.mo
share/locale/pl/LC_MESSAGES/libk3bdevice.mo
share/locale/pt/LC_MESSAGES/k3b.mo
share/locale/pt/LC_MESSAGES/k3bsetup.mo
share/locale/pt/LC_MESSAGES/kio_videodvd.mo
share/locale/pt/LC_MESSAGES/libk3b.mo
share/locale/pt/LC_MESSAGES/libk3bdevice.mo
share/locale/pt_BR/LC_MESSAGES/k3b.mo
share/locale/pt_BR/LC_MESSAGES/k3bsetup.mo
share/locale/pt_BR/LC_MESSAGES/kio_videodvd.mo
share/locale/pt_BR/LC_MESSAGES/libk3b.mo
share/locale/pt_BR/LC_MESSAGES/libk3bdevice.mo
share/locale/ro/LC_MESSAGES/k3b.mo
share/locale/ro/LC_MESSAGES/k3bsetup.mo
share/locale/ro/LC_MESSAGES/libk3b.mo
share/locale/ro/LC_MESSAGES/libk3bdevice.mo
share/locale/ru/LC_MESSAGES/k3b.mo
share/locale/ru/LC_MESSAGES/k3bsetup.mo
share/locale/ru/LC_MESSAGES/kio_videodvd.mo
share/locale/ru/LC_MESSAGES/libk3b.mo
share/locale/ru/LC_MESSAGES/libk3bdevice.mo
share/locale/se/LC_MESSAGES/k3b.mo
share/locale/se/LC_MESSAGES/k3bsetup.mo
share/locale/se/LC_MESSAGES/libk3b.mo
share/locale/se/LC_MESSAGES/libk3bdevice.mo
share/locale/sk/LC_MESSAGES/k3b.mo
share/locale/sk/LC_MESSAGES/k3bsetup.mo
share/locale/sk/LC_MESSAGES/kio_videodvd.mo
share/locale/sk/LC_MESSAGES/libk3b.mo
share/locale/sk/LC_MESSAGES/libk3bdevice.mo
share/locale/sl/LC_MESSAGES/k3b.mo
share/locale/sl/LC_MESSAGES/k3bsetup.mo
share/locale/sl/LC_MESSAGES/libk3b.mo
share/locale/sl/LC_MESSAGES/libk3bdevice.mo
share/locale/sr/LC_MESSAGES/k3b.mo
share/locale/sr/LC_MESSAGES/k3bsetup.mo
share/locale/sr/LC_MESSAGES/kio_videodvd.mo
share/locale/sr/LC_MESSAGES/libk3b.mo
share/locale/sr/LC_MESSAGES/libk3bdevice.mo
share/locale/sr@ijekavian/LC_MESSAGES/k3b.mo
share/locale/sr@ijekavian/LC_MESSAGES/k3bsetup.mo
share/locale/sr@ijekavian/LC_MESSAGES/kio_videodvd.mo
share/locale/sr@ijekavian/LC_MESSAGES/libk3b.mo
share/locale/sr@ijekavian/LC_MESSAGES/libk3bdevice.mo
share/locale/sr@ijekavianlatin/LC_MESSAGES/k3b.mo
share/locale/sr@ijekavianlatin/LC_MESSAGES/k3bsetup.mo
share/locale/sr@ijekavianlatin/LC_MESSAGES/kio_videodvd.mo
share/locale/sr@ijekavianlatin/LC_MESSAGES/libk3b.mo
share/locale/sr@ijekavianlatin/LC_MESSAGES/libk3bdevice.mo
share/locale/sr@latin/LC_MESSAGES/k3b.mo
share/locale/sr@latin/LC_MESSAGES/k3bsetup.mo
share/locale/sr@latin/LC_MESSAGES/kio_videodvd.mo
share/locale/sr@latin/LC_MESSAGES/libk3b.mo
share/locale/sr@latin/LC_MESSAGES/libk3bdevice.mo
share/locale/sv/LC_MESSAGES/k3b.mo
share/locale/sv/LC_MESSAGES/k3bsetup.mo
share/locale/sv/LC_MESSAGES/kio_videodvd.mo
share/locale/sv/LC_MESSAGES/libk3b.mo
share/locale/sv/LC_MESSAGES/libk3bdevice.mo
share/locale/th/LC_MESSAGES/k3b.mo
share/locale/th/LC_MESSAGES/k3bsetup.mo
share/locale/th/LC_MESSAGES/libk3b.mo
share/locale/th/LC_MESSAGES/libk3bdevice.mo
share/locale/tr/LC_MESSAGES/k3b.mo
share/locale/tr/LC_MESSAGES/k3bsetup.mo
share/locale/tr/LC_MESSAGES/kio_videodvd.mo
share/locale/tr/LC_MESSAGES/libk3b.mo
share/locale/tr/LC_MESSAGES/libk3bdevice.mo
share/locale/uk/LC_MESSAGES/k3b.mo
share/locale/uk/LC_MESSAGES/k3bsetup.mo
share/locale/uk/LC_MESSAGES/kio_videodvd.mo
share/locale/uk/LC_MESSAGES/libk3b.mo
share/locale/uk/LC_MESSAGES/libk3bdevice.mo
share/locale/zh_CN/LC_MESSAGES/k3b.mo
share/locale/zh_CN/LC_MESSAGES/k3bsetup.mo
share/locale/zh_CN/LC_MESSAGES/libk3b.mo
share/locale/zh_CN/LC_MESSAGES/libk3bdevice.mo
share/locale/zh_TW/LC_MESSAGES/k3b.mo
share/locale/zh_TW/LC_MESSAGES/k3bsetup.mo
share/locale/zh_TW/LC_MESSAGES/kio_videodvd.mo
share/locale/zh_TW/LC_MESSAGES/libk3b.mo
share/locale/zh_TW/LC_MESSAGES/libk3bdevice.mo
share/mime/packages/x-k3b.xml

10
sysutils/k3b/distinfo Normal file
View File

@@ -0,0 +1,10 @@
$NetBSD: distinfo,v 1.20 2012/11/11 18:32:23 markd Exp $
SHA1 (k3b-2.0.2.tar.bz2) = 8b30a4d07942e82559b01bc07dea6bcf2defd532
RMD160 (k3b-2.0.2.tar.bz2) = a0289eb9ccec9607c2bdac3fc7c69102eec5ee40
Size (k3b-2.0.2.tar.bz2) = 12833321 bytes
SHA1 (patch-libk3b_jobs_k3bdatatrackreader.cpp) = 124d5ba1a3384d012a8b471f55fd624ffe9df5d4
SHA1 (patch-libk3bdevice_k3bdevice.cpp) = 8533f0c08551ef9b8429792f607a52675f79e419
SHA1 (patch-libk3bdevice_k3bdevicemanager.cpp) = fe07915854808758ab9d989d11b61fdc3b4b95bd
SHA1 (patch-libk3bdevice_k3bscsicommand_netbsd.cpp) = f2326f21219178443535fc4a80b8bdd46479b1ad
SHA1 (patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp) = 941f59b0764db37d0356279ffc2e01fe610b04ce

View File

@@ -0,0 +1,16 @@
$NetBSD: patch-libk3b_jobs_k3bdatatrackreader.cpp,v 1.1 2012/03/22 06:39:01 markd Exp $
--- libk3b/jobs/k3bdatatrackreader.cpp.orig 2009-04-22 05:54:02.000000000 +1200
+++ libk3b/jobs/k3bdatatrackreader.cpp
@@ -256,7 +256,11 @@ bool K3b::DataTrackReader::run()
//
d->device->setSpeed( 0xffff, 0xffff );
+#ifdef __NetBSD__
+ s_bufferSizeSectors = 31;
+#else
s_bufferSizeSectors = 128;
+#endif
unsigned char* buffer = new unsigned char[d->usedSectorSize*s_bufferSizeSectors];
while( s_bufferSizeSectors > 0 && read( buffer, d->firstSector.lba(), s_bufferSizeSectors ) < 0 ) {
kDebug() << "(K3b::DataTrackReader) determine max read sectors: "

View File

@@ -0,0 +1,28 @@
$NetBSD: patch-libk3bdevice_k3bdevice.cpp,v 1.1 2012/03/22 06:39:01 markd Exp $
--- libk3bdevice/k3bdevice.cpp.orig 2009-05-07 19:08:16.000000000 +1200
+++ libk3bdevice/k3bdevice.cpp
@@ -35,6 +35,7 @@
#include <Solid/OpticalDrive>
#include <Solid/Block>
#include <Solid/StorageAccess>
+#include <Solid/GenericInterface>
#include <sys/types.h>
#include <sys/ioctl.h>
@@ -242,9 +243,14 @@ K3b::Device::Device::Handle K3b::Device:
K3b::Device::Device::Device( const Solid::Device& dev )
{
+ const Solid::GenericInterface *gi = dev.as<Solid::GenericInterface>();
+
d = new Private;
d->solidDevice = dev;
- d->blockDevice = dev.as<Solid::Block>()->device();
+ if (gi->propertyExists("block.netbsd.raw_device"))
+ d->blockDevice = gi->property("block.netbsd.raw_device").toString();
+ else
+ d->blockDevice = dev.as<Solid::Block>()->device();
d->writeModes = 0;
d->maxWriteSpeed = 0;
d->maxReadSpeed = 0;

View File

@@ -0,0 +1,21 @@
$NetBSD: patch-libk3bdevice_k3bdevicemanager.cpp,v 1.1 2012/03/22 06:39:01 markd Exp $
--- libk3bdevice/k3bdevicemanager.cpp.orig 2011-01-15 20:47:29.000000000 +0000
+++ libk3bdevice/k3bdevicemanager.cpp
@@ -39,6 +39,7 @@
#include <Solid/OpticalDrive>
#include <Solid/Block>
#include <Solid/Device>
+#include <Solid/GenericInterface>
#include <iostream>
#include <limits.h>
@@ -356,7 +357,7 @@ bool K3b::Device::DeviceManager::saveCon
K3b::Device::Device* K3b::Device::DeviceManager::addDevice( const Solid::Device& solidDevice )
{
if( const Solid::Block* blockDevice = solidDevice.as<Solid::Block>() ) {
- if( !findDevice( blockDevice->device() ) )
+ if( !findDevice( solidDevice.as<Solid::GenericInterface>()->propertyExists("block.netbsd.raw_device") ? solidDevice.as<Solid::GenericInterface>()->property("block.netbsd.raw_device").toString() : blockDevice->device() ) )
return addDevice( new K3b::Device::Device( solidDevice ) );
else
kDebug() << "(K3b::Device::DeviceManager) dev " << blockDevice->device() << " already found";

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-libk3bdevice_k3bscsicommand_netbsd.cpp,v 1.1 2012/03/22 06:39:01 markd Exp $
--- libk3bdevice/k3bscsicommand_netbsd.cpp.orig 2009-04-04 04:27:24.000000000 +1300
+++ libk3bdevice/k3bscsicommand_netbsd.cpp
@@ -53,7 +53,7 @@ int K3b::Device::ScsiCommand::transport(
size_t len )
{
bool needToClose = false;
- int deviceHandler = -1;
+ int deviceHandle = -1;
if( m_device ) {
m_device->usageLock();
if( !m_device->isOpen() ) {

View File

@@ -0,0 +1,116 @@
$NetBSD: patch-plugins_decoder_ffmpeg_k3bffmpegwrapper.cpp,v 1.2 2012/11/11 18:32:24 markd Exp $
commit 61ca30beb978f68e72257408777c6433f33129bd
Author: Michal Malek <michalm@jabster.pl>
Date: Sun Aug 28 20:18:53 2011 +0200
Fixed compilation with new FFMPEG
BUG: 274817
FIXED-IN: 2.0.3
diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
index 0ad59fc..0c5f366 100644
--- plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+++ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
@@ -88,7 +88,7 @@
close();
// open the file
- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 );
+ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL);
if( err < 0 ) {
kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err;
return false;
@@ -109,7 +109,13 @@ bool K3bFFMpegFile::open()
#else
::AVCodecContext* codecContext = d->formatContext->streams[0]->codec;
#endif
- if( codecContext->codec_type != CODEC_TYPE_AUDIO ) {
+ if( codecContext->codec_type !=
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+ AVMEDIA_TYPE_AUDIO)
+#else
+ CODEC_TYPE_AUDIO)
+#endif
+ {
kDebug() << "(K3bFFMpegFile) not a simple audio stream: " << m_filename;
return false;
}
@@ -137,7 +143,7 @@
}
// dump some debugging info
- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
+ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 );
return true;
}
@@ -225,8 +231,11 @@ QString K3bFFMpegFile::typeComment() const
QString K3bFFMpegFile::title() const
{
// FIXME: is this UTF8 or something??
- if( d->formatContext->title[0] != '\0' )
- return QString::fromLocal8Bit( d->formatContext->title );
+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
+ if( ade == NULL )
+ return QString();
+ if( ade->value != '\0' )
+ return QString::fromLocal8Bit( ade->value );
else
return QString();
}
@@ -235,8 +244,11 @@ QString K3bFFMpegFile::title() const
QString K3bFFMpegFile::author() const
{
// FIXME: is this UTF8 or something??
- if( d->formatContext->author[0] != '\0' )
- return QString::fromLocal8Bit( d->formatContext->author );
+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
+ if( ade == NULL )
+ return QString();
+ if( ade->value != '\0' )
+ return QString::fromLocal8Bit( ade->value );
else
return QString();
}
@@ -245,8 +257,11 @@ QString K3bFFMpegFile::author() const
QString K3bFFMpegFile::comment() const
{
// FIXME: is this UTF8 or something??
- if( d->formatContext->comment[0] != '\0' )
- return QString::fromLocal8Bit( d->formatContext->comment );
+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
+ if( ade == NULL )
+ return QString();
+ if( ade->value != '\0' )
+ return QString::fromLocal8Bit( ade->value );
else
return QString();
}
@@ -309,8 +324,13 @@ int K3bFFMpegFile::fillOutputBuffer()
#if LIBAVCODEC_VERSION_MAJOR < 52
int len = ::avcodec_decode_audio(
#else
+ #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+ int len = ::avcodec_decode_audio3(
+ #else
int len = ::avcodec_decode_audio2(
+ #endif
#endif
+
#ifdef FFMPEG_BUILD_PRE_4629
&d->formatContext->streams[0]->codec,
#else
@@ -318,7 +338,11 @@ int K3bFFMpegFile::fillOutputBuffer()
#endif
(short*)d->alignedOutputBuffer,
&d->outputBufferSize,
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52, 64, 0)
+ &d->packet );
+#else
d->packetData, d->packetSize );
+#endif
if( d->packetSize <= 0 || len < 0 )
::av_free_packet( &d->packet );