Here are updates to libdvdread 6.1.2, libdvdnav 6.1.1, and libdvdcss 1.4.3.
I also tweaked libdvd to dlopen libdvdcss as I did with libbluray and as
done elsewhere, that is without a major version hardcoded.
Index: devel/libdvdread/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/libdvdread/Makefile,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 Makefile
--- devel/libdvdread/Makefile 18 Dec 2020 17:28:16 -0000 1.33
+++ devel/libdvdread/Makefile 21 Apr 2021 01:45:15 -0000
@@ -2,7 +2,7 @@
COMMENT = accessing DVD files
-VER = 6.1.1
+VER = 6.1.2
DISTNAME = libdvdread-${VER}
CATEGORIES = devel
MASTER_SITES = https://download.videolan.org/pub/videolan/libdvdread/${VER}/
@@ -20,7 +20,7 @@ PERMIT_PACKAGE = Yes
WANTLIB = dvdcss
# dlopen'd
-LIB_DEPENDS = converters/libdvdcss>=1.4.2
+LIB_DEPENDS = converters/libdvdcss>=1.4.3
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS =--disable-apidoc
Index: devel/libdvdread/distinfo
===================================================================
RCS file: /home/cvs/ports/devel/libdvdread/distinfo,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 distinfo
--- devel/libdvdread/distinfo 15 Dec 2020 18:57:38 -0000 1.14
+++ devel/libdvdread/distinfo 18 Apr 2021 22:38:54 -0000
@@ -1,2 +1,2 @@
-SHA256 (libdvdread-6.1.1.tar.bz2) =
PjVzCaF8W+NzE4W56r2mt+P6AQ9GAioG8QRVO/jiF5Y=
-SIZE (libdvdread-6.1.1.tar.bz2) = 392134
+SHA256 (libdvdread-6.1.2.tar.bz2) =
zBkPVTdYztdXGFnjAfgCy0gh8WTQK/rP0yDBSk4Np2M=
+SIZE (libdvdread-6.1.2.tar.bz2) = 391536
Index: devel/libdvdread/patches/patch-src_dvd_input_c
===================================================================
RCS file: /home/cvs/ports/devel/libdvdread/patches/patch-src_dvd_input_c,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-src_dvd_input_c
--- devel/libdvdread/patches/patch-src_dvd_input_c 15 Dec 2020 18:57:38
-0000 1.5
+++ devel/libdvdread/patches/patch-src_dvd_input_c 15 Aug 2021 04:40:19
-0000
@@ -3,12 +3,12 @@ $OpenBSD: patch-src_dvd_input_c,v 1.5 20
Index: src/dvd_input.c
--- src/dvd_input.c.orig
+++ src/dvd_input.c
-@@ -324,7 +324,7 @@ int dvdinput_setup(void *priv, dvd_logger_cb *logcb)
+@@ -346,6 +346,8 @@ int dvdinput_setup(void *priv, dvd_logger_cb *logcb)
+ #define CSS_LIB "libdvdcss-2.dll"
#elif defined(__OS2__)
#define CSS_LIB "dvdcss2.dll"
++#elif defined(__OpenBSD__)
++ #define CSS_LIB "libdvdcss.so"
#else
-- #define CSS_LIB "libdvdcss.so.2"
-+ #define CSS_LIB "libdvdcss.so.4"
+ #define CSS_LIB "libdvdcss.so.2"
#endif
- dvdcss_library = dlopen(CSS_LIB, RTLD_LAZY);
-
Index: multimedia/libdvdnav/Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/libdvdnav/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- multimedia/libdvdnav/Makefile 26 Dec 2020 19:02:45 -0000 1.29
+++ multimedia/libdvdnav/Makefile 21 Apr 2021 01:47:20 -0000
@@ -2,7 +2,7 @@
COMMENT= DVD navigation library
-VER= 6.1.0
+VER= 6.1.1
DISTNAME= libdvdnav-${VER}
EPOCH= 0
CATEGORIES= multimedia
@@ -18,7 +18,7 @@ PERMIT_PACKAGE= Yes
WANTLIB= dvdread>=9.0 pthread
-LIB_DEPENDS= devel/libdvdread>=6.1.1
+LIB_DEPENDS= devel/libdvdread>=6.1.2
CONFIGURE_STYLE= gnu
Index: multimedia/libdvdnav/distinfo
===================================================================
RCS file: /home/cvs/ports/multimedia/libdvdnav/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- multimedia/libdvdnav/distinfo 15 Dec 2020 18:57:43 -0000 1.12
+++ multimedia/libdvdnav/distinfo 21 Apr 2021 01:47:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (libdvdnav-6.1.0.tar.bz2) = 9pexXqn3Xp82vfbsNyYwgWnxVOKx6Zhl0LvoI3IM7ls=
-SIZE (libdvdnav-6.1.0.tar.bz2) = 370145
+SHA256 (libdvdnav-6.1.1.tar.bz2) = wZGnR1lH0yP/doDPksD7G+gjdwGIXzdlbGTQTpjRjUg=
+SIZE (libdvdnav-6.1.1.tar.bz2) = 367606
Index: converters/libdvdcss/Makefile
===================================================================
RCS file: /home/cvs/ports/converters/libdvdcss/Makefile,v
retrieving revision 1.31
diff -u -p -u -p -r1.31 Makefile
--- converters/libdvdcss/Makefile 21 Mar 2020 18:58:06 -0000 1.31
+++ converters/libdvdcss/Makefile 21 Apr 2021 01:42:48 -0000
@@ -2,8 +2,7 @@
COMMENT= descramble scrambled DVDs
-VER= 1.4.2
-REVISION= 1
+VER= 1.4.3
DISTNAME= libdvdcss-${VER}
CATEGORIES= converters
MASTER_SITES= https://download.videolan.org/pub/videolan/libdvdcss/${VER}/
Index: converters/libdvdcss/distinfo
===================================================================
RCS file: /home/cvs/ports/converters/libdvdcss/distinfo,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 distinfo
--- converters/libdvdcss/distinfo 2 May 2018 19:35:14 -0000 1.19
+++ converters/libdvdcss/distinfo 21 Apr 2021 01:42:53 -0000
@@ -1,2 +1,2 @@
-SHA256 (libdvdcss-1.4.2.tar.bz2) = eMLtd+ycDY++1799OryCBouIZL5JTPrRZYITd/8/JXU=
-SIZE (libdvdcss-1.4.2.tar.bz2) = 366824
+SHA256 (libdvdcss-1.4.3.tar.bz2) = IzzJL13AHF06lvWzWCvn1c7lo1pS06CBWHRdPYYHAHk=
+SIZE (libdvdcss-1.4.3.tar.bz2) = 388404
Index: converters/libdvdcss/patches/patch-src_libdvdcss_c
===================================================================
RCS file: converters/libdvdcss/patches/patch-src_libdvdcss_c
diff -N converters/libdvdcss/patches/patch-src_libdvdcss_c
--- converters/libdvdcss/patches/patch-src_libdvdcss_c 21 Mar 2020 18:58:07
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_libdvdcss_c,v 1.1 2020/03/21 18:58:07 kmos Exp $
-
-Squelch potential buffer overflow warning
-
-Index: src/libdvdcss.c
---- src/libdvdcss.c.orig
-+++ src/libdvdcss.c
-@@ -320,7 +320,19 @@ static int init_cache_dir( dvdcss_t dvdcss )
- return -1;
- }
-
-- sprintf( psz_tagfile, "%s/" CACHE_TAG_NAME, dvdcss->psz_cachefile );
-+ i_ret = snprintf( psz_tagfile, PATH_MAX, "%s/" CACHE_TAG_NAME,
-+ dvdcss->psz_cachefile );
-+ if ( i_ret < 0 || i_ret >= PATH_MAX)
-+ {
-+ if ( i_ret < 0)
-+ print_error( dvdcss, "failed to compose cache directory tag
path");
-+ else
-+ print_error( dvdcss, "cache directory tag path too long: %s/"
CACHE_TAG_NAME,
-+ dvdcss->psz_cachefile );
-+ dvdcss->psz_cachefile[0] = '\0';
-+ return -1;
-+ }
-+
- i_fd = open( psz_tagfile, O_RDWR|O_CREAT, 0644 );
- if( i_fd >= 0 )
- {
Index: converters/libdvdcss/pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/converters/libdvdcss/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 PLIST
--- converters/libdvdcss/pkg/PLIST 25 Jan 2016 07:02:03 -0000 1.11
+++ converters/libdvdcss/pkg/PLIST 21 Apr 2021 01:43:50 -0000
@@ -2,7 +2,7 @@
include/dvdcss/
include/dvdcss/dvdcss.h
include/dvdcss/version.h
-lib/libdvdcss.a
+@static-lib lib/libdvdcss.a
lib/libdvdcss.la
@lib lib/libdvdcss.so.${LIBdvdcss_VERSION}
lib/pkgconfig/libdvdcss.pc
