UPDATE: libdvdread 6.1.3

Here is an update to libdvdread 6.1.3.


libdvdread (6.1.3)
* Improvements for OpenBSD
* Fix crashes on some DVD (0 PCGI SRP)
* Misc source fixes and cleanups, including fixes for recent toolchains


Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/libdvdread/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- Makefile 11 Mar 2022 18:50:30 -0000 1.36
+++ Makefile 18 Sep 2022 06:02:42 -0000
@@ -1,8 +1,7 @@
COMMENT = accessing DVD files

-VER = 6.1.2
+VER = 6.1.3
DISTNAME = libdvdread-${VER}
-REVISION = 0
CATEGORIES = devel
MASTER_SITES = https://download.videolan.org/pub/videolan/libdvdread/${VER}/
EXTRACT_SUFX = .tar.bz2
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/devel/libdvdread/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo 11 Oct 2021 06:11:29 -0000 1.15
+++ distinfo 18 Sep 2022 05:53:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (libdvdread-6.1.2.tar.bz2) = zBkPVTdYztdXGFnjAfgCy0gh8WTQK/rP0yDBSk4Np2M=
-SIZE (libdvdread-6.1.2.tar.bz2) = 391536
+SHA256 (libdvdread-6.1.3.tar.bz2) = zjVFSZeiCMvlDpEjLw5z+xrDRxllgToTuHMKjxihU2k=
+SIZE (libdvdread-6.1.3.tar.bz2) = 395439
Index: patches/patch-src_bitreader_c
===================================================================
RCS file: patches/patch-src_bitreader_c
diff -N patches/patch-src_bitreader_c
--- patches/patch-src_bitreader_c 11 Mar 2022 18:50:30 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,62 +0,0 @@
-avoid reading the next byte ahead
-f6774c386f404b49a13d9027567d57e104c5a415
-
-Index: src/bitreader.c
---- src/bitreader.c.orig
-+++ src/bitreader.c
-@@ -26,12 +26,11 @@
-
- #include "dvdread/bitreader.h"
-
--int dvdread_getbits_init(getbits_state_t *state, uint8_t *start) {
-+int dvdread_getbits_init(getbits_state_t *state, const uint8_t *start) {
- if ((state == NULL) || (start == NULL)) return 0;
- state->start = start;
- state->bit_position = 0;
- state->byte_position = 0;
-- state->byte = start[0];
- return 1;
- }
-
-@@ -47,37 +46,32 @@ uint32_t dvdread_getbits(getbits_state_t *state, uint3
-
- if ((state->bit_position) > 0) { /* Last getbits left us in the middle of a byte. */
- if (number_of_bits > (8-state->bit_position)) { /* this getbits will span 2 or more bytes. */
-- byte = state->byte;
-+ byte = state->start[state->byte_position] << state->bit_position;
- byte = byte >> (state->bit_position);
- result = byte;
- number_of_bits -= (8-state->bit_position);
- state->bit_position = 0;
- state->byte_position++;
-- state->byte = state->start[state->byte_position];
- } else {
-- byte=state->byte;
-- state->byte = state->byte << number_of_bits;
-+ byte = state->start[state->byte_position] << state->bit_position;
- byte = byte >> (8 - number_of_bits);
- result = byte;
- state->bit_position += number_of_bits; /* Here it is impossible for bit_position > 8 */
- if (state->bit_position == 8) {
- state->bit_position = 0;
- state->byte_position++;
-- state->byte = state->start[state->byte_position];
- }
- number_of_bits = 0;
- }
- }
- if ((state->bit_position) == 0) {
- while (number_of_bits > 7) {
-- result = (result << 8) + state->byte;
-+ result = (result << 8) + state->start[state->byte_position];
- state->byte_position++;
-- state->byte = state->start[state->byte_position];
- number_of_bits -= 8;
- }
- if (number_of_bits > 0) { /* number_of_bits < 8 */
-- byte = state->byte;
-- state->byte = state->byte << number_of_bits;
-+ byte = state->start[state->byte_position] << state->bit_position;
- state->bit_position += number_of_bits; /* Here it is impossible for bit_position > 7 */
- byte = byte >> (8 - number_of_bits);
- result = (result << number_of_bits) + byte;
Index: patches/patch-src_dvd_input_c
===================================================================
RCS file: patches/patch-src_dvd_input_c
diff -N patches/patch-src_dvd_input_c
--- patches/patch-src_dvd_input_c 11 Mar 2022 18:50:30 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-Use correct name of the libdvdcss shared library on OpenBSD.
-1c031048907b72c4757926a06f2bc5fac42fba15
-
-Index: src/dvd_input.c
---- src/dvd_input.c.orig
-+++ src/dvd_input.c
-@@ -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"
-