diff --git a/cross/duplicity/Makefile b/cross/duplicity/Makefile index 2a5eb487928a..b20cb0cdd5fb 100644 --- a/cross/duplicity/Makefile +++ b/cross/duplicity/Makefile @@ -1,6 +1,6 @@ PKG_NAME = duplicity PKG_SHORT_VERS = 0.7 -PKG_VERS = $(PKG_SHORT_VERS).11 +PKG_VERS = $(PKG_SHORT_VERS).19 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://launchpad.net/$(PKG_NAME)/$(PKG_SHORT_VERS)-series/$(PKG_VERS)/+download diff --git a/cross/duplicity/digests b/cross/duplicity/digests index 8aacdbc0b45b..309da6d3ec00 100644 --- a/cross/duplicity/digests +++ b/cross/duplicity/digests @@ -1,3 +1,3 @@ -duplicity-0.7.11.tar.gz SHA1 493b26f3e2ee15979a05cb651af9c1841ab226a2 -duplicity-0.7.11.tar.gz SHA256 b047a1590a1f5bb3974643ad2cc9dfdd32f61adbf2c1989191fb12cb59c2ec07 -duplicity-0.7.11.tar.gz MD5 9904a5bd8eb1d57d50ff1518a106dfc6 +duplicity-0.7.19.tar.gz SHA1 c9b2ae6781e1457a2f8800ec6d12af09869c1a0d +duplicity-0.7.19.tar.gz SHA256 a6aa905a63df5101193d3e8fd4ffdf35acb9307b184ac7a9d68a76aaed6ce929 +duplicity-0.7.19.tar.gz MD5 b4decdb60275c87b4fafab55c31dc5ce diff --git a/cross/ifuse/Makefile b/cross/ifuse/Makefile index 87f09b27cb83..ff52b03c5044 100644 --- a/cross/ifuse/Makefile +++ b/cross/ifuse/Makefile @@ -2,7 +2,8 @@ PKG_NAME = ifuse PKG_VERS = 1.1.3 PKG_EXT = tar.gz PKG_DOWNLOAD_METHOD = git -PKG_GIT_HASH = df048a1d07628a6a02ed77a8dc0f64930b78acee +# commited on Oct 8, 2018 +PKG_GIT_HASH = e75d32c34d0e8b80320f0a007d5ecbb3f55ef7f0 PKG_DIST_SITE = https://github.com/libimobiledevice/$(PKG_NAME).git PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-git$(PKG_GIT_HASH) @@ -15,17 +16,23 @@ LICENSE = LGPL-2.1 GNU_CONFIGURE = 1 PRE_CONFIGURE_TARGET = ifuse_pre_configure -INSTALL_TARGET = ifuse_extra_install +INSTALL_TARGET = ifuse_install +IFUSE_AUTOGEN_ARGS = include ../../mk/spksrc.cross-cc.mk ifeq ($(findstring $(ARCH), $(ARM_ARCHES)),$(ARCH)) -ifuse_pre_configure: - $(RUN) ; ./autogen.sh --host=arm-linux -else -ifuse_pre_configure: - $(RUN) ; ./autogen.sh +IFUSE_AUTOGEN_ARGS += --host=arm-linux +endif +ifeq ($(findstring $(ARCH), $(PPC_ARCHES)),$(ARCH)) +IFUSE_AUTOGEN_ARGS += --host=ppc-linux endif -ifuse_extra_install: + +.PHONY ifuse_pre_configure: +ifuse_pre_configure: + $(RUN) ./autogen.sh $(IFUSE_AUTOGEN_ARGS) + +.PHONY ifuse_install: +ifuse_install: $(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR) diff --git a/cross/ifuse/digests b/cross/ifuse/digests index fc3fb645d06d..5a351faec524 100644 --- a/cross/ifuse/digests +++ b/cross/ifuse/digests @@ -1,3 +1,3 @@ -ifuse-gitdf048a1d07628a6a02ed77a8dc0f64930b78acee.tar.gz SHA1 f44f8ffada5620fe562e7c871a97ca097fa7449b -ifuse-gitdf048a1d07628a6a02ed77a8dc0f64930b78acee.tar.gz SHA256 c1fb161d7ddc35afcbb820f2bbae98f882c5221b6fa9333278ecb6bec97a89a9 -ifuse-gitdf048a1d07628a6a02ed77a8dc0f64930b78acee.tar.gz MD5 8adbef1108eca728da4d8045a67787cd +ifuse-gite75d32c34d0e8b80320f0a007d5ecbb3f55ef7f0.tar.gz SHA1 d6c64b2f04f6feb28dbc7e8b438cf745b63c8f93 +ifuse-gite75d32c34d0e8b80320f0a007d5ecbb3f55ef7f0.tar.gz SHA256 11cebbea606fc05cf471ce1032c47bf3840f0d8b42b3a3b963c97ba00ebeb5ec +ifuse-gite75d32c34d0e8b80320f0a007d5ecbb3f55ef7f0.tar.gz MD5 f4639d64c95090c318c456e2ee2ebd0a diff --git a/cross/imagemagick/Makefile b/cross/imagemagick/Makefile index 893f97ccae60..72c9a7f63441 100644 --- a/cross/imagemagick/Makefile +++ b/cross/imagemagick/Makefile @@ -12,18 +12,25 @@ HOMEPAGE = http://www.imagemagick.org/ COMMENT = ImageMagick is a software suite to create, edit, compose, or convert bitmap images. LICENSE = Apache 2.0 -UNSUPPORTED_ARCHS = powerpc ppc824x GNU_CONFIGURE = 1 CONFIGURE_ARGS = --disable-installed --without-perl --without-x --without-fpx --without-wmf --disable-openmp -INSTALL_TARGET = imagemagick_extra_install +INSTALL_TARGET = imagemagick_install include ../../mk/spksrc.cross-cc.mk -imagemagick_extra_install: +ifeq ($(findstring $(ARCH), $(ARM5_ARCHES) powerpc ppc824x ppc853x ppc854x),$(ARCH)) +# ARM5_ARCHES and PPC_ARCHES (except QorIQ) have older kernels +# linking to lib rt fixes unreferenced clock_gettime +CONFIGURE_ARGS += CFLAGS=-lrt +endif + + +.PHONY: imagemagick_install +imagemagick_install: $(RUN) make install prefix=$(STAGING_INSTALL_PREFIX) \ SHARE_PATH=$(STAGING_INSTALL_PREFIX)/share/ImageMagick-7/ \ DATA_DIR=$(STAGING_INSTALL_PREFIX)/share/ImageMagick-7/ \ diff --git a/cross/libimobiledevice/Makefile b/cross/libimobiledevice/Makefile index 38a3e339d6f5..dc1102aa396c 100644 --- a/cross/libimobiledevice/Makefile +++ b/cross/libimobiledevice/Makefile @@ -2,7 +2,8 @@ PKG_NAME = libimobiledevice PKG_VERS = 1.2.0 PKG_EXT = tar.gz PKG_DOWNLOAD_METHOD = git -PKG_GIT_HASH = 26373b334889f5ae2e2737ff447eb25b1700fa2f +# with commits on Jun 13, 2019 +PKG_GIT_HASH = 6edc36fccb52a963c9ebfbb44ba7b91570e0fd06 PKG_DIST_SITE = https://github.com/libimobiledevice/$(PKG_NAME).git PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-git$(PKG_GIT_HASH) @@ -15,18 +16,23 @@ LICENSE = LGPL-2.1 GNU_CONFIGURE = 1 PRE_CONFIGURE_TARGET = libimobiledevice_pre_configure -INSTALL_TARGET = libimobiledevice_extra_install -CONFIGURE_ARGS = --disable-largefile --without-cython --enable-debug-code +INSTALL_TARGET = libimobiledevice_install +CONFIGURE_ARGS = --disable-largefile --without-cython --disable-debug-code +LIBIMOBILEDEVICE_AUTOGEN_ARGS = $(CONFIGURE_ARGS) include ../../mk/spksrc.cross-cc.mk ifeq ($(findstring $(ARCH), $(ARM_ARCHES)),$(ARCH)) -libimobiledevice_pre_configure: - $(RUN) ; ./autogen.sh --disable-largefile --without-cython --enable-debug-code --host=arm-linux -else -libimobiledevice_pre_configure: - $(RUN) ; ./autogen.sh --disable-largefile --without-cython --enable-debug-code + LIBIMOBILEDEVICE_AUTOGEN_ARGS += --host=arm-linux +endif +ifeq ($(findstring $(ARCH), $(PPC_ARCHES)),$(ARCH)) + LIBIMOBILEDEVICE_AUTOGEN_ARGS += --host=ppc-linux endif -libimobiledevice_extra_install: +.PHONY: libimobiledevice_pre_configure +libimobiledevice_pre_configure: + $(RUN) ./autogen.sh $(LIBIMOBILEDEVICE_AUTOGEN_ARGS) + +.PHONY: libimobiledevice_install +libimobiledevice_install: $(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR) diff --git a/cross/libimobiledevice/digests b/cross/libimobiledevice/digests index 76ee08e3d93a..f992f6043aac 100644 --- a/cross/libimobiledevice/digests +++ b/cross/libimobiledevice/digests @@ -1,3 +1,3 @@ -libimobiledevice-git26373b334889f5ae2e2737ff447eb25b1700fa2f.tar.gz SHA1 dfc0b928eb0d07e668218263e57f5e5ac2e3b1ae -libimobiledevice-git26373b334889f5ae2e2737ff447eb25b1700fa2f.tar.gz SHA256 c8f6d4697988dbc4b2379a2ed3141272d57387032c33014990ce090ff3545059 -libimobiledevice-git26373b334889f5ae2e2737ff447eb25b1700fa2f.tar.gz MD5 dacf8e8e17e3ffd62c4acc007fa2c7f8 +libimobiledevice-git6edc36fccb52a963c9ebfbb44ba7b91570e0fd06.tar.gz SHA1 67155689b4d05bef94a8d590448a9057f1941159 +libimobiledevice-git6edc36fccb52a963c9ebfbb44ba7b91570e0fd06.tar.gz SHA256 9e1da1c3186055f8e3e024f37737494ef110b9de57a27f18672b49b6b7ea33dd +libimobiledevice-git6edc36fccb52a963c9ebfbb44ba7b91570e0fd06.tar.gz MD5 3f445afcc913ab193d6aebc8136db9db diff --git a/cross/libplist/Makefile b/cross/libplist/Makefile index c3940104b65a..f3576cd8358d 100644 --- a/cross/libplist/Makefile +++ b/cross/libplist/Makefile @@ -2,7 +2,8 @@ PKG_NAME = libplist PKG_VERS = 2.0.0 PKG_EXT = tar.gz PKG_DOWNLOAD_METHOD = git -PKG_GIT_HASH = ec9ba8bff6a4469aa75f6d570ab5109c061c6a9e +# with Commits on Sep 3, 2019 +PKG_GIT_HASH = 6a53de92e2b5029ee293c79d481ff5fd9528f8c3 PKG_DIST_SITE = https://github.com/libimobiledevice/$(PKG_NAME).git PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-git$(PKG_GIT_HASH) @@ -15,19 +16,25 @@ LICENSE = LGPL-2.1 GNU_CONFIGURE = 1 PRE_CONFIGURE_TARGET = libplist_pre_configure -INSTALL_TARGET = libplist_extra_install +INSTALL_TARGET = libplist_install CONFIGURE_ARGS = --without-cython +LIBPLIST_AUTOGEN_ARGS = $(CONFIGURE_ARGS) include ../../mk/spksrc.cross-cc.mk ifeq ($(findstring $(ARCH), $(ARM_ARCHES)),$(ARCH)) -libplist_pre_configure: - $(RUN) ; ./autogen.sh --without-cython --host=arm-linux -else -libplist_pre_configure: - $(RUN) ; ./autogen.sh --without-cython +LIBPLIST_AUTOGEN_ARGS += --host=arm-linux +endif +ifeq ($(findstring $(ARCH), $(PPC_ARCHES)),$(ARCH)) +LIBPLIST_AUTOGEN_ARGS += --host=ppc-linux endif -libplist_extra_install: + +.PHONY: libplist_pre_configure +libplist_pre_configure: + $(RUN) ; ./autogen.sh $(LIBPLIST_AUTOGEN_ARGS) + +.PHONY: libplist_install +libplist_install: $(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR) diff --git a/cross/libplist/digests b/cross/libplist/digests index a5a03f890c04..b03359f9db88 100644 --- a/cross/libplist/digests +++ b/cross/libplist/digests @@ -1,3 +1,3 @@ -libplist-gitec9ba8bff6a4469aa75f6d570ab5109c061c6a9e.tar.gz SHA1 ae88dc7aa1eea5c7879e027d5c53b298925a9149 -libplist-gitec9ba8bff6a4469aa75f6d570ab5109c061c6a9e.tar.gz SHA256 6dbed5381ed244f42bef696b0bac63e4c35e885e577c57c0477e4eef23d31b4e -libplist-gitec9ba8bff6a4469aa75f6d570ab5109c061c6a9e.tar.gz MD5 021eeae2554353fa527bb86419feb8db +libplist-git6a53de92e2b5029ee293c79d481ff5fd9528f8c3.tar.gz SHA1 d85731a176d081a8c17f79702c100787ede922ae +libplist-git6a53de92e2b5029ee293c79d481ff5fd9528f8c3.tar.gz SHA256 3fdfaa50e735fadd83daac283c0602b5c38b9d352c7cb1ae2ec664f020644112 +libplist-git6a53de92e2b5029ee293c79d481ff5fd9528f8c3.tar.gz MD5 2ddfdb5f8d31f77130185b58f715e051 diff --git a/cross/libusb/Makefile b/cross/libusb/Makefile index f1ddc8dd36fa..9d395abe140a 100644 --- a/cross/libusb/Makefile +++ b/cross/libusb/Makefile @@ -1,5 +1,5 @@ PKG_NAME = libusb -PKG_VERS = 1.0.9 +PKG_VERS = 1.0.23 PKG_EXT = tar.gz PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://github.com/libusb/libusb/archive @@ -14,14 +14,19 @@ LICENSE = LGPL-2.1 GNU_CONFIGURE = 1 PRE_CONFIGURE_TARGET = libusb_pre_configure +CONFIGURE_ARGS = --disable-udev --disable-debug-log --disable-examples-build +LIBUSB_AUTOGEN_ARGS = $(CONFIGURE_ARGS) include ../../mk/spksrc.cross-cc.mk -LIBUSB_AUTOGEN_PARAMS = ifeq ($(findstring $(ARCH), $(ARM_ARCHES)),$(ARCH)) -LIBUSB_AUTOGEN_PARAMS += --host=arm-linux +LIBUSB_AUTOGEN_ARGS += --host=arm-linux +endif +ifeq ($(findstring $(ARCH), $(PPC_ARCHES)),$(ARCH)) +LIBUSB_AUTOGEN_ARGS += --host=ppc-linux endif +.PHONY: libusb_pre_configure libusb_pre_configure: - $(RUN) ; ./autogen.sh $(LIBUSB_AUTOGEN_PARAMS) + $(RUN) ; ./autogen.sh $(LIBUSB_AUTOGEN_ARGS) diff --git a/cross/libusb/PLIST b/cross/libusb/PLIST index 519a82126696..cd79fa6360a1 100644 --- a/cross/libusb/PLIST +++ b/cross/libusb/PLIST @@ -1,3 +1,3 @@ lnk:lib/libusb-1.0.so lnk:lib/libusb-1.0.so.0 -lib:lib/libusb-1.0.so.0.1.0 +lib:lib/libusb-1.0.so.0.2.0 diff --git a/cross/libusb/digests b/cross/libusb/digests index 7abe67789dc7..5c1a8cea947c 100644 --- a/cross/libusb/digests +++ b/cross/libusb/digests @@ -1,3 +1,3 @@ -libusb-1.0.9.tar.gz SHA1 6113d04aaae7c2a210a3ebad1f981ccb805e5c4f -libusb-1.0.9.tar.gz SHA256 a25ad51e9555099cc333998bbb8d033b5b20136c42b3dc16263c65b19f405ce4 -libusb-1.0.9.tar.gz MD5 af5630ac62b19901e6cefa9b37c70c13 +libusb-1.0.23.tar.gz SHA1 c8ebcc7d0a14f910151b3066326d8ba126894b88 +libusb-1.0.23.tar.gz SHA256 02620708c4eea7e736240a623b0b156650c39bfa93a14bcfa5f3e05270313eba +libusb-1.0.23.tar.gz MD5 009e75e0ef3ed54ebbc085468feeec28 diff --git a/cross/libusbmuxd/Makefile b/cross/libusbmuxd/Makefile index b727d1a6e968..2d5bde4d88fe 100644 --- a/cross/libusbmuxd/Makefile +++ b/cross/libusbmuxd/Makefile @@ -2,7 +2,8 @@ PKG_NAME = libusbmuxd PKG_VERS = 1.0.10 PKG_EXT = tar.gz PKG_DOWNLOAD_METHOD = git -PKG_GIT_HASH = 149da9b53a7d16f6056337bfa0ed55f44466007a +# with commits on Sep 28, 2019 +PKG_GIT_HASH = c2db27c92341e1ba257102f6fb29a61f66c2fb6d PKG_DIST_SITE = https://github.com/libimobiledevice/$(PKG_NAME).git PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-git$(PKG_GIT_HASH) @@ -15,18 +16,24 @@ LICENSE = LGPL-2.1 GNU_CONFIGURE = 1 PRE_CONFIGURE_TARGET = libusbmuxd_pre_configure -INSTALL_TARGET = libusbmuxd_extra_install +INSTALL_TARGET = libusbmuxd_install CONFIGURE_ARGS = ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes +LIBUSBMUXD_AUTOGEN_ARGS = include ../../mk/spksrc.cross-cc.mk ifeq ($(findstring $(ARCH), $(ARM_ARCHES)),$(ARCH)) -libusbmuxd_pre_configure: - $(RUN) ; ./autogen.sh --host=arm-linux -else -libusbmuxd_pre_configure: - $(RUN) ; ./autogen.sh + LIBUSBMUXD_AUTOGEN_ARGS += --host=arm-linux +endif +ifeq ($(findstring $(ARCH), $(PPC_ARCHES)),$(ARCH)) + LIBUSBMUXD_AUTOGEN_ARGS += --host=ppc-linux endif -libusbmuxd_extra_install: + +.PHONY: libusbmuxd_pre_configure +libusbmuxd_pre_configure: + $(RUN) ./autogen.sh $(LIBUSBMUXD_AUTOGEN_ARGS) + +.PHONY: libusbmuxd_install +libusbmuxd_install: $(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR) diff --git a/cross/libusbmuxd/PLIST b/cross/libusbmuxd/PLIST index f37554b55bfb..0e8c2f5a2e58 100644 --- a/cross/libusbmuxd/PLIST +++ b/cross/libusbmuxd/PLIST @@ -1,3 +1,5 @@ +bin:bin/icat +bin:bin/iproxy lnk:lib/libusbmuxd.so lnk:lib/libusbmuxd.so.4 -lib:lib/libusbmuxd.so.4.0.0 +lib:lib/libusbmuxd.so.4.1.0 diff --git a/cross/libusbmuxd/digests b/cross/libusbmuxd/digests index 440cd301224a..ca2b12ecbc75 100644 --- a/cross/libusbmuxd/digests +++ b/cross/libusbmuxd/digests @@ -1,3 +1,3 @@ -libusbmuxd-git149da9b53a7d16f6056337bfa0ed55f44466007a.tar.gz SHA1 3532334b049e8748de17511496651b3d65f9ef47 -libusbmuxd-git149da9b53a7d16f6056337bfa0ed55f44466007a.tar.gz SHA256 07b9fe176c491b86025903314e1d9660ec18217f0c46265fc5ded9cf0b81c4a3 -libusbmuxd-git149da9b53a7d16f6056337bfa0ed55f44466007a.tar.gz MD5 49ec32b3428b2cc28fba3ef068ffce0d +libusbmuxd-gitc2db27c92341e1ba257102f6fb29a61f66c2fb6d.tar.gz SHA1 324eb87d3b5461403a03c7df1fb0bd1af68e29d8 +libusbmuxd-gitc2db27c92341e1ba257102f6fb29a61f66c2fb6d.tar.gz SHA256 0bd9d6b767602fcd2b19554f9cc5d9bbf83f7804b25585909ad373dac7a8a7b1 +libusbmuxd-gitc2db27c92341e1ba257102f6fb29a61f66c2fb6d.tar.gz MD5 968cb6b6573a79d7d924693234fd7b54 diff --git a/cross/oscam/Makefile b/cross/oscam/Makefile deleted file mode 100644 index f2f8a937b42e..000000000000 --- a/cross/oscam/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -PKG_NAME = oscam -PKG_VERS = 1.20 -PKG_EXT = tar.gz -PKG_DOWNLOAD_METHOD = svn -PKG_SVN_REV = 7536 -PKG_DIST_NAME = trunk -PKG_DIST_SITE = http://www.streamboard.tv/svn/oscam -PKG_DIST_FILE = $(PKG_NAME)-r$(PKG_SVN_REV).$(PKG_EXT) -PKG_DIR = $(PKG_NAME)-r* - -DEPENDS = cross/openssl cross/libusb - -HOMEPAGE = http://oscam.to/ -COMMENT = OSCam is an Open Source Conditional Access Module software -LICENSE = GPLv3 - -GNU_CONFIGURE = 1 -CONFIGURE_TARGET = myConfigure -COMPILE_TARGET = myCompile -INSTALL_TARGET = myInstall - -include ../../mk/spksrc.cross-cc.mk - -.PHONY: myConfigure -myConfigure: - $(RUN) ./config.sh --enable WITH_SSL --disable HAVE_DVBAPI - -.PHONY: myCompile -myCompile: - $(RUN) $(MAKE) CROSS=$(shell echo $(ENV) | sed 's/ /\n/g' | sed -n -e 's/CC=\(.*-\)gcc/\1/p') CONF_DIR=$(INSTALL_PREFIX)/etc USE_LIBUSB=1 - -.PHONY: myInstall -myInstall: - rm -f $(WORK_DIR)/$(PKG_DIR)/Distribution/oscam*.debug - install -m 755 $(WORK_DIR)/$(PKG_DIR)/Distribution/list_smargo* $(STAGING_INSTALL_PREFIX)/bin/list_smargo - install -m 755 $(WORK_DIR)/$(PKG_DIR)/Distribution/oscam* $(STAGING_INSTALL_PREFIX)/bin/oscam diff --git a/cross/oscam/PLIST b/cross/oscam/PLIST deleted file mode 100644 index 86ee28da647b..000000000000 --- a/cross/oscam/PLIST +++ /dev/null @@ -1,2 +0,0 @@ -bin:bin/oscam -bin:bin/list_smargo diff --git a/cross/oscam/digests b/cross/oscam/digests deleted file mode 100644 index 9d19220aed36..000000000000 --- a/cross/oscam/digests +++ /dev/null @@ -1,3 +0,0 @@ -oscam-r7536.tar.gz SHA1 d6cad8ac1459d16585c5e32163647e685275dabb -oscam-r7536.tar.gz SHA256 c135e837070043fc15d7e786a7dd9ba714d71efe652eecb931d237952d7a8a44 -oscam-r7536.tar.gz MD5 3669f9bd165cfc4db68ae61a94e4894c diff --git a/cross/oscam/patches/001-not-overwrite-ldflags.patch b/cross/oscam/patches/001-not-overwrite-ldflags.patch deleted file mode 100644 index e0cdff8d706e..000000000000 --- a/cross/oscam/patches/001-not-overwrite-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2012-09-27 18:44:31.000000000 +0200 -+++ Makefile 2012-09-27 22:59:44.000000000 +0200 -@@ -53,7 +53,7 @@ - CC = $(CROSS_DIR)$(CROSS)gcc - STRIP = $(CROSS_DIR)$(CROSS)strip - --LDFLAGS = -Wl,--gc-sections -+LDFLAGS += -Wl,--gc-sections - - # The linker for powerpc have bug that prevents --gc-sections from working - # Check for the linker version and if it matches disable --gc-sections diff --git a/cross/tesseract-ocr/Makefile b/cross/tesseract-ocr/Makefile index 14fb102557cc..43ea624f9331 100644 --- a/cross/tesseract-ocr/Makefile +++ b/cross/tesseract-ocr/Makefile @@ -18,11 +18,11 @@ CONFIGURE_ARGS = LIBLEPT_HEADERSDIR=$(STAGING_INSTALL_PREFIX)/include/leptonica include ../../mk/spksrc.common.mk ifeq ($(findstring $(ARCH), powerpc ppc824x ppc853x ppc854x),$(ARCH)) -# workaround for g++ compiler: -ADDITIONAL_CXXFLAGS = -D nullptr=NULL +# workaround and experimental c++ features for g++ compiler: +ADDITIONAL_CXXFLAGS = -D nullptr=NULL -std=gnu++0x endif ifeq ($(findstring $(ARCH), $(ARM5_ARCHES)),$(ARCH)) -# enable experimental feature for (old) g++ compiler: +# enable experimental features for (old) g++ compiler: ADDITIONAL_CXXFLAGS = -std=gnu++0x endif diff --git a/cross/usbmuxd/Makefile b/cross/usbmuxd/Makefile index 367f432ba7cb..c156be084981 100644 --- a/cross/usbmuxd/Makefile +++ b/cross/usbmuxd/Makefile @@ -2,7 +2,8 @@ PKG_NAME = usbmuxd PKG_VERS = 1.1.0 PKG_EXT = tar.gz PKG_DOWNLOAD_METHOD = git -PKG_GIT_HASH = 08d9ec01cf59c7bb3febe3c4600e9efeb81901e3 +# with commits on Oct 4, 2019 +PKG_GIT_HASH = c41226df521de464a89f3d027f3e67d13d10d96f PKG_DIST_SITE = https://github.com/libimobiledevice/$(PKG_NAME).git PKG_DIST_FILE = $(PKG_NAME)-git$(PKG_GIT_HASH).$(PKG_EXT) PKG_DIR = $(PKG_NAME)-git$(PKG_GIT_HASH) @@ -15,18 +16,19 @@ LICENSE = LGPL-2.1 GNU_CONFIGURE = 1 PRE_CONFIGURE_TARGET = usbmuxd_pre_configure -INSTALL_TARGET = usbmuxd_extra_install CONFIGURE_ARGS = ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes +USBMUXD_AUTOGEN_ARGS = --without-cpython include ../../mk/spksrc.cross-cc.mk ifeq ($(findstring $(ARCH), $(ARM_ARCHES)),$(ARCH)) -usbmuxd_pre_configure: - $(RUN) ; ./autogen.sh --host=arm-linux -else -usbmuxd_pre_configure: - $(RUN) ; ./autogen.sh +USBMUXD_AUTOGEN_ARGS += --host=arm-linux +endif +ifeq ($(findstring $(ARCH), $(PPC_ARCHES)),$(ARCH)) +USBMUXD_AUTOGEN_ARGS += --host=ppc-linux endif -usbmuxd_extra_install: - $(RUN) $(MAKE) install DESTDIR=$(INSTALL_DIR) + +.PHONY: usbmuxd_pre_configure +usbmuxd_pre_configure: + $(RUN) ./autogen.sh $(USBMUXD_AUTOGEN_ARGS) diff --git a/cross/usbmuxd/digests b/cross/usbmuxd/digests index 352e6d8613a7..16eba38dc6ea 100644 --- a/cross/usbmuxd/digests +++ b/cross/usbmuxd/digests @@ -1,3 +1,3 @@ -usbmuxd-git08d9ec01cf59c7bb3febe3c4600e9efeb81901e3.tar.gz SHA1 0249d1f92ca1795fd33fefb5b8ebb2ece01ff37c -usbmuxd-git08d9ec01cf59c7bb3febe3c4600e9efeb81901e3.tar.gz SHA256 ff07a83c32170524b9b3e9ac1da766f544cd1213a7830be39520ed30d9d58987 -usbmuxd-git08d9ec01cf59c7bb3febe3c4600e9efeb81901e3.tar.gz MD5 e545b4df1441a19a8b9cf0bf187eaa36 +usbmuxd-gitc41226df521de464a89f3d027f3e67d13d10d96f.tar.gz SHA1 c38b35763e55892a686697c7c8b9b79501b2ffa9 +usbmuxd-gitc41226df521de464a89f3d027f3e67d13d10d96f.tar.gz SHA256 a4c85665bc2b2a826d40b116a30d38b99f52878b2ea2f126b02fda9b25d7c623 +usbmuxd-gitc41226df521de464a89f3d027f3e67d13d10d96f.tar.gz MD5 67fe21410264af814ba768789ffde0ef diff --git a/cross/usbmuxd/patches/001-check_if_clock_gettime_requires_-lrt_on_old_GNU_systems.patch b/cross/usbmuxd/patches/001-check_if_clock_gettime_requires_-lrt_on_old_GNU_systems.patch deleted file mode 100644 index fdc1d3ccad86..000000000000 --- a/cross/usbmuxd/patches/001-check_if_clock_gettime_requires_-lrt_on_old_GNU_systems.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- configure.ac.orig 2019-03-24 18:50:37.239438387 +0100 -+++ configure.ac 2019-03-24 18:49:01.315144842 +0100 -@@ -92,6 +92,9 @@ - AC_TYPE_UINT32_T - AC_TYPE_UINT8_T - -+# Check if clock_gettime requires -lrt (old GNU systems) -+AC_SEARCH_LIBS([clock_gettime],[rt posix4]) -+ - # Checks for library functions. - AC_FUNC_MALLOC - AC_FUNC_REALLOC diff --git a/spk/debian-chroot/src/app/images/debian-chroot-16.png b/spk/debian-chroot/src/app/images/debian-chroot-16.png deleted file mode 100644 index 1fca7a1ee1be..000000000000 Binary files a/spk/debian-chroot/src/app/images/debian-chroot-16.png and /dev/null differ diff --git a/spk/debian-chroot/src/app/images/debian-chroot-24.png b/spk/debian-chroot/src/app/images/debian-chroot-24.png deleted file mode 100644 index 8681145e6a3b..000000000000 Binary files a/spk/debian-chroot/src/app/images/debian-chroot-24.png and /dev/null differ diff --git a/spk/debian-chroot/src/app/images/debian-chroot-32.png b/spk/debian-chroot/src/app/images/debian-chroot-32.png deleted file mode 100644 index 1d5203a42780..000000000000 Binary files a/spk/debian-chroot/src/app/images/debian-chroot-32.png and /dev/null differ diff --git a/spk/debian-chroot/src/app/images/debian-chroot-48.png b/spk/debian-chroot/src/app/images/debian-chroot-48.png deleted file mode 100644 index 94e9d64d8420..000000000000 Binary files a/spk/debian-chroot/src/app/images/debian-chroot-48.png and /dev/null differ diff --git a/spk/duplicity/Makefile b/spk/duplicity/Makefile index d118b1777120..7ef454d1809e 100644 --- a/spk/duplicity/Makefile +++ b/spk/duplicity/Makefile @@ -1,6 +1,6 @@ SPK_NAME = duplicity -SPK_VERS = 0.7.11 -SPK_REV = 5 +SPK_VERS = 0.7.19 +SPK_REV = 6 SPK_ICON = src/duplicity.png BUILD_DEPENDS = cross/python cross/setuptools cross/pip cross/wheel @@ -13,8 +13,7 @@ MAINTAINER = SynoCommunity DESCRIPTION = Encrypted bandwidth-efficient backup using the rsync algorithm using a command line interface. Also contains duply wrapper script. STARTABLE = no DISPLAY_NAME = Duplicity -CHANGELOG = Add pyrax dependency -BETA = 1 +CHANGELOG = Update to version 0.7.19 HOMEPAGE = http://duplicity.nongnu.org/ LICENSE = GNU GPL v2 diff --git a/spk/itools/Makefile b/spk/itools/Makefile index 7a2f7c121d2d..72292cc0bc45 100644 --- a/spk/itools/Makefile +++ b/spk/itools/Makefile @@ -1,10 +1,10 @@ SPK_NAME = itools SPK_VERS = 1.1 -SPK_REV = 2 +SPK_REV = 3 SPK_ICON = src/itools.png - +# A collection of tools from ifuse and usbmuxd projects of libimobiledevice.org +# There exists no source code package "itools" and therefore no cross/itools project DEPENDS = cross/usbmuxd cross/ifuse -UNSUPPORTED_ARCHS = $(PPC_ARCHES) SPK_DEPENDS = "PythonModule" MAINTAINER = bxxxjxxg @@ -14,7 +14,7 @@ DISTRIBUTOR_URL = https://synocommunity.com DESCRIPTION = A collection toolkit for connecting iOS devices. RELOAD_UI = no DISPLAY_NAME = iOS Access -CHANGELOG = Added udev rules and python scripts to auto-detect and mount/umount iOS devices into/from FileStation. +CHANGELOG = Update dependencies \(2019.10\). HOMEPAGE = https://www.libimobiledevice.org LICENSE = LGPL 2.1 diff --git a/spk/itools/src/itools.png b/spk/itools/src/itools.png index 7ab6ee38de0d..98e5e9c3e3dd 100644 Binary files a/spk/itools/src/itools.png and b/spk/itools/src/itools.png differ diff --git a/spk/itools/src/service-setup.sh b/spk/itools/src/service-setup.sh index a02f0e383d49..e3cf48c6b945 100755 --- a/spk/itools/src/service-setup.sh +++ b/spk/itools/src/service-setup.sh @@ -9,24 +9,24 @@ SVC_WRITE_PID=y service_postinst () { - easy_install lockfile - ln -s ${SYNOPKG_PKGDEST_VOL} ${VOLUME_DIR} + easy_install lockfile >> ${INST_LOG} + ln -s ${SYNOPKG_PKGDEST_VOL} ${VOLUME_DIR} >> ${INST_LOG} } service_postuninst () { - rm -f ${VOLUME_DIR} + rm -f ${VOLUME_DIR} >> ${INST_LOG} } service_prestart () { - cp ${SYNOPKG_PKGDEST}/39-libimobiledevice.rules /usr/lib/udev/rules.d/ - udevadm control --reload-rules + cp ${SYNOPKG_PKGDEST}/39-libimobiledevice.rules /usr/lib/udev/rules.d/ >> ${INST_LOG} + udevadm control --reload-rules >> ${INST_LOG} } service_poststop () { - ${INSTALL_DIR}/umounting.py - rm -f /usr/lib/udev/rules.d/39-libimobiledevice.rules - udevadm control --reload-rules + ${INSTALL_DIR}/umounting.py >> ${INST_LOG} + rm -f /usr/lib/udev/rules.d/39-libimobiledevice.rules >> ${INST_LOG} + udevadm control --reload-rules >> ${INST_LOG} } diff --git a/spk/oscam/Makefile b/spk/oscam/Makefile deleted file mode 100644 index 2d8ece82d479..000000000000 --- a/spk/oscam/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -SPK_NAME = oscam -SPK_VERS = 1.20~r7536 -SPK_REV = 1 -SPK_ICON = src/oscam.png -DSM_UI_DIR = app - -DEPENDS = cross/busybox cross/$(SPK_NAME) - -MAINTAINER = Diaoul -DESCRIPTION = OSCam is a multi-protocol and cross-platform card server. A card server is a software which acts as a key host for card clients. A card server usually has one or more smartcard readers and ethernet interface. It emulates conditional access module \(CAM\) for accessing smartcard and offers virtual common interface to the clients. OSCam has a card client and a web interface -DESCRIPTION_FRE = OSCam est un card server multi-protocole et mutli-plateforme. Un card server est un logiciel qui agit comme une clé d\'hôte pour les card clients. Un card server a généralement un ou plusieurs lecteur de cartes à puce et une interface Ethernet. Il émule un Conditional Access Module \(CAM\) pour accéder à la carte à puce virtuelle et offre une interface commune pour les clients. OSCam a un card client et une interface web -ADMIN_PORT = 83 -RELOAD_UI = yes -DISPLAY_NAME = OSCam - -HOMEPAGE = https://www.oscam.to/ -LICENSE = - -INSTALLER_SCRIPT = src/installer.sh -SSS_SCRIPT = src/dsm-control.sh -FWPORTS = src/${SPK_NAME}.sc - -INSTALL_PREFIX = /usr/local/$(SPK_NAME) - -POST_STRIP_TARGET = oscam_extra_install - -ENV += BUSYBOX_CONFIG=usermng_pidof_defconfig -include ../../mk/spksrc.spk.mk - -.PHONY: oscam_extra_install -oscam_extra_install: - install -m 755 -d $(STAGING_DIR)/var - install -m 755 -d $(STAGING_DIR)/app - install -m 644 src/oscam.conf $(STAGING_DIR)/var/oscam.conf - install -m 644 src/app/config $(STAGING_DIR)/app/config - install -m 755 src/app/oscam.cgi.pl $(STAGING_DIR)/app/oscam.cgi diff --git a/spk/oscam/PLIST b/spk/oscam/PLIST deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/spk/oscam/src/app/config b/spk/oscam/src/app/config deleted file mode 100644 index 609f1bd20cf7..000000000000 --- a/spk/oscam/src/app/config +++ /dev/null @@ -1,13 +0,0 @@ -{ - ".url": { - "com.synocommunity.packages.oscam": { - "title": "OSCam", - "desc": "OSCam Web UI", - "icon": "images/oscam-{0}.png", - "type": "url", - "url": "3rdparty/oscam/oscam.cgi", - "allUsers": true, - "grantPrivilege": "local" - } - } -} diff --git a/spk/oscam/src/app/oscam.cgi.pl b/spk/oscam/src/app/oscam.cgi.pl deleted file mode 100755 index 10e4d9c563d6..000000000000 --- a/spk/oscam/src/app/oscam.cgi.pl +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/perl -w -use strict; -use warnings; -use CGI; -use CGI::Carp qw(fatalsToBrowser warningsToBrowser); - -# CGI -my $q = CGI->new; - -# Redirect -print $q->redirect("http://".$ENV{SERVER_NAME}.":83"); diff --git a/spk/oscam/src/dsm-control.sh b/spk/oscam/src/dsm-control.sh deleted file mode 100755 index aed9e46dc63b..000000000000 --- a/spk/oscam/src/dsm-control.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh - -# Package -PACKAGE="oscam" -DNAME="OSCam" - -# Others -INSTALL_DIR="/usr/local/${PACKAGE}" -PATH="${INSTALL_DIR}/bin:/usr/local/bin:/bin:/usr/bin:/usr/syno/bin" -USER="root" -OSCAM="${INSTALL_DIR}/bin/oscam" -PID_FILE="${INSTALL_DIR}/var/oscam.pid" - - -start_daemon () -{ - su ${USER} -s /bin/sh -c "${OSCAM} -b -c ${INSTALL_DIR}/var" - sleep 1 - pidof -s oscam > ${PID_FILE} -} - -stop_daemon () -{ - kill `cat ${PID_FILE}` - wait_for_status 1 20 - rm -f ${PID_FILE} -} - -daemon_status () -{ - if [ -f ${PID_FILE} ] && [ -d /proc/`cat ${PID_FILE}` ]; then - return - fi - return 1 -} - -wait_for_status () -{ - counter=$2 - while [ ${counter} -gt 0 ]; do - daemon_status - [ $? -eq $1 ] && break - let counter=counter-1 - sleep 1 - done -} - - -case $1 in - start) - if daemon_status; then - echo ${DNAME} is already running - exit 0 - else - echo Starting ${DNAME} ... - start_daemon - exit $? - fi - ;; - stop) - if daemon_status; then - echo Stopping ${DNAME} ... - stop_daemon - exit $? - else - echo ${DNAME} is not running - exit 0 - fi - ;; - restart) - stop_daemon - start_daemon - exit $? - ;; - status) - if daemon_status; then - echo ${DNAME} is running - exit 0 - else - echo ${DNAME} is not running - exit 1 - fi - ;; - *) - exit 1 - ;; -esac - diff --git a/spk/oscam/src/installer.sh b/spk/oscam/src/installer.sh deleted file mode 100755 index f0a55512e1b9..000000000000 --- a/spk/oscam/src/installer.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh - -# Package -PACKAGE="oscam" -DNAME="OSCam" - -# Others -INSTALL_DIR="/usr/local/${PACKAGE}" -PATH="${INSTALL_DIR}/bin:/usr/local/bin:/bin:/usr/bin:/usr/syno/bin" -RUNAS="root" -TMP_DIR="${SYNOPKG_PKGDEST}/../../@tmp" - -SERVICETOOL="/usr/syno/bin/servicetool" -FWPORTS="/var/packages/${PACKAGE}/scripts/${PACKAGE}.sc" - -preinst () -{ - exit 0 -} - -postinst () -{ - # Link - ln -s ${SYNOPKG_PKGDEST} ${INSTALL_DIR} - - # Install busybox stuff - ${INSTALL_DIR}/bin/busybox --install ${INSTALL_DIR}/bin - - # Correct the files ownership - chown -R ${RUNAS}:root ${SYNOPKG_PKGDEST} - - # Add firewall config - ${SERVICETOOL} --install-configure-file --package ${FWPORTS} >> /dev/null - - exit 0 -} - -preuninst () -{ - - # Remove firewall config - if [ "${SYNOPKG_PKG_STATUS}" == "UNINSTALL" ]; then - ${SERVICETOOL} --remove-configure-file --package ${PACKAGE}.sc >> /dev/null - fi - - exit 0 -} - -postuninst () -{ - # Remove link - rm -f ${INSTALL_DIR} - - exit 0 -} - -preupgrade () -{ - # Save some stuff - rm -fr ${TMP_DIR}/${PACKAGE} - mkdir -p ${TMP_DIR}/${PACKAGE} - mv ${INSTALL_DIR}/var ${TMP_DIR}/${PACKAGE}/ - - exit 0 -} - -postupgrade () -{ - # Restore some stuff - rm -fr ${INSTALL_DIR}/var - mv ${TMP_DIR}/${PACKAGE}/var ${INSTALL_DIR}/ - rm -fr ${TMP_DIR}/${PACKAGE} - - exit 0 -} - diff --git a/spk/oscam/src/oscam.conf b/spk/oscam/src/oscam.conf deleted file mode 100644 index 0b28db935303..000000000000 --- a/spk/oscam/src/oscam.conf +++ /dev/null @@ -1,6 +0,0 @@ -[global] -logfile = /usr/local/oscam/var/oscam.log - -[webif] -httpport = 83 -httpallowed = 127.0.0.1,000.000.000.000-255.255.255.255 diff --git a/spk/oscam/src/oscam.png b/spk/oscam/src/oscam.png deleted file mode 100644 index 32a1937c9c6d..000000000000 Binary files a/spk/oscam/src/oscam.png and /dev/null differ diff --git a/spk/oscam/src/oscam.sc b/spk/oscam/src/oscam.sc deleted file mode 100644 index 1dc46c386db6..000000000000 --- a/spk/oscam/src/oscam.sc +++ /dev/null @@ -1,6 +0,0 @@ -[oscam] -title="OSCam" -desc="OSCam" -port_forward="yes" -dst.ports="83/tcp" - diff --git a/spk/saltpad/Makefile b/spk/saltpad/Makefile index 553ab3a65354..0b68d3a37a85 100644 --- a/spk/saltpad/Makefile +++ b/spk/saltpad/Makefile @@ -1,6 +1,6 @@ SPK_NAME = saltpad SPK_VERS = $(shell date +%Y%m%d) -SPK_REV = 3 +SPK_REV = 4 SPK_ICON = src/saltpad.png DSM_UI_DIR = app @@ -15,7 +15,7 @@ RELOAD_UI = yes DISPLAY_NAME = SaltPad START_DEP_SERVICES = salt-master -HOMEPAGE = https://github.com/tinyclues/saltpad +HOMEPAGE = https://github.com/Lothiraldan/saltpad LICENSE = GPL INSTALLER_SCRIPT = src/installer.sh @@ -39,4 +39,4 @@ saltpad_extra_install: $(STAGING_DIR)/share/saltpad $(STAGING_DIR)/share/saltpad: install -m 755 -d $(STAGING_DIR)/share - cd $(STAGING_DIR)/share && git clone https://github.com/tinyclues/saltpad.git saltpad + cd $(STAGING_DIR)/share && git clone https://github.com/Lothiraldan/saltpad.git saltpad diff --git a/spk/subliminal/src/wizard/install_uifile_enu b/spk/subliminal/src/wizard/install_uifile_enu deleted file mode 100644 index 83f26d5aec7f..000000000000 --- a/spk/subliminal/src/wizard/install_uifile_enu +++ /dev/null @@ -1,27 +0,0 @@ -[{ - "step_title": "Choose your fork", - "items": [{ - "type": "textfield", - "desc": "Configure the fork to use", - "subitems": [{ - "key": "wizard_fork_url", - "desc": "Fork URL", - "defaultValue": "https://github.com/RuudBurger/CouchPotatoServer.git", - "validator": { - "allowBlank": false - } - }, { - "key": "wizard_fork_branch", - "desc": "Fork branch", - "defaultValue": "master", - "validator": { - "allowBlank": false - } - }] - }] -}, { - "step_title": "Attention! DSM6 Permissions", - "items": [{ - "desc": "Permissions are managed with the group 'sc-media' in DSM." - }] -}] diff --git a/spk/subliminal/src/wizard/upgrade_uifile_enu b/spk/subliminal/src/wizard/upgrade_uifile_enu deleted file mode 100644 index 061677c8d1e3..000000000000 --- a/spk/subliminal/src/wizard/upgrade_uifile_enu +++ /dev/null @@ -1,6 +0,0 @@ -[{ - "step_title": "Attention! DSM6 Permissions", - "items": [{ - "desc": "Permissions are managed with the group 'sc-media' in DSM. The group 'users' is no longer used." - }] -}]