minor update to make it work

README.md

@@ -8,19 +8,23 @@ It may or may not work on your Linux distribution, perhaps it may work on cygwin
 ### Distribution
 On my Debian sid I've installed following packages:
 
-    binutils-mingw-w64-i686
-    binutils-mingw-w64-x86-64
+    binutils-mingw-w64
     g++-mingw-w64
-    g++-mingw-w64-i686
-    g++-mingw-w64-x86-64
     gcc-mingw-w64
-    gcc-mingw-w64-base
-    gcc-mingw-w64-i686
-    gcc-mingw-w64-x86-64
     mingw-w64
-    mingw-w64-i686-dev
     mingw-w64-tools
-    mingw-w64-x86-64-dev
+    build-essential
+    cmake
+    autoconf
+    automake
+    nasm
+    yasm
+    gperf
+    dos2unix
+    p7zip-full
+    git
+    subversion
+    mercurial
 
 ### Environment
 You may adapt some of config variables in `config.sh` (at the toplevel)
@@ -46,6 +50,7 @@ and causing misleading detections.
 * sudo (for setup.sh script)
 * git (for packages from git repositories)
 * svn (for packages from svn repositories)
+* mercurial (for packages from hg repositories)
 * cmake (to build cmake based packages)
 * nasm and yasm
 

packages/frei0r/build.sh

@@ -20,6 +20,8 @@ export_toolchain
 get_package_filename()
 {
     version=$(cd ${BUILDDIR} && git describe --tags)
+    if [ -e dist ]; then rm -rf dist; fi
+    mkdir dist
     echo "$(cd dist && pwd)/frei0r-plugins-${ARCH}-${version}.7z"
 }
 

packages/functions.sh

@@ -190,7 +190,11 @@ apply_patches()
 
     for p in $(pwd)/patches/*; do
         echo "- Appling $(basename $p)"
-         patch -d ${BUILDDIR} -p1 < $p || return 1
+        if ! patch -d ${BUILDDIR} -p1 -N --dry-run -f --silent < $p; then
+            echo "patch $p already applied, skip."
+            continue
+        fi
+        patch -d ${BUILDDIR} -p1 < $p || return 1
     done
 }
 

packages/vidstab/patches/00_sherpya-nofpic.diff

@@ -1,13 +1,12 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d02fe2a..88ed3b6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,7 +25,7 @@ else()
-     set(LIBSUFFIX "")
- endif()
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2018-05-29 21:48:59.575706804 +0800
++++ b/CMakeLists.txt	2018-05-29 21:51:31.179700310 +0800
+@@ -21,7 +21,7 @@
 
--add_definitions( -Wall -O3 -g -Wno-pointer-sign -fPIC -std=gnu99)
-+add_definitions( -Wall -O3 -g -Wno-pointer-sign -std=gnu99)
- # add_definitions(  -Wall -O0 -g -Wno-pointer-sign )
+ option(USE_OMP "use parallelization use OMP" ON)
+
+-add_definitions(-Wall -Wno-pointer-sign -fPIC -std=gnu99)
++add_definitions(-Wall -Wno-pointer-sign -std=gnu99)
 
  ### ORC is not used in any active code at the moment  ###
+ # I tried it with 0.4.14

packages/x265/patches/01_sherpya_hg_extension.diff

@@ -0,0 +1,11 @@
+diff -Nrau a/.hg/hgrc b/.hg/hgrc
+--- a/.hg/hgrc	2018-05-29 23:41:09.227418511 +0800
++++ b/.hg/hgrc	2018-05-29 23:48:30.139399622 +0800
+@@ -12,3 +12,7 @@
+ [ui]
+ # name and email (local to this repository, optional), e.g.
+ # username = Jane Doe <[email protected]>
++
++[extensions]
++purge =
++