Update to 12b472eaa75bce25dc63ec61d9233aadb996f3a4,

Various bug fixes

5 files changed, 25 insertions, 62 deletions

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;
- };
- 
-