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

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Dec 23 10:01:29 2016
New Revision: 429238
URL: https://svnweb.freebsd.org/changeset/ports/429238

Log:
  - Switch to USES=localbase
  - Fix build on 11+

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

Modified: head/multimedia/oggvideotools/Makefile
==============================================================================
--- head/multimedia/oggvideotools/Makefile	Fri Dec 23 09:59:23 2016	(r429237)
+++ head/multimedia/oggvideotools/Makefile	Fri Dec 23 10:01:29 2016	(r429238)
@@ -11,20 +11,18 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Toolbox for manipulating Ogg video files
 
 LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgd.so:graphics/gd \
 		libogg.so:audio/libogg \
 		libtheora.so:multimedia/libtheora \
 		libvorbis.so:audio/libvorbis
 
-USES=		cmake compiler:c++11-lib pkgconfig
+USES=		cmake compiler:c++11-lib localbase:ldflags pkgconfig
 USE_CXXSTD=	c++11
 USE_SDL=	sdl
 USE_LDCONFIG=	yes
 
-CFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|-O0.*-fPIC|-fPIC|' ${WRKSRC}/CMakeLists.txt

Added: head/multimedia/oggvideotools/files/patch-src_base_oggPacket.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/oggvideotools/files/patch-src_base_oggPacket.cpp	Fri Dec 23 10:01:29 2016	(r429238)
@@ -0,0 +1,11 @@
+--- src/base/oggPacket.cpp.orig	2016-01-11 07:51:37 UTC
++++ src/base/oggPacket.cpp
+@@ -34,7 +34,7 @@ streamType(OggType::unknown), streamNo(2
+ 
+ OggPacketInternal::OggPacketInternal(uint8* data, uint32 length,
+                                      uint32 packetNo, int64 granulePos, PacketType packetType)
+-  : oggPacket {/*packet*/data,/*bytes*/length, /*b_o_s*/0, /*e_o_s*/0, /*granualpos*/granulePos, /*packetno*/packetNo},
++  : oggPacket {/*packet*/data,/*bytes*/static_cast<long>(length), /*b_o_s*/0, /*e_o_s*/0, /*granualpos*/granulePos, /*packetno*/packetNo},
+ streamType(OggType::unknown), streamNo(255), streamHeader(false)
+ {
+   switch (packetType) {