Update to 12b472eaa75bce25dc63ec61d9233aadb996f3a4,

Various bug fixes

7 files changed, 44 insertions, 80 deletions

diff --git a/multimedia/omxplayer/Makefile b/multimedia/omxplayer/Makefile
index 50f21cb519f..552e079131d 100644
--- a/multimedia/omxplayer/Makefile
+++ b/multimedia/omxplayer/Makefile
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.10 2017/01/16 23:45:15 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2017/01/17 07:33:50 skrll Exp $
 
-DISTNAME=	omxplayer-20150118
-PKGREVISION=	9
+DISTNAME=	omxplayer-20170112
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.invisible.ca/packages/distfiles/
-EXTRACT_SUFX=	.zip
+MASTER_SITES=   ${MASTER_SITE_GITHUB:=popcornmix/}
+GITHUB_PROJECT= omxplayer
+GITHUB_TAG=     12b472eaa75bce25dc63ec61d9233aadb996f3a4
 
 MAINTAINER=	port-arm@NetBSD.org
 HOMEPAGE=	https://github.com/popcornmix/omxplayer
 COMMENT=	Raspberry Pi video player
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/omxplayer-master
 USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake bash:build
 BUILD_TARGET=	omxplayer.bin
 INSTALLATION_DIRS+= bin share/docs/omxplayer
 REPLACE_BASH=	omxplayer
 
+EXTRACT_USING=	bsdtar
+
 ONLY_FOR_PLATFORM=	NetBSD-*-earm*hf
 
 CFLAGS+=	-DPREFIX=\"${PREFIX}\"
@@ -34,7 +35,9 @@ DEPENDS+=	freefont-ttf-[0-9]*:../../fonts/freefont-ttf
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../misc/raspberrypi-userland/buildlink3.mk"
-.include "../../multimedia/ffmpeg2/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/omxplayer/distinfo b/multimedia/omxplayer/distinfo
index 2edb7d924ea..638e13623b5 100644
--- a/multimedia/omxplayer/distinfo
+++ b/multimedia/omxplayer/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.6 2015/11/13 15:12:15 skrll Exp $
+$NetBSD: distinfo,v 1.7 2017/01/17 07:33:50 skrll Exp $
 
-SHA1 (omxplayer-20150118.zip) = 95522df16247bd1ece40cbccac05f9e73f1c1d2a
-RMD160 (omxplayer-20150118.zip) = 0d3678c8ae71ed3ae507b7f0aaab2a482ee87691
-SHA512 (omxplayer-20150118.zip) = e0d9378077aa78d3d1b3ba3ea87bde9e5f8c488344e1f82c6e5457370c77782a660a8321a4afef6d14f7df14d8a4523a998d4787b2e7716cdddfc8510fc9bb84
-Size (omxplayer-20150118.zip) = 1265704 bytes
+SHA1 (omxplayer-20170112-12b472eaa75bce25dc63ec61d9233aadb996f3a4.tar.gz) = 7a0e4aa2709fe6c0b85b26bc4227f78d90dd6d3b
+RMD160 (omxplayer-20170112-12b472eaa75bce25dc63ec61d9233aadb996f3a4.tar.gz) = 99898cc1ac443c5fda20d62e256045baa29bd8d5
+SHA512 (omxplayer-20170112-12b472eaa75bce25dc63ec61d9233aadb996f3a4.tar.gz) = c9e14c7ed83259e5e2ee23cdf7d11ba498851814e502fffd8e62676a91adaa5ec28a7f34d831a2c9feae46acea21520df79d308de8514198fbecab5eaa912a6f
+Size (omxplayer-20170112-12b472eaa75bce25dc63ec61d9233aadb996f3a4.tar.gz) = 1218873 bytes
 SHA1 (patch-Keyboard.cpp) = 92044ce1077bf043553c7631fad5a779f93ff33c
 SHA1 (patch-Keyboard.h) = 48d4b5da443b6a1e5b736907b9b660c1afb1f119
-SHA1 (patch-Makefile) = fe45c59a7cb1282c48f16bd56be9f64422fa4bf2
-SHA1 (patch-Makefile.include) = c78979b5b0e2d76f4e83f80bd6144d5b892eff34
-SHA1 (patch-OMXControl.cpp) = 55e3e73b29c1e8cf1999271a0fbf298e3e0eaa8e
-SHA1 (patch-OMXThread.cpp) = 9d5cd21fb0dc3881507f94ac7723a325877bf3d4
+SHA1 (patch-Makefile) = 6e609a19a9b83872f5fded93c001ae9ab7881e9d
+SHA1 (patch-Makefile.include) = 894f1f0acf0ec823c7915e2333ab5ac0937af24e
+SHA1 (patch-OMXAudio.cpp) = 8b142577fc2bd18dcbf5485e3070f70062f7ce92
 SHA1 (patch-linux_PlatformDefs.h) = 1918a2b87e33074a08cd36f3b932c8d6b3273457
