Skip to contentSkip to conversation

package/tinyalsa: bump to version 2.0.0

PATCH Applied Fabrice Fontaine 2 participants 2 messages Jan 1, 2022 – Jan 4, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/tinyalsa: bump to version 2.0.0

- Switch to meson-package to drop first patch and disable examples and utils
- Drop second patch (already in version)
- Update hash of NOTICE (empty new lines added with
https://github.com/tinyalsa/tinyalsa/commit/902b8c8f9fa5a2e1937007d7d5ee90f01790808b)

https://github.com/tinyalsa/tinyalsa/releases/tag/v2.0.0

---
 .../tinyalsa/0001-disable-doxygen-usage.patch | 35 ------------------
 .../0002-interval.h-add-missing-header.patch  | 36 -------------------
 package/tinyalsa/tinyalsa.hash                |  4 +--
 package/tinyalsa/tinyalsa.mk                  | 27 +++-----------
 4 files changed, 6 insertions(+), 96 deletions(-)
 delete mode 100644 package/tinyalsa/0001-disable-doxygen-usage.patch
 delete mode 100644 package/tinyalsa/0002-interval.h-add-missing-header.patch
package/tinyalsa/0001-disable-doxygen-usage.patch deleted +0 -35
deleted file mode 100644
index ed939fb9bf..0000000000
@@ -1,35 +0,0 @@
-Disable doxygen usage
-
-In order to avoid a dependency on doxygen on the build machine, this
-patch adjusts the main Makefile to not build and install the
-documentation.
-
-[Vincent: tweak patch for 1.1.1 version]
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Signed-off-by: Vicente Olivert Riera <[email protected]>
-
-diff -rup a/Makefile b/Makefile
---- a/Makefile	2017-05-24 05:23:57.000000000 +0100
-+++ b/Makefile	2017-05-25 10:35:20.781747053 +0100
-@@ -11,14 +11,12 @@ export MANDIR ?= $(PREFIX)/share/man
- all:
- 	$(MAKE) -C src
- 	$(MAKE) -C utils
--	$(MAKE) -C doxygen
- 	$(MAKE) -C examples
- 
- .PHONY: clean
- clean:
- 	$(MAKE) -C src clean
- 	$(MAKE) -C utils clean
--	$(MAKE) -C doxygen clean
- 	$(MAKE) -C examples clean
- 
- .PHONY: install
-@@ -30,5 +28,4 @@ install:
- 	install include/tinyalsa/version.h $(DESTDIR)$(INCDIR)/
- 	$(MAKE) -C src install
- 	$(MAKE) -C utils install
--	$(MAKE) -C doxygen install
- 
package/tinyalsa/0002-interval.h-add-missing-header.patch deleted +0 -36
deleted file mode 100644
index c043145b55..0000000000
@@ -1,36 +0,0 @@
-From 685e530d8a0063134642371eaacd01fee2f62d85 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-Date: Fri, 2 Jun 2017 12:19:03 +0300
-Subject: [PATCH] interval.h: add missing header
-
-The ssize_t type requires the unistd.h header. This fixes build with musl
-libc:
-
-In file included from ../include/tinyalsa/limits.h:32:0,
-                 from limits.c:1:
-../include/tinyalsa/interval.h:38:2: error: unknown type name 'ssize_t'
-  ssize_t max;
-  ^
-
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: https://github.com/tinyalsa/tinyalsa/pull/98
-
- include/tinyalsa/interval.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/tinyalsa/interval.h b/include/tinyalsa/interval.h
-index 3f6f3dce5d90..068571df5a63 100644
---- a/include/tinyalsa/interval.h
-+++ b/include/tinyalsa/interval.h
-@@ -30,6 +30,7 @@
- #define TINYALSA_INTERVAL_H
- 
- #include <stdlib.h>
-+#include <unistd.h>
- 
- /** A closed range signed interval. */
- 
--- 
-2.11.0
-
package/tinyalsa/tinyalsa.hash +2 -2
index d078bab597..f7673b1769 100644
@@ -1,3 +1,3 @@
 # locally computed
-sha256  d92b438cea348ae316c4b2cbf367b4f01ed821a947e6a34d813624e9e3c936c1  tinyalsa-1.1.1.tar.gz
-sha256  ca2b89a68c33fba3c8bcaec96f32907e2ede0eb33688ae61d29ec49732158f6d  NOTICE
+sha256  573ae0b2d3480851c1d2a12503ead2beea27f92d44ed47b74b553ba947994ef1  tinyalsa-2.0.0.tar.gz
+sha256  ea22a4711f5250f88a4d7011fbc65367d1b02ac954dcc49f5b6d7c135e6537c4  NOTICE
package/tinyalsa/tinyalsa.mk +4 -23
index bd9d9a00d0..b5c39e35d6 100644
@@ -4,30 +4,11 @@
 #
 ################################################################################
 
-TINYALSA_VERSION = 1.1.1
-TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION))
+TINYALSA_VERSION = 2.0.0
+TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION))
 TINYALSA_LICENSE = BSD-3-Clause
 TINYALSA_LICENSE_FILES = NOTICE
 TINYALSA_INSTALL_STAGING = YES
+TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled
 
-define TINYALSA_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D)
-endef
-
-define TINYALSA_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) \
-		-C $(@D) \
-		PREFIX="/usr" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		DESTDIR="$(STAGING_DIR)" install
-endef
-
-define TINYALSA_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) \
-		-C $(@D) \
-		PREFIX="/usr" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		DESTDIR="$(TARGET_DIR)" install
-endef
-
-$(eval $(generic-package))
+$(eval $(meson-package))
Signature · 6 lines
2.33.0

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 9 lines · Fabrice Fontaine

- Switch to meson-package to drop first patch and disable examples and utils
- Drop second patch (already in version)
- Update hash of NOTICE (empty new lines added with
https://github.com/tinyalsa/tinyalsa/commit/902b8c8f9fa5a2e1937007d7d5ee90f01790808b)

https://github.com/tinyalsa/tinyalsa/releases/tag/v2.0.0

Applied to master, thanks.

Regards,
Arnout

Quoted 132 lines
---
  .../tinyalsa/0001-disable-doxygen-usage.patch | 35 ------------------
  .../0002-interval.h-add-missing-header.patch  | 36 -------------------
  package/tinyalsa/tinyalsa.hash                |  4 +--
  package/tinyalsa/tinyalsa.mk                  | 27 +++-----------
  4 files changed, 6 insertions(+), 96 deletions(-)

delete mode 100644 package/tinyalsa/0001-disable-doxygen-usage.patch delete mode 100644 package/tinyalsa/0002-interval.h-add-missing-header.patch

package/tinyalsa/0001-disable-doxygen-usage.patch deleted +0 -35
deleted file mode 100644
index ed939fb9bf..0000000000
@@ -1,35 +0,0 @@
-Disable doxygen usage
-
-In order to avoid a dependency on doxygen on the build machine, this
-patch adjusts the main Makefile to not build and install the
-documentation.
-
-[Vincent: tweak patch for 1.1.1 version]
-
-Signed-off-by: Thomas Petazzoni <[email protected]>
-Signed-off-by: Vicente Olivert Riera <[email protected]>
-
-diff -rup a/Makefile b/Makefile
---- a/Makefile	2017-05-24 05:23:57.000000000 +0100
-+++ b/Makefile	2017-05-25 10:35:20.781747053 +0100
-@@ -11,14 +11,12 @@ export MANDIR ?= $(PREFIX)/share/man
- all:
- 	$(MAKE) -C src
- 	$(MAKE) -C utils
--	$(MAKE) -C doxygen
- 	$(MAKE) -C examples
-
- .PHONY: clean
- clean:
- 	$(MAKE) -C src clean
- 	$(MAKE) -C utils clean
--	$(MAKE) -C doxygen clean
- 	$(MAKE) -C examples clean
-
- .PHONY: install
-@@ -30,5 +28,4 @@ install:
- 	install include/tinyalsa/version.h $(DESTDIR)$(INCDIR)/
- 	$(MAKE) -C src install
- 	$(MAKE) -C utils install
--	$(MAKE) -C doxygen install
-
package/tinyalsa/0002-interval.h-add-missing-header.patch deleted +0 -36
deleted file mode 100644
index c043145b55..0000000000
@@ -1,36 +0,0 @@
-From 685e530d8a0063134642371eaacd01fee2f62d85 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <[email protected]>
-Date: Fri, 2 Jun 2017 12:19:03 +0300
-Subject: [PATCH] interval.h: add missing header
-
-The ssize_t type requires the unistd.h header. This fixes build with musl
-libc:
-
-In file included from ../include/tinyalsa/limits.h:32:0,
-                 from limits.c:1:
-../include/tinyalsa/interval.h:38:2: error: unknown type name 'ssize_t'
-  ssize_t max;
-  ^
-
-Signed-off-by: Baruch Siach <[email protected]>
----
-Upstream status: https://github.com/tinyalsa/tinyalsa/pull/98
-
- include/tinyalsa/interval.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/tinyalsa/interval.h b/include/tinyalsa/interval.h
-index 3f6f3dce5d90..068571df5a63 100644
---- a/include/tinyalsa/interval.h
-+++ b/include/tinyalsa/interval.h
-@@ -30,6 +30,7 @@
- #define TINYALSA_INTERVAL_H
-
- #include <stdlib.h>
-+#include <unistd.h>
-
- /** A closed range signed interval. */
-
---
-2.11.0
-
package/tinyalsa/tinyalsa.hash +2 -2
index d078bab597..f7673b1769 100644
@@ -1,3 +1,3 @@
  # locally computed
-sha256  d92b438cea348ae316c4b2cbf367b4f01ed821a947e6a34d813624e9e3c936c1  tinyalsa-1.1.1.tar.gz
-sha256  ca2b89a68c33fba3c8bcaec96f32907e2ede0eb33688ae61d29ec49732158f6d  NOTICE
+sha256  573ae0b2d3480851c1d2a12503ead2beea27f92d44ed47b74b553ba947994ef1  tinyalsa-2.0.0.tar.gz
+sha256  ea22a4711f5250f88a4d7011fbc65367d1b02ac954dcc49f5b6d7c135e6537c4  NOTICE
package/tinyalsa/tinyalsa.mk +3 -14
index bd9d9a00d0..b5c39e35d6 100644
@@ -4,30 +4,11 @@
  #
  ################################################################################
 
-TINYALSA_VERSION = 1.1.1
-TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION))
+TINYALSA_VERSION = 2.0.0
+TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,v$(TINYALSA_VERSION))
  TINYALSA_LICENSE = BSD-3-Clause
  TINYALSA_LICENSE_FILES = NOTICE
  TINYALSA_INSTALL_STAGING = YES
+TINYALSA_CONF_OPTS = -Ddocs=disabled -Dexamples=disabled -Dutils=disabled
 
-define TINYALSA_BUILD_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D)
-endef
-
-define TINYALSA_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) \
-		-C $(@D) \
-		PREFIX="/usr" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		DESTDIR="$(STAGING_DIR)" install
-endef
-

package/tinyalsa/tinyalsa.mk line 14

Quoted 10 lines
package/tinyalsa/tinyalsa.mk +1 -9
-define TINYALSA_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) $(MAKE) \
-		-C $(@D) \
-		PREFIX="/usr" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		DESTDIR="$(TARGET_DIR)" install
-endef
-
-$(eval $(generic-package))
+$(eval $(meson-package))

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot