tjh.dev / nixpkgs
nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

libbluray: fix build failure on 1.3.1 with java

Backported from an upstream patch

Gauvain 'GovanifY' Roussel-Tarbouriech 785ca266 938ea3de

+38 -8
+8 -5
pkgs/development/libraries/libbluray/BDJ-JARFILE-path.patch
··· 1 1 diff --git a/configure.ac b/configure.ac 2 - index 5007bbd..335f3f5 100644 2 + index 5007bbd..f46de1a 100644 3 3 --- a/configure.ac 4 4 +++ b/configure.ac 5 - @@ -253,6 +253,7 @@ AS_IF([test "x${JDK_HOME}" != "x"], [ 5 + @@ -253,7 +253,7 @@ AS_IF([test "x${JDK_HOME}" != "x"], [ 6 6 ]) 7 7 8 8 AS_IF([test "x$use_bdjava_jar" = "xyes"], [ 9 + - 9 10 + CPPFLAGS="${CPPFLAGS} -DJARDIR='\"\$(datadir)/java\"'" 10 - 11 11 dnl check for ant 12 12 AC_CHECK_PROG(HAVE_ANT, [ant], yes, no) 13 + AS_IF([test "x$HAVE_ANT" = "xno"], [ 13 14 diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c 14 - index 1cb1bfe..94a175c 100644 15 + index 1cb1bfe..f3711c2 100644 15 16 --- a/src/libbluray/bdj/bdj.c 16 17 +++ b/src/libbluray/bdj/bdj.c 17 - @@ -533,6 +533,7 @@ static char *_find_libbluray_jar0() 18 + @@ -533,6 +533,9 @@ static char *_find_libbluray_jar0() 18 19 # ifdef __FreeBSD__ 19 20 "/usr/local/share/java/" BDJ_JARFILE, 20 21 # else 22 + +# ifdef JARDIR 21 23 + JARDIR "/" BDJ_JARFILE, 24 + +# endif 22 25 "/usr/share/java/" BDJ_JARFILE, 23 26 "/usr/share/libbluray/lib/" BDJ_JARFILE, 24 27 # endif
+5 -3
pkgs/development/libraries/libbluray/default.nix
··· 20 20 sha256 = "sha256-wksPQcW3N7u2XFRP5jSVY3p3HBClGd/IAudp8RK0O3U="; 21 21 }; 22 22 23 - patches = optional withJava ./BDJ-JARFILE-path.patch; 23 + patches = [ 24 + ./BDJ-JARFILE-path.patch 25 + ./libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch 26 + ]; 24 27 25 28 nativeBuildInputs = [ pkg-config autoreconfHook ] 26 - ++ optionals withJava [ ant ] 27 - ; 29 + ++ optionals withJava [ ant ]; 28 30 29 31 buildInputs = [ fontconfig ] 30 32 ++ optional withJava jdk
+25
pkgs/development/libraries/libbluray/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch
··· 1 + From 8f26777b1ce124ff761f80ef52d6be10bcea323e Mon Sep 17 00:00:00 2001 2 + From: Fridrich Strba <fstrba@suse.com> 3 + Date: Mon, 25 Apr 2022 14:28:58 +0300 4 + Subject: [PATCH] Fix build failure after Oracle Java CPU for April 2022 5 + 6 + --- a/src/libbluray/bdj/java/java/io/BDFileSystem.java 7 + +++ b/src/libbluray/bdj/java/java/io/BDFileSystem.java 8 + @@ -227,6 +227,17 @@ public abstract class BDFileSystem extends FileSystem { 9 + return fs.isAbsolute(f); 10 + } 11 + 12 + + public boolean isInvalid(File f) { 13 + + try { 14 + + Method m = fs.getClass().getDeclaredMethod("isInvalid", new Class[] { File.class }); 15 + + Object[] args = new Object[] {(Object)f}; 16 + + Boolean result = (Boolean)m.invoke(fs, args); 17 + + return result.booleanValue(); 18 + + } finally { 19 + + return false; 20 + + } 21 + + } 22 + + 23 + public String resolve(File f) { 24 + if (!booted) 25 + return fs.resolve(f);