* [Buildroot] [PATCH/next 1/3] package/live555: Add a pkg-config file for the shared libraries
@ 2018-08-18 18:22 Bernd Kuhls
2018-08-18 18:22 ` [Buildroot] [PATCH/next 2/3] package/vlc: use pkgconf to find live555 libraries Bernd Kuhls
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Bernd Kuhls @ 2018-08-18 18:22 UTC (permalink / raw)
To: buildroot
Needed for vlc to fix linking issue.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
...config-file-for-the-shared-libraries.patch | 66 +++++++++++++++++++
1 file changed, 66 insertions(+)
create mode 100644 package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch
diff --git a/package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch b/package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch
new file mode 100644
index 0000000000..a2ae1c183a
--- /dev/null
+++ b/package/live555/0001-Add-a-pkg-config-file-for-the-shared-libraries.patch
@@ -0,0 +1,66 @@
+From: Benjamin Drung <bdrung@debian.org>
+Date: Sat, 16 Sep 2017 11:22:03 +0200
+Subject: Add a pkg-config file for the shared libraries
+
+This patch was downloaded from Debian
+https://sources.debian.org/src/liblivemedia/2018.08.05-1/debian/patches/0002-Add-a-pkg-config-file-for-the-shared-libraries.patch/
+
+The local/ part of PREXIX and LIBDIR was removed to fit into buildroot.
+
+A similar version of this patch is part of the vlc source repo:
+http://git.videolan.org/?p=vlc.git;a=blob;f=contrib/src/live555/add-pkgconfig-file.patch;hb=HEAD
+
+Upstream status: Rejected
+http://lists.live555.com/pipermail/live-devel/2013-January/016374.html
+http://lists.live555.com/pipermail/live-devel/2013-January/016375.html
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ Makefile.head | 3 +++
+ Makefile.tail | 7 ++++++-
+ live555.pc.in | 9 +++++++++
+ 3 files changed, 18 insertions(+), 1 deletion(-)
+ create mode 100644 live555.pc.in
+
+diff --git a/Makefile.head b/Makefile.head
+index 458c54c..1571037 100644
+--- a/Makefile.head
++++ b/Makefile.head
+@@ -1 +1,4 @@
++PREFIX = /usr
++LIBDIR = /usr/lib
++VERSION = $(shell grep LIVEMEDIA_LIBRARY_VERSION_STRING liveMedia/include/liveMedia_version.hh | sed 's/.*"\([^"]*\)".*/\1/')
+ ##### Change the following for your environment:
+diff --git a/Makefile.tail b/Makefile.tail
+index fc594ea..a20a527 100644
+--- a/Makefile.tail
++++ b/Makefile.tail
+@@ -22,7 +22,12 @@ all:
+ @echo
+ @echo "For more information about this source code (including your obligations under the LGPL), please see our FAQ at http://live555.com/liveMedia/faq.html"
+
+-install:
++install_shared_libraries:
++ install -d $(DESTDIR)$(LIBDIR)/pkgconfig
++ sed "s#@PREFIX@#$(PREFIX)#;s#@LIBDIR@#$(LIBDIR)#;s#@VERSION@#$(VERSION)#" live555.pc.in > $(DESTDIR)$(LIBDIR)/pkgconfig/live555.pc
++ chmod 644 $(DESTDIR)$(LIBDIR)/pkgconfig/live555.pc
++
++install: $(INSTALL2)
+ cd $(LIVEMEDIA_DIR) ; $(MAKE) install
+ cd $(GROUPSOCK_DIR) ; $(MAKE) install
+ cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE) install
+diff --git a/live555.pc.in b/live555.pc.in
+new file mode 100644
+index 0000000..3736944
+--- /dev/null
++++ b/live555.pc.in
+@@ -0,0 +1,9 @@
++prefix=@PREFIX@
++libdir=@LIBDIR@
++includedir=${prefix}/include
++
++Name: live555
++Description: multimedia RTSP streaming library
++Version: @VERSION@
++Cflags: -I${includedir}/liveMedia -I${includedir}/groupsock -I${includedir}/BasicUsageEnvironment -I${includedir}/UsageEnvironment
++Libs: -L${libdir} -lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH/next 2/3] package/vlc: use pkgconf to find live555 libraries
2018-08-18 18:22 [Buildroot] [PATCH/next 1/3] package/live555: Add a pkg-config file for the shared libraries Bernd Kuhls
@ 2018-08-18 18:22 ` Bernd Kuhls
2018-08-20 21:21 ` Thomas Petazzoni
2018-08-18 18:22 ` [Buildroot] [PATCH/next 3/3] package/live555: bump version to 2018.08.05 Bernd Kuhls
2018-08-20 21:21 ` [Buildroot] [PATCH/next 1/3] package/live555: Add a pkg-config file for the shared libraries Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Bernd Kuhls @ 2018-08-18 18:22 UTC (permalink / raw)
To: buildroot
Some live555 libraries were missing in LIVE555_LIBS.
Instead of maintaining the list of live555 library files we use pkgconf
instead.
Fixes
http://autobuild.buildroot.net/results/744/7445bdc2fdcb28aa7f58c0249653329414e447df/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/vlc/vlc.mk | 8 --------
1 file changed, 8 deletions(-)
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index ed682e60b3..d4be8b0bf1 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -427,14 +427,6 @@ endif
ifeq ($(BR2_PACKAGE_LIVE555),y)
VLC_CONF_OPTS += --enable-live555
VLC_DEPENDENCIES += live555
-VLC_CONF_ENV += \
- LIVE555_CFLAGS="\
- -I$(STAGING_DIR)/usr/include/BasicUsageEnvironment \
- -I$(STAGING_DIR)/usr/include/groupsock \
- -I$(STAGING_DIR)/usr/include/liveMedia \
- -I$(STAGING_DIR)/usr/include/UsageEnvironment \
- " \
- LIVE555_LIBS="-L$(STAGING_DIR)/usr/lib -lliveMedia"
else
VLC_CONF_OPTS += --disable-live555
endif
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH/next 3/3] package/live555: bump version to 2018.08.05
2018-08-18 18:22 [Buildroot] [PATCH/next 1/3] package/live555: Add a pkg-config file for the shared libraries Bernd Kuhls
2018-08-18 18:22 ` [Buildroot] [PATCH/next 2/3] package/vlc: use pkgconf to find live555 libraries Bernd Kuhls
@ 2018-08-18 18:22 ` Bernd Kuhls
2018-08-20 21:22 ` Thomas Petazzoni
2018-08-20 21:21 ` [Buildroot] [PATCH/next 1/3] package/live555: Add a pkg-config file for the shared libraries Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Bernd Kuhls @ 2018-08-18 18:22 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/live555/live555.hash | 4 ++--
package/live555/live555.mk | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/live555/live555.hash b/package/live555/live555.hash
index 66a7b7d74c..d74d674c7a 100644
--- a/package/live555/live555.hash
+++ b/package/live555/live555.hash
@@ -1,5 +1,5 @@
# From http://live555.com/liveMedia/public/live555-latest-md5.txt
-md5 a5acd14c4fa7b50f7270304d3b4a70ae live.2017.10.28.tar.gz
+md5 93c65b0f55f37835c727bbf65c1b61b4 live.2018.08.05.tar.gz
# Locally generated
-sha256 d8eaec9ded34321aa655d3c9007217dd447218c54cb48c97827e58ecd5edb338 live.2017.10.28.tar.gz
+sha256 c309fb6d499557250b4db8371243715b9ee2cdaa7ccacaf254bcc62e97566ae4 live.2018.08.05.tar.gz
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
diff --git a/package/live555/live555.mk b/package/live555/live555.mk
index 0507ee9b1b..a5479d6d7c 100644
--- a/package/live555/live555.mk
+++ b/package/live555/live555.mk
@@ -4,7 +4,7 @@
#
################################################################################
-LIVE555_VERSION = 2017.10.28
+LIVE555_VERSION = 2018.08.05
LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz
LIVE555_SITE = http://www.live555.com/liveMedia/public
LIVE555_LICENSE = LGPL-2.1+
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH/next 1/3] package/live555: Add a pkg-config file for the shared libraries
2018-08-18 18:22 [Buildroot] [PATCH/next 1/3] package/live555: Add a pkg-config file for the shared libraries Bernd Kuhls
2018-08-18 18:22 ` [Buildroot] [PATCH/next 2/3] package/vlc: use pkgconf to find live555 libraries Bernd Kuhls
2018-08-18 18:22 ` [Buildroot] [PATCH/next 3/3] package/live555: bump version to 2018.08.05 Bernd Kuhls
@ 2018-08-20 21:21 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2018-08-20 21:21 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 18 Aug 2018 20:22:56 +0200, Bernd Kuhls wrote:
> Needed for vlc to fix linking issue.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Applied to next, thanks.
> +Upstream status: Rejected
> +http://lists.live555.com/pipermail/live-devel/2013-January/016374.html
> +http://lists.live555.com/pipermail/live-devel/2013-January/016375.html
Wow. So everybody needs it (Debian, VLC, now Buildroot), and the answer
of upstream is "it's a distribution problem". Interesting.
Could you try to send it again ? Maybe 5 years later the maintainer
will have changed his mind, especially if you show that Debian, VLC and
Buildroot need it ?
Thanks,
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH/next 2/3] package/vlc: use pkgconf to find live555 libraries
2018-08-18 18:22 ` [Buildroot] [PATCH/next 2/3] package/vlc: use pkgconf to find live555 libraries Bernd Kuhls
@ 2018-08-20 21:21 ` Thomas Petazzoni
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2018-08-20 21:21 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 18 Aug 2018 20:22:57 +0200, Bernd Kuhls wrote:
> Some live555 libraries were missing in LIVE555_LIBS.
> Instead of maintaining the list of live555 library files we use pkgconf
> instead.
>
> Fixes
> http://autobuild.buildroot.net/results/744/7445bdc2fdcb28aa7f58c0249653329414e447df/
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/vlc/vlc.mk | 8 --------
> 1 file changed, 8 deletions(-)
Applied to next, thanks. pkg-config is good.
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH/next 3/3] package/live555: bump version to 2018.08.05
2018-08-18 18:22 ` [Buildroot] [PATCH/next 3/3] package/live555: bump version to 2018.08.05 Bernd Kuhls
@ 2018-08-20 21:22 ` Thomas Petazzoni
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2018-08-20 21:22 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 18 Aug 2018 20:22:58 +0200, Bernd Kuhls wrote:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/live555/live555.hash | 4 ++--
> package/live555/live555.mk | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
Applied to next, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-08-20 21:22 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-18 18:22 [Buildroot] [PATCH/next 1/3] package/live555: Add a pkg-config file for the shared libraries Bernd Kuhls
2018-08-18 18:22 ` [Buildroot] [PATCH/next 2/3] package/vlc: use pkgconf to find live555 libraries Bernd Kuhls
2018-08-20 21:21 ` Thomas Petazzoni
2018-08-18 18:22 ` [Buildroot] [PATCH/next 3/3] package/live555: bump version to 2018.08.05 Bernd Kuhls
2018-08-20 21:22 ` Thomas Petazzoni
2018-08-20 21:21 ` [Buildroot] [PATCH/next 1/3] package/live555: Add a pkg-config file for the shared libraries Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox