Skip to content

Commit

Permalink
update dar to v2.7.16
Browse files Browse the repository at this point in the history
- update dar from v2.7.14 to v2.7.16
- update crosss/libthreadar from v1.4.0 to v1.5.0
  • Loading branch information
hgy59 committed Jan 31, 2025
1 parent 88e24a6 commit 3a4689a
Show file tree
Hide file tree
Showing 10 changed files with 33 additions and 19 deletions.
2 changes: 1 addition & 1 deletion cross/dar/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = dar
PKG_VERS = 2.7.14
PKG_VERS = 2.7.16
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://sourceforge.net/projects/dar/files/dar/$(PKG_VERS)
Expand Down
2 changes: 1 addition & 1 deletion cross/dar/PLIST
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ bin:bin/dar_xform
rsc:etc/darrc
lnk:lib/libdar64.so
lnk:lib/libdar64.so.6000
lib:lib/libdar64.so.6000.7.2
lib:lib/libdar64.so.6000.8.0
6 changes: 3 additions & 3 deletions cross/dar/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dar-2.7.14.tar.gz SHA1 6c87630992cb63f28e2014f7b7d8a0e50e9af488
dar-2.7.14.tar.gz SHA256 40d4dba44260df3a8ddce1e61f411ea9ab43c2cfc47bd83ab868c939d19dc582
dar-2.7.14.tar.gz MD5 268f9e3c799eff1fcc2881baf7e45beb
dar-2.7.16.tar.gz SHA1 98cb3c4f8ee9cbe6d5c8bd4ae3bd6858ff90e0f2
dar-2.7.16.tar.gz SHA256 1aac0eab03602ccfa3696c2e1817c09665deee124da6c319d77f1ee1d641804d
dar-2.7.16.tar.gz MD5 31ceabf598403bc279a54e842b480d9f
8 changes: 4 additions & 4 deletions cross/libthreadar/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME = libthreadar
PKG_VERS = 1.4.0
PKG_VERS = 1.5.0
PKG_EXT = tar.gz
PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIST_SITE = https://sourceforge.net/projects/libthreadar/files/$(PKG_VERS)
Expand All @@ -9,16 +9,16 @@ DEPENDS =

# archs without C++11 support are not supported:
UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
# other compiler problem
# other compiler problem (declaraton of libthreadar::exception_base ...)
UNSUPPORTED_ARCHS += $(ARMv7L_ARCHS)

HOMEPAGE = http://libthreadar.sourceforge.net/
COMMENT = Libthreadar is a C++ library providing a small set of C++ classes to manipulate threads in a very simple and efficient way from your C++ code.
LICENSE = LGPLv3

GNU_CONFIGURE = 1
# avoid build of subdir "doc"
CONFIGURE_ARGS = ac_subdirs_all="src"
# to disable static library we must patch Makefile to skip doc folder
CONFIGURE_ARGS = --disable-static

ADDITIONAL_CPPFLAGS = -O

