svn commit: r335100 - in head/multimedia/oggvideotools: . files

[Philippe Audeoud]

Author: jadawin
Date: Thu Nov 28 15:29:50 2013
New Revision: 335100
URL: http://svnweb.freebsd.org/changeset/ports/335100

Log:
  - Fix build on CURRENT
  
  PR:		ports/184243
  Submitted by:	KATO Tsuguru <tkato432 at yahoo.com>

Added:
  head/multimedia/oggvideotools/files/patch-src__pictureBlend.cpp   (contents, props changed)
Modified:
  head/multimedia/oggvideotools/Makefile
  head/multimedia/oggvideotools/pkg-plist

Modified: head/multimedia/oggvideotools/Makefile
==============================================================================
--- head/multimedia/oggvideotools/Makefile	Thu Nov 28 15:09:39 2013	(r335099)
+++ head/multimedia/oggvideotools/Makefile	Thu Nov 28 15:29:50 2013	(r335100)
@@ -12,20 +12,16 @@ COMMENT=	Toolbox for manipulating Ogg vi
 
 LICENSE=	GPLv2 # (or later)
 
-LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd \
-		ogg:${PORTSDIR}/audio/libogg \
-		theora:${PORTSDIR}/multimedia/libtheora \
-		vorbis:${PORTSDIR}/audio/libvorbis
+LIB_DEPENDS=	libgd.so:${PORTSDIR}/graphics/gd \
+		libogg.so:${PORTSDIR}/audio/libogg \
+		libtheora.so:${PORTSDIR}/multimedia/libtheora \
+		libvorbis.so:${PORTSDIR}/audio/libvorbis
 
-USE_SDL=	sdl
 USES=		cmake pkgconfig
+USE_SDL=	sdl
 USE_LDCONFIG=	yes
 
+CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		mkThumbs.1 oggCat.1 oggCut.1 oggDump.1 oggJoin.1 \
-		oggLength.1 oggSilence.1 oggSlideshow.1 oggSplit.1 \
-		oggThumb.1 oggTranscode.1
-
-NO_STAGE=	yes
 .include <bsd.port.mk>

Added: head/multimedia/oggvideotools/files/patch-src__pictureBlend.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/oggvideotools/files/patch-src__pictureBlend.cpp	Thu Nov 28 15:29:50 2013	(r335100)
@@ -0,0 +1,11 @@
+--- src/pictureBlend.cpp.orig
++++ src/pictureBlend.cpp
+@@ -9,6 +9,8 @@
+ // Copyright: See COPYING file that comes with this distribution
+ //
+ //
++#include <string>
++
+ #include "pictureBlend.h"
+ #include "exception.h"
+ 

Modified: head/multimedia/oggvideotools/pkg-plist
==============================================================================
--- head/multimedia/oggvideotools/pkg-plist	Thu Nov 28 15:09:39 2013	(r335099)
+++ head/multimedia/oggvideotools/pkg-plist	Thu Nov 28 15:29:50 2013	(r335100)
@@ -78,5 +78,16 @@ include/oggvt/vorbisPosInterpreter.h
 include/oggvt/vorbisStreamParameter.h
 include/oggvt/wishList.h
 lib/liboggvideotools.so
+man/man1/mkThumbs.1.gz
+man/man1/oggCat.1.gz
+man/man1/oggCut.1.gz
+man/man1/oggDump.1.gz
+man/man1/oggJoin.1.gz
+man/man1/oggLength.1.gz
+man/man1/oggSilence.1.gz
+man/man1/oggSlideshow.1.gz
+man/man1/oggSplit.1.gz
+man/man1/oggThumb.1.gz
+man/man1/oggTranscode.1.gz
 sbin/mkThumbs
 @dirrm include/oggvt