pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/k3b Update to 2.0.2
details: https://anonhg.NetBSD.org/pkgsrc/rev/f6babd6023d8
branches: trunk
changeset: 601541:f6babd6023d8
user: markd <markd%pkgsrc.org@localhost>
date: Thu Mar 22 06:39:00 2012 +0000
description:
Update to 2.0.2
KDE4 version.
diffstat:
sysutils/k3b/Makefile | 41 +-
sysutils/k3b/PLIST | 570 +++++++--
sysutils/k3b/distinfo | 16 +-
sysutils/k3b/patches/patch-ab | 22 -
sysutils/k3b/patches/patch-ac | 13 -
sysutils/k3b/patches/patch-ad | 38 -
sysutils/k3b/patches/patch-ae | 16 -
sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp | 16 +
sysutils/k3b/patches/patch-libk3bdevice_k3bdevice.cpp | 28 +
sysutils/k3b/patches/patch-libk3bdevice_k3bdevicemanager.cpp | 21 +
sysutils/k3b/patches/patch-libk3bdevice_k3bscsicommand_netbsd.cpp | 13 +
11 files changed, 520 insertions(+), 274 deletions(-)
diffs (truncated from 965 to 300 lines):
diff -r 667717721a38 -r f6babd6023d8 sysutils/k3b/Makefile
--- a/sysutils/k3b/Makefile Thu Mar 22 06:12:10 2012 +0000
+++ b/sysutils/k3b/Makefile Thu Mar 22 06:39:00 2012 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2012/03/03 00:13:57 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2012/03/22 06:39:00 markd Exp $
#
-DISTNAME= k3b-1.0.5
-PKGREVISION= 14
+DISTNAME= k3b-2.0.2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=k3b/}
EXTRACT_SUFX= .tar.bz2
@@ -13,24 +12,46 @@
PKG_DESTDIR_SUPPORT= user-destdir
+BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
DEPENDS+= cdrdao-[0-9]*:../../sysutils/cdrdao
DEPENDS+= {cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
-GNU_CONFIGURE= yes
-SET_LIBDIR= yes
-USE_TOOLS+= gmake perl pkg-config
+USE_TOOLS+= perl pkg-config gmake msgfmt
USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
+
+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-*-*
-.include "../../meta-pkgs/kde3/kde3.mk"
+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 "../../x11/kdebase3/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
+.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/kdemultimedia4/buildlink3.mk"
+.include "../../multimedia/libdvdread/buildlink3.mk"
+.include "../../security/polkit-qt/buildlink3.mk"
+.include "../../x11/kdelibs4/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 667717721a38 -r f6babd6023d8 sysutils/k3b/PLIST
--- a/sysutils/k3b/PLIST Thu Mar 22 06:12:10 2012 +0000
+++ b/sysutils/k3b/PLIST Thu Mar 22 06:39:00 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:16:08 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/03/22 06:39:00 markd Exp $
bin/k3b
bin/k3bsetup
include/k3b_export.h
@@ -12,8 +12,8 @@
include/k3baudiodoc.h
include/k3baudioencoder.h
include/k3baudiofile.h
+include/k3baudiofileanalyzerjob.h
include/k3baudiojob.h
-include/k3baudiooutputplugin.h
include/k3baudiotrack.h
include/k3baudiozerodata.h
include/k3bbinimagewritingjob.h
@@ -22,7 +22,6 @@
include/k3bbusywidget.h
include/k3bcdcopyjob.h
include/k3bcddb.h
-include/k3bcddbresult.h
include/k3bcdparanoialib.h
include/k3bcdrdaowriter.h
include/k3bcdrecordwriter.h
@@ -32,11 +31,9 @@
include/k3bclonejob.h
include/k3bcore.h
include/k3bcuefileparser.h
-include/k3bcutcombobox.h
include/k3bdatadoc.h
include/k3bdataitem.h
include/k3bdatajob.h
-include/k3bdebug.h
include/k3bdefaultexternalprograms.h
include/k3bdevice.h
include/k3bdevice_export.h
@@ -51,9 +48,7 @@
include/k3bdiskinfo.h
include/k3bdoc.h
include/k3bdvdcopyjob.h
-include/k3bdvddoc.h
include/k3bdvdformattingjob.h
-include/k3bdvdjob.h
include/k3bexceptions.h
include/k3bexternalbinmanager.h
include/k3bfileitem.h
@@ -75,40 +70,35 @@
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/k3bmovixdvddoc.h
-include/k3bmovixdvdjob.h
include/k3bmovixfileitem.h
include/k3bmovixjob.h
include/k3bmsf.h
include/k3bmsfedit.h
include/k3bmultichoicedialog.h
-include/k3bpipe.h
include/k3bplugin.h
include/k3bpluginconfigwidget.h
-include/k3bpluginfactory.h
include/k3bpluginmanager.h
include/k3bprocess.h
include/k3bprogressdialog.h
include/k3bprojectplugin.h
include/k3bpushbutton.h
-include/k3bradioaction.h
+include/k3brawaudiodatasource.h
include/k3brichtextlabel.h
include/k3bsignalwaiter.h
include/k3bsimplejobhandler.h
include/k3bstdguiitems.h
include/k3bstringutils.h
-include/k3btempfile.h
-include/k3bthread.h
include/k3bthreadjob.h
include/k3bthreadwidget.h
include/k3bthroughputestimator.h
include/k3btoc.h
include/k3btocfilewriter.h
-include/k3btoolbox.h
-include/k3btoolbutton.h
include/k3btrack.h
include/k3bvalidators.h
include/k3bvcddoc.h
@@ -116,149 +106,139 @@
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
-include/kcutlabel.h
-lib/kde3/kcm_k3bsetup2.la
-lib/kde3/kfile_k3b.la
-lib/kde3/kio_videodvd.la
-lib/kde3/libk3bartsoutputplugin.la
-lib/kde3/libk3baudiometainforenamerplugin.la
-lib/kde3/libk3baudioprojectcddbplugin.la
-lib/kde3/libk3bexternalencoder.la
-lib/kde3/libk3bflacdecoder.la
-lib/kde3/libk3blameencoder.la
-lib/kde3/libk3blibsndfiledecoder.la
-lib/kde3/libk3bmaddecoder.la
-lib/kde3/libk3boggvorbisdecoder.la
-lib/kde3/libk3boggvorbisencoder.la
-lib/kde3/libk3bsoxencoder.la
-lib/kde3/libk3bwavedecoder.la
-lib/libk3b.la
-lib/libk3bdevice.la
-share/applications/kde/k3b.desktop
-share/doc/kde/HTML/en/k3b/audiocd-howto.docbook
-share/doc/kde/HTML/en/k3b/burndialog_audio.png
-share/doc/kde/HTML/en/k3b/burndialog_progress.png
-share/doc/kde/HTML/en/k3b/cdcloning_dialog.png
-share/doc/kde/HTML/en/k3b/cdcloning_reading.png
-share/doc/kde/HTML/en/k3b/cdcopy-howto.docbook
-share/doc/kde/HTML/en/k3b/cdcopy_done.png
-share/doc/kde/HTML/en/k3b/cdcopy_reading.png
-share/doc/kde/HTML/en/k3b/cdcopy_settings.png
-share/doc/kde/HTML/en/k3b/cdcopy_writing.png
-share/doc/kde/HTML/en/k3b/commands.docbook
+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/dcop.docbook
share/doc/kde/HTML/en/k3b/index.cache.bz2
share/doc/kde/HTML/en/k3b/index.docbook
-share/doc/kde/HTML/en/k3b/select_audiofiles.png
-share/doc/kde/HTML/en/k3b/select_project.png
+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/kde/applnk/.hidden/k3b-cue.desktop
-share/kde/applnk/.hidden/k3b-iso.desktop
-share/kde/applnk/Settings/System/k3bsetup2.desktop
+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/eventsrc
share/kde/apps/k3b/extra/k3bphotosvcd.mpg
share/kde/apps/k3b/extra/k3bphotovcd.mpg
-share/kde/apps/k3b/icons/crystalsvg/16x16/actions/greenled.png
-share/kde/apps/k3b/icons/crystalsvg/16x16/actions/redled.png
-share/kde/apps/k3b/icons/crystalsvg/16x16/actions/yellowinfo.png
-share/kde/apps/k3b/icons/crystalsvg/16x16/actions/yellowled.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/audiocd.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/burn_cdimage.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/burn_dvdimage.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/cdburn.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/cdcopy.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/cddarip.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/datacd.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/datadvd.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/dvdcopy.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/emovix.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/erasecd.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/formatdvd.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/mixedcd.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/mp3cd.png
share/kde/apps/k3b/icons/hicolor/16x16/actions/musicbrainz.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/videocd.png
-share/kde/apps/k3b/icons/hicolor/16x16/actions/videodvd.png
-share/kde/apps/k3b/icons/hicolor/22x22/actions/audiocd.png
-share/kde/apps/k3b/icons/hicolor/22x22/actions/burn_cdimage.png
-share/kde/apps/k3b/icons/hicolor/22x22/actions/burn_dvdimage.png
-share/kde/apps/k3b/icons/hicolor/22x22/actions/cdburn.png
-share/kde/apps/k3b/icons/hicolor/22x22/actions/cdcopy.png
-share/kde/apps/k3b/icons/hicolor/22x22/actions/cddarip.png
-share/kde/apps/k3b/icons/hicolor/22x22/actions/datacd.png
-share/kde/apps/k3b/icons/hicolor/22x22/actions/datadvd.png
-share/kde/apps/k3b/icons/hicolor/22x22/actions/dvdcopy.png
-share/kde/apps/k3b/icons/hicolor/22x22/actions/emovix.png
-share/kde/apps/k3b/icons/hicolor/22x22/actions/erasecd.png
Home |
Main Index |
Thread Index |
Old Index