diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile
index adfee079ff52..0649ff548525 100644
--- a/multimedia/libbluray/Makefile
+++ b/multimedia/libbluray/Makefile
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	libbluray
-DISTVERSION=	1.1.1
-PORTREVISION=	2
+DISTVERSION=	1.2.1
 PORTEPOCH=	1
 CATEGORIES=	multimedia
-MASTER_SITES=	ftp://ftp.videolan.org/pub/videolan/${PORTNAME}/${PORTVERSION}/ \
-		http://blu.opsec.eu/
+MASTER_SITES=	https://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Blu-Ray discs playback library for media players
@@ -16,34 +14,38 @@ LICENSE=	LGPL21
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
-# dlopen dependencies
-LIB_DEPENDS+=	libaacs.so:multimedia/libaacs \
-		libbdplus.so:multimedia/libbdplus
 
-USES=		gnome iconv libtool pathfix pkgconfig tar:bzip2
+USES=		gnome libtool pathfix pkgconfig tar:bzip2
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	--disable-static
+CONFIGURE_ARGS=	--disable-doxygen-doc --disable-optimizations --disable-static
 CONFIGURE_ENV=	PACKAGES="" # Bug #226009
 
 INSTALL_TARGET=	install-strip
 
-.include "Makefile.include"
-
 OPTIONS_DEFINE=	JAVA
 OPTIONS_SUB=	yes
 
 JAVA_DESC=	Enable Blu-Ray Java support
 
-JAVA_BUILD_DEPENDS=		ant:devel/apache-ant
 JAVA_CATEGORIES=		java
+JAVA_BUILD_DEPENDS=		ant:devel/apache-ant
 JAVA_CONFIGURE_ENABLE=		bdjava-jar
-JAVA_CONFIGURE_ENV=		JDK_HOME="${JAVA_HOME}"
-JAVA_USE=			JAVA=yes
-JAVA_VARS=			JAVA_BUILD=yes JAVA_RUN=yes
+JAVA_CONFIGURE_WITH=		java9
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MJAVA}
+USE_JAVA=	yes
+JAVA_VERSION=	8
+JAVA_BUILD=	yes
+MAKE_ENV=	JAVA_HOME=${JAVA_HOME} \
+		PATH=${JAVA_HOME}/bin:${PATH}
+
+.endif
 
 post-patch:
 	@${RLN} ${WRKSRC}/jni/linux ${WRKSRC}/jni/freebsd
diff --git a/multimedia/libbluray/Makefile.include b/multimedia/libbluray/Makefile.include
deleted file mode 100644
index 1aa0f64e186a..000000000000
--- a/multimedia/libbluray/Makefile.include
+++ /dev/null
@@ -1,10 +0,0 @@
-# Makefile with common configure and install flags for libbluray
-# related ports.
-
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--prefix="${PREFIX}"
-CONFIGURE_ENV+=	PKG_CONFIG_PATH="${LOCALBASE}/libdata/pkgconfig"
-
-MAKE_ARGS+=	pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
-		CFLAGS=${CFLAGS:Q}
-
diff --git a/multimedia/libbluray/distinfo b/multimedia/libbluray/distinfo
index 72a180778cee..25553bbdbeb5 100644
--- a/multimedia/libbluray/distinfo
+++ b/multimedia/libbluray/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1554632967
-SHA256 (libbluray-1.1.1.tar.bz2) = 106478a17c8bcac8c7b4174e7432b2bad5a1e6dd2926c4224791fd4669472338
-SIZE (libbluray-1.1.1.tar.bz2) = 746034
+TIMESTAMP = 1604890408
+SHA256 (libbluray-1.2.1.tar.bz2) = 5223e83f7988ea2cc860b5cadcaf9cf971087b0c80ca7b60cc17c8300cae36ec
+SIZE (libbluray-1.2.1.tar.bz2) = 751063
diff --git a/multimedia/libbluray/files/patch-src_libbluray_bdj_build.xml b/multimedia/libbluray/files/patch-src_libbluray_bdj_build.xml
new file mode 100644
index 000000000000..093c16f2a34f
--- /dev/null
+++ b/multimedia/libbluray/files/patch-src_libbluray_bdj_build.xml
@@ -0,0 +1,29 @@
+--- src/libbluray/bdj/build.xml.orig	2020-11-09 05:36:04 UTC
++++ src/libbluray/bdj/build.xml
+@@ -8,10 +8,9 @@
+     <property name="dist"  location="../../.libs"/>
+     <property name="src_awt" value=""/>
+     <property name="src_asm" value="../../../contrib/asm/src/"/>
+-    <property name="bootclasspath" value=""/>
+     <property name="version" value=""/>
+-    <property name="java_version_asm" value="1.5"/>
+-    <property name="java_version_bdj" value="1.4"/>
++    <property name="java_version_asm" value="1.6"/>
++    <property name="java_version_bdj" value="1.6"/>
+ 
+     <target name="init">
+         <tstamp/>
+@@ -22,13 +21,11 @@
+     <target name="compile" depends="init"
+             description="compile the source " >
+         <javac srcdir="${src_asm}" destdir="${build}" debug="yes"
+-               bootclasspath="${bootclasspath}"
+                source="${java_version_asm}" target="${java_version_asm}">
+                <compilerarg value="-XDignore.symbol.file"/>
+                <compilerarg value="-Xlint:-deprecation"/>
+         </javac>
+         <javac srcdir="${src}${src_awt}" destdir="${build}" debug="yes"
+-               bootclasspath="${bootclasspath}"
+                source="${java_version_bdj}" target="${java_version_bdj}">
+                <compilerarg value="-XDignore.symbol.file"/>
+                <compilerarg value="-Xlint:-deprecation"/>
diff --git a/multimedia/libbluray/pkg-plist b/multimedia/libbluray/pkg-plist
index 5b6c4c986b00..06c4bfabfdda 100644
--- a/multimedia/libbluray/pkg-plist
+++ b/multimedia/libbluray/pkg-plist
@@ -1,4 +1,6 @@
 bin/bd_info
+bin/bd_list_titles
+bin/bd_splice
 include/libbluray/bluray-version.h
 include/libbluray/bluray.h
 include/libbluray/clpi_data.h
@@ -10,7 +12,7 @@ include/libbluray/overlay.h
 include/libbluray/player_settings.h
 lib/libbluray.so
 lib/libbluray.so.2
-lib/libbluray.so.2.1.1
+lib/libbluray.so.2.3.0
 libdata/pkgconfig/libbluray.pc
-%%JAVA%%%%JAVASHAREDIR%%/libbluray-j2se-1.1.1.jar
-%%JAVA%%%%JAVASHAREDIR%%/libbluray-awt-j2se-1.1.1.jar
+%%JAVA%%%%JAVASHAREDIR%%/libbluray-j2se-1.2.1.jar
+%%JAVA%%%%JAVASHAREDIR%%/libbluray-awt-j2se-1.2.1.jar