[ptxdist] [PATCH v2] beep: version bump 1.3 -> 1.4.12

[ptxdist] [PATCH v2] beep: version bump 1.3 -> 1.4.12

[Ladislav Michl]

From: Ladislav Michl <ladis@linux-mips.org>

Move package to a new upstream at https://github.com/spkr-beep/beep/

Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
---
 CHANGES:
 - v2: Add prepare rule to avoid dependencies on additional
       libraries (beep's GNUMakefile is trying to be smart,
       but lacks handling consequences)

 rules/beep.make | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/rules/beep.make b/rules/beep.make
index 69ab02f1a..234a3513f 100644
--- a/rules/beep.make
+++ b/rules/beep.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_BEEP) += beep
 #
 # Paths and names
 #
-BEEP_VERSION	:= 1.3
-BEEP_MD5	:= 49c340ceb95dbda3f97b2daafac7892a
+BEEP_VERSION	:= 1.4.12
+BEEP_MD5	:= a817f05c5473a23d700778b2c0108cc4
 BEEP		:= beep-$(BEEP_VERSION)
 BEEP_SUFFIX	:= tar.gz
-BEEP_URL	:= http://www.johnath.com/beep/$(BEEP).$(BEEP_SUFFIX)
+BEEP_URL	:= https://github.com/spkr-beep/beep/archive/refs/tags/v$(BEEP_VERSION).$(BEEP_SUFFIX)
 BEEP_SOURCE	:= $(SRCDIR)/$(BEEP).$(BEEP_SUFFIX)
 BEEP_DIR	:= $(BUILDDIR)/$(BEEP)
 BEEP_LICENSE	:= GPL-2.0-only
@@ -28,7 +28,25 @@ BEEP_LICENSE	:= GPL-2.0-only
 # ----------------------------------------------------------------------------
 
 BEEP_CONF_TOOL	:= NO
-BEEP_MAKE_OPT	:= CC=$(CROSS_CC)
+BEEP_MAKE_OPT	:= \
+	CC=$(CROSS_CC) \
+	prefix=/usr
+
+$(STATEDIR)/beep.prepare:
+	@$(call targetinfo)
+	# Override detected CFLAGS as some of them may require linking
+	# with additional libraries (-lubsan and -latomic)
+	@echo "common_CFLAGS = -std=gnu99 -pedantic"	>  $(BEEP_DIR)/local.mk
+	@echo "CFLAGS = -O2 -g -save-temps=obj"		>> $(BEEP_DIR)/local.mk
+	@$(call touch)
+
+# ----------------------------------------------------------------------------
+# Install
+# ----------------------------------------------------------------------------
+
+BEEP_INSTALL_OPT	:= \
+	prefix=/usr \
+	install
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.39.2

Re: [ptxdist] [APPLIED] beep: version bump 1.3 -> 1.4.12

[Michael Olbrich]

Thanks, applied as 0b9fb169815fdea1de4901ce0434a048affbff39.

Michael

[sent from post-receive hook]

On Sun, 12 May 2024 15:16:36 +0200, Ladislav Michl <oss-lists@triops.cz> wrote:
> Move package to a new upstream at https://github.com/spkr-beep/beep/
> 
> Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
> Message-Id: <ZitwRmqDAmeX1-45@lenoch>
> [mol: remove old patches]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/patches/beep-1.3/0001-Makefile-fix.patch b/patches/beep-1.3/0001-Makefile-fix.patch
> deleted file mode 100644
> index 3a0e4eae8034..000000000000
> --- a/patches/beep-1.3/0001-Makefile-fix.patch
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -From: Bastian Stender <bst@pengutronix.de>
> -Date: Tue, 10 Oct 2017 11:58:17 +0200
> -Subject: [PATCH] Makefile: fix
> -
> -Signed-off-by: Bastian Stender <bst@pengutronix.de>
> ----
> - Makefile | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index cc359c4843e4..23f40d4a2a10 100644
> ---- a/Makefile
> -+++ b/Makefile
> -@@ -1,9 +1,9 @@
> - CC=gcc
> - FLAGS=-Wall
> - EXEC_NAME=beep
> --INSTALL_DIR=/usr/bin
> -+INSTALL_DIR=${DESTDIR}/usr/bin
> - MAN_FILE=beep.1.gz
> --MAN_DIR=/usr/man/man1
> -+MAN_DIR=${DESTDIR}/usr/man/man1
> - 
> - default : beep
> - 
> diff --git a/patches/beep-1.3/series b/patches/beep-1.3/series
> deleted file mode 100644
> index 1511acea7106..000000000000
> --- a/patches/beep-1.3/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Makefile-fix.patch
> -# d6a7d2de78aeb0017353e94c1b0870c5  - git-ptx-patches magic
> diff --git a/rules/beep.make b/rules/beep.make
> index 69ab02f1ab6b..234a3513fe1c 100644
> --- a/rules/beep.make
> +++ b/rules/beep.make
> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_BEEP) += beep
>  #
>  # Paths and names
>  #
> -BEEP_VERSION	:= 1.3
> -BEEP_MD5	:= 49c340ceb95dbda3f97b2daafac7892a
> +BEEP_VERSION	:= 1.4.12
> +BEEP_MD5	:= a817f05c5473a23d700778b2c0108cc4
>  BEEP		:= beep-$(BEEP_VERSION)
>  BEEP_SUFFIX	:= tar.gz
> -BEEP_URL	:= http://www.johnath.com/beep/$(BEEP).$(BEEP_SUFFIX)
> +BEEP_URL	:= https://github.com/spkr-beep/beep/archive/refs/tags/v$(BEEP_VERSION).$(BEEP_SUFFIX)
>  BEEP_SOURCE	:= $(SRCDIR)/$(BEEP).$(BEEP_SUFFIX)
>  BEEP_DIR	:= $(BUILDDIR)/$(BEEP)
>  BEEP_LICENSE	:= GPL-2.0-only
> @@ -28,7 +28,25 @@ BEEP_LICENSE	:= GPL-2.0-only
>  # ----------------------------------------------------------------------------
>  
>  BEEP_CONF_TOOL	:= NO
> -BEEP_MAKE_OPT	:= CC=$(CROSS_CC)
> +BEEP_MAKE_OPT	:= \
> +	CC=$(CROSS_CC) \
> +	prefix=/usr
> +
> +$(STATEDIR)/beep.prepare:
> +	@$(call targetinfo)
> +	# Override detected CFLAGS as some of them may require linking
> +	# with additional libraries (-lubsan and -latomic)
> +	@echo "common_CFLAGS = -std=gnu99 -pedantic"	>  $(BEEP_DIR)/local.mk
> +	@echo "CFLAGS = -O2 -g -save-temps=obj"		>> $(BEEP_DIR)/local.mk
> +	@$(call touch)
> +
> +# ----------------------------------------------------------------------------
> +# Install
> +# ----------------------------------------------------------------------------
> +
> +BEEP_INSTALL_OPT	:= \
> +	prefix=/usr \
> +	install
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install