[Buildroot] [PATCH/next v2 1/1] package/libbluray: add optional support for libudfread

[Buildroot] [PATCH/next v2 1/1] package/libbluray: add optional support for libudfread

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: rebased, removed patch which is included in current upstream release

 package/libbluray/libbluray.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk
index 5c5f603dd8..233797f38d 100644
--- a/package/libbluray/libbluray.mk
+++ b/package/libbluray/libbluray.mk
@@ -19,6 +19,10 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y)
 LIBBLURAY_DEPENDENCIES += libiconv
 endif
 
+ifeq ($(BR2_PACKAGE_LIBUDFREAD),y)
+LIBBLURAY_DEPENDENCIES += libudfread
+endif
+
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
 LIBBLURAY_DEPENDENCIES += freetype
 LIBBLURAY_CONF_OPTS += --with-freetype
-- 
2.29.2

[Buildroot] [PATCH/next v2 1/1] package/libbluray: add optional support for libudfread

[Yann E. MORIN]

Bernd, All,

On 2021-05-15 09:01 +0200, Bernd Kuhls spake thusly:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

In fact, this is fixing a hidden optional dependency, so I've applied to
master. Thanks!

Regards,
Yann E. MORIN.

> ---
> v2: rebased, removed patch which is included in current upstream release
> 
>  package/libbluray/libbluray.mk | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk
> index 5c5f603dd8..233797f38d 100644
> --- a/package/libbluray/libbluray.mk
> +++ b/package/libbluray/libbluray.mk
> @@ -19,6 +19,10 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y)
>  LIBBLURAY_DEPENDENCIES += libiconv
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LIBUDFREAD),y)
> +LIBBLURAY_DEPENDENCIES += libudfread
> +endif
> +
>  ifeq ($(BR2_PACKAGE_FREETYPE),y)
>  LIBBLURAY_DEPENDENCIES += freetype
>  LIBBLURAY_CONF_OPTS += --with-freetype
> -- 
> 2.29.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH/next v2 1/1] package/libbluray: add optional support for libudfread

[Bernd Kuhls]

Am Sat, 15 May 2021 18:15:29 +0200 schrieb Yann E. MORIN:

> Bernd, All,
> 
> On 2021-05-15 09:01 +0200, Bernd Kuhls spake thusly:
>> Signed-off-by: Bernd Kuhls
>> <bernd.kuhls@t-online.de>
> 
> In fact, this is fixing a hidden optional dependency, so I've applied to
> master. Thanks!

Hi Yann,

this is a bad idea because libbluray-1.2.1 contains a bug detecting 
libudfread so I sent the patch for the -next branch which contains the 
bump to the fixed libbluray version 1.3.0.

My original patch from February also contained a backported patch to fix 
the problem for libbluray-1.2.1: http://patchwork.ozlabs.org/project/
buildroot/patch/20210221172307.289368-1-bernd.kuhls at t-online.de/

So for the master branch, which is broken atm w.r.t. to the detection of 
udfread by libbluray, we have three choices:

- revert this commit
- apply the full patch http://patchwork.ozlabs.org/project/buildroot/
patch/20210221172307.289368-1-bernd.kuhls at t-online.de/
- bump libbluray to 1.3.0

Regards, Bernd

PS: @Yann:
I did not sent this mail CC to you because all mails I try to send are 
bouncing for years now:

<yann.morin.1998@free.fr>: host mx1.free.fr[212.27.48.7] said: 451 too 
many
    errors from your ip (194.25.134.83), please visit
    http://postmaster.free.fr/ (in reply to DATA command)

[Buildroot] [PATCH/next v2 1/1] package/libbluray: add optional support for libudfread

[Yann E. MORIN]

Bernd, All,

On 2021-05-15 22:40 +0200, Bernd Kuhls spake thusly:
> Am Sat, 15 May 2021 18:15:29 +0200 schrieb Yann E. MORIN:
> 
> > Bernd, All,
> > 
> > On 2021-05-15 09:01 +0200, Bernd Kuhls spake thusly:
> >> Signed-off-by: Bernd Kuhls
> >> <bernd.kuhls@t-online.de>
> > 
> > In fact, this is fixing a hidden optional dependency, so I've applied to
> > master. Thanks!
> 
> Hi Yann,
> 
> this is a bad idea because libbluray-1.2.1 contains a bug detecting 
> libudfread so I sent the patch for the -next branch which contains the 
> bump to the fixed libbluray version 1.3.0.

Ah, I was afraid of that. But then, what guarantees, on master, that
libudfread is never built before libbluray?

> My original patch from February also contained a backported patch to fix 
> the problem for libbluray-1.2.1: http://patchwork.ozlabs.org/project/
> buildroot/patch/20210221172307.289368-1-bernd.kuhls at t-online.de/

Ah, yes, I remember that patch, now. OK, so the bug is that, even if
libudfread is present, libbluray will not find it, because it is not
looking for the correct name.

> So for the master branch, which is broken atm w.r.t. to the detection of 

In fact, it is not more broken than before: libbluray was never going to
detect libudfread becasue it is not looking for the correct name.

> udfread by libbluray, we have three choices:
> 
> - revert this commit

Right, I will do that, and apply it to next.