-SHA1 (patch-omxplayer.cpp) = 6746573a66ccdf6791afe3e38f07330d8444dd0b
-SHA1 (patch-utils_SingleLock.h) = 34597e7196a4ab066ee9a4c9685a10fb75db7e36
+SHA1 (patch-omxplayer.cpp) = bee9abeb8f48eddaa249c36ac6200af22959b2cf
diff --git a/multimedia/omxplayer/patches/patch-Makefile b/multimedia/omxplayer/patches/patch-Makefile
index 2f25bf8aa2c..5e401973b69 100644
--- a/multimedia/omxplayer/patches/patch-Makefile
+++ b/multimedia/omxplayer/patches/patch-Makefile
@@ -1,24 +1,13 @@
-$NetBSD: patch-Makefile,v 1.1 2015/01/18 23:09:25 jmcneill Exp $
+$NetBSD: patch-Makefile,v 1.2 2017/01/17 07:33:50 skrll Exp $
 
---- Makefile.orig	2015-01-12 15:10:50.000000000 +0000
+--- Makefile.orig	2016-10-10 15:38:42.000000000 +0000
 +++ Makefile
-@@ -2,9 +2,9 @@ include Makefile.include
+@@ -4,7 +4,7 @@ CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MAC
  
- CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
- 
--LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
-+LDFLAGS+=-L./ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz
+ LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
  
 -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
-+INCLUDES+=-I./ -Ilinux -I$(LOCALBASE)/include/dbus-1.0 -I$(LOCALBASE)/lib/dbus-1.0/include
++INCLUDES+=-I./ -Ilinux
  
  DIST ?= omxplayer-dist
  
-@@ -52,7 +52,6 @@ version:
- 
- omxplayer.bin: version $(OBJS)
- 	$(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre
--	$(STRIP) omxplayer.bin
- 
- help.h: README.md Makefile
- 	awk '/SYNOPSIS/{p=1;print;next} p&&/KEY BINDINGS/{p=0};p' $< \
diff --git a/multimedia/omxplayer/patches/patch-Makefile.include b/multimedia/omxplayer/patches/patch-Makefile.include
index cdc5d8627dc..b9ba480e025 100644
--- a/multimedia/omxplayer/patches/patch-Makefile.include
+++ b/multimedia/omxplayer/patches/patch-Makefile.include
@@ -1,6 +1,6 @@
-$NetBSD: patch-Makefile.include,v 1.1 2015/01/18 23:09:25 jmcneill Exp $
+$NetBSD: patch-Makefile.include,v 1.2 2017/01/17 07:33:50 skrll Exp $
 
---- Makefile.include.orig	2015-01-12 15:10:50.000000000 +0000
+--- Makefile.include.orig	2016-10-10 15:38:42.000000000 +0000
 +++ Makefile.include
 @@ -1,40 +1,7 @@
 -USE_BUILDROOT=0
@@ -36,7 +36,7 @@ $NetBSD: patch-Makefile.include,v 1.1 2015/01/18 23:09:25 jmcneill Exp $
 -RANLIB			:= $(TOOLCHAIN)/bin/$(HOST)-ranlib
 -STRIP				:= $(TOOLCHAIN)/bin/$(HOST)-strip
 -AR 					:= $(TOOLCHAIN)/bin/$(HOST)-ar
-+LDFLAGS			:= -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib/ffmpeg2 -L$(LOCALBASE)/lib/ffmpeg2 -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib
++LDFLAGS			:= -Wl,-R$(LOCALBASE)/lib -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib/ffmpeg3 -L$(LOCALBASE)/lib/ffmpeg3 -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib
  CXXCP 			:= $(CXX) -E
 -PATH 				:= $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH)
 +STRIP			:= strip
@@ -46,4 +46,4 @@ $NetBSD: patch-Makefile.include,v 1.1 2015/01/18 23:09:25 jmcneill Exp $
 -LDFLAGS			+= -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build
 -#INCLUDES		+= -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2
 -INCLUDES		+= -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include
-+INCLUDES		+= -I$(LOCALBASE)/include -I$(LOCALBASE)/include/interface/vcos/pthreads -I$(LOCALBASE)/include/interface/vmcs_host/linux
++INCLUDES		+= -I$(LOCALBASE)/include -I$(LOCALBASE)/include/interface/vcos/pthreads -I$(LOCALBASE)/include/interface/vmcs_host/linux -I$(LOCALBASE)/include/dbus-1.0 -I$(LOCALBASE)/lib/dbus-1.0/include
diff --git a/multimedia/omxplayer/patches/patch-OMXAudio.cpp b/multimedia/omxplayer/patches/patch-OMXAudio.cpp
new file mode 100644
index 00000000000..c51e4d31803
--- /dev/null
+++ b/multimedia/omxplayer/patches/patch-OMXAudio.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-OMXAudio.cpp,v 1.1 2017/01/17 07:33:50 skrll Exp $
+
+--- OMXAudio.cpp.orig	2016-10-10 15:38:42.000000000 +0000
++++ OMXAudio.cpp
+@@ -585,7 +585,7 @@ bool COMXAudio::Initialize(OMXClock *clo
+     }
+ 
+     omx_buffer->nOffset = 0;
+-    omx_buffer->nFilledLen  = std::min(sizeof(m_wave_header), omx_buffer->nAllocLen);
++    omx_buffer->nFilledLen  = std::min(sizeof(m_wave_header), (size_t)omx_buffer->nAllocLen);
+ 
+     memset((unsigned char *)omx_buffer->pBuffer, 0x0, omx_buffer->nAllocLen);
+     memcpy((unsigned char *)omx_buffer->pBuffer, &m_wave_header, omx_buffer->nFilledLen);
diff --git a/multimedia/omxplayer/patches/patch-omxplayer.cpp b/multimedia/omxplayer/patches/patch-omxplayer.cpp
index cb4641fa124..32d13ac1fee 100644
--- a/multimedia/omxplayer/patches/patch-omxplayer.cpp
+++ b/multimedia/omxplayer/patches/patch-omxplayer.cpp
@@ -1,18 +1,8 @@
-$NetBSD: patch-omxplayer.cpp,v 1.1 2015/01/18 23:09:25 jmcneill Exp $
+$NetBSD: patch-omxplayer.cpp,v 1.2 2017/01/17 07:33:50 skrll Exp $
 
---- omxplayer.cpp.orig	2015-01-12 15:10:50.000000000 +0000
+--- omxplayer.cpp.orig	2016-10-10 15:38:42.000000000 +0000
 +++ omxplayer.cpp
-@@ -23,7 +23,9 @@
- #include <stdint.h>
- #include <termios.h>
- #include <sys/mman.h>
-+#if defined(__linux__)
- #include <linux/fb.h>
-+#endif
- #include <sys/ioctl.h>
- #include <getopt.h>
- #include <string.h>
-@@ -90,8 +92,8 @@ bool              m_osd                 
+@@ -83,8 +83,8 @@ bool              m_osd                 
  bool              m_no_keys             = false;
  std::string       m_external_subtitles_path;
  bool              m_has_external_subtitles = false;
diff --git a/multimedia/omxplayer/patches/patch-utils_SingleLock.h b/multimedia/omxplayer/patches/patch-utils_SingleLock.h
deleted file mode 100644
index f13f7bd54d4..00000000000
--- a/multimedia/omxplayer/patches/patch-utils_SingleLock.h
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-utils_SingleLock.h,v 1.1 2015/11/13 15:12:15 skrll Exp $
-
---- utils/SingleLock.h.orig	2015-01-12 15:10:50.000000000 +0000
-+++ utils/SingleLock.h
-@@ -40,6 +40,10 @@ public:
-   inline void Lock()         { pthread_mutex_lock(&m_lock); }
-   inline void Unlock()       { pthread_mutex_unlock(&m_lock); }
- 
-+private:
-+  CCriticalSection(CCriticalSection &other) = delete;
-+  CCriticalSection& operator=(const CCriticalSection&) = delete;
-+
- protected:
-   pthread_mutex_t m_lock;
- };
-@@ -48,11 +52,11 @@ protected:
- class CSingleLock
- {
- public:
--  inline CSingleLock(CCriticalSection& cs) { m_section = cs; m_section.Lock(); }
-+  inline CSingleLock(CCriticalSection& cs) : m_section(cs) { m_section.Lock(); }
-   inline ~CSingleLock()                    { m_section.Unlock(); }
- 
- protected:
--  CCriticalSection m_section;
-+  CCriticalSection &m_section;
- };
- 
-