* [PATCH 1/3] mpd: Update to 0.22.6
@ 2021-04-09 19:10 Adolf Belka
2021-04-09 19:10 ` [PATCH 2/3] libupnp: Update to 1.14.5 Adolf Belka
2021-04-09 19:10 ` [PATCH 3/3] libid3tag: Addition of pkgconfig file Adolf Belka
0 siblings, 2 replies; 7+ messages in thread
From: Adolf Belka @ 2021-04-09 19:10 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3168 bytes --]
- Update from 0.19.19 to 0.22.6
- Update rootfile
- Required update of libupnp
- Autotools no longer available
Build changed to meson
Meson build required addition of pkgconfig file for libid3tag
- Changelog is too large to include here.
Full details can be found in the NEWS file in the source tarball
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/packages/mpd | 12 +++--------
lfs/mpd | 39 ++++++++++++++++++-----------------
2 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/config/rootfiles/packages/mpd b/config/rootfiles/packages/mpd
index c49d33498..85501238b 100644
--- a/config/rootfiles/packages/mpd
+++ b/config/rootfiles/packages/mpd
@@ -1,16 +1,10 @@
etc/rc.d/init.d/mpd
usr/bin/mpd
-var/log/mpd.error.log
-var/log/mpd.log
#usr/share/doc/mpd
#usr/share/doc/mpd/AUTHORS
#usr/share/doc/mpd/COPYING
#usr/share/doc/mpd/NEWS
-#usr/share/doc/mpd/COMMANDS
-#usr/share/doc/mpd/README
#usr/share/doc/mpd/README.md
-#usr/share/doc/mpd/TODO
-#usr/share/doc/mpd/UPGRADING
-#usr/share/doc/mpd/mpdconf.example
-#usr/share/man/man1/mpd.1
-#usr/share/man/man5/mpd.conf.5
+#usr/share/icons/hicolor/scalable/apps/mpd.svg
+var/log/mpd.error.log
+var/log/mpd.log
diff --git a/lfs/mpd b/lfs/mpd
index f7abccf2c..3112575ad 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -24,7 +24,7 @@
include Config
-VER = 0.19.19
+VER = 0.22.6
THISAPP = mpd-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/${THISAPP}
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mpd
-PAK_VER = 20
+PAK_VER = 21
DEPS = alsa avahi faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus soxr
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6e4fca9a9c26dad08b61bac9a91802db
+$(DL_FILE)_MD5 = 774a6250870730f3d55eb1445ab751dd
install : $(TARGET)
@@ -78,22 +78,23 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
$(UPDATE_AUTOMAKE)
- cd $(DIR_APP) && ./configure \
- --prefix=/usr \
- --disable-ipv6 \
- --sysconfdir=/etc \
- --disable-sqlite \
- --disable-smbclient \
- --enable-id3 \
- --enable-vorbis \
- --enable-expat \
- --enable-ffmpeg \
- --enable-flac \
- --enable-lame-encoder \
- --enable-upnp \
- --disable-icu
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
+ cd $(DIR_APP) && meson --prefix=/usr \
+ --sysconfdir=/etc \
+ --libdir=/usr/lib \
+ -D ipv6=disabled \
+ -D sqlite=disabled \
+ -D smbclient=disabled \
+ -D id3tag=enabled \
+ -D vorbis=enabled \
+ -D expat=enabled \
+ -D ffmpeg=enabled \
+ -D flac=enabled \
+ -D lame=enabled \
+ -D upnp=enabled \
+ -D icu=disabled \
+ builddir/
+ cd $(DIR_APP) && ninja -C builddir/
+ cd $(DIR_APP) && ninja -C builddir/ install
#install initscripts
$(call INSTALL_INITSCRIPT,mpd)
--
2.31.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/3] libupnp: Update to 1.14.5
2021-04-09 19:10 [PATCH 1/3] mpd: Update to 0.22.6 Adolf Belka
@ 2021-04-09 19:10 ` Adolf Belka
2021-04-12 9:53 ` Michael Tremer
2021-04-09 19:10 ` [PATCH 3/3] libid3tag: Addition of pkgconfig file Adolf Belka
1 sibling, 1 reply; 7+ messages in thread
From: Adolf Belka @ 2021-04-09 19:10 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2640 bytes --]
- Update from 1.6.18 to 1.14.5
- Update required for successfgul build of mpd-0.22.6
- Update of rootfile
- Changelog is too large to include here
Full details can be found in the ChangeLog file in the source tarball
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/common/libupnp | 33 ++++++++++++++++++---------------
lfs/libupnp | 4 ++--
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/config/rootfiles/common/libupnp b/config/rootfiles/common/libupnp
index cec62c463..d5b6f5df0 100644
--- a/config/rootfiles/common/libupnp
+++ b/config/rootfiles/common/libupnp
@@ -1,34 +1,37 @@
#usr/include/upnp
-#usr/include/upnp/FreeList.h
-#usr/include/upnp/LinkedList.h
-#usr/include/upnp/ThreadPool.h
-#usr/include/upnp/TimerThread.h
+#usr/include/upnp/Callback.h
+#usr/include/upnp/UpnpActionComplete.h
+#usr/include/upnp/UpnpActionRequest.h
+#usr/include/upnp/UpnpDiscovery.h
+#usr/include/upnp/UpnpEvent.h
+#usr/include/upnp/UpnpEventSubscribe.h
+#usr/include/upnp/UpnpExtraHeaders.h
+#usr/include/upnp/UpnpFileInfo.h
#usr/include/upnp/UpnpGlobal.h
#usr/include/upnp/UpnpInet.h
#usr/include/upnp/UpnpIntTypes.h
+#usr/include/upnp/UpnpStateVarComplete.h
+#usr/include/upnp/UpnpStateVarRequest.h
#usr/include/upnp/UpnpStdInt.h
#usr/include/upnp/UpnpString.h
+#usr/include/upnp/UpnpSubscriptionRequest.h
#usr/include/upnp/UpnpUniStd.h
#usr/include/upnp/ithread.h
#usr/include/upnp/ixml.h
#usr/include/upnp/ixmldebug.h
+#usr/include/upnp/list.h
#usr/include/upnp/upnp.h
#usr/include/upnp/upnpconfig.h
#usr/include/upnp/upnpdebug.h
#usr/include/upnp/upnptools.h
#usr/lib/libixml.a
#usr/lib/libixml.la
-usr/lib/libixml.so
-usr/lib/libixml.so.2
-usr/lib/libixml.so.2.0.8
-#usr/lib/libthreadutil.a
-#usr/lib/libthreadutil.la
-usr/lib/libthreadutil.so
-usr/lib/libthreadutil.so.6
-usr/lib/libthreadutil.so.6.0.3
+#usr/lib/libixml.so
+usr/lib/libixml.so.11
+usr/lib/libixml.so.11.0.1
#usr/lib/libupnp.a
#usr/lib/libupnp.la
-usr/lib/libupnp.so
-usr/lib/libupnp.so.6
-usr/lib/libupnp.so.6.3.2
+#usr/lib/libupnp.so
+usr/lib/libupnp.so.17
+usr/lib/libupnp.so.17.0.5
#usr/lib/pkgconfig/libupnp.pc
diff --git a/lfs/libupnp b/lfs/libupnp
index 683a887ad..90cb48b84 100644
--- a/lfs/libupnp
+++ b/lfs/libupnp
@@ -24,7 +24,7 @@
include Config
-VER = 1.6.18
+VER = 1.14.5
THISAPP = libupnp-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 11c6484fd2e2927bf3b8d8108407ca56
+$(DL_FILE)_MD5 = 813094b1348883d1091199ff516674dd
install : $(TARGET)
--
2.31.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/3] libid3tag: Addition of pkgconfig file
2021-04-09 19:10 [PATCH 1/3] mpd: Update to 0.22.6 Adolf Belka
2021-04-09 19:10 ` [PATCH 2/3] libupnp: Update to 1.14.5 Adolf Belka
@ 2021-04-09 19:10 ` Adolf Belka
1 sibling, 0 replies; 7+ messages in thread
From: Adolf Belka @ 2021-04-09 19:10 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2054 bytes --]
- id3tag.pc pkgconfig file required for mpd-0.22.6 to find libid3tag
library files
- Update of rootfile
- update lfs to install id3tag.pc file to /usr/lib/pkgconfig directory
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/libid3tag/id3tag.pc | 8 ++++++++
config/rootfiles/packages/libid3tag | 3 ++-
lfs/libid3tag | 5 ++++-
3 files changed, 14 insertions(+), 2 deletions(-)
create mode 100644 config/libid3tag/id3tag.pc
diff --git a/config/libid3tag/id3tag.pc b/config/libid3tag/id3tag.pc
new file mode 100644
index 000000000..e03cc771e
--- /dev/null
+++ b/config/libid3tag/id3tag.pc
@@ -0,0 +1,8 @@
+prefix=/usr
+libdir=${prefix}/lib
+
+Name: ID3TAG
+Description: libid3tag - ID3 tag manipulation library
+Version: 0.15.1b
+Libs: -L${libdir} -lid3tag -lz
+Cflags:
diff --git a/config/rootfiles/packages/libid3tag b/config/rootfiles/packages/libid3tag
index 8963ab803..0899f8702 100644
--- a/config/rootfiles/packages/libid3tag
+++ b/config/rootfiles/packages/libid3tag
@@ -1,6 +1,7 @@
#usr/include/id3tag.h
#usr/lib/libid3tag.a
#usr/lib/libid3tag.la
-usr/lib/libid3tag.so
+#usr/lib/libid3tag.so
usr/lib/libid3tag.so.0
usr/lib/libid3tag.so.0.3.0
+usr/lib/pkgconfig/id3tag.pc
diff --git a/lfs/libid3tag b/lfs/libid3tag
index 8c61c5157..9005ca94c 100644
--- a/lfs/libid3tag
+++ b/lfs/libid3tag
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = libid3tag
-PAK_VER = 1
+PAK_VER = 2
DEPS =
@@ -78,6 +78,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
$(UPDATE_AUTOMAKE)
+ # install id3tag pkgconfig file
+ install -v -m 644 ${DIR_SRC}/config/libid3tag/id3tag.pc \
+ /usr/lib/pkgconfig/id3tag.pc
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
--
2.31.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] libupnp: Update to 1.14.5
2021-04-09 19:10 ` [PATCH 2/3] libupnp: Update to 1.14.5 Adolf Belka
@ 2021-04-12 9:53 ` Michael Tremer
2021-04-12 11:17 ` Adolf Belka
0 siblings, 1 reply; 7+ messages in thread
From: Michael Tremer @ 2021-04-12 9:53 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3405 bytes --]
Hello,
This patch contains an “soname bump”, i.e. libupnp.so.6 has become libupnp.so.11.
Anything that is linked against the former won’t be able to use the latter version. Normally this can be checked with “./make.sh find-dependencies”, but I currently do not have a full build environment on my build machine (trying to build loads of other things).
Just wanted to drop a note so that you are aware :)
-Michael
> On 9 Apr 2021, at 20:10, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>
> - Update from 1.6.18 to 1.14.5
> - Update required for successfgul build of mpd-0.22.6
> - Update of rootfile
> - Changelog is too large to include here
> Full details can be found in the ChangeLog file in the source tarball
>
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/rootfiles/common/libupnp | 33 ++++++++++++++++++---------------
> lfs/libupnp | 4 ++--
> 2 files changed, 20 insertions(+), 17 deletions(-)
>
> diff --git a/config/rootfiles/common/libupnp b/config/rootfiles/common/libupnp
> index cec62c463..d5b6f5df0 100644
> --- a/config/rootfiles/common/libupnp
> +++ b/config/rootfiles/common/libupnp
> @@ -1,34 +1,37 @@
> #usr/include/upnp
> -#usr/include/upnp/FreeList.h
> -#usr/include/upnp/LinkedList.h
> -#usr/include/upnp/ThreadPool.h
> -#usr/include/upnp/TimerThread.h
> +#usr/include/upnp/Callback.h
> +#usr/include/upnp/UpnpActionComplete.h
> +#usr/include/upnp/UpnpActionRequest.h
> +#usr/include/upnp/UpnpDiscovery.h
> +#usr/include/upnp/UpnpEvent.h
> +#usr/include/upnp/UpnpEventSubscribe.h
> +#usr/include/upnp/UpnpExtraHeaders.h
> +#usr/include/upnp/UpnpFileInfo.h
> #usr/include/upnp/UpnpGlobal.h
> #usr/include/upnp/UpnpInet.h
> #usr/include/upnp/UpnpIntTypes.h
> +#usr/include/upnp/UpnpStateVarComplete.h
> +#usr/include/upnp/UpnpStateVarRequest.h
> #usr/include/upnp/UpnpStdInt.h
> #usr/include/upnp/UpnpString.h
> +#usr/include/upnp/UpnpSubscriptionRequest.h
> #usr/include/upnp/UpnpUniStd.h
> #usr/include/upnp/ithread.h
> #usr/include/upnp/ixml.h
> #usr/include/upnp/ixmldebug.h
> +#usr/include/upnp/list.h
> #usr/include/upnp/upnp.h
> #usr/include/upnp/upnpconfig.h
> #usr/include/upnp/upnpdebug.h
> #usr/include/upnp/upnptools.h
> #usr/lib/libixml.a
> #usr/lib/libixml.la
> -usr/lib/libixml.so
> -usr/lib/libixml.so.2
> -usr/lib/libixml.so.2.0.8
> -#usr/lib/libthreadutil.a
> -#usr/lib/libthreadutil.la
> -usr/lib/libthreadutil.so
> -usr/lib/libthreadutil.so.6
> -usr/lib/libthreadutil.so.6.0.3
> +#usr/lib/libixml.so
> +usr/lib/libixml.so.11
> +usr/lib/libixml.so.11.0.1
> #usr/lib/libupnp.a
> #usr/lib/libupnp.la
> -usr/lib/libupnp.so
> -usr/lib/libupnp.so.6
> -usr/lib/libupnp.so.6.3.2
> +#usr/lib/libupnp.so
> +usr/lib/libupnp.so.17
> +usr/lib/libupnp.so.17.0.5
> #usr/lib/pkgconfig/libupnp.pc
> diff --git a/lfs/libupnp b/lfs/libupnp
> index 683a887ad..90cb48b84 100644
> --- a/lfs/libupnp
> +++ b/lfs/libupnp
> @@ -24,7 +24,7 @@
>
> include Config
>
> -VER = 1.6.18
> +VER = 1.14.5
>
> THISAPP = libupnp-$(VER)
> DL_FILE = $(THISAPP).tar.bz2
> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>
> -$(DL_FILE)_MD5 = 11c6484fd2e2927bf3b8d8108407ca56
> +$(DL_FILE)_MD5 = 813094b1348883d1091199ff516674dd
>
> install : $(TARGET)
>
> --
> 2.31.1
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] libupnp: Update to 1.14.5
2021-04-12 9:53 ` Michael Tremer
@ 2021-04-12 11:17 ` Adolf Belka
2021-04-12 16:30 ` Adolf Belka
0 siblings, 1 reply; 7+ messages in thread
From: Adolf Belka @ 2021-04-12 11:17 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 3761 bytes --]
Hi Michael,
On 12/04/2021 11:53, Michael Tremer wrote:
> Hello,
>
> This patch contains an “soname bump”, i.e. libupnp.so.6 has become libupnp.so.11.
>
> Anything that is linked against the former won’t be able to use the latter version. Normally this can be checked with “./make.sh find-dependencies”, but I currently do not have a full build environment on my build machine (trying to build loads of other things).
Was not aware of the find-dependencies option. Thanks for letting me know.
>
> Just wanted to drop a note so that you are aware :)
As you don't have a full build environment available at the moment should I carry that out?
Regards,
Adolf.
>
> -Michael
>
>> On 9 Apr 2021, at 20:10, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>
>> - Update from 1.6.18 to 1.14.5
>> - Update required for successfgul build of mpd-0.22.6
>> - Update of rootfile
>> - Changelog is too large to include here
>> Full details can be found in the ChangeLog file in the source tarball
>>
>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>> ---
>> config/rootfiles/common/libupnp | 33 ++++++++++++++++++---------------
>> lfs/libupnp | 4 ++--
>> 2 files changed, 20 insertions(+), 17 deletions(-)
>>
>> diff --git a/config/rootfiles/common/libupnp b/config/rootfiles/common/libupnp
>> index cec62c463..d5b6f5df0 100644
>> --- a/config/rootfiles/common/libupnp
>> +++ b/config/rootfiles/common/libupnp
>> @@ -1,34 +1,37 @@
>> #usr/include/upnp
>> -#usr/include/upnp/FreeList.h
>> -#usr/include/upnp/LinkedList.h
>> -#usr/include/upnp/ThreadPool.h
>> -#usr/include/upnp/TimerThread.h
>> +#usr/include/upnp/Callback.h
>> +#usr/include/upnp/UpnpActionComplete.h
>> +#usr/include/upnp/UpnpActionRequest.h
>> +#usr/include/upnp/UpnpDiscovery.h
>> +#usr/include/upnp/UpnpEvent.h
>> +#usr/include/upnp/UpnpEventSubscribe.h
>> +#usr/include/upnp/UpnpExtraHeaders.h
>> +#usr/include/upnp/UpnpFileInfo.h
>> #usr/include/upnp/UpnpGlobal.h
>> #usr/include/upnp/UpnpInet.h
>> #usr/include/upnp/UpnpIntTypes.h
>> +#usr/include/upnp/UpnpStateVarComplete.h
>> +#usr/include/upnp/UpnpStateVarRequest.h
>> #usr/include/upnp/UpnpStdInt.h
>> #usr/include/upnp/UpnpString.h
>> +#usr/include/upnp/UpnpSubscriptionRequest.h
>> #usr/include/upnp/UpnpUniStd.h
>> #usr/include/upnp/ithread.h
>> #usr/include/upnp/ixml.h
>> #usr/include/upnp/ixmldebug.h
>> +#usr/include/upnp/list.h
>> #usr/include/upnp/upnp.h
>> #usr/include/upnp/upnpconfig.h
>> #usr/include/upnp/upnpdebug.h
>> #usr/include/upnp/upnptools.h
>> #usr/lib/libixml.a
>> #usr/lib/libixml.la
>> -usr/lib/libixml.so
>> -usr/lib/libixml.so.2
>> -usr/lib/libixml.so.2.0.8
>> -#usr/lib/libthreadutil.a
>> -#usr/lib/libthreadutil.la
>> -usr/lib/libthreadutil.so
>> -usr/lib/libthreadutil.so.6
>> -usr/lib/libthreadutil.so.6.0.3
>> +#usr/lib/libixml.so
>> +usr/lib/libixml.so.11
>> +usr/lib/libixml.so.11.0.1
>> #usr/lib/libupnp.a
>> #usr/lib/libupnp.la
>> -usr/lib/libupnp.so
>> -usr/lib/libupnp.so.6
>> -usr/lib/libupnp.so.6.3.2
>> +#usr/lib/libupnp.so
>> +usr/lib/libupnp.so.17
>> +usr/lib/libupnp.so.17.0.5
>> #usr/lib/pkgconfig/libupnp.pc
>> diff --git a/lfs/libupnp b/lfs/libupnp
>> index 683a887ad..90cb48b84 100644
>> --- a/lfs/libupnp
>> +++ b/lfs/libupnp
>> @@ -24,7 +24,7 @@
>>
>> include Config
>>
>> -VER = 1.6.18
>> +VER = 1.14.5
>>
>> THISAPP = libupnp-$(VER)
>> DL_FILE = $(THISAPP).tar.bz2
>> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>>
>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>
>> -$(DL_FILE)_MD5 = 11c6484fd2e2927bf3b8d8108407ca56
>> +$(DL_FILE)_MD5 = 813094b1348883d1091199ff516674dd
>>
>> install : $(TARGET)
>>
>> --
>> 2.31.1
>>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] libupnp: Update to 1.14.5
2021-04-12 11:17 ` Adolf Belka
@ 2021-04-12 16:30 ` Adolf Belka
2021-04-14 9:12 ` Michael Tremer
0 siblings, 1 reply; 7+ messages in thread
From: Adolf Belka @ 2021-04-12 16:30 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 4720 bytes --]
Hi Michael,
On 12/04/2021 13:17, Adolf Belka wrote:
> Hi Michael,
>
> On 12/04/2021 11:53, Michael Tremer wrote:
>> Hello,
>>
>> This patch contains an “soname bump”, i.e. libupnp.so.6 has become libupnp.so.11.
>>
>> Anything that is linked against the former won’t be able to use the latter version. Normally this can be checked with “./make.sh find-dependencies”, but I currently do not have a full build environment on my build machine (trying to build loads of other things).
> Was not aware of the find-dependencies option. Thanks for letting me know.
>>
>> Just wanted to drop a note so that you are aware :)
> As you don't have a full build environment available at the moment should I carry that out?
>
Thought I would give it a try anyway to see how to do it, especially as you don't have a free build system to use currently.
I did a git pull origin next to update my git repository to the latest IPFire next status.
I then did a ./make.sh clean followed by ./make.sh build
I then ran ./make.sh find-dependencies /usr/lib libupnp.so.6
Nothing came back on the command line.
I then ran ./make.sh find-dependencies /usr/lib libupnp.so.17
It came back with ipfire-2.x/build/usr/bin/mpd and nothing else.
Presuming that I had the correct format for the find-dependencies command then it looks like everything is okay. If the command is not correct then let me know what I should be using and I will have another go.
Regards,
Adolf.
> Adolf.
>>
>> -Michael
>>
>>> On 9 Apr 2021, at 20:10, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>>
>>> - Update from 1.6.18 to 1.14.5
>>> - Update required for successfgul build of mpd-0.22.6
>>> - Update of rootfile
>>> - Changelog is too large to include here
>>> Full details can be found in the ChangeLog file in the source tarball
>>>
>>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>> ---
>>> config/rootfiles/common/libupnp | 33 ++++++++++++++++++---------------
>>> lfs/libupnp | 4 ++--
>>> 2 files changed, 20 insertions(+), 17 deletions(-)
>>>
>>> diff --git a/config/rootfiles/common/libupnp b/config/rootfiles/common/libupnp
>>> index cec62c463..d5b6f5df0 100644
>>> --- a/config/rootfiles/common/libupnp
>>> +++ b/config/rootfiles/common/libupnp
>>> @@ -1,34 +1,37 @@
>>> #usr/include/upnp
>>> -#usr/include/upnp/FreeList.h
>>> -#usr/include/upnp/LinkedList.h
>>> -#usr/include/upnp/ThreadPool.h
>>> -#usr/include/upnp/TimerThread.h
>>> +#usr/include/upnp/Callback.h
>>> +#usr/include/upnp/UpnpActionComplete.h
>>> +#usr/include/upnp/UpnpActionRequest.h
>>> +#usr/include/upnp/UpnpDiscovery.h
>>> +#usr/include/upnp/UpnpEvent.h
>>> +#usr/include/upnp/UpnpEventSubscribe.h
>>> +#usr/include/upnp/UpnpExtraHeaders.h
>>> +#usr/include/upnp/UpnpFileInfo.h
>>> #usr/include/upnp/UpnpGlobal.h
>>> #usr/include/upnp/UpnpInet.h
>>> #usr/include/upnp/UpnpIntTypes.h
>>> +#usr/include/upnp/UpnpStateVarComplete.h
>>> +#usr/include/upnp/UpnpStateVarRequest.h
>>> #usr/include/upnp/UpnpStdInt.h
>>> #usr/include/upnp/UpnpString.h
>>> +#usr/include/upnp/UpnpSubscriptionRequest.h
>>> #usr/include/upnp/UpnpUniStd.h
>>> #usr/include/upnp/ithread.h
>>> #usr/include/upnp/ixml.h
>>> #usr/include/upnp/ixmldebug.h
>>> +#usr/include/upnp/list.h
>>> #usr/include/upnp/upnp.h
>>> #usr/include/upnp/upnpconfig.h
>>> #usr/include/upnp/upnpdebug.h
>>> #usr/include/upnp/upnptools.h
>>> #usr/lib/libixml.a
>>> #usr/lib/libixml.la
>>> -usr/lib/libixml.so
>>> -usr/lib/libixml.so.2
>>> -usr/lib/libixml.so.2.0.8
>>> -#usr/lib/libthreadutil.a
>>> -#usr/lib/libthreadutil.la
>>> -usr/lib/libthreadutil.so
>>> -usr/lib/libthreadutil.so.6
>>> -usr/lib/libthreadutil.so.6.0.3
>>> +#usr/lib/libixml.so
>>> +usr/lib/libixml.so.11
>>> +usr/lib/libixml.so.11.0.1
>>> #usr/lib/libupnp.a
>>> #usr/lib/libupnp.la
>>> -usr/lib/libupnp.so
>>> -usr/lib/libupnp.so.6
>>> -usr/lib/libupnp.so.6.3.2
>>> +#usr/lib/libupnp.so
>>> +usr/lib/libupnp.so.17
>>> +usr/lib/libupnp.so.17.0.5
>>> #usr/lib/pkgconfig/libupnp.pc
>>> diff --git a/lfs/libupnp b/lfs/libupnp
>>> index 683a887ad..90cb48b84 100644
>>> --- a/lfs/libupnp
>>> +++ b/lfs/libupnp
>>> @@ -24,7 +24,7 @@
>>>
>>> include Config
>>>
>>> -VER = 1.6.18
>>> +VER = 1.14.5
>>>
>>> THISAPP = libupnp-$(VER)
>>> DL_FILE = $(THISAPP).tar.bz2
>>> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>>>
>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>>
>>> -$(DL_FILE)_MD5 = 11c6484fd2e2927bf3b8d8108407ca56
>>> +$(DL_FILE)_MD5 = 813094b1348883d1091199ff516674dd
>>>
>>> install : $(TARGET)
>>>
>>> --
>>> 2.31.1
>>>
>>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] libupnp: Update to 1.14.5
2021-04-12 16:30 ` Adolf Belka
@ 2021-04-14 9:12 ` Michael Tremer
0 siblings, 0 replies; 7+ messages in thread
From: Michael Tremer @ 2021-04-14 9:12 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 5113 bytes --]
Hello,
Thank you. This confirms that we can actually just merge this without expecting any problems with other programs that are linked against this library.
-Michael
> On 12 Apr 2021, at 17:30, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>
> Hi Michael,
>
> On 12/04/2021 13:17, Adolf Belka wrote:
>> Hi Michael,
>>
>> On 12/04/2021 11:53, Michael Tremer wrote:
>>> Hello,
>>>
>>> This patch contains an “soname bump”, i.e. libupnp.so.6 has become libupnp.so.11.
>>>
>>> Anything that is linked against the former won’t be able to use the latter version. Normally this can be checked with “./make.sh find-dependencies”, but I currently do not have a full build environment on my build machine (trying to build loads of other things).
>> Was not aware of the find-dependencies option. Thanks for letting me know.
>>>
>>> Just wanted to drop a note so that you are aware :)
>> As you don't have a full build environment available at the moment should I carry that out?
>>
> Thought I would give it a try anyway to see how to do it, especially as you don't have a free build system to use currently.
>
> I did a git pull origin next to update my git repository to the latest IPFire next status.
>
> I then did a ./make.sh clean followed by ./make.sh build
>
> I then ran ./make.sh find-dependencies /usr/lib libupnp.so.6
>
> Nothing came back on the command line.
>
> I then ran ./make.sh find-dependencies /usr/lib libupnp.so.17
>
> It came back with ipfire-2.x/build/usr/bin/mpd and nothing else.
>
> Presuming that I had the correct format for the find-dependencies command then it looks like everything is okay. If the command is not correct then let me know what I should be using and I will have another go.
>
> Regards,
>
> Adolf.
>
>> Adolf.
>>>
>>> -Michael
>>>
>>>> On 9 Apr 2021, at 20:10, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
>>>>
>>>> - Update from 1.6.18 to 1.14.5
>>>> - Update required for successfgul build of mpd-0.22.6
>>>> - Update of rootfile
>>>> - Changelog is too large to include here
>>>> Full details can be found in the ChangeLog file in the source tarball
>>>>
>>>> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
>>>> ---
>>>> config/rootfiles/common/libupnp | 33 ++++++++++++++++++---------------
>>>> lfs/libupnp | 4 ++--
>>>> 2 files changed, 20 insertions(+), 17 deletions(-)
>>>>
>>>> diff --git a/config/rootfiles/common/libupnp b/config/rootfiles/common/libupnp
>>>> index cec62c463..d5b6f5df0 100644
>>>> --- a/config/rootfiles/common/libupnp
>>>> +++ b/config/rootfiles/common/libupnp
>>>> @@ -1,34 +1,37 @@
>>>> #usr/include/upnp
>>>> -#usr/include/upnp/FreeList.h
>>>> -#usr/include/upnp/LinkedList.h
>>>> -#usr/include/upnp/ThreadPool.h
>>>> -#usr/include/upnp/TimerThread.h
>>>> +#usr/include/upnp/Callback.h
>>>> +#usr/include/upnp/UpnpActionComplete.h
>>>> +#usr/include/upnp/UpnpActionRequest.h
>>>> +#usr/include/upnp/UpnpDiscovery.h
>>>> +#usr/include/upnp/UpnpEvent.h
>>>> +#usr/include/upnp/UpnpEventSubscribe.h
>>>> +#usr/include/upnp/UpnpExtraHeaders.h
>>>> +#usr/include/upnp/UpnpFileInfo.h
>>>> #usr/include/upnp/UpnpGlobal.h
>>>> #usr/include/upnp/UpnpInet.h
>>>> #usr/include/upnp/UpnpIntTypes.h
>>>> +#usr/include/upnp/UpnpStateVarComplete.h
>>>> +#usr/include/upnp/UpnpStateVarRequest.h
>>>> #usr/include/upnp/UpnpStdInt.h
>>>> #usr/include/upnp/UpnpString.h
>>>> +#usr/include/upnp/UpnpSubscriptionRequest.h
>>>> #usr/include/upnp/UpnpUniStd.h
>>>> #usr/include/upnp/ithread.h
>>>> #usr/include/upnp/ixml.h
>>>> #usr/include/upnp/ixmldebug.h
>>>> +#usr/include/upnp/list.h
>>>> #usr/include/upnp/upnp.h
>>>> #usr/include/upnp/upnpconfig.h
>>>> #usr/include/upnp/upnpdebug.h
>>>> #usr/include/upnp/upnptools.h
>>>> #usr/lib/libixml.a
>>>> #usr/lib/libixml.la
>>>> -usr/lib/libixml.so
>>>> -usr/lib/libixml.so.2
>>>> -usr/lib/libixml.so.2.0.8
>>>> -#usr/lib/libthreadutil.a
>>>> -#usr/lib/libthreadutil.la
>>>> -usr/lib/libthreadutil.so
>>>> -usr/lib/libthreadutil.so.6
>>>> -usr/lib/libthreadutil.so.6.0.3
>>>> +#usr/lib/libixml.so
>>>> +usr/lib/libixml.so.11
>>>> +usr/lib/libixml.so.11.0.1
>>>> #usr/lib/libupnp.a
>>>> #usr/lib/libupnp.la
>>>> -usr/lib/libupnp.so
>>>> -usr/lib/libupnp.so.6
>>>> -usr/lib/libupnp.so.6.3.2
>>>> +#usr/lib/libupnp.so
>>>> +usr/lib/libupnp.so.17
>>>> +usr/lib/libupnp.so.17.0.5
>>>> #usr/lib/pkgconfig/libupnp.pc
>>>> diff --git a/lfs/libupnp b/lfs/libupnp
>>>> index 683a887ad..90cb48b84 100644
>>>> --- a/lfs/libupnp
>>>> +++ b/lfs/libupnp
>>>> @@ -24,7 +24,7 @@
>>>>
>>>> include Config
>>>>
>>>> -VER = 1.6.18
>>>> +VER = 1.14.5
>>>>
>>>> THISAPP = libupnp-$(VER)
>>>> DL_FILE = $(THISAPP).tar.bz2
>>>> @@ -40,7 +40,7 @@ objects = $(DL_FILE)
>>>>
>>>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>>>>
>>>> -$(DL_FILE)_MD5 = 11c6484fd2e2927bf3b8d8108407ca56
>>>> +$(DL_FILE)_MD5 = 813094b1348883d1091199ff516674dd
>>>>
>>>> install : $(TARGET)
>>>>
>>>> --
>>>> 2.31.1
>>>>
>>>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-04-14 9:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-09 19:10 [PATCH 1/3] mpd: Update to 0.22.6 Adolf Belka
2021-04-09 19:10 ` [PATCH 2/3] libupnp: Update to 1.14.5 Adolf Belka
2021-04-12 9:53 ` Michael Tremer
2021-04-12 11:17 ` Adolf Belka
2021-04-12 16:30 ` Adolf Belka
2021-04-14 9:12 ` Michael Tremer
2021-04-09 19:10 ` [PATCH 3/3] libid3tag: Addition of pkgconfig file Adolf Belka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox