d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1583 from LuaAndC/update-versions-plugins 

make versions.json and cleanup-deps-style aware of plugins; apply cleanup-deps-style
This commit is contained in:
Boris Nagaev 2016-12-05 08:42:04 +00:00 committed by GitHub
parent 62de2147b3 647ea47b82
commit 286f8f25a7
12 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -760,13 +760,13 @@ cleanup-style:
.PHONY: cleanup-deps-style
cleanup-deps-style:
@grep '(PKG)_DEPS.*\\' '$(TOP_DIR)'/src/*.mk > $(TOP_DIR)/tmp-$@-pre
@grep '(PKG)_DEPS.*\\' $(foreach 1,$(PKGS),$(PKG_MAKEFILES)) > $(TOP_DIR)/tmp-$@-pre
@$(foreach PKG,$(PKGS), \
$(if $(call lne,$(sort $(filter-out gcc,$($(PKG)_DEPS))),$(filter-out gcc,$($(PKG)_DEPS))), \
$(info [cleanup] $(PKG)) \
$(SED) -i 's/^\([^ ]*_DEPS *:=\).*/\1 '"$(strip $(filter gcc,$($(PKG)_DEPS)) $(sort $(filter-out gcc,$($(PKG)_DEPS))))"'/' '$(TOP_DIR)/src/$(PKG).mk'; \
$(SED) -i 's/^\([^ ]*_DEPS *:=\)[^$$]*$$/\1 '"$(strip $(filter gcc,$($(PKG)_DEPS)) $(sort $(filter-out gcc,$($(PKG)_DEPS))))"'/' '$(call PKG_MAKEFILES,$(PKG))'; \
))
@grep '(PKG)_DEPS.*\\' '$(TOP_DIR)'/src/*.mk > $(TOP_DIR)/tmp-$@-post
@grep '(PKG)_DEPS.*\\' $(foreach 1,$(PKGS),$(PKG_MAKEFILES)) > $(TOP_DIR)/tmp-$@-post
@diff -u $(TOP_DIR)/tmp-$@-pre $(TOP_DIR)/tmp-$@-post >/dev/null \
|| echo '*** Multi-line deps are mangled ***' && comm -3 tmp-$@-pre tmp-$@-post
@rm -f $(TOP_DIR)/tmp-$@-*
@ -865,7 +865,7 @@ docs/build-matrix.html: $(foreach 1,$(PKGS),$(PKG_MAKEFILES))
@echo '</html>' >> $@
.PHONY: docs/versions.json
docs/versions.json: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
docs/versions.json: $(foreach 1,$(PKGS),$(PKG_MAKEFILES))
@echo '{' > $@
@{$(foreach PKG,$(PKGS), \
echo ' "$(PKG)": \

2
plugins/apps/msmtp.mk
View File

@ -8,7 +8,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_OWNER := https://github.com/andrew-strong
$(PKG)_DEPS := gcc libidn libgsasl gnutls libiconv libgpg_error libgcrypt libntlm
$(PKG)_DEPS := gcc gnutls libgcrypt libgpg_error libgsasl libiconv libidn libntlm
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://sourceforge.net/projects/msmtp/files/msmtp/' | \

2
plugins/apps/qbittorrent.mk
View File

@ -9,7 +9,7 @@ $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$(PKG)-$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_WEBSITE := http://qbittorrent.org/
$(PKG)_OWNER := https://github.com/starius
$(PKG)_DEPS := gcc libtorrent-rasterbar qt boost
$(PKG)_DEPS := gcc boost libtorrent-rasterbar qt
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://www.qbittorrent.org/download.php' | \

2
src/gst-plugins-bad.mk
View File

@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := 650855e39ff56a8bb6cb0c192109c5926ce12f536d06e19ebf829de71ef39
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc gst-plugins-base gstreamer faad2 libass libgcrypt mpg123 openjpeg openal vo-aacenc vo-amrwbenc
$(PKG)_DEPS := gcc faad2 gst-plugins-base gstreamer libass libgcrypt mpg123 openal openjpeg vo-aacenc vo-amrwbenc
$(PKG)_UPDATE = $(subst gstreamer/refs,gst-plugins-bad/refs,$(gstreamer_UPDATE))

2
src/gst-plugins-ugly.mk
View File

@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := e7f1b6321c8667fabc0dedce3998a3c6e90ce9ce9dea7186d33dc4359f9e9
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://gstreamer.freedesktop.org/src/$(PKG)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc gst-plugins-base gstreamer lame libdvdread x264 a52dec libmad libcdio opencore-amr twolame
$(PKG)_DEPS := gcc a52dec gst-plugins-base gstreamer lame libcdio libdvdread libmad opencore-amr twolame x264
$(PKG)_UPDATE = $(subst gstreamer/refs,gst-plugins-ugly/refs,$(gstreamer_UPDATE))

2
src/libechonest.mk
View File

@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := ab961ab952df30c5234b548031594d7e281e7c9f2a9d1ce91fe5421ddde85
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/lfranchi/$(PKG)/archive/$($(PKG)_VERSION).tar.gz
$(PKG)_DEPS := gcc qt qjson
$(PKG)_DEPS := gcc qjson qt
define $(PKG)_UPDATE
$(call MXE_GET_GITHUB_TAGS, lfranchi/libechonest)

2
src/protobuf.mk
View File

@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := 0a0ae63cbffc274efb573bdde9a253e3f32e458c41261df51c5dbc5ad541e
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/google/$(PKG)/archive/v$($(PKG)_VERSION).tar.gz
$(PKG)_DEPS := gcc zlib googlemock googletest
$(PKG)_DEPS := gcc googlemock googletest zlib
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
$(PKG)_DEPS_$(BUILD) := googlemock googletest

2
src/qtbase.mk
View File

@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := 3e7b6d123cab23a587ccbc45173296b33786faa409dba0494e4658fda3ede
$(PKG)_SUBDIR := $(PKG)-opensource-src-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
$(PKG)_DEPS := gcc dbus fontconfig freetds freetype harfbuzz jpeg libpng libmysqlclient openssl pcre postgresql sqlite zlib
$(PKG)_DEPS := gcc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre postgresql sqlite zlib
define $(PKG)_UPDATE
$(WGET) -q -O- http://download.qt-project.org/official_releases/qt/5.5/ | \

2
src/subversion.mk
View File

@ -8,7 +8,7 @@ $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://archive.apache.org/dist/subversion/$($(PKG)_FILE)
$(PKG)_URL_2 := http://mirror.23media.de/apache/$(PKG)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc apr apr-util sqlite openssl
$(PKG)_DEPS := gcc apr apr-util openssl sqlite
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://subversion.apache.org/download.cgi' | \

2
src/upx.mk
View File

@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := 527ce757429841f51675352b1f9f6fc8ad97b18002080d7bf8672c466d8c6
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)-src
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION)-src.tar.bz2
$(PKG)_URL := http://upx.sourceforge.net/download/$($(PKG)_FILE)
$(PKG)_DEPS := gcc ucl zlib lzma
$(PKG)_DEPS := gcc lzma ucl zlib
$(PKG)_DEPS_$(BUILD) := ucl zlib lzma
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)

2
src/vmime.mk
View File

@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := 2278d199b24f9f1ef71c4f698063a36d40c47da4b817e8ea7f100f0a2ef6e
$(PKG)_SUBDIR := kisli-vmime-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://github.com/kisli/vmime/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc gnutls libiconv libgsasl pthreads zlib
$(PKG)_DEPS := gcc gnutls libgsasl libiconv pthreads zlib
$(PKG)_UPDATE = $(call MXE_GET_GITHUB_SHA, kisli/vmime, master) | $(SED) 's/^\(.......\).*/\1/;'

2
src/x264.mk
View File

@ -7,7 +7,7 @@ $(PKG)_CHECKSUM := 0825e14945bc373107f9a00e66d45d5389bb86368efd834b92c52cddb2ded
$(PKG)_SUBDIR := $(PKG)-snapshot-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2
$(PKG)_URL := http://download.videolan.org/pub/videolan/$(PKG)/snapshots/$($(PKG)_FILE)
$(PKG)_DEPS := gcc yasm liblsmash
$(PKG)_DEPS := gcc liblsmash yasm
define $(PKG)_UPDATE
$(WGET) -q -O- 'http://git.videolan.org/?p=x264.git;a=shortlog' | \