aboutsummaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authoramdmi3 <amdmi3@FreeBSD.org>2016-12-23 18:01:29 +0800
committeramdmi3 <amdmi3@FreeBSD.org>2016-12-23 18:01:29 +0800
commitf6de1b04b77bb068f4f1ceb5b8ebebb823bbaba6 (patch)
treef6929e29d2b27657afc68e7ee114956763772235 /multimedia
parent3ccfea0653c73397c056cdf2bfa79375f7c81057 (diff)
downloadfreebsd-ports-gnome-f6de1b04b77bb068f4f1ceb5b8ebebb823bbaba6.tar.gz
freebsd-ports-gnome-f6de1b04b77bb068f4f1ceb5b8ebebb823bbaba6.tar.zst
freebsd-ports-gnome-f6de1b04b77bb068f4f1ceb5b8ebebb823bbaba6.zip
- Switch to USES=localbase
- Fix build on 11+
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/oggvideotools/Makefile6
-rw-r--r--multimedia/oggvideotools/files/patch-src_base_oggPacket.cpp11
2 files changed, 13 insertions, 4 deletions
diff --git a/multimedia/oggvideotools/Makefile b/multimedia/oggvideotools/Makefile
index f170e4d2e0b8..681bd1f79fbb 100644
--- a/multimedia/oggvideotools/Makefile
+++ b/multimedia/oggvideotools/Makefile
@@ -11,20 +11,18 @@ MAINTAINER= ports@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
diff --git a/multimedia/oggvideotools/files/patch-src_base_oggPacket.cpp b/multimedia/oggvideotools/files/patch-src_base_oggPacket.cpp
new file mode 100644
index 000000000000..472bf0b6ce8b
--- /dev/null
+++ b/multimedia/oggvideotools/files/patch-src_base_oggPacket.cpp
@@ -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) {