* [Buildroot] [PATCH 2/4] package/libdeflate: new package
2022-07-27 18:13 [Buildroot] [PATCH 1/4] package/libutp: bump version Bernd Kuhls
@ 2022-07-27 18:13 ` Bernd Kuhls
2022-08-01 20:09 ` Thomas Petazzoni via buildroot
2022-07-27 18:13 ` [Buildroot] [PATCH 3/4] package/dht: " Bernd Kuhls
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Bernd Kuhls @ 2022-07-27 18:13 UTC (permalink / raw)
To: buildroot; +Cc: Samuel Martin, Thomas Petazzoni
Needed for upcoming version bump of transmission:
https://github.com/transmission/transmission/commit/d8d765c59551b97ffb10bedb6f66133a54954a0e
Build test using this defconfig
BR2_PACKAGE_LIBDEFLATE=y
was successful:
andes-nds32 [ 1/45]: OK
arm-aarch64 [ 2/45]: OK
bootlin-aarch64-glibc [ 3/45]: OK
bootlin-arcle-hs38-uclibc [ 4/45]: OK
bootlin-armv5-uclibc [ 5/45]: OK
bootlin-armv7-glibc [ 6/45]: OK
bootlin-armv7m-uclibc [ 7/45]: OK
bootlin-armv7-musl [ 8/45]: OK
bootlin-m68k-5208-uclibc [ 9/45]: OK
bootlin-m68k-68040-uclibc [10/45]: OK
bootlin-microblazeel-uclibc [11/45]: OK
bootlin-mipsel32r6-glibc [12/45]: OK
bootlin-mipsel-uclibc [13/45]: OK
bootlin-nios2-glibc [14/45]: OK
bootlin-openrisc-uclibc [15/45]: OK
bootlin-powerpc64le-power8-glibc [16/45]: OK
bootlin-powerpc-e500mc-uclibc [17/45]: OK
bootlin-riscv32-glibc [18/45]: OK
bootlin-riscv64-glibc [19/45]: OK
bootlin-riscv64-musl [20/45]: OK
bootlin-sh4-uclibc [21/45]: OK
bootlin-sparc64-glibc [22/45]: OK
bootlin-sparc-uclibc [23/45]: OK
bootlin-x86-64-glibc [24/45]: OK
bootlin-x86-64-musl [25/45]: OK
bootlin-x86-64-uclibc [26/45]: OK
bootlin-xtensa-uclibc [27/45]: OK
br-arm-basic [28/45]: OK
br-arm-full-nothread [29/45]: OK
br-arm-full-static [30/45]: OK
br-i386-pentium4-full [31/45]: OK
br-i386-pentium-mmx-musl [32/45]: OK
br-mips64-n64-full [33/45]: OK
br-mips64r6-el-hf-glibc [34/45]: OK
br-powerpc-603e-basic-cpp [35/45]: OK
br-powerpc64-power7-glibc [36/45]: OK
linaro-aarch64-be [37/45]: OK
linaro-aarch64 [38/45]: OK
linaro-arm [39/45]: OK
sourcery-arm-armv4t [40/45]: OK
sourcery-arm [41/45]: OK
sourcery-arm-thumb2 [42/45]: OK
sourcery-mips64 [43/45]: OK
sourcery-mips [44/45]: OK
sourcery-nios2 [45/45]: OK
45 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/libdeflate/Config.in | 7 ++++++
package/libdeflate/libdeflate.hash | 3 +++
package/libdeflate/libdeflate.mk | 34 ++++++++++++++++++++++++++++++
5 files changed, 46 insertions(+)
create mode 100644 package/libdeflate/Config.in
create mode 100644 package/libdeflate/libdeflate.hash
create mode 100644 package/libdeflate/libdeflate.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index 29a06523e5..ecc619a755 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -360,6 +360,7 @@ F: package/libcec/
F: package/libcodec2/
F: package/libcrossguid/
F: package/libdcadec/
+F: package/libdeflate/
F: package/libdrm/
F: package/libdvbcsa/
F: package/libdvdcss/
diff --git a/package/Config.in b/package/Config.in
index 268cf40c93..eb18673361 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1402,6 +1402,7 @@ endmenu
menu "Compression and decompression"
source "package/libarchive/Config.in"
+ source "package/libdeflate/Config.in"
source "package/libmspack/Config.in"
source "package/libsquish/Config.in"
source "package/libzip/Config.in"
diff --git a/package/libdeflate/Config.in b/package/libdeflate/Config.in
new file mode 100644
index 0000000000..d2fb0d6c55
--- /dev/null
+++ b/package/libdeflate/Config.in
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_LIBDEFLATE
+ bool "libdeflate"
+ help
+ Libdeflate is a heavily optimized library for DEFLATE/zlib/
+ gzip compression and decompression
+
+ https://github.com/ebiggers/libdeflate
diff --git a/package/libdeflate/libdeflate.hash b/package/libdeflate/libdeflate.hash
new file mode 100644
index 0000000000..7dae12921f
--- /dev/null
+++ b/package/libdeflate/libdeflate.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 ba89fb167a5ab6bbdfa6ee3b1a71636e8140fa8471cce8a311697584948e4d06 libdeflate-1.12.tar.gz
+sha256 5d246dd2537307b80fed9ba5fdddf5d0fe7a8f023393a071182b9daed56b40fe COPYING
diff --git a/package/libdeflate/libdeflate.mk b/package/libdeflate/libdeflate.mk
new file mode 100644
index 0000000000..93ec5909a5
--- /dev/null
+++ b/package/libdeflate/libdeflate.mk
@@ -0,0 +1,34 @@
+################################################################################
+#
+# libdeflate
+#
+################################################################################
+
+LIBDEFLATE_VERSION = 1.12
+LIBDEFLATE_SITE = $(call github,ebiggers,libdeflate,v$(LIBDEFLATE_VERSION))
+LIBDEFLATE_LICENSE = MIT
+LIBDEFLATE_LICENSE_FILES = COPYING
+LIBDEFLATE_INSTALL_STAGING = YES
+
+ifeq ($(BR2_STATIC_LIBS),y)
+LIBDEFLATE_MAKE_OPTS += DISABLE_SHARED=yes
+endif
+
+define LIBDEFLATE_BUILD_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+ $(LIBDEFLATE_MAKE_OPTS)
+endef
+
+define LIBDEFLATE_INSTALL_STAGING_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+ $(LIBDEFLATE_MAKE_OPTS) \
+ DESTDIR="$(STAGING_DIR)" PREFIX=/usr install
+endef
+
+define LIBDEFLATE_INSTALL_TARGET_CMDS
+ $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \
+ $(LIBDEFLATE_MAKE_OPTS) \
+ DESTDIR="$(TARGET_DIR)" PREFIX=/usr install
+endef
+
+$(eval $(generic-package))
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Buildroot] [PATCH 2/4] package/libdeflate: new package
2022-07-27 18:13 ` [Buildroot] [PATCH 2/4] package/libdeflate: new package Bernd Kuhls
@ 2022-08-01 20:09 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-08-01 20:09 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Samuel Martin, buildroot
On Wed, 27 Jul 2022 20:13:02 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> Needed for upcoming version bump of transmission:
> https://github.com/transmission/transmission/commit/d8d765c59551b97ffb10bedb6f66133a54954a0e
>
> Build test using this defconfig
>
> BR2_PACKAGE_LIBDEFLATE=y
>
> was successful:
>
> andes-nds32 [ 1/45]: OK
> arm-aarch64 [ 2/45]: OK
> bootlin-aarch64-glibc [ 3/45]: OK
> bootlin-arcle-hs38-uclibc [ 4/45]: OK
> bootlin-armv5-uclibc [ 5/45]: OK
> bootlin-armv7-glibc [ 6/45]: OK
> bootlin-armv7m-uclibc [ 7/45]: OK
> bootlin-armv7-musl [ 8/45]: OK
> bootlin-m68k-5208-uclibc [ 9/45]: OK
> bootlin-m68k-68040-uclibc [10/45]: OK
> bootlin-microblazeel-uclibc [11/45]: OK
> bootlin-mipsel32r6-glibc [12/45]: OK
> bootlin-mipsel-uclibc [13/45]: OK
> bootlin-nios2-glibc [14/45]: OK
> bootlin-openrisc-uclibc [15/45]: OK
> bootlin-powerpc64le-power8-glibc [16/45]: OK
> bootlin-powerpc-e500mc-uclibc [17/45]: OK
> bootlin-riscv32-glibc [18/45]: OK
> bootlin-riscv64-glibc [19/45]: OK
> bootlin-riscv64-musl [20/45]: OK
> bootlin-sh4-uclibc [21/45]: OK
> bootlin-sparc64-glibc [22/45]: OK
> bootlin-sparc-uclibc [23/45]: OK
> bootlin-x86-64-glibc [24/45]: OK
> bootlin-x86-64-musl [25/45]: OK
> bootlin-x86-64-uclibc [26/45]: OK
> bootlin-xtensa-uclibc [27/45]: OK
> br-arm-basic [28/45]: OK
> br-arm-full-nothread [29/45]: OK
> br-arm-full-static [30/45]: OK
> br-i386-pentium4-full [31/45]: OK
> br-i386-pentium-mmx-musl [32/45]: OK
> br-mips64-n64-full [33/45]: OK
> br-mips64r6-el-hf-glibc [34/45]: OK
> br-powerpc-603e-basic-cpp [35/45]: OK
> br-powerpc64-power7-glibc [36/45]: OK
> linaro-aarch64-be [37/45]: OK
> linaro-aarch64 [38/45]: OK
> linaro-arm [39/45]: OK
> sourcery-arm-armv4t [40/45]: OK
> sourcery-arm [41/45]: OK
> sourcery-arm-thumb2 [42/45]: OK
> sourcery-mips64 [43/45]: OK
> sourcery-mips [44/45]: OK
> sourcery-nios2 [45/45]: OK
> 45 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> DEVELOPERS | 1 +
> package/Config.in | 1 +
> package/libdeflate/Config.in | 7 ++++++
> package/libdeflate/libdeflate.hash | 3 +++
> package/libdeflate/libdeflate.mk | 34 ++++++++++++++++++++++++++++++
> 5 files changed, 46 insertions(+)
> create mode 100644 package/libdeflate/Config.in
> create mode 100644 package/libdeflate/libdeflate.hash
> create mode 100644 package/libdeflate/libdeflate.mk
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 3/4] package/dht: new package
2022-07-27 18:13 [Buildroot] [PATCH 1/4] package/libutp: bump version Bernd Kuhls
2022-07-27 18:13 ` [Buildroot] [PATCH 2/4] package/libdeflate: new package Bernd Kuhls
@ 2022-07-27 18:13 ` Bernd Kuhls
2022-08-01 20:10 ` Thomas Petazzoni via buildroot
2022-07-27 18:13 ` [Buildroot] [PATCH/RFC 4/4] package/transmission: bump version Bernd Kuhls
2022-08-01 20:09 ` [Buildroot] [PATCH 1/4] package/libutp: " Thomas Petazzoni via buildroot
3 siblings, 1 reply; 7+ messages in thread
From: Bernd Kuhls @ 2022-07-27 18:13 UTC (permalink / raw)
To: buildroot; +Cc: Samuel Martin, Thomas Petazzoni
Needed for upcoming version bump of transmission.
Build test using this defconfig
BR2_PACKAGE_DHT=y
was successful:
andes-nds32 [ 1/45]: OK
arm-aarch64 [ 2/45]: OK
bootlin-aarch64-glibc [ 3/45]: OK
bootlin-arcle-hs38-uclibc [ 4/45]: OK
bootlin-armv5-uclibc [ 5/45]: OK
bootlin-armv7-glibc [ 6/45]: OK
bootlin-armv7m-uclibc [ 7/45]: OK
bootlin-armv7-musl [ 8/45]: OK
bootlin-m68k-5208-uclibc [ 9/45]: OK
bootlin-m68k-68040-uclibc [10/45]: OK
bootlin-microblazeel-uclibc [11/45]: OK
bootlin-mipsel32r6-glibc [12/45]: OK
bootlin-mipsel-uclibc [13/45]: OK
bootlin-nios2-glibc [14/45]: OK
bootlin-openrisc-uclibc [15/45]: OK
bootlin-powerpc64le-power8-glibc [16/45]: OK
bootlin-powerpc-e500mc-uclibc [17/45]: OK
bootlin-riscv32-glibc [18/45]: OK
bootlin-riscv64-glibc [19/45]: OK
bootlin-riscv64-musl [20/45]: OK
bootlin-sh4-uclibc [21/45]: OK
bootlin-sparc64-glibc [22/45]: OK
bootlin-sparc-uclibc [23/45]: OK
bootlin-x86-64-glibc [24/45]: OK
bootlin-x86-64-musl [25/45]: OK
bootlin-x86-64-uclibc [26/45]: OK
bootlin-xtensa-uclibc [27/45]: OK
br-arm-basic [28/45]: OK
br-arm-full-nothread [29/45]: OK
br-arm-full-static [30/45]: OK
br-i386-pentium4-full [31/45]: OK
br-i386-pentium-mmx-musl [32/45]: OK
br-mips64-n64-full [33/45]: OK
br-mips64r6-el-hf-glibc [34/45]: OK
br-powerpc-603e-basic-cpp [35/45]: OK
br-powerpc64-power7-glibc [36/45]: OK
linaro-aarch64-be [37/45]: OK
linaro-aarch64 [38/45]: OK
linaro-arm [39/45]: OK
sourcery-arm-armv4t [40/45]: OK
sourcery-arm [41/45]: OK
sourcery-arm-thumb2 [42/45]: OK
sourcery-mips64 [43/45]: OK
sourcery-mips [44/45]: OK
sourcery-nios2 [45/45]: OK
45 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
DEVELOPERS | 1 +
package/Config.in | 1 +
package/dht/0001-cmake.patch | 67 ++++++++++++++++++++++++++++++++++++
package/dht/Config.in | 6 ++++
package/dht/dht.hash | 3 ++
package/dht/dht.mk | 13 +++++++
6 files changed, 91 insertions(+)
create mode 100644 package/dht/0001-cmake.patch
create mode 100644 package/dht/Config.in
create mode 100644 package/dht/dht.hash
create mode 100644 package/dht/dht.mk
diff --git a/DEVELOPERS b/DEVELOPERS
index ecc619a755..4d871f6e8d 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -320,6 +320,7 @@ F: package/bluez-tools/
F: package/boinc/
F: package/clamav/
F: package/dav1d/
+F: package/dht/
F: package/dovecot/
F: package/dovecot-pigeonhole/
F: package/dtv-scan-tables/
diff --git a/package/Config.in b/package/Config.in
index eb18673361..276742ce9c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1815,6 +1815,7 @@ menu "Networking"
source "package/daq/Config.in"
source "package/daq3/Config.in"
source "package/davici/Config.in"
+ source "package/dht/Config.in"
source "package/enet/Config.in"
source "package/filemq/Config.in"
source "package/flickcurl/Config.in"
diff --git a/package/dht/0001-cmake.patch b/package/dht/0001-cmake.patch
new file mode 100644
index 0000000000..bbac639044
--- /dev/null
+++ b/package/dht/0001-cmake.patch
@@ -0,0 +1,67 @@
+From 25e12bb39eea3d433602de6390796fec8a8f3620 Mon Sep 17 00:00:00 2001
+From: Mike Gelfand <mikedld@mikedld.com>
+Date: Sun, 1 Jan 2017 16:23:21 +0300
+Subject: [PATCH] Remove Makefile, add Makefile.am and CMakeLists.txt
+
+Downloaded from transmission repo:
+https://github.com/transmission/dht/commit/25e12bb39eea3d433602de6390796fec8a8f3620
+
+Upstream status: rejected (https://github.com/jech/dht/pull/19)
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ CMakeLists.txt | 9 +++++++++
+ Makefile | 9 ---------
+ Makefile.am | 11 +++++++++++
+ 3 files changed, 20 insertions(+), 9 deletions(-)
+ create mode 100644 CMakeLists.txt
+ delete mode 100644 Makefile
+ create mode 100644 Makefile.am
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..6d4aa99
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,9 @@
++cmake_minimum_required(VERSION 2.8)
++project(dht C)
++
++add_library(${PROJECT_NAME} STATIC
++ dht.c
++)
++
++install(TARGETS ${PROJECT_NAME} DESTINATION lib)
++install(FILES dht.h DESTINATION include/dht)
+diff --git a/Makefile b/Makefile
+deleted file mode 100644
+index e012945..0000000
+--- a/Makefile
++++ /dev/null
+@@ -1,9 +0,0 @@
+-CFLAGS = -g -Wall
+-LDLIBS = -lcrypt
+-
+-dht-example: dht-example.o dht.o
+-
+-all: dht-example
+-
+-clean:
+- -rm -f dht-example dht-example.o dht-example.id dht.o *~ core
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..2dba648
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,11 @@
++AM_CFLAGS = @PTHREAD_CFLAGS@
++
++noinst_LIBRARIES = libdht.a
++libdht_a_SOURCES = dht.c
++libdht_a_DEPENDENCIES = $(builddir)/include/dht
++noinst_HEADERS = dht.h
++EXTRA_DIST = CHANGES CMakeLists.txt dht-example.c LICENCE README
++
++$(builddir)/include/dht:
++ $(MKDIR_P) $(builddir)/include
++ (cd $(builddir)/include && $(LN_S) $(abs_srcdir) dht)
diff --git a/package/dht/Config.in b/package/dht/Config.in
new file mode 100644
index 0000000000..7660295c8d
--- /dev/null
+++ b/package/dht/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_DHT
+ bool "dht"
+ help
+ BitTorrent DHT library
+
+ https://www.irif.fr/~jch/software/bittorrent
diff --git a/package/dht/dht.hash b/package/dht/dht.hash
new file mode 100644
index 0000000000..2b641b9dcb
--- /dev/null
+++ b/package/dht/dht.hash
@@ -0,0 +1,3 @@
+# Locally computed
+sha256 caba469a784a5c359c084099fdc025cfe09b1faec2ba9ba257b7384351c43c0a dht-0.27.tar.gz
+sha256 06ce07293caf8c8ddfaf47797ad1fb18d1c040a8375231d8f8a6105cef51a8e6 LICENCE
diff --git a/package/dht/dht.mk b/package/dht/dht.mk
new file mode 100644
index 0000000000..4f78f027c7
--- /dev/null
+++ b/package/dht/dht.mk
@@ -0,0 +1,13 @@
+################################################################################
+#
+# dht
+#
+################################################################################
+
+DHT_VERSION = 0.27
+DHT_SITE = $(call github,jech,dht,dht-$(DHT_VERSION))
+DHT_LICENSE = MIT
+DHT_LICENSE_FILES = LICENCE
+DHT_INSTALL_STAGING = YES
+
+$(eval $(cmake-package))
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Buildroot] [PATCH 3/4] package/dht: new package
2022-07-27 18:13 ` [Buildroot] [PATCH 3/4] package/dht: " Bernd Kuhls
@ 2022-08-01 20:10 ` Thomas Petazzoni via buildroot
0 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-08-01 20:10 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Samuel Martin, buildroot
On Wed, 27 Jul 2022 20:13:03 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> Needed for upcoming version bump of transmission.
>
> Build test using this defconfig
>
> BR2_PACKAGE_DHT=y
I was not really happy with the patch adding CMakeLists.txt that
upstream rejected. But the upstream Makefile does not even allow
building dht as a library, nor installing its header file. So the other
option would have been to do it directly in the Buildroot .mk file,
which is not really better than adding a CMakeLists.txt. So I've
applied as-is, even if it's not ideal.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH/RFC 4/4] package/transmission: bump version
2022-07-27 18:13 [Buildroot] [PATCH 1/4] package/libutp: bump version Bernd Kuhls
2022-07-27 18:13 ` [Buildroot] [PATCH 2/4] package/libdeflate: new package Bernd Kuhls
2022-07-27 18:13 ` [Buildroot] [PATCH 3/4] package/dht: " Bernd Kuhls
@ 2022-07-27 18:13 ` Bernd Kuhls
2022-08-01 20:09 ` [Buildroot] [PATCH 1/4] package/libutp: " Thomas Petazzoni via buildroot
3 siblings, 0 replies; 7+ messages in thread
From: Bernd Kuhls @ 2022-07-27 18:13 UTC (permalink / raw)
To: buildroot; +Cc: Samuel Martin, Thomas Petazzoni
Switch buildsystem to cmake, rework dependencies.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
This RFC was requested by Thomas:
https://lists.buildroot.org/pipermail/buildroot/2022-July/647727.html
This patch is not ready for production, I would like to wait until
upstream releases its code as a new version.
package/transmission/0001-fix-utypes.patch | 30 ---------
.../transmission/0002-fix-utp-include.patch | 46 --------------
...ac-fix-autoreconf-with-autoconf-2.70.patch | 42 -------------
package/transmission/Config.in | 29 ++++-----
package/transmission/transmission.hash | 4 +-
package/transmission/transmission.mk | 63 +++++++++----------
6 files changed, 47 insertions(+), 167 deletions(-)
delete mode 100644 package/transmission/0001-fix-utypes.patch
delete mode 100644 package/transmission/0002-fix-utp-include.patch
delete mode 100644 package/transmission/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch
diff --git a/package/transmission/0001-fix-utypes.patch b/package/transmission/0001-fix-utypes.patch
deleted file mode 100644
index 81efa884a7..0000000000
--- a/package/transmission/0001-fix-utypes.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix build error "conflicting types for 'UTP_Write'"
-
-Fetch from: http://www.adminsehow.com/2012/10/how-to-install-transmission-2-71-on-debian-6-0-squeeze/
-
-The corresponding upstream bug report (unfixed) can be found here:
-https://trac.transmissionbt.com/ticket/5232
-
-Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
-[Fabrice: adapt to 3.00, which always uses stdbool.h]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[yann.morin.1998@free.fr:
- - don't comment-out dropped code, just drop it
- - use CR-LF in replacement code, as used by upstream
-]
-Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
-
---- transmission-2.82.org/third-party/libutp/utypes.h 2013-08-09 04:47:43.000000000 +0200
-+++ transmission-2.82/third-party/libutp/utypes.h 2014-01-02 20:17:18.000000000 +0100
-@@ -35,8 +35,8 @@
- typedef const char * cstr;
- typedef char * str;
-
--#ifndef __cplusplus
--typedef uint8 bool;
--#endif
-+#ifndef __cplusplus
-+#include <stdbool.h>
-+#endif
-
- #endif //__UTYPES_H__
diff --git a/package/transmission/0002-fix-utp-include.patch b/package/transmission/0002-fix-utp-include.patch
deleted file mode 100644
index db8b5ab39b..0000000000
--- a/package/transmission/0002-fix-utp-include.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Fix compilation when using system libminiupnpc with libutp disabled
-
-If transmission uses its own copy of libminiupnpc in third-party/ then
-the configure script adds that path to CFLAGS:
-https://trac.transmissionbt.com/browser/trunk/configure.ac#L455
-
-This path is also added if transmission uses its own copy of libutp:
-https://trac.transmissionbt.com/browser/trunk/configure.ac#L349
-
-But if a system-provided libminiupnpc is used and utp-support is
-disabled using --disable-utp the result is a build error, detected by
-buildroot autobuilders:
-http://autobuild.buildroot.net/results/b79/b79e51140cb0320554a58ce59dcb33f53cd9211a/build-end.log
-
-net.c:40:24: fatal error: libutp/utp.h: No such file or directory
-
-Patch proposed by Yann E. MORIN:
-http://lists.busybox.net/pipermail/buildroot/2016-July/167896.html
-
-Patch sent upstream: https://trac.transmissionbt.com/ticket/6163
-
-Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
-
-diff -uNr transmission-2.92.org/configure.ac transmission-2.92/configure.ac
---- transmission-2.92.org/configure.ac 2016-03-06 21:23:45.336198393 +0100
-+++ transmission-2.92/configure.ac 2016-07-31 12:13:40.921660078 +0200
-@@ -358,6 +358,10 @@
- else
- AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found")
- fi
-+else
-+ # For the system libminiupnpc with UTC disabled,
-+ # point to our bundled UTP headers
-+ LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/"
- fi
- AC_SUBST(LIBUTP_CFLAGS)
- AC_SUBST(LIBUTP_LIBS)
-@@ -457,7 +461,7 @@
- LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a"
- else
- AC_DEFINE([SYSTEM_MINIUPNP])
-- LIBUPNP_CFLAGS=""
-+ LIBUPNP_CFLAGS="${LIBUTP_CFLAGS}"
- LIBUPNP_LIBS="-lminiupnpc"
- LIBUPNP_LIBS_QT="-lminiupnpc"
- fi
diff --git a/package/transmission/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch b/package/transmission/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch
deleted file mode 100644
index bfb0084bc4..0000000000
--- a/package/transmission/0003-configure.ac-fix-autoreconf-with-autoconf-2.70.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 857ac91a03a096601f62b358fc61355d4cc25b9b Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Sat, 9 Oct 2021 18:51:13 +0200
-Subject: [PATCH] configure.ac: fix autoreconf with autoconf >= 2.70
-
-Remove the whitespace before IT_PROG_INTLTOOL as suggested in
-https://www.mail-archive.com/bug-autoconf@gnu.org/msg04851.html
-to avoid the following build failure with autoconf >= 2.70:
-
-ERROR: 'IT_PROG_INTLTOOL' must appear in configure.ac for intltool to work.
-
-The problem has been introduced by upstream autoconf commit
-http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commit;h=b3b3af821a0b9e82ebe56b77b1731d2fe58f52de
-
-Fixes:
- - http://autobuild.buildroot.org/results/e8bea26f6b12adf16335b24836a7c5c31911af6a
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-[Upstream status: not upstreamable as upstream swicthed to cmake (
-https://github.com/transmission/transmission/issues/1573)]
----
- configure.ac | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index fd1132fda..04e0e19bb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -555,9 +555,7 @@ dnl it should be safe to re-edit 0.40 back down to 0.23
- use_nls=no
- if test "x$enable_nls" = "xyes" ; then
- use_nls=yes
-- m4_ifdef([IT_PROG_INTLTOOL],
-- [IT_PROG_INTLTOOL([0.35.0],[no-xml])],
-- [AC_MSG_ERROR("--enable-nls requires intltool to be installed.")])
-+IT_PROG_INTLTOOL([0.35.0],[no-xml])
- AC_CHECK_HEADERS([libintl.h])
- GETTEXT_PACKAGE=transmission-gtk
- AC_SUBST(GETTEXT_PACKAGE)
---
-2.33.0
-
diff --git a/package/transmission/Config.in b/package/transmission/Config.in
index 980b042e33..42c2cc6740 100644
--- a/package/transmission/Config.in
+++ b/package/transmission/Config.in
@@ -1,12 +1,21 @@
config BR2_PACKAGE_TRANSMISSION
bool "transmission"
+ depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17
depends on BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_USE_MMU # fork()
- select BR2_PACKAGE_ZLIB
- select BR2_PACKAGE_OPENSSL
- select BR2_PACKAGE_LIBOPENSSL_ENABLE_RC4 if BR2_PACKAGE_LIBOPENSSL
+ depends on BR2_USE_WCHAR # libpsl
+ select BR2_PACKAGE_DHT
+ select BR2_PACKAGE_LIBB64
select BR2_PACKAGE_LIBCURL
+ select BR2_PACKAGE_LIBDEFLATE
select BR2_PACKAGE_LIBEVENT
+ select BR2_PACKAGE_LIBMINIUPNPC
+ select BR2_PACKAGE_LIBNATPMP
+ select BR2_PACKAGE_LIBPSL
+ select BR2_PACKAGE_LIBUTP
+ select BR2_PACKAGE_OPENSSL
+ select BR2_PACKAGE_ZLIB
help
Transmission is a cross-platform BitTorrent client.
@@ -14,15 +23,6 @@ config BR2_PACKAGE_TRANSMISSION
if BR2_PACKAGE_TRANSMISSION
-config BR2_PACKAGE_TRANSMISSION_UTP
- bool "Transmission uTP support"
- depends on BR2_INSTALL_LIBSTDCPP
- help
- Install support for uTorrent Transport Protocol
-
-comment "uTP needs a toolchain w/ C++"
- depends on !BR2_INSTALL_LIBSTDCPP
-
config BR2_PACKAGE_TRANSMISSION_CLI
bool "transmission-cli"
help
@@ -43,6 +43,7 @@ comment "transmission-gtk needs NLS enabled"
depends on BR2_PACKAGE_LIBGTK3 && !BR2_SYSTEM_ENABLE_NLS
endif
-comment "transmission needs a toolchain w/ threads"
+comment "transmission needs a toolchain w/ threads, C++, gcc >= 7"
depends on BR2_USE_MMU
- depends on !BR2_TOOLCHAIN_HAS_THREADS
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \
+ !BR2_TOOLCHAIN_GCC_AT_LEAST_7
diff --git a/package/transmission/transmission.hash b/package/transmission/transmission.hash
index 13cbc969d3..c1b2529a95 100644
--- a/package/transmission/transmission.hash
+++ b/package/transmission/transmission.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 9144652fe742f7f7dd6657716e378da60b751aaeda8bef8344b3eefc4db255f2 transmission-3.00.tar.xz
-sha256 2b16da5bd02790d1e4d332cfd42b9dfd7d1b0ed3a16a75dc7e76b6ed239fdba9 COPYING
+sha256 1dbf536ad9ac0f92fdddd7e545196070b699abe3ef062e700ccb93e9c1946fe5 transmission-b7bc21cdb687dd90ad9c3ff540c228dfdd0b0a71-br1.tar.gz
+sha256 4d0c4f4b9ad917da909b9143a86232c385ca8dc7f221a599c3c67419854ea30b COPYING
diff --git a/package/transmission/transmission.mk b/package/transmission/transmission.mk
index 1660d2c2b9..16e807beb8 100644
--- a/package/transmission/transmission.mk
+++ b/package/transmission/transmission.mk
@@ -4,55 +4,52 @@
#
################################################################################
-TRANSMISSION_VERSION = 3.00
-TRANSMISSION_SITE = https://github.com/transmission/transmission-releases/raw/master
-TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz
+TRANSMISSION_VERSION = b7bc21cdb687dd90ad9c3ff540c228dfdd0b0a71
+TRANSMISSION_SITE = https://github.com/transmission/transmission
+TRANSMISSION_SITE_METHOD = git
+TRANSMISSION_GIT_SUBMODULES = YES
+
TRANSMISSION_DEPENDENCIES = \
host-pkgconf \
- host-intltool \
+ dht \
+ libb64 \
libcurl \
+ libdeflate \
libevent \
+ libminiupnpc \
+ libnatpmp \
+ libpsl \
+ libutp \
openssl \
zlib
-TRANSMISSION_AUTORECONF = YES
TRANSMISSION_CONF_OPTS = \
- --without-inotify \
- --enable-lightweight
+ -DENABLE_LIGHTWEIGHT=ON \
+ -DENABLE_TESTS=OFF \
+ -DRUN_CLANG_TIDY=OFF \
+ -DUSE_SYSTEM_B64=ON \
+ -DUSE_SYSTEM_DEFLATE=ON \
+ -DUSE_SYSTEM_DHT=ON \
+ -DUSE_SYSTEM_NATPMP=ON \
+ -DUSE_SYSTEM_PSL=ON \
+ -DWITH_INOTIFY=OFF
TRANSMISSION_LICENSE = GPL-2.0 or GPL-3.0 with OpenSSL exception
TRANSMISSION_LICENSE_FILES = COPYING
TRANSMISSION_CPE_ID_VENDOR = transmissionbt
-ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y)
-TRANSMISSION_DEPENDENCIES += libminiupnpc
-endif
-
-ifeq ($(BR2_PACKAGE_LIBNATPMP),y)
-TRANSMISSION_DEPENDENCIES += libnatpmp
-TRANSMISSION_CONF_OPTS += --enable-external-natpmp
-else
-TRANSMISSION_CONF_OPTS += --disable-external-natpmp
-endif
-
-ifeq ($(BR2_PACKAGE_TRANSMISSION_UTP),y)
-TRANSMISSION_CONF_OPTS += --enable-utp
-else
-TRANSMISSION_CONF_OPTS += --disable-utp
-endif
-
ifeq ($(BR2_PACKAGE_TRANSMISSION_CLI),y)
-TRANSMISSION_CONF_OPTS += --enable-cli
+TRANSMISSION_CONF_OPTS += -DENABLE_CLI=ON
else
-TRANSMISSION_CONF_OPTS += --disable-cli
+TRANSMISSION_CONF_OPTS += -DENABLE_CLI=OFF
endif
ifeq ($(BR2_PACKAGE_TRANSMISSION_DAEMON),y)
-TRANSMISSION_CONF_OPTS += --enable-daemon
+TRANSMISSION_CONF_OPTS += -DENABLE_DAEMON=ON
ifeq ($(BR2_PACKAGE_SYSTEMD),y)
TRANSMISSION_DEPENDENCIES += systemd
-TRANSMISSION_CONF_OPTS += --with-systemd
+TRANSMISSION_CONF_OPTS += -DWITH_SYSTEMD=ON
else
-TRANSMISSION_CONF_OPTS += --without-systemd
+TRANSMISSION_CONF_OPTS += -DWITH_SYSTEMD=OFF
endif
define TRANSMISSION_USERS
@@ -70,14 +67,14 @@ define TRANSMISSION_INSTALL_INIT_SYSTEMD
endef
else
-TRANSMISSION_CONF_OPTS += --disable-daemon
+TRANSMISSION_CONF_OPTS += -DENABLE_DAEMON=OFF
endif
ifeq ($(BR2_PACKAGE_TRANSMISSION_GTK),y)
-TRANSMISSION_CONF_OPTS += --with-gtk
+TRANSMISSION_CONF_OPTS += -DENABLE_GTK=ON
TRANSMISSION_DEPENDENCIES += libgtk3
else
-TRANSMISSION_CONF_OPTS += --without-gtk
+TRANSMISSION_CONF_OPTS += -DENABLE_GTK=OFF
endif
-$(eval $(autotools-package))
+$(eval $(cmake-package))
--
2.30.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [Buildroot] [PATCH 1/4] package/libutp: bump version
2022-07-27 18:13 [Buildroot] [PATCH 1/4] package/libutp: bump version Bernd Kuhls
` (2 preceding siblings ...)
2022-07-27 18:13 ` [Buildroot] [PATCH/RFC 4/4] package/transmission: bump version Bernd Kuhls
@ 2022-08-01 20:09 ` Thomas Petazzoni via buildroot
3 siblings, 0 replies; 7+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-08-01 20:09 UTC (permalink / raw)
To: Bernd Kuhls; +Cc: Samuel Martin, buildroot
On Wed, 27 Jul 2022 20:13:01 +0200
Bernd Kuhls <bernd.kuhls@t-online.de> wrote:
> Follow transmission switching from branch post-3.3-transmission to
> branch post-3.4-transmission:
> https://github.com/transmission/transmission/commit/745adf8332b9686afa55407f9be20de21002a187
>
> This branch contains a copyright year bump for the license file:
> https://github.com/transmission/libutp/commit/365254427e5358a0c390aa5a60df5f449b9c0f00
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/libutp/libutp.hash | 4 ++--
> package/libutp/libutp.mk | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 7+ messages in thread