diff options
| author | Tony Theodore <tonyt@logyst.com> | 2018-03-13 10:13:41 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2018-03-15 01:28:24 (GMT) |
| commit | b3552f798ccdc03466f78b43fe9c1ab5df6eda18 (patch) | |
| tree | f4399f1a92e682e04838de3021ae035f1da8b34b | |
| parent | 7e3453b34a159b1ea3ca23c0775c071d94f6ec4e (diff) | |
| download | mxe-b3552f798ccdc03466f78b43fe9c1ab5df6eda18.zip mxe-b3552f798ccdc03466f78b43fe9c1ab5df6eda18.tar.gz mxe-b3552f798ccdc03466f78b43fe9c1ab5df6eda18.tar.bz2 | |
various pkgs: updates, cleanups, new-style options
| -rw-r--r-- | src/liblsmash-1.patch | 12 | ||||
| -rw-r--r-- | src/liblsmash.mk | 18 | ||||
| -rw-r--r-- | src/librtmp.mk | 12 | ||||
| -rw-r--r-- | src/libuv.mk | 22 | ||||
| -rw-r--r-- | src/libwebsockets-1-fixes.patch | 162 | ||||
| -rw-r--r-- | src/libwebsockets.mk | 21 | ||||
| -rw-r--r-- | src/miniupnpc-1-fixes.patch | 29 | ||||
| -rw-r--r-- | src/miniupnpc.mk | 25 |
8 files changed, 34 insertions, 267 deletions
diff --git a/src/liblsmash-1.patch b/src/liblsmash-1.patch deleted file mode 100644 index 14f9da5..0000000 --- a/src/liblsmash-1.patch +++ /dev/null @@ -1,12 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - ---- a/configure -+++ b/configure -@@ -198,6 +198,7 @@ - case "$TARGET_OS" in - *mingw*) - EXT=".exe" -+ SHARED_NAME="liblsmash-$MAJVER" - SHARED_EXT=".dll" - IMPLIB="liblsmash.dll.a" - SO_LDFLAGS="-shared -Wl,--out-implib,$IMPLIB" diff --git a/src/liblsmash.mk b/src/liblsmash.mk index b6f63a5..13473e7 100644 --- a/src/liblsmash.mk +++ b/src/liblsmash.mk @@ -4,25 +4,19 @@ PKG := liblsmash $(PKG)_WEBSITE := https://l-smash.github.io/l-smash/ $(PKG)_DESCR := L-SMASH $(PKG)_IGNORE := -$(PKG)_VERSION := 2.9.1 -$(PKG)_CHECKSUM := 17f24fc8bffba753f8c628f1732fc3581b80362341274747ef6fb96af1cac45c -$(PKG)_SUBDIR := l-smash-$($(PKG)_VERSION) -$(PKG)_FILE := $($(PKG)_SUBDIR).tar.gz -$(PKG)_URL := https://github.com/l-smash/l-smash/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_VERSION := 2.14.5 +$(PKG)_CHECKSUM := e6f7c31de684f4b89ee27e5cd6262bf96f2a5b117ba938d2d606cf6220f05935 +$(PKG)_GH_CONF := l-smash/l-smash/tags, v $(PKG)_DEPS := cc -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, l-smash/l-smash, v) -endef - # L-SMASH uses a custom made configure script that doesn't recognize # the option --host and fails on unknown options. # Therefor $(MXE_CONFIGURE_OPTS) can't be used here. define $(PKG)_BUILD - cd '$(1)' && ./configure \ + cd '$(SOURCE_DIR)' && ./configure \ --prefix='$(PREFIX)/$(TARGET)' \ --cross-prefix=$(TARGET)- \ $(if $(BUILD_SHARED), --enable-shared --disable-static) - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(SOURCE_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(SOURCE_DIR)' -j 1 install endef diff --git a/src/librtmp.mk b/src/librtmp.mk index 6badc65..5d0a6e8 100644 --- a/src/librtmp.mk +++ b/src/librtmp.mk @@ -3,17 +3,13 @@ PKG := librtmp $(PKG)_WEBSITE := https://rtmpdump.mplayerhq.hu/ $(PKG)_IGNORE := -$(PKG)_VERSION := a107cef -$(PKG)_CHECKSUM := aea53f2a2c6596c93eeb288d97266e89a97b31795b678daccedc31d70dad28c4 -$(PKG)_SUBDIR := mirror-rtmpdump-$($(PKG)_VERSION) -$(PKG)_FILE := rtmpdump-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/mirror/rtmpdump/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_VERSION := fa8646d +$(PKG)_CHECKSUM := 301cb9e93a7d2bf2da6b784ee6a9e45a04e2a9e3d322080d46c5d66576a792ec +$(PKG)_GH_CONF := mirror/rtmpdump/branches/master $(PKG)_DEPS := cc gnutls -$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, mirror/rtmpdump, master) - define $(PKG)_BUILD - $(MAKE) -C '$(1)' \ + $(MAKE) -C '$(SOURCE_DIR)' \ CROSS_COMPILE='$(TARGET)-' \ prefix='$(PREFIX)/$(TARGET)' \ SYS=mingw \ diff --git a/src/libuv.mk b/src/libuv.mk index d00d4f9..1e8f840 100644 --- a/src/libuv.mk +++ b/src/libuv.mk @@ -1,25 +1,19 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := libuv -$(PKG)_WEBSITE := http://libuv.org/ +$(PKG)_WEBSITE := https://libuv.org $(PKG)_IGNORE := -$(PKG)_VERSION := 1.9.1 -$(PKG)_CHECKSUM := e83953782c916d7822ef0b94e8115ce5756fab5300cca173f0de5f5b0e0ae928 -$(PKG)_SUBDIR := $(PKG)-v$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-v$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://dist.libuv.org/dist/v$($(PKG)_VERSION)/$($(PKG)_FILE) +$(PKG)_VERSION := 1.19.2 +$(PKG)_CHECKSUM := ccc5f3b43ed171640513786e5e809508cb6308279b4d71a016e4550ad62f1686 +$(PKG)_GH_CONF := libuv/libuv/tags, v $(PKG)_DEPS := cc -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, libuv/libuv, v) -endef - define $(PKG)_BUILD - cd '$(1)' && sh autogen.sh - cd '$(1)' && ./configure \ + cd '$(SOURCE_DIR)' && sh autogen.sh + cd '$(BUILD_DIR)' && $(SOURCE_DIR)/configure \ $(MXE_CONFIGURE_OPTS) - $(MAKE) -C '$(1)' -j '$(JOBS)' - $(MAKE) -C '$(1)' -j 1 install + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install '$(TARGET)-gcc' \ -W -Wall -Werror -pedantic \ diff --git a/src/libwebsockets-1-fixes.patch b/src/libwebsockets-1-fixes.patch deleted file mode 100644 index 19d838a..0000000 --- a/src/libwebsockets-1-fixes.patch +++ /dev/null @@ -1,162 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Timothy Gu <timothygu99@gmail.com> -Date: Mon, 4 Aug 2014 18:28:33 -0700 -Subject: [PATCH 1/1] Remove the special _shared lib - -Signed-off-by: Timothy Gu <timothygu99@gmail.com> - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1111111..2222222 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -380,43 +380,41 @@ source_group("Sources" FILES ${SOURCES}) - # - # Create the lib. - # --add_library(websockets STATIC -- ${HDR_PRIVATE} -- ${HDR_PUBLIC} -- ${SOURCES}) --add_library(websockets_shared SHARED -+add_library(websockets - ${HDR_PRIVATE} - ${HDR_PUBLIC} - ${SOURCES}) - - if (WIN32) -- # On Windows libs have the same file ending (.lib) -- # for both static and shared libraries, so we -- # need a unique name for the static one. -- set_target_properties(websockets -- PROPERTIES -- OUTPUT_NAME websockets_static) -- -- # Compile as DLL (export function declarations) -- set_property( -- TARGET websockets_shared -- PROPERTY COMPILE_DEFINITIONS -- LWS_DLL -- LWS_INTERNAL -- ) -+# # On Windows libs have the same file ending (.lib) -+# # for both static and shared libraries, so we -+# # need a unique name for the static one. -+# set_target_properties(websockets -+# PROPERTIES -+# OUTPUT_NAME websockets_static) -+ -+ if (BUILD_SHARED_LIBS) -+ # Compile as DLL (export function declarations) -+ set_property( -+ TARGET websockets -+ PROPERTY COMPILE_DEFINITIONS -+ LWS_DLL -+ LWS_INTERNAL -+ ) -+ endif (BUILD_SHARED_LIBS) - endif(WIN32) - - # We want the shared lib to be named "libwebsockets" - # not "libwebsocket_shared". --set_target_properties(websockets_shared -- PROPERTIES -- OUTPUT_NAME websockets) -+# set_target_properties(websockets_shared -+# PROPERTIES -+# OUTPUT_NAME websockets) - - # Set the so version of the lib. - # Equivalent to LDFLAGS=-version-info x:x:x - if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) -- foreach(lib websockets websockets_shared) -- set_target_properties(${lib} -+ foreach(lib websockets) -+ set_target_properties(${lib} - PROPERTIES - SOVERSION ${SOVERSION}) - endforeach() -@@ -468,7 +466,7 @@ if (NOT LWS_WITHOUT_EXTENSIONS) - endif() - - # Make sure ZLib is compiled before the libs. -- foreach (lib websockets websockets_shared) -+ foreach (lib websockets) - add_dependencies(${lib} ZLIB) - endforeach() - -@@ -538,7 +536,7 @@ if (UNIX) - endif() - - # Setup the linking for all libs. --foreach (lib websockets websockets_shared) -+foreach (lib websockets) - target_link_libraries(${lib} ${LIB_LIST}) - endforeach() - -@@ -571,11 +569,8 @@ if (NOT LWS_WITHOUT_TESTAPPS) - source_group("Headers Private" FILES ${TEST_HDR}) - source_group("Sources" FILES ${TEST_SRCS}) - add_executable(${TEST_NAME} ${TEST_SRCS} ${TEST_HDR}) -- -- if (LWS_LINK_TESTAPPS_DYNAMIC) -- target_link_libraries(${TEST_NAME} websockets_shared) -- add_dependencies(${TEST_NAME} websockets_shared) -- else(LWS_LINK_TESTAPPS_DYNAMIC) -+ -+ if (NOT LWS_LINK_TESTAPPS_DYNAMIC) - target_link_libraries(${TEST_NAME} websockets) - add_dependencies(${TEST_NAME} websockets) - endif(LWS_LINK_TESTAPPS_DYNAMIC) -@@ -807,7 +802,7 @@ endif() - set(LWS_INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files") - - # Export targets (This is used for other CMake projects to easily find the libraries and include files). --export(TARGETS websockets websockets_shared -+export(TARGETS websockets - FILE "${PROJECT_BINARY_DIR}/LibwebsocketsTargets.cmake") - export(PACKAGE libwebsockets) - -@@ -843,7 +838,7 @@ configure_file(${PROJECT_SOURCE_DIR}/cmake/LibwebsocketsConfigVersion.cmake.in - ${PROJECT_BINARY_DIR}/LibwebsocketsConfigVersion.cmake - @ONLY) - --set_target_properties(websockets websockets_shared -+set_target_properties(websockets - PROPERTIES PUBLIC_HEADER "${HDR_PUBLIC}") - - # -@@ -851,7 +846,7 @@ set_target_properties(websockets websockets_shared - # - - # Install libs and headers. --install(TARGETS websockets websockets_shared -+install(TARGETS websockets - EXPORT LibwebsocketsTargets - LIBRARY DESTINATION "${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}" COMPONENT libraries - ARCHIVE DESTINATION "${LWS_INSTALL_LIB_DIR}${LIB_SUFFIX}" COMPONENT libraries -@@ -920,9 +915,8 @@ message(" LWS_WITH_HTTP2 = ${LWS_WITH_HTTP2}") - message("---------------------------------------------------------------------") - - # These will be available to parent projects including libwebsockets using add_subdirectory() --set(LIBWEBSOCKETS_LIBRARIES websocket websockets_shared CACHE STRING "Libwebsocket libraries") -+set(LIBWEBSOCKETS_LIBRARIES websocket CACHE STRING "Libwebsocket libraries") - set(LIBWEBSOCKETS_LIBRARIES_STATIC websocket CACHE STRING "Libwebsocket static library") --set(LIBWEBSOCKETS_LIBRARIES_SHARED websockets_shared CACHE STRING "Libwebsocket shared library") - - # This must always be last! - include(CPack) -diff --git a/cmake/LibwebsocketsConfig.cmake.in b/cmake/LibwebsocketsConfig.cmake.in -index 1111111..2222222 100644 ---- a/cmake/LibwebsocketsConfig.cmake.in -+++ b/cmake/LibwebsocketsConfig.cmake.in -@@ -13,5 +13,5 @@ set(LIBWEBSOCKETS_INCLUDE_DIRS "@LWS__INCLUDE_DIRS@") - include(${LWS_CMAKE_DIR}/LibwebsocketsTargets.cmake) - - # IMPORTED targets from LibwebsocketsTargets.cmake --set(LIBWEBSOCKETS_LIBRARIES websockets websockets_shared) -+set(LIBWEBSOCKETS_LIBRARIES websockets) - diff --git a/src/libwebsockets.mk b/src/libwebsockets.mk index e41e21f..5b8e0eb 100644 --- a/src/libwebsockets.mk +++ b/src/libwebsockets.mk @@ -3,21 +3,18 @@ PKG := libwebsockets $(PKG)_WEBSITE := https://libwebsockets.org/ $(PKG)_IGNORE := -$(PKG)_VERSION := 1.4-chrome43-firefox-36 -$(PKG)_CHECKSUM := e11492477e582ef0b1a6ea2f18d81a9619b449170a3a5c43f32a9468461a9798 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := https://github.com/warmcat/libwebsockets/archive/v$($(PKG)_VERSION).tar.gz +$(PKG)_VERSION := 2.4.2 +$(PKG)_CHECKSUM := 73012d7fcf428dedccc816e83a63a01462e27819d5537b8e0d0c7264bfacfad6 +$(PKG)_GH_CONF := warmcat/libwebsockets/tags, v $(PKG)_DEPS := cc openssl zlib -define $(PKG)_UPDATE - $(call MXE_GET_GITHUB_TAGS, warmcat/libwebsockets, \(v\|.[^0-9].*\)) -endef - define $(PKG)_BUILD - cd '$(1)' && '$(TARGET)-cmake' \ + # build and install the library + cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)' \ + -DLWS_WITH_STATIC=$(CMAKE_STATIC_BOOL) \ + -DLWS_WITH_SHARED=$(CMAKE_SHARED_BOOL) \ -DLWS_WITHOUT_TESTAPPS=ON \ -DLWS_USE_EXTERNAL_ZLIB=ON - $(MAKE) -C '$(1)' -j $(JOBS) - $(MAKE) -C '$(1)' install + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install endef diff --git a/src/miniupnpc-1-fixes.patch b/src/miniupnpc-1-fixes.patch deleted file mode 100644 index 3a16f1a..0000000 --- a/src/miniupnpc-1-fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ -This file is part of MXE. See LICENSE.md for licensing information. - -Contains ad hoc patches for cross building. - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Boris Nagaev <bnagaev@gmail.com> -Date: Sun, 13 Dec 2015 16:56:42 +0300 -Subject: [PATCH 1/1] cmake: add headers to install - - * bsdqueue.h - * miniupnpctypes.h - * portlistingparse.h - -See https://github.com/mxe/mxe/issues/1051#issuecomment-164260560 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1111111..2222222 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -166,6 +166,9 @@ install (FILES - upnpreplyparse.h - upnperrors.h - declspec.h -+ bsdqueue.h -+ miniupnpctypes.h -+ portlistingparse.h - DESTINATION include/miniupnpc - ) - diff --git a/src/miniupnpc.mk b/src/miniupnpc.mk index 195d35a..e446753 100644 --- a/src/miniupnpc.mk +++ b/src/miniupnpc.mk @@ -3,28 +3,17 @@ PKG := miniupnpc $(PKG)_WEBSITE := http://miniupnp.free.fr/ $(PKG)_IGNORE := -$(PKG)_VERSION := 1.9 -$(PKG)_CHECKSUM := 2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464 -$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) -$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz -$(PKG)_URL := http://miniupnp.free.fr/files/$($(PKG)_FILE) -$(PKG)_URL_2 := https://miniupnp.tuxfamily.org/files/$($(PKG)_FILE) +$(PKG)_VERSION := 2.0 +$(PKG)_CHECKSUM := 253a0ea5fe8f17d9f79f8758e1b6415d6a560e58bf3e9b5dbe714413dc908446 +$(PKG)_GH_CONF := miniupnp/miniupnp/tags,miniupnpc_,,,_ $(PKG)_DEPS := cc -define $(PKG)_UPDATE - $(WGET) -q -O- 'https://api.github.com/repos/miniupnp/miniupnp/git/refs/tags/' | \ - $(SED) -n 's#.*"ref": "refs/tags/miniupnpc_\([^"]*\).*#\1#p' | \ - $(SED) 's,_,.,g' | \ - $(SORT) -V | \ - tail -1 -endef - define $(PKG)_BUILD - mkdir '$(1).build' - cd '$(1).build' && '$(TARGET)-cmake' '$(1)' \ + # build and install the library + cd '$(BUILD_DIR)' && $(TARGET)-cmake '$(SOURCE_DIR)/miniupnpc' \ -DUPNPC_BUILD_STATIC=$(CMAKE_STATIC_BOOL) \ -DUPNPC_BUILD_SHARED=$(CMAKE_SHARED_BOOL) \ -DUPNPC_BUILD_TESTS=OFF - $(MAKE) -C '$(1).build' -j '$(JOBS)' - $(MAKE) -C '$(1).build' -j 1 install + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' + $(MAKE) -C '$(BUILD_DIR)' -j 1 install endef |