[PATCH 1/2] mpd: Add fmt as a run time dependency

[PATCH 1/2] mpd: Add fmt as a run time dependency

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 712 bytes --]

Fixes: Bug#12909
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 lfs/mpd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lfs/mpd b/lfs/mpd
index e4381fc1b..9e664bf41 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -34,10 +34,10 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 25
+PAK_VER    = 26
 SUP_ARCH   = aarch64 armv6l x86_64
 
-DEPS       = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr
+DEPS       = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr fmt
 
 SERVICES   = mpd
 
-- 
2.37.1

[PATCH 2/2] fmt: Convert from build only to run time also for mpd

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 1626 bytes --]

- libfmt required in run time by mpd
- mpd changelog specifically said fmt was a build only dependency
- Bug#12909 flagged up that fmt was also a run time dependency for mpd

Fixes: Bug#12909
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/rootfiles/{common => packages}/fmt | 4 ++--
 lfs/fmt                                   | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)
 rename config/rootfiles/{common => packages}/fmt (92%)

diff --git a/config/rootfiles/common/fmt b/config/rootfiles/packages/fmt
similarity index 92%
rename from config/rootfiles/common/fmt
rename to config/rootfiles/packages/fmt
index d9067f14a..ab97316a2 100644
--- a/config/rootfiles/common/fmt
+++ b/config/rootfiles/packages/fmt
@@ -18,6 +18,6 @@
 #usr/lib/cmake/fmt/fmt-targets-release.cmake
 #usr/lib/cmake/fmt/fmt-targets.cmake
 #usr/lib/libfmt.so
-#usr/lib/libfmt.so.8
-#usr/lib/libfmt.so.8.1.1
+usr/lib/libfmt.so.8
+usr/lib/libfmt.so.8.1.1
 #usr/lib/pkgconfig/fmt.pc
diff --git a/lfs/fmt b/lfs/fmt
index 754de03b1..9f36e4942 100644
--- a/lfs/fmt
+++ b/lfs/fmt
@@ -24,6 +24,8 @@
 
 include Config
 
+SUMMARY    = Open-source formatting library for C++
+
 VER        = 8.1.1
 
 THISAPP    = fmt-$(VER)
@@ -31,6 +33,11 @@ DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = fmt
+PAK_VER    = 1
+SUP_ARCH   = aarch64 armv6l x86_64
+
+DEPS       = 
 
 ###############################################################################
 # Top-level Rules
-- 
2.37.1

Re: [PATCH 1/2] mpd: Add fmt as a run time dependency

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 802 bytes --]

Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

> Fixes: Bug#12909
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
>  lfs/mpd | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lfs/mpd b/lfs/mpd
> index e4381fc1b..9e664bf41 100644
> --- a/lfs/mpd
> +++ b/lfs/mpd
> @@ -34,10 +34,10 @@ DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/${THISAPP}
>  TARGET     = $(DIR_INFO)/$(THISAPP)
>  PROG       = mpd
> -PAK_VER    = 25
> +PAK_VER    = 26
>  SUP_ARCH   = aarch64 armv6l x86_64
>  
> -DEPS       = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr
> +DEPS       = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr fmt
>  
>  SERVICES   = mpd
>  

Re: [PATCH 2/2] fmt: Convert from build only to run time also for mpd

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 1776 bytes --]

Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>

> - libfmt required in run time by mpd
> - mpd changelog specifically said fmt was a build only dependency
> - Bug#12909 flagged up that fmt was also a run time dependency for mpd
> 
> Fixes: Bug#12909
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
>  config/rootfiles/{common => packages}/fmt | 4 ++--
>  lfs/fmt                                   | 7 +++++++
>  2 files changed, 9 insertions(+), 2 deletions(-)
>  rename config/rootfiles/{common => packages}/fmt (92%)
> 
> diff --git a/config/rootfiles/common/fmt b/config/rootfiles/packages/fmt
> similarity index 92%
> rename from config/rootfiles/common/fmt
> rename to config/rootfiles/packages/fmt
> index d9067f14a..ab97316a2 100644
> --- a/config/rootfiles/common/fmt
> +++ b/config/rootfiles/packages/fmt
> @@ -18,6 +18,6 @@
>  #usr/lib/cmake/fmt/fmt-targets-release.cmake
>  #usr/lib/cmake/fmt/fmt-targets.cmake
>  #usr/lib/libfmt.so
> -#usr/lib/libfmt.so.8
> -#usr/lib/libfmt.so.8.1.1
> +usr/lib/libfmt.so.8
> +usr/lib/libfmt.so.8.1.1
>  #usr/lib/pkgconfig/fmt.pc
> diff --git a/lfs/fmt b/lfs/fmt
> index 754de03b1..9f36e4942 100644
> --- a/lfs/fmt
> +++ b/lfs/fmt
> @@ -24,6 +24,8 @@
>  
>  include Config
>  
> +SUMMARY    = Open-source formatting library for C++
> +
>  VER        = 8.1.1
>  
>  THISAPP    = fmt-$(VER)
> @@ -31,6 +33,11 @@ DL_FILE    = $(THISAPP).tar.gz
>  DL_FROM    = $(URL_IPFIRE)
>  DIR_APP    = $(DIR_SRC)/$(THISAPP)
>  TARGET     = $(DIR_INFO)/$(THISAPP)
> +PROG       = fmt
> +PAK_VER    = 1
> +SUP_ARCH   = aarch64 armv6l x86_64
> +
> +DEPS       = 
>  
>  ###############################################################################
>  # Top-level Rules