Expand Down
2 changes: 1 addition & 1 deletion cross/libthreadar/PLIST
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
lnk:lib/libthreadar.so
lnk:lib/libthreadar.so.1000
lib:lib/libthreadar.so.1000.4.0
lib:lib/libthreadar.so.1000.5.0
6 changes: 3 additions & 3 deletions cross/libthreadar/digests
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
libthreadar-1.4.0.tar.gz SHA1 40fb643fcb4854d7fee77d85df44b7a05d12d36f
libthreadar-1.4.0.tar.gz SHA256 2e4715178027bac973a4883f4bcb063494327ba886710446a82a80860f1a3791
libthreadar-1.4.0.tar.gz MD5 88c53a1981d91c22e56e122c609e1c11
libthreadar-1.5.0.tar.gz SHA1 ed0e2ece19ac7accc4ed232179835f7258b33e4b
libthreadar-1.5.0.tar.gz SHA256 c0902421418aed477a9f6a75dbbe6f3644b1fd6ecb9602965d06837af7ad3e4a
libthreadar-1.5.0.tar.gz MD5 1e80acd5996d121b6c9ddeb433fe8595
8 changes: 4 additions & 4 deletions cross/libthreadar/patches/001-fix-include-path.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
# - use relativ path instead of absolute path (pkgincludedir)
# otherwise cross/dar cannot use the libthreadar header files and disables multithreading support
#
--- src/Makefile.in.orig 2022-03-09 20:55:05.000000000 +0000
+++ src/Makefile.in 2024-03-28 19:46:42.518017640 +0000
@@ -716,7 +716,7 @@
--- src/Makefile.in.orig 2024-08-21 20:55:45.000000000 +0000
+++ src/Makefile.in 2025-01-31 19:54:51.171604127 +0000
@@ -719,7 +719,7 @@
install-data-local:
mkdir -p $(DESTDIR)$(pkgincludedir)
cp ../config.h $(DESTDIR)$(pkgincludedir)/libthreadar_config.h
- for file in $(dist_noinst_DATA) ; do sed -e 's%#include \"config.h\"%MY_CONFIG_FILE_H%g' -e "s%#include \"%#include \"$(pkgincludedir)/%g" -e "s%MY_CONFIG_FILE_H%#include \"$(pkgincludedir)/libthreadar_config.h\"%g" "$$file" > $(DESTDIR)$(pkgincludedir)/"$$file" ; done
+ for file in $(dist_noinst_DATA) ; do sed -e 's%#include \"config.h\"%MY_CONFIG_FILE_H%g' -e "s%#include \"%#include \"libthreadar/%g" -e "s%MY_CONFIG_FILE_H%#include \"libthreadar/libthreadar_config.h\"%g" "$$file" > $(DESTDIR)$(pkgincludedir)/"$$file" ; done
for file in $(DESTDIR)$(pkgincludedir)/* ; do sed -e 's%HAVE_%LIBTHREADAR_HAS_%g' -e 's%VERSION%LIBTHREADAR_VERSION%g' -e 's%_AVAILABLE%_AVAILABLE_FOR_LIBTHREDAR%g' -e 's%STDC_HEADERS%LIBTHREADAR_STDC_HEADERS%g' -e 's%ENABLE_NLS%LIBTHREADAR_ENABLE_NLS%g' -e 's%PACKAGE_%LIBTHREADAR_PACKAGE_%g' "$$file" > "$$file.tmp" && mv "$$file.tmp" "$$file" ; done
for file in $(DESTDIR)$(pkgincludedir)/* ; do sed -e 's%HAVE_%LIBTHREADAR_HAS_%g' -e 's%VERSION%LIBTHREADAR_VERSION%g' -e 's%_AVAILABLE%_AVAILABLE_FOR_LIBTHREDAR%g' -e 's%ENABLE_NLS%LIBTHREADAR_ENABLE_NLS%g' -e 's%PACKAGE_%LIBTHREADAR_PACKAGE_%g' "$$file" > "$$file.tmp" && mv "$$file.tmp" "$$file" ; done
egrep 'LIBTHREADAR' $(DESTDIR)$(pkgincludedir)/libthreadar_config.h | grep -v "#undef" > $(DESTDIR)$(pkgincludedir)/config.h.tmp
mv $(DESTDIR)$(pkgincludedir)/config.h.tmp $(DESTDIR)$(pkgincludedir)/libthreadar_config.h
14 changes: 14 additions & 0 deletions cross/libthreadar/patches/002-disable-build-of-doc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# avoid build of examples in doc directory
# - examples are statically linked but we don't want to build the static library
#
--- Makefile.in.orig 2024-08-21 20:55:45.000000000 +0000
+++ Makefile.in 2025-01-31 21:17:57.328622772 +0000
@@ -338,7 +338,7 @@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = src doc
+SUBDIRS = src
dist_noinst_DATA = INSTALL README THANKS AUTHORS COPYING COPYING.LESSER
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
2 changes: 1 addition & 1 deletion diyspk/dar/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SPK_NAME = dar
SPK_VERS = 2.7.14
SPK_VERS = 2.7.16
SPK_REV = 1
SPK_ICON = src/dar.png

Expand Down
2 changes: 1 addition & 1 deletion spk/synocli-disk/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ endif

DESCRIPTION = "SynoCli Disk Tools provides a number of small command-line utilities: e2fsprogs, fuse, ntfs-3g/ntfsprogs, testdisk, ncdu, davfs2, lsscsi, ddrescure, s3backer$(OPTIONAL_DESC)."
STARTABLE = no
CHANGELOG = "1. Add smartmontools 7.4. <br/>2. Remove dua for ARMv5 (88f628x cpu)."
CHANGELOG = "1. Add smartmontools 7.4. <br/>2. Remove dua for ARMv5 (88f628x cpu). <br/>3. Update dar to v2.7.16."

HOMEPAGE = https://github.com/SynoCommunity/spksrc/wiki/FAQ-SynoCliDisk
LICENSE = Each tool is licensed under it\'s respective license.
Expand Down

0 comments on commit 3a4689a

Please sign in to comment.