> - apply the full patch http://patchwork.ozlabs.org/project/buildroot/
> patch/20210221172307.289368-1-bernd.kuhls at t-online.de/
> - bump libbluray to 1.3.0

Thanks for the heads up! :-)

> Regards, Bernd
> 
> PS: @Yann:
> I did not sent this mail CC to you because all mails I try to send are 
> bouncing for years now:
> 
> <yann.morin.1998@free.fr>: host mx1.free.fr[212.27.48.7] said: 451 too 
> many
>     errors from your ip (194.25.134.83), please visit
>     http://postmaster.free.fr/ (in reply to DATA command)

This error means just that: the MX server for free.fr has detected too
many errors from your IP (presumably someone at your ISP caused some
black list to include that IP...)

I have no lever on how free.fr or t-online manage their servers... :-/

Regards,
Yann E. MORIN.

> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH/next v2 1/1] package/libbluray: add optional support for libudfread

[Yann E. MORIN]

Bernd, All,

On 2021-05-15 09:01 +0200, Bernd Kuhls spake thusly:
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Applied to next, thanks.

Regards,
Yann E. MORIN.

> ---
> v2: rebased, removed patch which is included in current upstream release
> 
>  package/libbluray/libbluray.mk | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk
> index 5c5f603dd8..233797f38d 100644
> --- a/package/libbluray/libbluray.mk
> +++ b/package/libbluray/libbluray.mk
> @@ -19,6 +19,10 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y)
>  LIBBLURAY_DEPENDENCIES += libiconv
>  endif
>  
> +ifeq ($(BR2_PACKAGE_LIBUDFREAD),y)
> +LIBBLURAY_DEPENDENCIES += libudfread
> +endif
> +
>  ifeq ($(BR2_PACKAGE_FREETYPE),y)
>  LIBBLURAY_DEPENDENCIES += freetype
>  LIBBLURAY_CONF_OPTS += --with-freetype
> -- 
> 2.29.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH/next v2 1/1] package/libbluray: add optional support for libudfread

[Bernd Kuhls]

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
v2: added note that the patch fixes a bug (Yann)

 package/libbluray/0001-libudfread.patch | 32 +++++++++++++++++++++++++
 package/libbluray/libbluray.mk          |  6 +++++
 2 files changed, 38 insertions(+)
 create mode 100644 package/libbluray/0001-libudfread.patch

diff --git a/package/libbluray/0001-libudfread.patch b/package/libbluray/0001-libudfread.patch
new file mode 100644
index 0000000000..7e00069d47
--- /dev/null
+++ b/package/libbluray/0001-libudfread.patch
@@ -0,0 +1,32 @@
+From 24d38b8ec371d89b51f8b65f3085672db12334ff Mon Sep 17 00:00:00 2001
+From: Sebastian Ramacher <sramacher@debian.org>
+Date: Sun, 20 Dec 2020 13:32:33 +0100
+Subject: [PATCH] Update check for new libudfread pkg-config file name
+
+Fixes detection of libudfread due to upstream commit:
+https://code.videolan.org/videolan/libudfread/-/commit/76294a7449e068c527e31aec1a22076bf87c6302
+
+Downloaded from upstream commit:
+https://code.videolan.org/videolan/libbluray/-/commit/24d38b8ec371d89b51f8b65f3085672db12334ff
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e0e80cce..250db73b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -279,7 +279,7 @@ AM_CONDITIONAL([BDJ_J2SE], [ test x"$BDJ_TYPE" != x"j2me" ])
+ dnl bootclasspath
+ AC_SUBST(BDJ_BOOTCLASSPATH)
+ 
+-PKG_CHECK_MODULES([LIBUDFREAD], [udfread >= 1.1.0],
++PKG_CHECK_MODULES([LIBUDFREAD], [libudfread >= 1.1.0],
+     [with_libudfread=yes
+      AC_DEFINE([HAVE_LIBUDFREAD], [1], [Define to 1 if external libudfread is to be used])
+      PACKAGES="$PACKAGES libudfread >= 1.1.0"
+-- 
+GitLab
+
diff --git a/package/libbluray/libbluray.mk b/package/libbluray/libbluray.mk
index 36f59190b1..e4fca5204f 100644
--- a/package/libbluray/libbluray.mk
+++ b/package/libbluray/libbluray.mk
@@ -12,6 +12,8 @@ LIBBLURAY_LICENSE = LGPL-2.1+
 LIBBLURAY_LICENSE_FILES = COPYING
 LIBBLURAY_CPE_ID_VENDOR = videolan
 LIBBLURAY_DEPENDENCIES = host-pkgconf
+# 0001-libudfread.patch
+LIBBLURAY_AUTORECONF = YES
 
 LIBBLURAY_CONF_OPTS = --disable-bdjava-jar
 
@@ -19,6 +21,10 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y)
 LIBBLURAY_DEPENDENCIES += libiconv
 endif
 
+ifeq ($(BR2_PACKAGE_LIBUDFREAD),y)
+LIBBLURAY_DEPENDENCIES += libudfread
+endif
+
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
 LIBBLURAY_DEPENDENCIES += freetype
 LIBBLURAY_CONF_OPTS += --with-freetype
-- 
2.29.2