bump version libopenthreads-3.2

diff --git a/make/archives.mk b/make/archives.mk
index bd655fa7088c8fd2f7ed63b774c3068dafc86547..c2a53f357180d2b25d7440ecda52c8b4af325f82 100755 (executable)
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -73,8 +73,8 @@ $(ARCHIVE)/libsigc++-$(LIBSIGC_VER).tar.xz:
 $(ARCHIVE)/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz:
        $(WGET) http://www.openssl.org/source/openssl-$(OPENSSL_VER)$(OPENSSL_SUBVER).tar.gz
 
-$(ARCHIVE)/OpenThreads-$(OPENTHREADS_VER).zip:
-       $(WGET) http://trac.openscenegraph.org/downloads/developer_releases/OpenThreads-$(OPENTHREADS_VER).zip
+$(ARCHIVE)/OpenThreads-$(LIBOPENTHREADS_VER).tar.gz:
+       $(WGET) https://sourceforge.net/projects/mxedeps/files/OpenThreads-$(LIBOPENTHREADS_VER).tar.gz
 
 $(ARCHIVE)/libogg-1.3.1.tar.gz:
        $(WGET) http://www.fhloston-paradise.de/libogg-1.3.1.tar.gz

diff --git a/make/libraries.mk b/make/libraries.mk
index fa6584a9fbef08caeefaddd4d2a8fc7011788e24..5fcde2de1ec4547cbb2dd046fd1b6339f40d6f0d 100755 (executable)
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -665,22 +665,25 @@ $(D)/libogg: $(ARCHIVE)/libogg-1.3.1.tar.gz | $(TARGETPREFIX)
        $(REMOVE)/libogg-1.3.1
        $(TOUCH)
 
-$(D)/openthreads: $(ARCHIVE)/OpenThreads-$(OPENTHREADS_VER).zip | $(TARGETPREFIX)
+$(D)/libopenthreads: $(ARCHIVE)/OpenThreads-$(LIBOPENTHREADS_VER).tar.gz | $(TARGETPREFIX)
        $(START_BUILD)
-       unzip $(ARCHIVE)/OpenThreads-$(OPENTHREADS_VER).zip -d $(BUILD_TMP)
-       set -e; cd $(BUILD_TMP)/OpenThreads-$(OPENTHREADS_VER); \
-               $(PATCH)/openthreads-replaced-openthreads.pc-with-openthreads.pc.in.patch; \
+       $(UNTAR)/OpenThreads-$(LIBOPENTHREADS_VER).tar.gz
+       set -e; cd $(BUILD_TMP)/OpenThreads-$(LIBOPENTHREADS_VER); \
                $(PATCH)/openthreads-add-cached-settings-for-gccs-atomic-builtins.patch; \
                echo "# dummy file to prevent warning message" > examples/CMakeLists.txt; \
-               cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_SYSTEM_NAME="Linux" \
+               cmake . -DCMAKE_BUILD_TYPE=Release \
+                       -DCMAKE_SYSTEM_NAME="Linux" \
                        -DCMAKE_INSTALL_PREFIX="" \
                        -DCMAKE_C_COMPILER="$(TARGET)-gcc" \
                        -DCMAKE_CXX_COMPILER="$(TARGET)-g++" \
-                       -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1; \
+                       -D_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS_EXITCODE=1 \
+               ; \
+               find . -name cmake_install.cmake -print0 | xargs -0 \
+               sed -i 's@SET(CMAKE_INSTALL_PREFIX "/usr/local")@SET(CMAKE_INSTALL_PREFIX "")@'; \
                $(MAKE); \
-               make install DESTDIR=$(TARGETPREFIX)
+               $(MAKE) install DESTDIR=$(TARGETPREFIX)
        $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/openthreads.pc
-       $(REMOVE)/OpenThreads-$(OPENTHREADS_VER) $(PKGPREFIX)
+       $(REMOVE)/OpenThreads-$(LIBOPENTHREADS_VER)
        $(TOUCH)
 
 $(D)/libiconv: $(ARCHIVE)/libiconv-1.14.tar.gz | $(TARGETPREFIX)

diff --git a/make/neutrino.mk b/make/neutrino.mk
index 282030071195046fd4cdfe8358ed26b9508e6f5b..979cd5a136436f5215d0cfaa430556456f8e15f2 100755 (executable)
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -121,6 +121,6 @@ $(D)/neutrino-hd-libs:
        $(MAKE) $(D)/libsigc $(D)/giflib $(D)/openssl \
                        $(D)/libcurl $(D)/freetype $(D)/libjpeg \
                        $(D)/libdvbsi++ $(D)/pugixml $(D)/ffmpeg \
-                       $(D)/libbluray $(D)/openthreads $(D)/libusb $(D)/libfribidi \
+                       $(D)/libbluray $(D)/libopenthreads $(D)/libusb $(D)/libfribidi \
                        $(D)/luaposix $(D)/luacurl $(D)/luasocket $(D)/lua-expat $(D)/lua-feedparser
        $(TOUCH)

diff --git a/make/versions.mk b/make/versions.mk
index 46243487f5ffdbb93a0678b251e6286f56ebffa2..fbfa2a7fa61cded96ded70bd8d1afa62c7893b9f 100644 (file)
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -123,7 +123,7 @@ OPENSSL_VER=1.0.2
 OPENSSL_SUBVER=m
 
 # openthreads; an object-oriented thread interface for C++ programmers
-OPENTHREADS_VER=2.6.0
+LIBOPENTHREADS_VER=3.2
 
 # pkg-config; a helper tool used when compiling applications and libraries to insert the correct compiler options
 PKGCONFIG_VER=0.29.2