svn commit: r331739 - in head/multimedia/bombono: . files

[Pawel Pekala]

Author: pawel
Date: Sat Oct 26 22:08:51 2013
New Revision: 331739
URL: http://svnweb.freebsd.org/changeset/ports/331739

Log:
  - Fix build after recent ffmpeg update
  - Add support for STAGEDIR
  - Convert to USES=scons

Added:
  head/multimedia/bombono/files/patch-src-mgui-ffviewer.cpp   (contents, props changed)
Modified:
  head/multimedia/bombono/Makefile
  head/multimedia/bombono/pkg-plist

Modified: head/multimedia/bombono/Makefile
==============================================================================
--- head/multimedia/bombono/Makefile	Sat Oct 26 21:46:57 2013	(r331738)
+++ head/multimedia/bombono/Makefile	Sat Oct 26 22:08:51 2013	(r331739)
@@ -23,27 +23,23 @@ RUN_DEPENDS=	GraphicsMagick>=1.1.7:${POR
 		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>

Added: head/multimedia/bombono/files/patch-src-mgui-ffviewer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/bombono/files/patch-src-mgui-ffviewer.cpp	Sat Oct 26 22:08:51 2013	(r331739)
@@ -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);
+ }

Modified: head/multimedia/bombono/pkg-plist
==============================================================================
--- head/multimedia/bombono/pkg-plist	Sat Oct 26 21:46:57 2013	(r331738)
+++ head/multimedia/bombono/pkg-plist	Sat Oct 26 22:08:51 2013	(r331739)
@@ -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