diff options
| author | pawel <pawel@FreeBSD.org> | 2013-10-27 06:08:51 +0800 |
|---|---|---|
| committer | pawel <pawel@FreeBSD.org> | 2013-10-27 06:08:51 +0800 |
| commit | edeb1d571568f081ffacf6e9e87b4e40af0d2afd (patch) | |
| tree | b1922d4322ee6faeaf17b570285ec1b76eb16c18 | |
| parent | 1a544ac78e7a5fb45ca3751a455a17c8135c35c7 (diff) | |
| download | freebsd-ports-gnome-edeb1d571568f081ffacf6e9e87b4e40af0d2afd.tar.gz freebsd-ports-gnome-edeb1d571568f081ffacf6e9e87b4e40af0d2afd.tar.zst freebsd-ports-gnome-edeb1d571568f081ffacf6e9e87b4e40af0d2afd.zip | |
- Fix build after recent ffmpeg update
- Add support for STAGEDIR
- Convert to USES=scons
| -rw-r--r-- | multimedia/bombono/Makefile | 18 | ||||
| -rw-r--r-- | multimedia/bombono/files/patch-src-mgui-ffviewer.cpp | 11 | ||||
| -rw-r--r-- | multimedia/bombono/pkg-plist | 2 |
3 files changed, 20 insertions, 11 deletions
diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile index dede3ec335c1..bd5625f9194f 100644 --- a/multimedia/bombono/Makefile +++ b/multimedia/bombono/Makefile @@ -23,27 +23,23 @@ RUN_DEPENDS= GraphicsMagick>=1.1.7:${PORTSDIR}/graphics/GraphicsMagick \ growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \ toolame:${PORTSDIR}/audio/toolame -USES= pkgconfig gettext +USES= pkgconfig scons USE_BZIP2= yes -USE_SCONS= yes USE_GCC= 4.2+ INSTALLS_ICONS= yes CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl -SCONS_ARGS= DVDREAD_LIBPATH=${LOCALBASE}/lib \ - DVDREAD_INCLUDE=${LOCALBASE}/include LDFLAGS="${LDFLAGS}" +MAKE_ARGS= DVDREAD_INCLUDE=${LOCALBASE}/include \ + DVDREAD_LIBPATH=${LOCALBASE}/lib \ + CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}" \ + CC="${CC}" CXX="${CXX}" -MAN1= bombono-dvd.1 mpeg2demux.1 -MANDIR= ${MANPREFIX}/man/man1 - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/SConstruct post-install: - ${MKDIR} ${MANDIR} - ${INSTALL_MAN} ${WRKSRC}/docs/man/man1/bombono-dvd.1 ${MANDIR} - ${INSTALL_MAN} ${WRKSRC}/docs/man/man1/mpeg2demux.1 ${MANDIR} + cd ${WRKSRC}/docs/man/man1 && ${INSTALL_MAN} bombono-dvd.1 \ + mpeg2demux.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> diff --git a/multimedia/bombono/files/patch-src-mgui-ffviewer.cpp b/multimedia/bombono/files/patch-src-mgui-ffviewer.cpp new file mode 100644 index 000000000000..7e8f07281485 --- /dev/null +++ b/multimedia/bombono/files/patch-src-mgui-ffviewer.cpp @@ -0,0 +1,11 @@ +--- src/mgui/ffviewer.cpp.orig 2013-10-24 20:27:18.405577708 +0200 ++++ src/mgui/ffviewer.cpp 2013-10-24 20:29:52.933598308 +0200 +@@ -406,7 +406,7 @@ + + #else // CALC_FF_TAG + +-static std::string CodecID2Str(CodecID codec_id) ++static std::string CodecID2Str(AVCodecID codec_id) + { + return Int2Str(codec_id); + } diff --git a/multimedia/bombono/pkg-plist b/multimedia/bombono/pkg-plist index fd9dfff99b71..d377d5a9dab8 100644 --- a/multimedia/bombono/pkg-plist +++ b/multimedia/bombono/pkg-plist @@ -1,5 +1,7 @@ bin/bombono-dvd bin/mpeg2demux +man/man1/bombono-dvd.1.gz +man/man1/mpeg2demux.1.gz share/applications/bombono-dvd.desktop %%DATADIR%%/resources/about-back.png %%DATADIR%%/resources/about-front.png |