From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH 2/3] libupnp: Update to 1.14.5 Date: Wed, 14 Apr 2021 10:12:53 +0100 Message-ID: In-Reply-To: <29724bf8-f960-529d-4156-60c1292a2305@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3990425705834531555==" List-Id: --===============3990425705834531555== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hello, Thank you. This confirms that we can actually just merge this without expecti= ng any problems with other programs that are linked against this library. -Michael > On 12 Apr 2021, at 17:30, Adolf Belka wrote: >=20 > Hi Michael, >=20 > On 12/04/2021 13:17, Adolf Belka wrote: >> Hi Michael, >>=20 >> On 12/04/2021 11:53, Michael Tremer wrote: >>> Hello, >>>=20 >>> This patch contains an =E2=80=9Csoname bump=E2=80=9D, i.e. libupnp.so.6 h= as become libupnp.so.11. >>>=20 >>> Anything that is linked against the former won=E2=80=99t be able to use t= he latter version. Normally this can be checked with =E2=80=9C./make.sh find-= dependencies=E2=80=9D, but I currently do not have a full build environment o= n my build machine (trying to build loads of other things). >> Was not aware of the find-dependencies option. Thanks for letting me know. >>>=20 >>> 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? >>=20 > 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. >=20 > I did a git pull origin next to update my git repository to the latest IPFi= re next status. >=20 > I then did a ./make.sh clean followed by ./make.sh build >=20 > I then ran ./make.sh find-dependencies /usr/lib libupnp.so.6 >=20 > Nothing came back on the command line. >=20 > I then ran ./make.sh find-dependencies /usr/lib libupnp.so.17 >=20 > It came back with ipfire-2.x/build/usr/bin/mpd and nothing else. >=20 > Presuming that I had the correct format for the find-dependencies command t= hen 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. >=20 > Regards, >=20 > Adolf. >=20 >> Adolf. >>>=20 >>> -Michael >>>=20 >>>> On 9 Apr 2021, at 20:10, Adolf Belka wrote: >>>>=20 >>>> - 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 >>>>=20 >>>> Signed-off-by: Adolf Belka >>>> --- >>>> config/rootfiles/common/libupnp | 33 ++++++++++++++++++--------------- >>>> lfs/libupnp | 4 ++-- >>>> 2 files changed, 20 insertions(+), 17 deletions(-) >>>>=20 >>>> diff --git a/config/rootfiles/common/libupnp b/config/rootfiles/common/l= ibupnp >>>> 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 @@ >>>>=20 >>>> include Config >>>>=20 >>>> -VER =3D 1.6.18 >>>> +VER =3D 1.14.5 >>>>=20 >>>> THISAPP =3D libupnp-$(VER) >>>> DL_FILE =3D $(THISAPP).tar.bz2 >>>> @@ -40,7 +40,7 @@ objects =3D $(DL_FILE) >>>>=20 >>>> $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) >>>>=20 >>>> -$(DL_FILE)_MD5 =3D 11c6484fd2e2927bf3b8d8108407ca56 >>>> +$(DL_FILE)_MD5 =3D 813094b1348883d1091199ff516674dd >>>>=20 >>>> install : $(TARGET) >>>>=20 >>>> --=20 >>>> 2.31.1 >>>>=20 >>>=20 --===============3990425705834531555==--