On 2019/01/15 12:01, Brad Smith wrote:
> Here are updates to libdvdread 6.0.0 / libdvdnav 6.0.0 and adding
> HTTPS URLs where appropriate to libdvdcss.
Diff looks good to me but I have no optical drives to test with..
> Index: devel/libdvdread/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/devel/libdvdread/Makefile,v
> retrieving revision 1.28
> diff -u -p -u -p -r1.28 Makefile
> --- devel/libdvdread/Makefile 15 Mar 2016 20:51:11 -0000 1.28
> +++ devel/libdvdread/Makefile 15 Jan 2019 16:58:01 -0000
> @@ -2,14 +2,13 @@
>
> COMMENT = accessing DVD files
>
> -VER = 5.0.3
> +VER = 6.0.0
> DISTNAME = libdvdread-${VER}
> -REVISION = 0
> CATEGORIES = devel
> -MASTER_SITES =
> http://download.videolan.org/pub/videolan/libdvdread/${VER}/
> +MASTER_SITES =
> https://download.videolan.org/pub/videolan/libdvdread/${VER}/
> EXTRACT_SUFX = .tar.bz2
>
> -SHARED_LIBS = dvdread 6.1
> +SHARED_LIBS = dvdread 7.0
>
> HOMEPAGE = http://dvdnav.mplayerhq.hu/
>
> @@ -21,7 +20,7 @@ PERMIT_PACKAGE_CDROM = Yes
> WANTLIB = dvdcss
>
> # dlopen'd
> -LIB_DEPENDS = converters/libdvdcss>=1.3.99
> +LIB_DEPENDS = converters/libdvdcss>=1.4.2
>
> CONFIGURE_STYLE = gnu
> CONFIGURE_ARGS =--disable-apidoc
> Index: devel/libdvdread/distinfo
> ===================================================================
> RCS file: /home/cvs/ports/devel/libdvdread/distinfo,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 distinfo
> --- devel/libdvdread/distinfo 27 Apr 2015 12:17:06 -0000 1.11
> +++ devel/libdvdread/distinfo 17 Feb 2018 20:47:16 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libdvdread-5.0.3.tar.bz2) =
> MhzfLb3IPJZXK8WDzSfYxmDdtUD/FmcuyyhgfQGO2Cs=
> -SIZE (libdvdread-5.0.3.tar.bz2) = 394885
> +SHA256 (libdvdread-6.0.0.tar.bz2) =
> szsZU7SGBUW3X278BuAdmEni6k95dlImOwtK9t0Q+TU=
> +SIZE (libdvdread-6.0.0.tar.bz2) = 394627
> 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.3
> diff -u -p -u -p -r1.3 patch-src_dvd_input_c
> --- devel/libdvdread/patches/patch-src_dvd_input_c 27 Apr 2015 12:17:06
> -0000 1.3
> +++ devel/libdvdread/patches/patch-src_dvd_input_c 17 Feb 2018 20:54:54
> -0000
> @@ -1,7 +1,9 @@
> $OpenBSD: patch-src_dvd_input_c,v 1.3 2015/04/27 12:17:06 ajacoutot Exp $
> ---- src/dvd_input.c.orig Wed Jan 28 11:17:27 2015
> -+++ src/dvd_input.c Tue Feb 10 14:36:16 2015
> -@@ -308,7 +308,7 @@ int dvdinput_setup(void)
> +
> +Index: src/dvd_input.c
> +--- src/dvd_input.c.orig
> ++++ src/dvd_input.c
> +@@ -282,7 +282,7 @@ int dvdinput_setup(void)
> #elif defined(__OS2__)
> #define CSS_LIB "dvdcss2.dll"
> #else
> Index: devel/libdvdread/patches/patch-src_dvd_reader_c
> ===================================================================
> RCS file: devel/libdvdread/patches/patch-src_dvd_reader_c
> diff -N devel/libdvdread/patches/patch-src_dvd_reader_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ devel/libdvdread/patches/patch-src_dvd_reader_c 15 Jan 2019 16:19:56
> -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +Invalidate cache when forcing filesize
> +
> +Index: src/dvd_reader.c
> +--- src/dvd_reader.c.orig
> ++++ src/dvd_reader.c
> +@@ -1332,6 +1332,8 @@ int DVDFileSeekForce(dvd_file_t *dvd_file, int offset,
> + force_size = (offset - 1) / DVD_VIDEO_LB_LEN + 1;
> + if( dvd_file->filesize < force_size ) {
> + dvd_file->filesize = force_size;
> ++ free(dvd_file->cache);
> ++ dvd_file->cache = NULL;
> + fprintf(stderr, "libdvdread: Ignored size of file indicated in
> UDF.\n");
> + }
> + }
> Index: devel/libdvdread/patches/patch-src_ifo_read_c
> ===================================================================
> RCS file: devel/libdvdread/patches/patch-src_ifo_read_c
> diff -N devel/libdvdread/patches/patch-src_ifo_read_c
> --- devel/libdvdread/patches/patch-src_ifo_read_c 15 Mar 2016 20:51:11
> -0000 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,19 +0,0 @@
> -$OpenBSD: patch-src_ifo_read_c,v 1.3 2016/03/15 20:51:11 kili Exp $
> -
> -Fix write after free.
> -
> -From git commit 4e269e52103a0422a3954ecc2f1901dec5fb4f0d (Petri
> -Hintukainen)
> -
> ---- src/ifo_read.c.orig Wed Jan 21 17:22:42 2015
> -+++ src/ifo_read.c Tue Mar 15 20:06:08 2016
> -@@ -1118,8 +1118,8 @@ void ifoFree_TT_SRPT(ifo_handle_t *ifofile) {
> -
> - if(ifofile->tt_srpt) {
> - free(ifofile->tt_srpt->title);
> -- free(ifofile->tt_srpt);
> - ifofile->tt_srpt->title = NULL;
> -+ free(ifofile->tt_srpt);
> - ifofile->tt_srpt = NULL;
> - }
> - }
> Index: devel/libdvdread/pkg/PLIST
> ===================================================================
> RCS file: /home/cvs/ports/devel/libdvdread/pkg/PLIST,v
> retrieving revision 1.7
> diff -u -p -u -p -r1.7 PLIST
> --- devel/libdvdread/pkg/PLIST 29 Nov 2014 07:35:40 -0000 1.7
> +++ devel/libdvdread/pkg/PLIST 17 Feb 2018 20:55:56 -0000
> @@ -9,6 +9,7 @@ include/dvdread/ifo_types.h
> include/dvdread/nav_print.h
> include/dvdread/nav_read.h
> include/dvdread/nav_types.h
> +include/dvdread/version.h
> lib/libdvdread.a
> lib/libdvdread.la
> @lib lib/libdvdread.so.${LIBdvdread_VERSION}
> Index: multimedia/libdvdnav/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/multimedia/libdvdnav/Makefile,v
> retrieving revision 1.24
> diff -u -p -u -p -r1.24 Makefile
> --- multimedia/libdvdnav/Makefile 27 Apr 2015 12:17:36 -0000 1.24
> +++ multimedia/libdvdnav/Makefile 15 Jan 2019 16:41:45 -0000
> @@ -2,11 +2,11 @@
>
> COMMENT= DVD navigation library
>
> -VER= 5.0.3
> +VER= 6.0.0
> DISTNAME= libdvdnav-${VER}
> EPOCH= 0
> CATEGORIES= multimedia
> -MASTER_SITES=
> http://download.videolan.org/pub/videolan/libdvdnav/${VER}/
> +MASTER_SITES=
> https://download.videolan.org/pub/videolan/libdvdnav/${VER}/
> EXTRACT_SUFX= .tar.bz2
>
> SHARED_LIBS= dvdnav 7.1
> @@ -16,9 +16,9 @@ HOMEPAGE= http://dvdnav.mplayerhq.hu/
> # GPLv2+
> PERMIT_PACKAGE_CDROM= Yes
>
> -WANTLIB= dvdread>=6.1 pthread
> +WANTLIB= dvdread>=7.0 pthread
>
> -LIB_DEPENDS= devel/libdvdread>=5.0.3
> +LIB_DEPENDS= devel/libdvdread>=6.0.0
>
> CONFIGURE_STYLE= gnu
>
> Index: multimedia/libdvdnav/distinfo
> ===================================================================
> RCS file: /home/cvs/ports/multimedia/libdvdnav/distinfo,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 distinfo
> --- multimedia/libdvdnav/distinfo 27 Apr 2015 12:17:36 -0000 1.9
> +++ multimedia/libdvdnav/distinfo 17 Feb 2018 20:58:47 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (libdvdnav-5.0.3.tar.bz2) =
> UJcCPj0rNpRMdj8d9wfuBrGdxjmyto+zAROl8sv2C20=
> -SIZE (libdvdnav-5.0.3.tar.bz2) = 372203
> +SHA256 (libdvdnav-6.0.0.tar.bz2) =
> 8KJxGwigIXWXkvjrFLuC/4o8kpv4jDO2T/zdqieTVhg=
> +SIZE (libdvdnav-6.0.0.tar.bz2) = 369605
> Index: converters/libdvdcss/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/converters/libdvdcss/Makefile,v
> retrieving revision 1.28
> diff -u -p -u -p -r1.28 Makefile
> --- converters/libdvdcss/Makefile 2 May 2018 19:35:14 -0000 1.28
> +++ converters/libdvdcss/Makefile 15 Jan 2019 16:43:06 -0000
> @@ -3,14 +3,15 @@
> COMMENT= descramble scrambled DVDs
>
> VER= 1.4.2
> +REVISION= 0
> DISTNAME= libdvdcss-${VER}
> CATEGORIES= converters
> -MASTER_SITES=
> http://download.videolan.org/pub/videolan/libdvdcss/${VER}/
> +MASTER_SITES=
> https://download.videolan.org/pub/videolan/libdvdcss/${VER}/
> EXTRACT_SUFX= .tar.bz2
>
> SHARED_LIBS= dvdcss 4.1
>
> -HOMEPAGE= http://www.videolan.org/developers/libdvdcss.html
> +HOMEPAGE= https://www.videolan.org/developers/libdvdcss.html
>
> # GPLv2+
> PERMIT_PACKAGE_CDROM= Free speech issue
>
