From a9e909ff7c45e959f772536cef3231af7cff3763 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Thu, 15 Mar 2018 20:35:30 +1100
Subject: [PATCH] vidstab: update 0.98b --> 1.1.0

---
 src/vidstab-1-lib-type.patch     | 41 --------------------
 src/vidstab-2-lib-type-fix.patch | 64 --------------------------------
 src/vidstab.mk                   | 26 ++++---------
 3 files changed, 8 insertions(+), 123 deletions(-)
 delete mode 100644 src/vidstab-1-lib-type.patch
 delete mode 100644 src/vidstab-2-lib-type-fix.patch

diff --git a/src/vidstab-1-lib-type.patch b/src/vidstab-1-lib-type.patch
deleted file mode 100644
index 2956d672..00000000
--- a/src/vidstab-1-lib-type.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-This patch has been taken from:
-https://github.com/georgmartius/vid.stab/pull/19
-
-From 1b6d48225e6c0c2c04598782582c9a0f1ea1d8e4 Mon Sep 17 00:00:00 2001
-From: Timothy Gu <timothygu99@gmail.com>
-Date: Fri, 8 Aug 2014 14:56:19 -0700
-Subject: [PATCH] Support changing lib type through BUILD_SHARED_LIBS
-
----
- CMakeLists.txt | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f310e4d..e9a2af4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,6 +12,9 @@ set(MINOR_VERSION 0)
- set(PATCH_VERSION 0)
- set(VIDSTAB_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}${PATCH_VERSION})
- 
-+option(BUILD_SHARED_LIBS "build shared libraries instead of static libraries"
-+       ON)
-+
- add_definitions( -Wall -O3 -g -Wno-pointer-sign -fPIC -std=gnu99)
- # add_definitions(  -Wall -O0 -g -Wno-pointer-sign )
- 
-@@ -43,8 +46,7 @@ set(HEADERS src/frameinfo.h src/transformtype.h src/libvidstab.h
- 
- 
- # Create the vidstab library
--# add_library (vidstab STATIC ${SOURCES})
--add_library (vidstab SHARED ${SOURCES})
-+add_library (vidstab ${SOURCES})
- 
- #set version of lib
- set_target_properties(vidstab PROPERTIES SOVERSION ${MAJOR_VERSION}.${MINOR_VERSION})
--- 
-2.0.3
-
diff --git a/src/vidstab-2-lib-type-fix.patch b/src/vidstab-2-lib-type-fix.patch
deleted file mode 100644
index 2fe99bc6..00000000
--- a/src/vidstab-2-lib-type-fix.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-This file is part of MXE. See LICENSE.md for licensing information.
-
-This patch has been taken from:
-https://github.com/georgmartius/vid.stab/pull/20
-
-From f06ce5b7ad4fc60ecf11b86059541c7dc321806c Mon Sep 17 00:00:00 2001
-From: Timothy Gu <timothygu99@gmail.com>
-Date: Fri, 15 Aug 2014 17:58:49 -0700
-Subject: [PATCH] Fix if BUILD_SHARED_LIBS is OFF
-
-The option() disrupts toolchain files.
-
-Signed-off-by: Timothy Gu <timothygu99@gmail.com>
----
- CMakeLists.txt | 26 ++++++++++++--------------
- 1 file changed, 12 insertions(+), 14 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e9a2af4..920a2da 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -12,9 +12,6 @@ set(MINOR_VERSION 0)
- set(PATCH_VERSION 0)
- set(VIDSTAB_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}${PATCH_VERSION})
- 
--option(BUILD_SHARED_LIBS "build shared libraries instead of static libraries"
--       ON)
--
- add_definitions( -Wall -O3 -g -Wno-pointer-sign -fPIC -std=gnu99)
- # add_definitions(  -Wall -O0 -g -Wno-pointer-sign )
- 
-@@ -48,17 +45,18 @@ set(HEADERS src/frameinfo.h src/transformtype.h src/libvidstab.h
- # Create the vidstab library
- add_library (vidstab ${SOURCES})
- 
--#set version of lib
--set_target_properties(vidstab PROPERTIES SOVERSION ${MAJOR_VERSION}.${MINOR_VERSION})
--
--
--target_link_libraries(vidstab m)
--if(ORC_FOUND)
--target_link_libraries(vidstab ${ORC_LIBRARIES})
--endif()
--if(USE_OMP)
--target_link_libraries(vidstab gomp)
--endif()
-+if(BUILD_SHARED_LIBS)
-+  #set version of lib
-+  set_target_properties(vidstab PROPERTIES SOVERSION ${MAJOR_VERSION}.${MINOR_VERSION})
-+
-+  target_link_libraries(vidstab m)
-+  if(ORC_FOUND)
-+    target_link_libraries(vidstab ${ORC_LIBRARIES})
-+  endif()
-+  if(USE_OMP)
-+    target_link_libraries(vidstab gomp)
-+  endif()
-+endif(BUILD_SHARED_LIBS)
- 
- 
- #if(!NOHEADERS)
--- 
-2.0.3
-
diff --git a/src/vidstab.mk b/src/vidstab.mk
index 568b4ddc..515a1ce4 100644
--- a/src/vidstab.mk
+++ b/src/vidstab.mk
@@ -4,28 +4,18 @@ PKG             := vidstab
 $(PKG)_WEBSITE  := http://public.hronopik.de/vid.stab/features.php?lang=en
 $(PKG)_DESCR    := vid.stab video stablizer
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.98b
-$(PKG)_CHECKSUM := 530f0bf7479ec89d9326af3a286a15d7d6a90fcafbb641e3b8bdb8d05637d025
-$(PKG)_SUBDIR   := vid.stab-release-$($(PKG)_VERSION)
-$(PKG)_FILE     := vid.stab-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := https://github.com/georgmartius/vid.stab/archive/release-$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := cc
-
-define $(PKG)_UPDATE
-    $(WGET) -q -O- 'https://github.com/georgmartius/vid.stab/tags' | \
-    grep '<a href="/georgmartius/vid.stab/archive/' | \
-    $(SED) -n 's,.*href="/georgmartius/vid.stab/archive/release-\([0-9][^"]*\)\.tar.*,\1,p' | \
-    head -1
-endef
+$(PKG)_VERSION  := 1.1.0
+$(PKG)_CHECKSUM := 14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb
+$(PKG)_GH_CONF  := georgmartius/vid.stab/tags,v
+$(PKG)_DEPS     := cc pthreads
 
 define $(PKG)_BUILD
-    mkdir '$(1)/build'
-    cd '$(1)/build' && '$(TARGET)-cmake' ..
-    $(MAKE) -C '$(1)/build' -j $(JOBS)
-    $(MAKE) -C '$(1)/build' -j 1 install
+    cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 
     '$(TARGET)-gcc' \
         -W -Wall -Werror -pedantic \
         '$(TEST_FILE)' -o '$(PREFIX)/$(TARGET)/bin/test-vidstab.exe' \
-        `'$(TARGET)-pkg-config' --static --cflags --libs vidstab`
+        `'$(TARGET)-pkg-config' --static --cflags --libs vidstab pthreads`
 endef