Fix for wayland & ffmpeg fix update

5 files changed, 45 insertions, 108 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ffec16870043..bf9e59222d4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pangolin-git
 	pkgdesc = Pangolin is a lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input.
-	pkgver = r1610.c2a6ef5
+	pkgver = r1627.1934956
 	pkgrel = 1
 	url = https://github.com/stevenlovegrove/Pangolin
 	arch = x86_64
@@ -23,10 +23,10 @@ pkgbase = pangolin-git
 	provides = pangolin
 	conflicts = pangolin
 	source = LICENSE
-	source = 318.patch
+	source = wayland.patch
 	source = pangolin::git+https://github.com/stevenlovegrove/Pangolin.git
 	sha256sums = fe25815547bcad7ff6d9ab12a381f64c0ef57e9fbb06cb831e9becdd22fde7c7
-	sha256sums = 13e2dfe72209656e309e3d767e021f8c341326bec1c2a579aef5a610dab9efe6
+	sha256sums = 7a5f5578d34c2f88f759f860ff074c906c2dafe62411cdffa468f877503617e7
 	sha256sums = SKIP
 
 pkgname = pangolin-git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..a82be312cc8e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/*.pkg.*
+/pangolin/
+/pkg/
+/src/
diff --git a/318.patch b/318.patch
deleted file mode 100644
index 29e8ddd90731..000000000000
--- a/318.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From b56a041ca1586ebaac0659892e5ba381e0a4288d Mon Sep 17 00:00:00 2001
-From: ericb <eric.bachard@free.fr>
-Date: Wed, 3 Jan 2018 18:46:31 +0100
-Subject: [PATCH] Proposed fix for the Linux (maybe other OSs)  issue, because
- of deprecated CONSTANTS
-
----
- CMakeModules/FindFFMPEG.cmake |  4 ++--
- src/video/drivers/ffmpeg.cpp  | 12 ++++++++++++
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeModules/FindFFMPEG.cmake b/CMakeModules/FindFFMPEG.cmake
-index 4f77e5a6..0f3b6cb8 100644
---- a/CMakeModules/FindFFMPEG.cmake
-+++ b/CMakeModules/FindFFMPEG.cmake
-@@ -60,8 +60,8 @@ IF(AVCODEC_INCLUDE_DIR AND AVFORMAT_INCLUDE_DIR AND AVUTIL_INCLUDE_DIR AND SWSCA
-    CHECK_CXX_SOURCE_COMPILES(
-      "#include \"${AVCODEC_INCLUDE_DIR}/libavformat/avformat.h\"
-       int main() {
--        sizeof(AVFormatContext::max_analyze_duration2);
--      }" HAVE_FFMPEG_MAX_ANALYZE_DURATION2
-+        sizeof(AVFormatContext::max_analyze_duration);
-+      }" HAVE_FFMPEG_MAX_ANALYZE_DURATION
-    )
-    CHECK_CXX_SOURCE_COMPILES(
-      "#include \"${AVCODEC_INCLUDE_DIR}/libavformat/avformat.h\"
-diff --git a/src/video/drivers/ffmpeg.cpp b/src/video/drivers/ffmpeg.cpp
-index f0aa6ad5..efd48ddc 100644
---- a/src/video/drivers/ffmpeg.cpp
-+++ b/src/video/drivers/ffmpeg.cpp
-@@ -40,6 +40,8 @@ extern "C"
- #include <libavutil/mathematics.h>
- }
- 
-+#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
-+
- namespace pangolin
- {
- 
-@@ -80,8 +82,10 @@ std::string FfmpegFmtToString(const AVPixelFormat fmt)
-     TEST_PIX_FMT_RETURN(YUVJ420P);
-     TEST_PIX_FMT_RETURN(YUVJ422P);
-     TEST_PIX_FMT_RETURN(YUVJ444P);
-+#ifdef FF_API_XVMC
-     TEST_PIX_FMT_RETURN(XVMC_MPEG2_MC);
-     TEST_PIX_FMT_RETURN(XVMC_MPEG2_IDCT);
-+#endif
-     TEST_PIX_FMT_RETURN(UYVY422);
-     TEST_PIX_FMT_RETURN(UYYVYY411);
-     TEST_PIX_FMT_RETURN(BGR8);
-@@ -101,11 +105,13 @@ std::string FfmpegFmtToString(const AVPixelFormat fmt)
-     TEST_PIX_FMT_RETURN(YUV440P);
-     TEST_PIX_FMT_RETURN(YUVJ440P);
-     TEST_PIX_FMT_RETURN(YUVA420P);
-+#ifdef FF_API_VDPAU
-     TEST_PIX_FMT_RETURN(VDPAU_H264);
-     TEST_PIX_FMT_RETURN(VDPAU_MPEG1);
-     TEST_PIX_FMT_RETURN(VDPAU_MPEG2);
-     TEST_PIX_FMT_RETURN(VDPAU_WMV3);
-     TEST_PIX_FMT_RETURN(VDPAU_VC1);
-+#endif
-     TEST_PIX_FMT_RETURN(RGB48BE );
-     TEST_PIX_FMT_RETURN(RGB48LE );
-     TEST_PIX_FMT_RETURN(RGB565BE);
-@@ -125,7 +131,9 @@ std::string FfmpegFmtToString(const AVPixelFormat fmt)
-     TEST_PIX_FMT_RETURN(YUV422P16BE);
-     TEST_PIX_FMT_RETURN(YUV444P16LE);
-     TEST_PIX_FMT_RETURN(YUV444P16BE);
-+#ifdef FF_API_VDPAU
-     TEST_PIX_FMT_RETURN(VDPAU_MPEG4);
-+#endif
-     TEST_PIX_FMT_RETURN(DXVA2_VLD);
-     TEST_PIX_FMT_RETURN(RGB444BE);
-     TEST_PIX_FMT_RETURN(RGB444LE);
-@@ -578,6 +586,7 @@ void FfmpegVideoOutputStream::WriteFrame(AVFrame* frame)
-     int ret;
-     int got_packet = 1;
- 
-+#if FF_API_LAVF_FMT_RAWPICTURE
-     // Setup AVPacket
-     if (recorder.oc->oformat->flags & AVFMT_RAWPICTURE) {
-         /* Raw video case - directly store the picture in the packet */
-@@ -587,6 +596,9 @@ void FfmpegVideoOutputStream::WriteFrame(AVFrame* frame)
-         pkt.pts           = frame->pts;
-         ret = 0;
-     } else {
-+#else
-+    {
-+#endif
-         /* encode the image */
- #if (LIBAVFORMAT_VERSION_MAJOR >= 54)
-         ret = avcodec_encode_video2(stream->codec, &pkt, frame, &got_packet);
diff --git a/PKGBUILD b/PKGBUILD
index 7d8e21e28030..8ec39abc0f20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Peter Sutton <foxxy@foxdogstudios.com>
 pkgname=pangolin-git
-pkgver=r1610.c2a6ef5
-pkgrel=2
+_name=${pkgname%-git}
+pkgver=r1627.5c04fb7
+pkgrel=1
 pkgdesc="Pangolin is a lightweight portable rapid development library for managing OpenGL display / interaction and abstracting video input."
 arch=(x86_64)
 url="https://github.com/stevenlovegrove/Pangolin"
@@ -26,34 +27,36 @@ optdepends=(
     # DepthSense SDK
 )
 makedepends=('cmake' 'doxygen' 'git')
-provides=("${pkgname%-git}")
-conflicts=("${pkgname%-git}")
+provides=("$_name")
+conflicts=("$_name")
 replaces=()
 backup=()
 options=()
 install=
 source=(
     'LICENSE'
-    '318.patch'
+    'wayland.patch'
     'pangolin::git+https://github.com/stevenlovegrove/Pangolin.git'
 )
 noextract=()
 sha256sums=('fe25815547bcad7ff6d9ab12a381f64c0ef57e9fbb06cb831e9becdd22fde7c7'
-            '13e2dfe72209656e309e3d767e021f8c341326bec1c2a579aef5a610dab9efe6'
+            '7a5f5578d34c2f88f759f860ff074c906c2dafe62411cdffa468f877503617e7'
             'SKIP')
 
 pkgver() {
-    cd "$srcdir/${pkgname%-git}"
+    cd "$srcdir/$_name"
     printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-    cd "$srcdir/${pkgname%-git}"
-    git apply "$srcdir/318.patch"
+    cd "$srcdir"/"$_name"
+    git remote add patch https://github.com/ebachard/Pangolin.git
+    git pull patch master
+    git apply "$srcdir"/wayland.patch
 }
 
 build() {
-    cd "$srcdir/${pkgname%-git}"
+    cd "$srcdir"/"$_name"
     mkdir build
     cd build
     cmake -DCMAKE_INSTALL_PREFIX=/usr \
@@ -64,7 +67,7 @@ build() {
 }
 
 package() {
-    cd "$srcdir/${pkgname%-git}/build"
-    make DESTDIR="$pkgdir/" install
-    install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    cd "$srcdir"/"$_name"/build
+    make DESTDIR="$pkgdir"/ install
+    install -Dm644 "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
 }
diff --git a/wayland.patch b/wayland.patch
new file mode 100644
index 000000000000..2f88892233f8
--- /dev/null
+++ b/wayland.patch
@@ -0,0 +1,22 @@
+diff --git a/src/display/device/display_wayland.cpp b/src/display/device/display_wayland.cpp
+index 455cb66..5d3a234 100755
+--- a/src/display/device/display_wayland.cpp
++++ b/src/display/device/display_wayland.cpp
+@@ -582,13 +582,13 @@ static void pointer_handle_axis(void *data, struct wl_pointer */*wl_pointer*/, u
+     }
+ }
+ 
+-//static void pointer_handle_frame(void */*data*/, struct wl_pointer */*wl_pointer*/) { }
++static void pointer_handle_frame(void *data, struct wl_pointer *wl_pointer) { }
+ 
+-//static void pointer_handle_axis_source(void */*data*/, struct wl_pointer */*wl_pointer*/, uint32_t /*axis_source*/) { }
++static void pointer_handle_axis_source(void *data, struct wl_pointer *wl_pointer, uint32_t /*axis_source*/) { }
+ 
+-//static void pointer_handle_axis_stop(void */*data*/, struct wl_pointer */*wl_pointer*/, uint32_t /*time*/, uint32_t /*axis*/) { }
++static void pointer_handle_axis_stop(void *data, struct wl_pointer *wl_pointer, uint32_t /*time*/, uint32_t /*axis*/) { }
+ 
+-//static void pointer_handle_axis_discrete(void */*data*/, struct wl_pointer */*wl_pointer*/, uint32_t /*axis*/, int32_t /*discrete*/) { }
++static void pointer_handle_axis_discrete(void *data, struct wl_pointer *wl_pointer, uint32_t /*axis*/, int32_t /*discrete*/) { }
+ 
+ static const struct wl_pointer_listener pointer_listener = {
+     pointer_handle_enter,