From 59fb0b4bc2a9746ff64d8af048ef00063d4bba0c Mon Sep 17 00:00:00 2001 From: Wen Heping Date: Wed, 17 Nov 2010 08:32:17 +0000 Subject: [PATCH] - Update to version 0.8.1 - Mark MAKE_JOBS_SAFE - Grab maintainership PR: ports/152241 Submitted by: "Pawel Pekala" --- multimedia/bombono/Makefile | 14 ++++++------ multimedia/bombono/distinfo | 5 ++--- multimedia/bombono/files/patch-SConstruct | 21 ++++++++++++++++++ multimedia/bombono/pkg-plist | 26 +++++++++++++++++++++++ 4 files changed, 55 insertions(+), 11 deletions(-) create mode 100644 multimedia/bombono/files/patch-SConstruct diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile index ce52d156e437..af33f34eb274 100644 --- a/multimedia/bombono/Makefile +++ b/multimedia/bombono/Makefile @@ -6,14 +6,12 @@ # PORTNAME= bombono -PORTVERSION= 0.5.1 -PORTREVISION= 4 +PORTVERSION= 0.8.1 CATEGORIES= multimedia -MASTER_SITES= SF/bombono/bombono-dvd/${PORTVERSION} \ - http://www.stasyan.com/devel/distfiles/ +MASTER_SITES= SF/bombono/bombono-dvd/0.8 DISTNAME= bombono-dvd-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= c0rn@o2.pl COMMENT= DVD authoring program LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ @@ -21,9 +19,7 @@ LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ BUILD_DEPENDS= GraphicsMagick>=1.1.7:${PORTSDIR}/graphics/GraphicsMagick \ mjpegtools>=1.9.0:${PORTSDIR}/multimedia/mjpegtools \ dvdread-config:${PORTSDIR}/multimedia/libdvdread -RUN_DEPENDS= GraphicsMagick>=1.1.7:${PORTSDIR}/graphics/GraphicsMagick \ - mjpegtools>=1.9.0:${PORTSDIR}/multimedia/mjpegtools \ - dvdread-config:${PORTSDIR}/multimedia/libdvdread \ +RUN_DEPENDS= ${BUILD_DEPENDS} \ dvda-author:${PORTSDIR}/audio/dvda-author \ growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ toolame:${PORTSDIR}/audio/toolame @@ -32,6 +28,8 @@ USE_BZIP2= yes USE_GNOME= gtk20 libxml2 USE_GCC= 4.2+ USE_SCONS= yes +USE_GETTEXT= yes +MAKE_JOBS_SAFE= yes SCONS_ENV= CCFLAGS="${CCFLAGS}" CXXFLAGS="${CXXFLAGS}" \ LINKFLAGS="${LINKFLAGS}" PKGCONFIGDIR="${PKGCONFIGDIR}" \ CPPPATH="${CPPPATH}" LIBPATH="${LIBPATH}" PREFIX="${PREFIX}" \ diff --git a/multimedia/bombono/distinfo b/multimedia/bombono/distinfo index 508cdce503e5..bc9709c21143 100644 --- a/multimedia/bombono/distinfo +++ b/multimedia/bombono/distinfo @@ -1,3 +1,2 @@ -MD5 (bombono-dvd-0.5.1.tar.bz2) = 0626c604cce6f2030259b041ca45dafd -SHA256 (bombono-dvd-0.5.1.tar.bz2) = 090288d0da4b01a4ab76535bc73e848f1813362827290a9942cc7976a87b31dd -SIZE (bombono-dvd-0.5.1.tar.bz2) = 1699435 +SHA256 (bombono-dvd-0.8.1.tar.bz2) = 689b46db1b09bf37125bb78aebbe81ea2a09a048f5115bdf85fb26396fd93287 +SIZE (bombono-dvd-0.8.1.tar.bz2) = 2156322 diff --git a/multimedia/bombono/files/patch-SConstruct b/multimedia/bombono/files/patch-SConstruct new file mode 100644 index 000000000000..3e4ecd925a79 --- /dev/null +++ b/multimedia/bombono/files/patch-SConstruct @@ -0,0 +1,21 @@ +--- SConstruct.orig 2010-11-14 15:09:16.000000000 +0100 ++++ SConstruct 2010-11-14 15:09:36.000000000 +0100 +@@ -143,18 +143,6 @@ + #env.Replace (PATH = user_options_dict['PATH']) + #env.Replace (AR = user_options_dict['AR']) + +- # Large File Support +- if not BV.IsReenter(AdjustConfigOptions): +- if BV.IsSConsLE_0_96(env): +- # :TRICKY: nobody but me uses so old scons, so I do it straight +- dict = { 'CPPDEFINES': ['_LARGEFILE_SOURCE', ('_FILE_OFFSET_BITS', '64')] } +- else: +- dict = BV.ParseFlagsForCommand('getconf LFS_CFLAGS', 1) +- dict.update(BV.ParseFlagsForCommand('getconf LFS_LDFLAGS')) +- dict.update(BV.ParseFlagsForCommand('getconf LFS_LIBS')) +- AdjustConfigOptions.lfs = dict +- env.Append(**AdjustConfigOptions.lfs) +- + # Multithreading, global + if IsThreadedBuild: + env.Append(CCFLAGS = ThreadOpt, LINKFLAGS = ThreadOpt) diff --git a/multimedia/bombono/pkg-plist b/multimedia/bombono/pkg-plist index c7fd62acff97..18c56f95cf4a 100644 --- a/multimedia/bombono/pkg-plist +++ b/multimedia/bombono/pkg-plist @@ -14,6 +14,7 @@ share/applications/bombono-dvd.desktop %%DATADIR%%/resources/button/008.ico %%DATADIR%%/resources/button/still.ico %%DATADIR%%/resources/cap400.png +%%DATADIR%%/resources/copy-n-paste/lpetool_show_bbox.png %%DATADIR%%/resources/copy-n-paste/HelixPlayer_Activity-watch-listen.svg %%DATADIR%%/resources/copy-n-paste/HelixPlayer_Activity-watch-listen/12.png %%DATADIR%%/resources/copy-n-paste/HelixPlayer_Activity-watch-listen/16.png @@ -66,6 +67,16 @@ share/applications/bombono-dvd.desktop %%DATADIR%%/resources/frames/roundrect/frame.png %%DATADIR%%/resources/frames/roundrect/vframe.png %%DATADIR%%/resources/frames/samples/background.png +%%DATADIR%%/resources/frames/shadow & white/frame.png +%%DATADIR%%/resources/frames/shadow & white/vframe.png +%%DATADIR%%/resources/frames/shadow/frame.png +%%DATADIR%%/resources/frames/shadow/vframe.png +%%DATADIR%%/resources/frames/shadow2/frame.png +%%DATADIR%%/resources/frames/shadow2/info +%%DATADIR%%/resources/frames/shadow2/vframe.png +%%DATADIR%%/resources/frames/slide/frame.png +%%DATADIR%%/resources/frames/slide/info +%%DATADIR%%/resources/frames/slide/vframe.png %%DATADIR%%/resources/frames/stonerect/frame.png %%DATADIR%%/resources/frames/stonerect/vframe.png %%DATADIR%%/resources/gtkrc @@ -76,16 +87,31 @@ share/applications/bombono-dvd.desktop %%DATADIR%%/resources/icons/bombono-dvd_64px.png %%DATADIR%%/resources/scons_authoring/ADVD.py %%DATADIR%%/resources/scons_authoring/README +%%DATADIR%%/resources/scons_authoring/README-ru %%DATADIR%%/resources/scons_authoring/SConsTwin.py %%DATADIR%%/resources/scons_authoring/SConstruct %%DATADIR%%/resources/scons_authoring/menu_SConscript %%DATADIR%%/resources/tool-pointer.png %%DATADIR%%/resources/tool-text.png share/pixmaps/bombono-dvd.png +share/locale/cs/LC_MESSAGES/bombono-dvd.mo +share/locale/da/LC_MESSAGES/bombono-dvd.mo +share/locale/es/LC_MESSAGES/bombono-dvd.mo +share/locale/fi/LC_MESSAGES/bombono-dvd.mo +share/locale/fr/LC_MESSAGES/bombono-dvd.mo +share/locale/it/LC_MESSAGES/bombono-dvd.mo +share/locale/nn/LC_MESSAGES/bombono-dvd.mo +share/locale/ru/LC_MESSAGES/bombono-dvd.mo +share/locale/sv/LC_MESSAGES/bombono-dvd.mo +share/locale/vi/LC_MESSAGES/bombono-dvd.mo @dirrmtry share/applications @dirrm %%DATADIR%%/resources/scons_authoring @dirrm %%DATADIR%%/resources/icons @dirrm %%DATADIR%%/resources/frames/stonerect +@dirrm %%DATADIR%%/resources/frames/slide +@dirrm %%DATADIR%%/resources/frames/shadow2 +@dirrm %%DATADIR%%/resources/frames/shadow +@dirrm %%DATADIR%%/resources/frames/shadow & white @dirrm %%DATADIR%%/resources/frames/samples @dirrm %%DATADIR%%/resources/frames/roundrect @dirrm %%DATADIR%%/resources/frames/rect