Skip to content

Commit

Permalink
Update duplicity to 0.7.19, remove beta=1
Browse files Browse the repository at this point in the history
update itools
fix saltpad homepage
use latest version of wheel that works with python 2
fix linking to rt lib

update itools
- update dependencies
- fix ppc-archs
- fix configure for linking to rt library in cross/usbmuxd

fix usage of DSM_APP_NAME in spk makefiles
retire oscam package (close SynoCommunity#2636)
Fix pyload/tesseract-ocr for ppc853x-5.2
  • Loading branch information
hgy59 committed Jun 20, 2020
1 parent 3248549 commit b970c32
Show file tree
Hide file tree
Showing 43 changed files with 137 additions and 428 deletions.
2 changes: 1 addition & 1 deletion cross/duplicity/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions cross/duplicity/digests
Original file line number Diff line number Diff line change
@@ -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
23 changes: 15 additions & 8 deletions cross/ifuse/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
6 changes: 3 additions & 3 deletions cross/ifuse/digests
Original file line number Diff line number Diff line change
@@ -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
13 changes: 10 additions & 3 deletions cross/imagemagick/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/ \
Expand Down
24 changes: 15 additions & 9 deletions cross/libimobiledevice/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
6 changes: 3 additions & 3 deletions cross/libimobiledevice/digests
Original file line number Diff line number Diff line change
@@ -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
23 changes: 15 additions & 8 deletions cross/libplist/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
6 changes: 3 additions & 3 deletions cross/libplist/digests
Original file line number Diff line number Diff line change
@@ -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
13 changes: 9 additions & 4 deletions cross/libusb/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
2 changes: 1 addition & 1 deletion cross/libusb/PLIST
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions cross/libusb/digests
Original file line number Diff line number Diff line change
@@ -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
23 changes: 15 additions & 8 deletions cross/libusbmuxd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
4 changes: 3 additions & 1 deletion cross/libusbmuxd/PLIST
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions cross/libusbmuxd/digests
Original file line number Diff line number Diff line change
@@ -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
36 changes: 0 additions & 36 deletions cross/oscam/Makefile

This file was deleted.

2 changes: 0 additions & 2 deletions cross/oscam/PLIST

This file was deleted.

3 changes: 0 additions & 3 deletions cross/oscam/digests

This file was deleted.

11 changes: 0 additions & 11 deletions cross/oscam/patches/001-not-overwrite-ldflags.patch

This file was deleted.

6 changes: 3 additions & 3 deletions cross/tesseract-ocr/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
20 changes: 11 additions & 9 deletions cross/usbmuxd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Loading

0 comments on commit b970c32

Please sign in to comment.